MAJ Module Paypal vers 5.1.1 (comme en prod)
This commit is contained in:
@@ -18,10 +18,11 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*/
|
||||
|
||||
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
|
||||
@@ -93,18 +94,18 @@
|
||||
var bt_amount = {$braintreeAmount|escape:'htmlall':'UTF-8'};
|
||||
var check3DS = {$check3Dsecure|escape:'htmlall':'UTF-8'};
|
||||
var bt_translations = {
|
||||
client:"{l s='Error create Client' mod='paypal'}",
|
||||
client:"{l s='Error creating Client Token' mod='paypal'}",
|
||||
card_nmb:"{l s='Card number' mod='paypal'}",
|
||||
cvc:"{l s='CVC' mod='paypal'}",
|
||||
date:"{l s='MM/YY' mod='paypal'}",
|
||||
hosted:"{l s='Error create Hosted fields' mod='paypal'}",
|
||||
hosted:"{l s='Error creating Hosted Fields' mod='paypal'}",
|
||||
empty:"{l s='All fields are empty! Please fill out the form.' mod='paypal'}",
|
||||
invalid:"{l s='Some fields are invalid :' mod='paypal'}",
|
||||
token:"{l s='Tokenization failed server side. Is the card valid?' mod='paypal'}",
|
||||
network:"{l s='Network error occurred when tokenizing.' mod='paypal'}",
|
||||
tkn_failed:"{l s='Tokenize failed' mod='paypal'}",
|
||||
https:"{l s='3D Secure requires HTTPS.' mod='paypal'}",
|
||||
load_3d:"{l s='Load 3D Secure Failed' mod='paypal'}",
|
||||
load_3d:"{l s='Loading 3D Secure failed' mod='paypal'}",
|
||||
request_problem:"{l s='There was a problem with your request.' mod='paypal'}",
|
||||
failed_3d:"{l s='3D Secure Failed' mod='paypal'}",
|
||||
empty_field:"{l s='is empty.' mod='paypal'}",
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
<!-- Header part menu -->
|
||||
@@ -48,17 +49,13 @@
|
||||
<section id="main">
|
||||
<section id="content" class="page-content card card-block">
|
||||
{include file='_partials/breadcrumb.tpl'}
|
||||
{if $method == 'BT'}
|
||||
<h2>{l s='Error in Braintree' mod='paypal'}</h2>
|
||||
{else}
|
||||
<h2>{l s='Error in Paypal' mod='paypal'}</h2>
|
||||
{/if}
|
||||
<h2>{l s='Error in Paypal' mod='paypal'}</h2>
|
||||
|
||||
<div class="table-responsive-row clearfix">
|
||||
<p class="paypal_error_msg">
|
||||
{if $error_msg == '' && $msg_long == ''}
|
||||
{if $error_code}<span class="code">[{$error_code|escape:'htmlall':'UTF-8'}]</span>{/if}
|
||||
{l s='Unexpected error occurred.' mod='paypal'}
|
||||
{l s='Unexpected error occurred. Please contact shop administrator.' mod='paypal'}
|
||||
{else}
|
||||
{if $error_code}<span class="code">[{$error_code|escape:'htmlall':'UTF-8'}]</span>{/if}
|
||||
{if $error_msg}<span class="short">{$error_msg|escape:'htmlall':'UTF-8'}</span>{/if}
|
||||
|
||||
@@ -17,13 +17,14 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
<p>{l s='Benefit from many PayPal advantages such as :' mod='paypal'}</p>
|
||||
<p><img src="{$path|escape:'html':'UTF-8'}views/img/protected.png" style="height: 43px; padding-right: 10px;">{l s='Your orders are protected' mod='paypal'}*</p>
|
||||
<p><img src="{$path|escape:'html':'UTF-8'}views/img/refund.png" style=" height: 43px; padding-right: 10px;">{l s='Return shipping refunded' mod='paypal'}*</p>
|
||||
<p><i>{l s='* See conditions on PayPal website' mod='paypal'}</i></p>
|
||||
<p><i>{l s='* See conditions on PayPal website' mod='paypal'}</i></p>
|
||||
|
||||
@@ -17,12 +17,12 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
|
||||
<p>{l s='You will be redirected to the PayPal website to process your card payment.' mod='paypal'}</p>
|
||||
<p>{l s='PayPal secures your payment and protect your financial information with strong encryption tools.' mod='paypal'}</p>
|
||||
<p>{l s='PayPal secures your payment and protect your financial information with strong encryption tools.' mod='paypal'}</p>
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
{extends file='customer/page.tpl'}
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-10">
|
||||
@@ -34,7 +35,7 @@
|
||||
<input type="hidden" name="payment_method_nonce" id="paypal_payment_method_nonce"/>
|
||||
<input type="hidden" name="payment_method_bt" value="{$bt_method|escape:'htmlall':'UTF-8'}"/>
|
||||
<div id="paypal-button"></div>
|
||||
<div id="paypal-vault-info"><p>{l s='You have to finish your payment done with your account PayPal:' mod='paypal'}</p></div>
|
||||
<div id="paypal-vault-info"><p>{l s='You have to finish your payment done with your PayPal account:' mod='paypal'}</p></div>
|
||||
{if isset($active_vaulting) && $active_vaulting}
|
||||
<div class="save-in-vault">
|
||||
<input type="checkbox" name="save_account_in_vault" id="save_account_in_vault"/> <label for="save_account_in_vault"> {l s='Memorize my PayPal account' mod='paypal'}</label>
|
||||
|
||||
@@ -17,41 +17,29 @@
|
||||
* versions in the future. If you wish to customize PrestaShop for your
|
||||
* needs please refer to http://www.prestashop.com for more information.
|
||||
*
|
||||
* @author PrestaShop SA <contact@prestashop.com>
|
||||
* @copyright 2007-2019 PrestaShop SA
|
||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
||||
* International Registered Trademark & Property of PrestaShop SA
|
||||
*}
|
||||
* @author 2007-2019 PayPal
|
||||
* @author 202 ecommerce <tech@202-ecommerce.com>
|
||||
* @copyright PayPal
|
||||
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
||||
*
|
||||
*}
|
||||
|
||||
<style>
|
||||
#popup-ppp-waiting p{
|
||||
font-size: 16px;
|
||||
margin: 10px;
|
||||
line-height: 1.5em;
|
||||
color: #373a3c;
|
||||
}
|
||||
#popup-ppp-waiting p {
|
||||
font-size: 16px;
|
||||
margin: 10px;
|
||||
line-height: 1.5em;
|
||||
color: #373a3c;
|
||||
}
|
||||
</style>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-10">
|
||||
<div class="paypal-plus-row-payment">
|
||||
<div class="payment_module paypal-plus">
|
||||
|
||||
{include file="module:paypal/views/templates/front/payment_infos.tpl"}
|
||||
|
||||
<div id="ppplus" style="width: 100%;"> </div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-10">
|
||||
<div class="paypal-plus-row-payment">
|
||||
<div class="payment_module paypal-plus">
|
||||
{include file="module:paypal/views/templates/front/payment_infos.tpl"}
|
||||
<div id="ppplus" style="width: 100%;"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
// no escape on url
|
||||
var ppp_approval_url = '{$approval_url_ppp nofilter}';
|
||||
var ppp_mode = '{$mode|escape:'htmlall':'UTF-8'}';
|
||||
var ppp_language_iso_code = '{$ppp_language_iso_code|escape:'htmlall':'UTF-8'}';
|
||||
var ppp_country_iso_code = '{$ppp_country_iso_code|escape:'htmlall':'UTF-8'}';
|
||||
// no escape on url
|
||||
var ajax_patch_url = '{$ajax_patch_url nofilter}';
|
||||
var waiting_redirection = "{l s='In few seconds you will be redirected to PayPal. Please wait.' mod='paypal'}";
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user