Merge pull request #14 from IDCI-Consulting/feat/fix-paypal-gateway

Fix: PayPal payment gateway

Author: konandrum

Gateway/PaypalPaymentGateway.php

@@ -14,6 +14,11 @@
 
 class PaypalPaymentGateway extends AbstractPaymentGateway
 {
+    const PAYPAL_CHECKOUT_FLOW_TEMPLATE_MAPPING = [
+        'PAY_NOW' => 'paypal_pay_now.html.twig',
+        // 'SMART_BUTTON' => 'paypal_smart_button.html.twig',
+    ];
+
     public function initialize(
         PaymentGatewayConfigurationInterface $paymentGatewayConfiguration,
         Transaction $transaction
@@ -23,7 +28,7 @@ public function initialize(
             'transaction' => $transaction,
             'callbackUrl' => $paymentGatewayConfiguration->get('callback_url'),
             'returnUrl' => $paymentGatewayConfiguration->get('return_url'),
-            'environment' => $paymentGatewayConfiguration->get('environment'),
+            'mode' => $paymentGatewayConfiguration->get('mode'),
         ];
     }
 
@@ -33,9 +38,25 @@ public function buildHTMLView(
     ): string {
         $initializationData = $this->initialize($paymentGatewayConfiguration, $transaction);
 
-        return $this->templating->render('@IDCIPaymentBundle/Resources/views/Gateway/paypal.html.twig', [
-            'initializationData' => $initializationData,
-        ]);
+        if (!array_key_exists($paymentGatewayConfiguration->get('checkout_flow'), self::PAYPAL_CHECKOUT_FLOW_TEMPLATE_MAPPING)) {
+            throw new \UnexpectedValueException(
+                sprintf(
+                    'The checkout flow "%s" is not yet implemented in %s',
+                    $paymentGatewayConfiguration->get('checkout_flow'),
+                    self::class
+                )
+            );
+        }
+
+        return $this->templating->render(
+            sprintf(
+                '@IDCIPaymentBundle/Resources/views/Gateway/%s',
+                self::PAYPAL_CHECKOUT_FLOW_TEMPLATE_MAPPING[$paymentGatewayConfiguration->get('checkout_flow')]
+            ),
+            [
+                'initializationData' => $initializationData,
+            ]
+        );
     }
 
     public function getResponse(
@@ -57,6 +78,10 @@ public function getResponse(
             $paymentGatewayConfiguration->get('client_secret')
         ));
 
+        $apiContext->setConfig([
+            'mode' => $paymentGatewayConfiguration->get('mode'),
+        ]);
+
         $paypalPayment = PaypalPayment::get($request->get('paymentID'), $apiContext);
 
         $amount = $paypalPayment->getTransactions()[0]->getAmount();
@@ -88,7 +113,8 @@ public static function getParameterNames(): ?array
             [
                 'client_id',
                 'client_secret',
-                'environment',
+                'mode',
+                'checkout_flow',
             ]
         );
     }

Resources/views/Gateway/paypal.html.twig …s/views/Gateway/paypal_pay_now.html.twigResources/views/Gateway/paypal.html.twig renamed to Resources/views/Gateway/paypal_pay_now.html.twig Resources/views/Gateway/paypal.html.twig renamed to Resources/views/Gateway/paypal_pay_now.html.twig

@@ -8,7 +8,7 @@
 
     paypal.Button.render({
 
-        env: '{{ initializationData.environment == 'live' ? 'production' : initializationData.environment }}',
+        env: '{{ initializationData.mode == 'live' ? 'production' : initializationData.mode }}',
 
         client: {
             sandbox:    '{{ initializationData.clientId }}',
@@ -39,5 +39,9 @@
             });
         }
 
+        onError: function (err) {
+            console.error(err);
+        }
+
     }, '#paypal-button');
 </script>