Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #47

Merged
merged 4 commits into from
Aug 25, 2017
Merged

Develop #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de9c7f4
Fix try catch and static methods
JoValo Aug 22, 2017
f37d568
Update CDN
JoValo Aug 22, 2017
d1a292e
Fix - setPublishableKey depecrated
JoValo Aug 22, 2017
4f8012c
Merge pull request #45 from conekta/feature/exception-correction
JoValo Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions conekta_prestashop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,7 @@ protected function generateCardPaymentForm()
//value by default
$msi = 0;
$jumps = array(1);

if (Configuration::get('PAYMENT_METHS_INSTALLMET')) {
$msi = 1;
$total = $this->context->cart->getOrderTotal();
Expand All @@ -896,7 +897,6 @@ protected function generateCardPaymentForm()
'months' => $months,
'years' => $years,
'msi' => $msi,
'total' => $total,
'msi_jumps' => $jumps[0],
'test_private_key' => Configuration::get('TEST_PRIVATE_KEY')
));
Expand Down Expand Up @@ -1104,20 +1104,14 @@ public function processPayment($type, $token, $msi)
'id_module' => (int) $this->id
));
Tools::redirect($redirect);
} catch (\Conekta\ErrorList $e) {
$message = "";
$log_message = "";
} catch (\Exception $e) {
$log_message = $e->getMessage() . ' ';
if (class_exists('Logger')) {
foreach ($e->details as $single_error) {
$log_message = $single_error->message . ' ';
Logger::addLog($this->l('Payment transaction failed') . ' '
. $log_message, 2, null, 'Cart', (int)$this->context->cart->id, true);
}
Logger::addLog($this->l('Payment transaction failed') . ' '
. $log_message, 2, null, 'Cart', (int)$this->context->cart->id, true);
}

foreach ($e->details as $single_error) {
$message .= $single_error->message . ' ';
}
$message = $e->getMessage() . ' ';

$controller = Configuration::get('PS_ORDER_PROCESS_TYPE') ? 'order-opc.php' : 'order.php';
$location = $this->context->link->getPageLink($controller, true) . (strpos($controller, '?') !== false ? '&' : '?') . 'step=3&conekta_error=1&message=' . $message . '#conekta_error';
Expand Down
12 changes: 6 additions & 6 deletions model/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
class Config
{
public function getLineItems($items = '')
public static function getLineItems($items = '')
{
$lineItems = array();
foreach ($items as $item) {
Expand Down Expand Up @@ -51,7 +51,7 @@ public function getLineItems($items = '')
return $lineItems;
}

public function getTaxLines($items = '')
public static function getTaxLines($items = '')
{
$tax_lines = array();
foreach ($items as $item) {
Expand All @@ -69,7 +69,7 @@ public function getTaxLines($items = '')
return $tax_lines;
}

public function getDiscountLines($cart, $discounts = '')
public static function getDiscountLines($cart, $discounts = '')
{
$discount_lines = array();
if (!empty($discounts)) {
Expand All @@ -87,7 +87,7 @@ public function getDiscountLines($cart, $discounts = '')
return $discount_lines;
}

public function getShippingLines($shipping_service, $shipping_carrier = '', $shipping_price = '')
public static function getShippingLines($shipping_service, $shipping_carrier = '', $shipping_price = '')
{
$shipping_lines = array(
array(
Expand All @@ -101,7 +101,7 @@ public function getShippingLines($shipping_service, $shipping_carrier = '', $shi
return $shipping_lines;
}

public function getShippingContact($customer = '', $address_delivery = '', $state = '', $country = '')
public static function getShippingContact($customer = '', $address_delivery = '', $state = '', $country = '')
{
$shipping_contact = array(
"receiver" => $customer->firstname . " " . $customer->lastname,
Expand All @@ -119,7 +119,7 @@ public function getShippingContact($customer = '', $address_delivery = '', $stat
return $shipping_contact;
}

public function getCustomerInfo($customer = '', $address_delivery = '')
public static function getCustomerInfo($customer = '', $address_delivery = '')
{
$customer_info = array(
"name" => $customer->firstname . " " . $customer->lastname,
Expand Down
6 changes: 3 additions & 3 deletions model/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static function insertOxxoPayment($order, $charge_response, $reference, $
. ($charge_response->livemode == 'true' ? '1' : '0') . '\' )');
}

public function installDb()
public static function installDb()
{
return (Db::getInstance()->Execute('CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'conekta_transaction` (
`id_conekta_transaction` int(11) NOT NULL AUTO_INCREMENT,
Expand All @@ -73,7 +73,7 @@ public function installDb()
}


public function insertSpeiPayment($order, $charge_response, $reference, $currentOrder, $cartId)
public static function insertSpeiPayment($order, $charge_response, $reference, $currentOrder, $cartId)
{
return Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction(
type, id_cart, id_order, id_conekta_order, id_transaction, amount,
Expand All @@ -87,7 +87,7 @@ public function insertSpeiPayment($order, $charge_response, $reference, $current
. $reference . '\', \'' . ($charge_response->livemode == 'true' ? '1' : '0') . '\' )');
}

public function insertCardPayment($order, $charge_response, $currentOrder, $cartId)
public static function insertCardPayment($order, $charge_response, $currentOrder, $cartId)
{
return Db::getInstance()->Execute('INSERT INTO ' . _DB_PREFIX_ . 'conekta_transaction (
type, id_cart, id_order, id_conekta_order, id_transaction,
Expand Down
2 changes: 1 addition & 1 deletion views/js/tokenize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function conektaSetup()
}

/* Set Conekta public key */
Conekta.setPublishableKey(conekta_public_key);
Conekta.setPublicKey(conekta_public_key);
//since we are using smarty html_select_date custom function
$('#conekta-card-expiry-month').removeAttr('name');
$('#conekta-card-expiry-year').removeAttr('name');
Expand Down
28 changes: 0 additions & 28 deletions views/templates/front/spei.tpl
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions views/templates/hook/hook-header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* @version v1.0.0
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*}
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="https://conektaapi.s3.amazonaws.com/v0.3.2/js/conekta.js"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.conekta.io/js/latest/conekta.js"></script>
<script type="text/javascript" src="{$path|escape:'htmlall':'UTF-8'}views/js/tokenize.js"></script>
<script type="text/javascript">
var conekta_public_key = "{$api_key|escape:'htmlall':'UTF-8'}";
Expand Down