Merge pull request #515 from Invertus/payment-fee-fix

fixed issue with payment fee and single click credit card method
mollie · Jan 25, 2022 · 4042457 · 4042457
2 parents 09c2ed3 + c1ff7e1
commit 4042457
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -175,23 +175,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod)
         $paymentFee = $this->paymentFeeProvider->getPaymentFee($paymentMethod);
 
         if ($paymentFee) {
-            $paymentOption->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'mollieCardToken',
-                    'value' => '',
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'payment-fee-price',
-                    'value' => $paymentFee,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'payment-fee-price-display',
-                    'value' => sprintf($this->module->l('Payment Fee: %1s'), Tools::displayPrice($paymentFee)),
-                ],
-            ]);
+            $paymentOption->setInputs(
+                array_merge($paymentOption->getInputs(), [
+                    [
+                        'type' => 'hidden',
+                        'name' => 'payment-fee-price',
+                        'value' => $paymentFee,
+                    ],
+                    [
+                        'type' => 'hidden',
+                        'name' => 'payment-fee-price-display',
+                        'value' => sprintf($this->module->l('Payment Fee: %1s'), Tools::displayPrice($paymentFee)),
+                    ],
+                ])
+            );
         }
 
         return $paymentOption;

diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -179,18 +179,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod)
         $paymentFee = $this->paymentFeeProvider->getPaymentFee($paymentMethod);
 
         if ($paymentFee) {
-            $paymentOption->setInputs([
-                [
-                    'type' => 'hidden',
-                    'name' => 'payment-fee-price',
-                    'value' => $paymentFee,
-                ],
-                [
-                    'type' => 'hidden',
-                    'name' => 'payment-fee-price-display',
-                    'value' => sprintf($this->module->l('Payment Fee: %1s'), Tools::displayPrice($paymentFee)),
-                ],
-            ]);
+            $paymentOption->setInputs(
+                array_merge($paymentOption->getInputs(), [
+                    [
+                        'type' => 'hidden',
+                        'name' => 'payment-fee-price',
+                        'value' => $paymentFee,
+                    ],
+                    [
+                        'type' => 'hidden',
+                        'name' => 'payment-fee-price-display',
+                        'value' => sprintf($this->module->l('Payment Fee: %1s'), Tools::displayPrice($paymentFee)),
+                    ],
+                ])
+            );
         }
 
         return $paymentOption;