Merge pull request #203 from alma/develop

Release 3.0.0
alma · Aug 8, 2023 · 9929915 · 9929915
2 parents 435d1f9 + e09bb2e
commit 9929915
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/alma/lib/Model/PaymentData.php b/alma/lib/Model/PaymentData.php
@@ -184,7 +184,7 @@ public static function dataFromCart($cart, $context, $feePlans, $forPayment = fa
                 'deferred_days' => $feePlans['deferredDays'],
                 'deferred_months' => $feePlans['deferredMonths'],
                 'purchase_amount' => PriceHelper::convertPriceToCents($purchaseAmount),
-                'customer_cancel_url' => $context->link->getPageLink('order'),
+                'customer_cancel_url' => $context->link->getPageLink('order&step=3'),
                 'return_url' => $context->link->getModuleLink('alma', 'validation'),
                 'ipn_callback_url' => $context->link->getModuleLink('alma', 'ipn'),
                 'shipping_address' => [

diff --git a/alma/views/templates/hook/_partials/displayPayment_deferred.tpl b/alma/views/templates/hook/_partials/displayPayment_deferred.tpl
@@ -66,7 +66,7 @@
                 </p>
             </div>
             {if $option.isInPageEnabled}
-                <div id="alma-inpage-payment-option-{$option.paymentOptionKey}" class="alma-inpage-payment-options" data-apimode="{$apiMode}" data-merchantid="{$merchantId}" data-isinpageenabled="{$option.isInPageEnabled}" data-installment="{$option.pnx}" data-purchaseamount="{$creditInfo.totalCart}" data-locale="{$option.locale}"></div>
+                <div id="alma-inpage-payment-option-{$option.paymentOptionKey|escape:'htmlall':'UTF-8'}" class="alma-inpage-payment-options" data-apimode="{$apiMode|escape:'htmlall':'UTF-8'}" data-merchantid="{$merchantId|escape:'htmlall':'UTF-8'}" data-isinpageenabled="{$option.isInPageEnabled|escape:'htmlall':'UTF-8'}" data-installment="{$option.pnx|escape:'htmlall':'UTF-8'}" data-purchaseamount="{$creditInfo.totalCart|escape:'htmlall':'UTF-8'}" data-locale="{$option.locale|escape:'htmlall':'UTF-8'}"></div>
             {/if}
         </div>
     {/if}    

diff --git a/alma/views/templates/hook/_partials/displayPayment_pnx.tpl b/alma/views/templates/hook/_partials/displayPayment_pnx.tpl
@@ -67,7 +67,7 @@
                 </p>
             </div>
             {if $option.isInPageEnabled}
-                <div id="alma-inpage-payment-option-{$option.paymentOptionKey}" class="alma-inpage-payment-options" data-apimode="{$apiMode}" data-merchantid="{$merchantId}" data-isinpageenabled="{$option.isInPageEnabled}" data-installment="{$option.pnx}" data-purchaseamount="{$creditInfo.totalCart}" data-locale="{$option.locale}"></div>
+                <div id="alma-inpage-payment-option-{$option.paymentOptionKey|escape:'htmlall':'UTF-8'}" class="alma-inpage-payment-options" data-apimode="{$apiMode|escape:'htmlall':'UTF-8'}" data-merchantid="{$merchantId|escape:'htmlall':'UTF-8'}" data-isinpageenabled="{$option.isInPageEnabled|escape:'htmlall':'UTF-8'}" data-installment="{$option.pnx|escape:'htmlall':'UTF-8'}" data-purchaseamount="{$creditInfo.totalCart|escape:'htmlall':'UTF-8'}" data-locale="{$option.locale|escape:'htmlall':'UTF-8'}"></div>
             {/if}
         </div>
     {/if}

diff --git a/alma/views/templates/hook/payment_button_deferred.tpl b/alma/views/templates/hook/payment_button_deferred.tpl
@@ -25,7 +25,7 @@
         {$desc|escape:'htmlall':'UTF-8'}
     </p>
     {if $isInPageEnabled}
-        <div class="alma-inpage" data-apimode="{$apiMode}" data-merchantid="{$merchantId}" data-isinpageenabled="{$isInPageEnabled}" data-installment="{$installment}" data-purchaseamount="{$creditInfo.totalCart}" data-locale="{$locale}"></div>
+        <div class="alma-inpage" data-apimode="{$apiMode|escape:'htmlall':'UTF-8'}" data-merchantid="{$merchantId|escape:'htmlall':'UTF-8'}" data-isinpageenabled="{$isInPageEnabled|escape:'htmlall':'UTF-8'}" data-installment="{$installment|escape:'htmlall':'UTF-8'}" data-purchaseamount="{$creditInfo.totalCart|escape:'htmlall':'UTF-8'}" data-locale="{$locale|escape:'htmlall':'UTF-8'}"></div>
     {else}
         {include file="modules/alma/views/templates/hook/_partials/deferred.tpl" plans=$plans}
     {/if}

diff --git a/alma/views/templates/hook/payment_button_pnx.tpl b/alma/views/templates/hook/payment_button_pnx.tpl
@@ -25,7 +25,7 @@
         {$desc|escape:'htmlall':'UTF-8'}
     </p>
     {if $isInPageEnabled}
-        <div class="alma-inpage" data-apimode="{$apiMode}" data-merchantid="{$merchantId}" data-isinpageenabled="{$isInPageEnabled}" data-installment="{$installment}" data-purchaseamount="{$creditInfo.totalCart}" data-locale="{$locale}"></div>
+        <div class="alma-inpage" data-apimode="{$apiMode|escape:'htmlall':'UTF-8'}" data-merchantid="{$merchantId|escape:'htmlall':'UTF-8'}" data-isinpageenabled="{$isInPageEnabled|escape:'htmlall':'UTF-8'}" data-installment="{$installment|escape:'htmlall':'UTF-8'}" data-purchaseamount="{$creditInfo.totalCart|escape:'htmlall':'UTF-8'}" data-locale="{$locale|escape:'htmlall':'UTF-8'}"></div>
     {else}
         {include file="modules/alma/views/templates/hook/_partials/feePlan.tpl" plans=$plans creditInfo=$creditInfo oneLiner=false}
     {/if}