Fix payment for non classic theme

PayU-EMEA · Apr 18, 2023 · 99ddbf0 · 99ddbf0
1 parent 0a00e5a
commit 99ddbf0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/payu/controllers/front/payment.php b/payu/controllers/front/payment.php
@@ -79,7 +79,7 @@ public function initContent()
             }
         }
         elseif ($payMethod === 'card') {
-            $cardToken = Tools::getValue('cardToken1');
+            $cardToken = Tools::getValue('cardToken');
             $paymentId = Tools::getValue('payment_id');
 
             if ($cardToken) {

diff --git a/payu/js/payu17.js b/payu/js/payu17.js
@@ -31,36 +31,52 @@ function openPayment(paymentId) {
         var transferGateways = document.querySelectorAll('input[name=transfer_gateway_id]');
         var currentGateway = document.querySelector('input[name=transferGateway]');
 
+        document.querySelectorAll('[name=payment-option][data-module-name=payu]').forEach(function (element) {
+            element.addEventListener('click', function (ev) {
+                var paymentId = ev.target.id.replace('payment-option-', '');
+                var poaiElement = document.getElementById('payment-option-' + paymentId + '-additional-information');
+                var pwpofElement = document.getElementById('pay-with-payment-option-' + paymentId + '-form');
+                var pocElement = document.getElementById('payment-option-' + paymentId + '-container');
 
-        document.querySelectorAll('div.payment-option, .repayment-single').forEach(function (element) {
-            if ($(element).find('[name=payment-option]').data('moduleName') !== 'payu') {
-                return;
-            }
+                var paymentNameElement = poaiElement.querySelector('.payment-name');
 
-            element.addEventListener('click', function (ev) {
-                ev.stopPropagation();
-                var payment = $(element).parent('div').next('.additional-information').find('.payment-name').data('pm');
+                if (!paymentNameElement) {
+                    return;
+                }
 
-                if ($(element).hasClass('repayment-single')) {
-                    $(element).closest('.repayment-options').find('.additional-information').hide();
-                    $(element).parent('div').next('.additional-information').show();
+                var payment = paymentNameElement.dataset.pm;
 
-                    $('[name="payMethod"]').val(payment);
+                if (pocElement?.classList.contains('repayment-single')) {
+                    document.getElementById('payuRetryPayment17').querySelectorAll('.additional-information').forEach(function (el) {
+                        el.style.display = 'none';
+                    })
+                    poaiElement.style.display = 'block';
+                    document.querySelectorAll('[name=payMethod]').forEach(function (el) {
+                        el.value = payment;
+                    })
                 }
 
                 if (payment === 'transfer') {
-                    if(currentGateway !== null){
+                    if (currentGateway !== null){
                         currentGateway.value = '';
                     }
 
                     Array.from(document.querySelectorAll('.pay-methods__item')).forEach(function (el) {
                         el.classList.remove('payMethodActive');
                     });
+
+                    var paymentIdElement = pwpofElement?.querySelector('input[name=payment_id]');
+
                 } else if (payment === 'card') {
                     validateBeforeSubmitCardForm();
+
+                    var paymentIdElement = poaiElement?.querySelector('input[name=payment_id]');
+                }
+
+                if (paymentIdElement) {
+                    paymentIdElement.value = paymentId;
                 }
 
-                $('[name="payment_id"]').val(ev.target.id.slice('15').replace('-container', ''));
             }, true);
         });