Merge pull request #1 from wychoong/wychoong-patch-1

fix

Author: wychoong

resources/views/components/payment-form.blade.php

@@ -10,12 +10,23 @@
                 .then(resp => {
                     this.initializing = false
 
+                    if(resp.error){
+                        console.log('error')
+
+                        return
+                    }
+
                     if(resp.session){
                         this.processing = true
 
+                        sessionStorage.removeItem('HostedCheckout_sessionId')
+
+                        session = resp.session
+
                         Checkout.configure({
                             session:{
-                                id: resp.session
+                                id: session.id,
+                                version: session.version,
                             }
                         });
 
@@ -25,7 +36,6 @@
         }
     }"
     @checkout='checkout'
-    @mpgs-complete.window='$wire.checkoutSuccess()'
 >
     <x-lunar-mpgs::embed-container />
     <x-lunar-mpgs::checkout-button />

src/Components/PaymentForm.php

@@ -21,26 +21,48 @@ class PaymentForm extends Component
         'cardDetailsSubmitted',
     ];
 
+    protected $queryString = [
+        'resultIndicator',
+    ];
+
+    public ?string $resultIndicator = null;
+
+    public function mount()
+    {
+        if ($this->resultIndicator) {
+            return $this->checkoutSuccess();
+        }
+    }
+
     public function checkout()
     {
         $this->cart->calculate();
         $intent = MpgsFacade::createIntent($this->cart);
 
+        if ($intent === false) {
+            return false;
+        }
+
         return [
             'session' => $intent,
         ];
     }
 
-    public function checkoutSuccess()
+    protected function checkoutSuccess()
     {
         $mpgs = (new MpgsPaymentType());
-        $payment = $mpgs->cart($this->cart)->authorize();
+
+        $payment = $mpgs->cart($this->cart)->withData([
+            'resultIndicator' => $this->resultIndicator,
+        ])->authorize();
 
         if ($payment->success) {
             $this->emit('mpgsPaymentSuccess');
 
             if (config('lunar-mpgs.route.payment-success')) {
-                return redirect()->route(config('lunar-mpgs.route.payment-success'));
+                $this->shouldSkipRender = false; //# workaround with an issue with livewire
+
+                return $this->redirectRoute(config('lunar-mpgs.route.payment-success'));
             }
 
             return;
@@ -49,8 +71,11 @@ public function checkoutSuccess()
         $this->emit('mpgsPaymentFailed');
 
         if (config('lunar-mpgs.route.payment-failed')) {
-            return redirect()->route(config('lunar-mpgs.route.payment-failed'));
+            $this->shouldSkipRender = false; //# workaround with an issue with livewire
+
+            return $this->redirectRoute(config('lunar-mpgs.route.payment-failed'));
         }
+
     }
 
     /**

src/Managers/MpgsManager.php

@@ -45,7 +45,7 @@ public static function notify($message, $error = false, $data = null)
         ]);
     }
 
-    public function createIntent(Cart $cart): string
+    public function createIntent(Cart $cart)
     {
         $meta = (array) $cart->meta;
 
@@ -55,24 +55,32 @@ public function createIntent(Cart $cart): string
             $cart
         );
 
-        $paymentIntent = $result['intent'];
+        $response = $result['response'];
         $orderId = $result['order_id'];
 
+        if ($response->result !== 'SUCCESS') {
+            return [
+                'error' => true,
+            ];
+        }
+
         if (! $meta) {
             $cart->update([
                 'meta' => [
-                    'payment_intent' => $paymentIntent->session->id,
+                    'checkout_session' => $response->session->id,
+                    'success_indicator' => $response->successIndicator,
                     'order_id' => $orderId,
                 ],
             ]);
         } else {
-            $meta['payment_intent'] = $paymentIntent->session->id;
+            $meta['checkout_session'] = $response->session->id;
+            $meta['success_indicator'] = $response->successIndicator;
             $meta['order_id'] = $orderId;
             $cart->meta = $meta;
             $cart->save();
         }
 
-        return $paymentIntent->session->id;
+        return $response->session;
     }
 
     public static function initiateCheckoutUsing(Closure $initiateCheckoutUsing)
@@ -90,7 +98,7 @@ protected function buildIntent($value, $currencyCode, $cart)
 
         return [
             'order_id' => $data['order']['id'] ?? null,
-            'intent' => Mpgs::initiateCheckout($data),
+            'response' => Mpgs::initiateCheckout($data),
         ];
     }
 }

src/MpgsPaymentServiceProvider.php

@@ -41,16 +41,15 @@ public function packageBooted()
         Blade::directive('mpgsScripts', function () {
             $jsUrl = config('lunar-mpgs.checkout_js');
 
-            return  <<<EOT
-                <script src="$jsUrl"
-                    data-error="errorCallback"
-                    data-cancel="cancelCallback"
-                    data-complete="completeCallback">
+            return <<<EOT
+                <script type="text/javascript" src="$jsUrl"
+                    data-error="errorCallback" data-cancel="cancelCallback" data-complete="completeCallback" >
                 </script>
                 <script type="text/javascript">
                     const et = new EventTarget();
                     function errorCallback(error) {
-                        et.dispatchEvent(new Event('mpgs-error'));
+                        et.dispatchEvent(new Event('mpgs-error', error));
+                        console.log('error', error)
                     }
                     function cancelCallback() {
                         et.dispatchEvent(new Event('mpgs-cancel'));

src/MpgsPaymentType.php

@@ -37,6 +37,15 @@ public function authorize(): PaymentAuthorize
 
         $meta = (array) $this->cart->meta;
 
+        $resultIndicator = $this->data['resultIndicator'];
+
+        if ($resultIndicator != $meta['success_indicator']) {
+            return new PaymentAuthorize(
+                success: false,
+                message: 'Payment failed',
+            );
+        }
+
         $orderId = $meta['order_id'];
         $this->orderResponse = Mpgs::retrieveOrder($orderId);