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

Feature/prestashop validator #16

Merged
merged 4 commits into from
Jul 28, 2017
Merged

Feature/prestashop validator #16

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
cd2c242
Correction blank spaces and totals
JoValo Jul 28, 2017
70f0a86
Merge branch 'master' of github.com:conekta/conekta_prestashop into f…
JoValo Jul 28, 2017
ad808fb
Correction discount lines
JoValo Jul 28, 2017
0c764b6
Correction security validator
JoValo Jul 28, 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
30 changes: 15 additions & 15 deletions conekta_prestashop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public function __construct()
'WEB_HOOK',
'PAYMENT_METHS_CARD',
'PAYMENT_METHS_INSTALLMET',
'PAYMENT_METHS_CASH',
'PAYMENT_METHS_SPEI',
'CONEKTA_CASH',
'CONEKTA_SPEI',
'TEST_PRIVATE_KEY',
'TEST_PUBLIC_KEY',
'LIVE_PRIVATE_KEY',
Expand Down Expand Up @@ -83,12 +83,12 @@ public function __construct()
$this->payment_method_installment = $config['PAYMENT_METHS_INSTALLMET'];
}

if (isset($config['PAYMENT_METHS_CASH'])) {
$this->payment_method_cash = $config['PAYMENT_METHS_CASH'];
if (isset($config['CONEKTA_CASH'])) {
$this->payment_method_cash = $config['CONEKTA_CASH'];
}

if (isset($config['PAYMENT_METHS_SPEI'])) {
$this->payment_method_spei = $config['PAYMENT_METHS_SPEI'];
if (isset($config['CONEKTA_SPEI'])) {
$this->payment_method_spei = $config['CONEKTA_SPEI'];
}

if (isset($config['TEST_PRIVATE_KEY'])) {
Expand Down Expand Up @@ -151,8 +151,8 @@ public function install()
||!$this->registerHook('adminOrder')
&& Configuration::updateValue('PAYMENT_METHS_CARD', 1)
&& Configuration::updateValue('PAYMENT_METHS_INSTALLMET', 1)
&& Configuration::updateValue('PAYMENT_METHS_CASH', 1)
&& Configuration::updateValue('PAYMENT_METHS_SPEI', 1)
&& Configuration::updateValue('CONEKTA_CASH', 1)
&& Configuration::updateValue('CONEKTA_SPEI', 1)
&& Configuration::updateValue('MODE', 0)
||!Database::installDb())
{
Expand Down Expand Up @@ -352,11 +352,11 @@ public function hookPaymentOptions($params)

$payment_options = array();

if (Configuration::get('PAYMENT_METHS_SPEI')) {
if (Configuration::get('CONEKTA_SPEI')) {
array_push($payment_options,$this->getSpeiPaymentOption());
}

if (Configuration::get('PAYMENT_METHS_CASH')) {
if (Configuration::get('CONEKTA_CASH')) {
array_push($payment_options,$this->getOxxoPaymentOption());
}

Expand Down Expand Up @@ -465,9 +465,9 @@ private function _postProcess()
Configuration::updateValue('WEB_HOOK', Tools::getValue('WEB_HOOK'));
Configuration::updateValue('PAYMENT_METHS_CARD', Tools::getValue('PAYMENT_METHS_CARD'));
Configuration::updateValue('PAYMENT_METHS_INSTALLMET', Tools::getValue('PAYMENT_METHS_INSTALLMET'));
Configuration::updateValue('PAYMENT_METHS_CASH', Tools::getValue('PAYMENT_METHS_CASH'));
Configuration::updateValue('CONEKTA_CASH', Tools::getValue('CONEKTA_CASH'));
Configuration::updateValue('PAYMENT_METHS_BANORTE', Tools::getValue('PAYMENT_METHS_BANORTE'));
Configuration::updateValue('PAYMENT_METHS_SPEI', Tools::getValue('PAYMENT_METHS_SPEI'));
Configuration::updateValue('CONEKTA_SPEI', Tools::getValue('CONEKTA_SPEI'));
Configuration::updateValue('TEST_PRIVATE_KEY', Tools::getValue('TEST_PRIVATE_KEY'));
Configuration::updateValue('TEST_PUBLIC_KEY', Tools::getValue('TEST_PUBLIC_KEY'));
Configuration::updateValue('LIVE_PRIVATE_KEY', Tools::getValue('LIVE_PRIVATE_KEY'));
Expand All @@ -492,9 +492,9 @@ public function getConfigFieldsValues()
'WEB_HOOK' => Tools::getValue('WEB_HOOK', Configuration::get('WEB_HOOK')),
'PAYMENT_METHS_CARD' => Tools::getValue('PAYMENT_METHS_CARD', Configuration::get('PAYMENT_METHS_CARD')),
'PAYMENT_METHS_INSTALLMET' => Tools::getValue('PAYMENT_METHS_INSTALLMET', Configuration::get('PAYMENT_METHS_INSTALLMET')),
'PAYMENT_METHS_CASH' => Tools::getValue('PAYMENT_METHS_CASH', Configuration::get('PAYMENT_METHS_CASH')),
'CONEKTA_CASH' => Tools::getValue('CONEKTA_CASH', Configuration::get('CONEKTA_CASH')),
'PAYMENT_METHS_BANORTE' => Tools::getValue('PAYMENT_METHS_BANORTE', Configuration::get('PAYMENT_METHS_BANORTE')),
'PAYMENT_METHS_SPEI' => Tools::getValue('PAYMENT_METHS_SPEI', Configuration::get('PAYMENT_METHS_SPEI')),
'CONEKTA_SPEI' => Tools::getValue('CONEKTA_SPEI', Configuration::get('CONEKTA_SPEI')),
'TEST_PRIVATE_KEY' => Tools::getValue('TEST_PRIVATE_KEY', Configuration::get('TEST_PRIVATE_KEY')),
'TEST_PUBLIC_KEY' => Tools::getValue('TEST_PUBLIC_KEY', Configuration::get('TEST_PUBLIC_KEY')),
'LIVE_PRIVATE_KEY' => Tools::getValue('LIVE_PRIVATE_KEY', Configuration::get('LIVE_PRIVATE_KEY')),
Expand Down Expand Up @@ -836,7 +836,7 @@ public function processPayment($type,$token)
$order_details['currency'] = $this->context->currency->iso_code;
$order_details['line_items'] = Config::getLineItems($items);
$order_details['tax_lines'] = Config::getTaxLines($items);
$order_details['discount_lines'] = Config::getDiscountLines($discounts);
$order_details['discount_lines'] = Config::getDiscountLines($discounts, $cart);
$order_details['customer_info'] = Config::getCustomerInfo($customer, $address_delivery);
$order_details['shipping_lines'] = Config::getShippingLines(
$shp_service, $shp_carrier, $shp_price
Expand Down
Empty file modified mails/index.php
100755 → 100644
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions model/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
* @version v1.0.0
*/

use Cart;

/**
* Class Config
*/
Expand Down Expand Up @@ -72,7 +74,7 @@ public function getTaxLines($items = '')
return $tax_lines;
}

public function getDiscountLines($discounts = '')
public function getDiscountLines($discounts = '', $cart)
{
$discount_lines = array();
if (!empty($discounts))
Expand All @@ -81,7 +83,7 @@ public function getDiscountLines($discounts = '')
$discount_lines = array_merge($discount_lines, array(
array(
'code' => $discount['code'],
'amount' => (int)$discount['value_real'] * 100,
'amount' => (string) $cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS) * 100,
'type' => 'coupon'
)
));
Expand Down
6 changes: 3 additions & 3 deletions views/templates/front/payment_form.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*}

<form action="{$action}" id="conekta-payment-form">
<form action="{$action|escape:'htmlall':'UTF-8'}" id="conekta-payment-form">
{if isset($smarty.get.conekta_error)}<a id="conekta_error" name="conekta_error"></a><div class="conekta-payment-errors">{l s='There was a problem processing your credit card, please double check your data and try again.' mod='conekta_prestashop'}</div>{/if}
<p>
<label>{l s='Nombre del Tarjetahabiente' mod='conekta_prestashop'}</label>
Expand All @@ -44,13 +44,13 @@
<label>{l s='Expiration (MM/AAAA)' mod='conekta_prestashop'}</label>
<select class="conekta-card-expiry-month" id="conekta-card-expiry-month" data-conekta="card[exp_month]" data-encrypted-name="month">
{foreach from=$months item=month}
<option value="{$month}">{$month}</option>
<option value="{$month|escape:'htmlall':'UTF-8'}">{$month|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
<span> / </span>
<select class="conekta-card-expiry-year" id="conekta-card-expiry-year" data-conekta="card[exp_year]" data-encrypted-name="year">
{foreach from=$years item=year}
<option value="{$year}">{$year}</option>
<option value="{$year|escape:'htmlall':'UTF-8'}">{$year|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
Expand Down
2 changes: 1 addition & 1 deletion views/templates/front/payment_return.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<p>{l s='Here are the params:' mod='conekta_prestashop'}</p>
<ul>
{foreach from=$params key=name item=value}
<li>{$name}: {$value}</li>
<li>{$name|escape:'htmlall':'UTF-8'}: {$value|escape:'htmlall':'UTF-8'}</li>
{/foreach}
</ul>
<p>{l s='Now, you just need to proceed the payment and do what you need to do.' mod='conekta_prestashop'}</p>
Expand Down