Merge remote-tracking branch 'github/master' into MPGS-534

# Conflicts: # README.md # simplifycommerce.php # views/js/simplify.js # views/templates/hook/module-wrapper.tpl
Mastercard-Gateway · Jul 27, 2021 · 2cbcaca · 2cbcaca
2 parents 1a2d495 + fd52ad7
commit 2cbcaca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/lib/Simplify.php b/lib/Simplify.php
@@ -54,7 +54,7 @@ class Simplify
     /**
      * @var string $userAgent User-agent string send with requests.
      */
-    public static $userAgent = null;
+    public static $userAgent = 'PrestaShop-2.1.0';
 
 }
 

diff --git a/views/templates/front/payment.tpl b/views/templates/front/payment.tpl
@@ -16,8 +16,7 @@
 <div>
     <script>
         var simplifyPublicKey = "{$simplify_public_key|escape:'htmlall':'UTF-8'}",
-            simplifyFirstname = "{$firstname|escape:'htmlall':'UTF-8'}",
-            simplifyLastname = "{$lastname|escape:'htmlall':'UTF-8'}",
+            simplifyCustomerName = "{$customer_name|escape:'htmlall':'UTF-8'}",
             simplifyCity = "{$city|escape:'htmlall':'UTF-8'}",
             simplifyAddress1 = "{$address1|escape:'htmlall':'UTF-8'}",
             simplifyAddress2 = "{$address2|escape:'htmlall':'UTF-8'}",
@@ -108,12 +107,12 @@
                     <div style="display:none">{* the order button clicks this hidden button *}
                         <button id="simplify-hosted-payment-button"
                                 data-sc-key="{$simplify_public_key|escape:'htmlall':'UTF-8'}"
-                                data-name="{$hosted_payment_name|escape:'htmlall':'UTF-8'}"
+                                {if isset($hosted_payment_name)}data-name="{$hosted_payment_name|escape:'htmlall':'UTF-8'}"{/if}
                                 data-description="{$hosted_payment_description|escape:'htmlall':'UTF-8'}"
                                 data-reference="{$hosted_payment_reference|escape:'htmlall':'UTF-8'}"
                                 data-amount="{$hosted_payment_amount}"
                                 data-operation="create.token"
-                                data-customer-name="{$firstname|escape:'htmlall':'UTF-8'} {$lastname|escape:'htmlall':'UTF-8'}"
+                                {if isset($customer_name)}data-customer-name="{$customer_name|escape:'htmlall':'UTF-8'}"{/if}
                                 data-color="{$overlay_color|escape:'htmlall':'UTF-8'}"
                                 data-currency="{$currency_iso}">
                             Pay Now

diff --git a/views/templates/hook/order_actions.tpl b/views/templates/hook/order_actions.tpl
@@ -33,16 +33,9 @@
             {if $can_void}
 				<a id="desc-order-void_payment" class="btn btn-default" href="{$link->getAdminLink('AdminSimplify')|escape:'html':'UTF-8'}&amp;action=void&amp;id_order={$order->id|intval}">
 					<i class="icon-remove"></i>
-                    {l s='Void Authorization' mod='simplifycommerce'}
+                    {l s='Reverse Authorization' mod='simplifycommerce'}
 				</a>
             {/if}
-
-{*            {if $can_refund}*}
-{*				<a id="desc-order-refund_payment" class="btn btn-default" href="{$link->getAdminLink('AdminSimplify')|escape:'html':'UTF-8'}&amp;action=refund&amp;id_order={$order->id|intval}">*}
-{*					<i class="icon-exchange"></i>*}
-{*                    {l s='Full Refund' mod='simplifycommerce'}*}
-{*				</a>*}
-{*            {/if}*}
 		</div>
     {/if}
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ class Simplify @@
         /**
          * @var string $userAgent User-agent string send with requests.
          */
-        public static $userAgent = null;
+        public static $userAgent = 'PrestaShop-2.1.0';
     }
@@ Expand Down @@