Merge pull request #144 from synolia/fix/order-payment-integrated

fix(form): payplug integrated payment rendering once became an order
payplug · Dec 2, 2024 · 0b4657c · 0b4657c
2 parents 452b3f6 + afd896f
commit 0b4657c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/Resources/dev/shop/payment/integrated.js b/src/Resources/dev/shop/payment/integrated.js
@@ -52,12 +52,12 @@ const IntegratedPayment = {
       })
       return;
     }
-    if (document.querySelector('[id*=sylius_checkout_select_payment_payments][value=payplug]:checked')) {
+    if (document.querySelector(`[id*=sylius_checkout_select_payment_payments][value=${payplug_integrated_payment_params.payment_method_code}]:checked`)) {
       IntegratedPayment.openFields();
     }
     document.querySelectorAll('[id*=sylius_checkout_select_payment_payments]').forEach((element) => {
       element.addEventListener('change', (e) => {
-        if ('payplug' === e.currentTarget.value && e.currentTarget.checked) {
+        if (payplug_integrated_payment_params.payment_method_code === e.currentTarget.value && e.currentTarget.checked) {
           IntegratedPayment.openFields();
           return;
         }
@@ -67,14 +67,14 @@ const IntegratedPayment = {
   },
   openFields() {
     document.querySelector('.payplugIntegratedPayment').classList.add('payplugIntegratedPayment--loaded');
-    document.querySelector('#next-step').classList.add('disabled');
+    document.querySelector('button[type=submit]').classList.add('disabled');
     if (null === IntegratedPayment.options.api) {
       IntegratedPayment.load();
     }
   },
   closeFields() {
     document.querySelector('.payplugIntegratedPayment').classList.remove('payplugIntegratedPayment--loaded');
-    document.querySelector('#next-step').classList.remove('disabled');
+    document.querySelector('button[type=submit]').classList.remove('disabled');
   },
   load() {
     IntegratedPayment.options.api = integratedPaymentApi = new Payplug.IntegratedPayment(payplug_integrated_payment_params.is_test_mode);
@@ -127,12 +127,10 @@ const IntegratedPayment = {
         if (null !== chosenScheme) {
           IntegratedPayment.options.scheme = chosenScheme.value;
         }
-
         if (payplug_integrated_payment_params.payment_id !== undefined) {
           integratedPaymentApi.pay(payplug_integrated_payment_params.payment_id, IntegratedPayment.options.scheme, {save_card: IntegratedPayment.options.save_card});
           return;
         }
-
         const response = await fetch(payplug_integrated_payment_params.routes.init_payment, {method: 'POST'});
         const data = await response.json();
         integratedPaymentApi.pay(data.payment_id, IntegratedPayment.options.scheme, {save_card: IntegratedPayment.options.save_card});
@@ -153,7 +151,6 @@ const IntegratedPayment = {
         if (err.error) {
           document.querySelector(`.payplugIntegratedPayment__error--${key}`).classList.remove('payplugIntegratedPayment__error--hide');
           document.querySelector(`.${key}-input-container`).classList.add('payplugIntegratedPayment__container--invalid');
-
           if (err.error.name === "FIELD_EMPTY") {
             document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".emptyField").classList.remove('payplugIntegratedPayment__error--hide');
             document.querySelector(`.payplugIntegratedPayment__error--${key}`).querySelector(".invalidField").classList.add('payplugIntegratedPayment__error--hide');

diff --git a/src/Resources/public/assets/shop/payment/integrated.js b/src/Resources/public/assets/shop/payment/integrated.js
diff --git a/src/Resources/views/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig b/src/Resources/views/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig
@@ -96,7 +96,7 @@
             {% include '@PayPlugSyliusPayPlugPlugin/form/integrated.html.twig' with {
                 'paymentMethod': method,
                 'payment': order.getLastPayment('cart'),
-                'hasSavedCards': hasSavedCards
+                'hasSavedCards': hasSavedCards,
             } %}
         {% endif %}
         {% if method.gatewayConfig.factoryName == applePayFactoryName %}

diff --git a/src/Resources/views/form/integrated.html.twig b/src/Resources/views/form/integrated.html.twig
@@ -4,6 +4,7 @@
   var payplug_integrated_payment_params = {
     is_test_mode: '{{ is_payplug_test_mode_enabled(paymentMethod) }}',
     has_saved_cards: '{{ hasSavedCards }}',
+    payment_method_code: '{{ paymentMethod.code }}',
     {% if payment.details.payment_id is defined %}
     payment_id: '{{ payment.details.payment_id }}',
     {% endif %}