payment method flow completed

Anmol-Chauhan · Anmol-Chauhan · commit 9c42b8bcf94b · 2025-06-02T13:20:16.000+05:30
diff --git a/Postman_APIs/Collections/GraphQL-API.postman_collection.json b/Postman_APIs/Collections/GraphQL-API.postman_collection.json
@@ -10654,7 +10654,7 @@
 								"body": {
 									"mode": "graphql",
 									"graphql": {
-										"query": "mutation placeOrder {\n    placeOrder (\n        isPaymentCompleted: true\n        error: false\n        message: \"Success\"\n        transactionId: \"PAYID-NA3LUPI8RM83901H3162294C\"\n        paymentStatus: \"Completed\"\n        paymentMethod: \"paypal_standard\"\n\n    ) {\n        success\n        redirectUrl\n        selectedMethod\n        order {\n            id\n            customerEmail\n            customerFirstName\n            customerLastName\n        }\n    }\n}",
+										"query": "mutation placeOrder {\n    placeOrder (\n        isPaymentCompleted: true\n        # Paypal Standard\n        error: false\n        message: \"Success\"\n        transactionId: \"PAYID-NA3LUPI8RM83901H3162294C\"\n        paymentStatus: \"Completed\"\n        paymentType: \"instant\"\n        paymentMethod: \"paypal_standard\"\n        # Paypal Smart Button\n        orderID: \"xyz\"\n    ) {\n        success\n        redirectUrl\n        selectedMethod\n        order {\n            id\n            customerEmail\n            customerFirstName\n            customerLastName\n        }\n    }\n}",
 										"variables": ""
 									}
 								},
diff --git a/src/Helper/PaymentHelper.php b/src/Helper/PaymentHelper.php
@@ -2,6 +2,8 @@
 
 namespace Webkul\GraphQLAPI\Helper;
 
+use Illuminate\Support\Facades\DB;
+use Webkul\Paypal\Payment\SmartButton;
 use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Sales\Repositories\InvoiceRepository;
 
@@ -14,7 +16,8 @@ class PaymentHelper
      */
     public function __construct(
         protected OrderRepository $orderRepository,
-        protected InvoiceRepository $invoiceRepository
+        protected InvoiceRepository $invoiceRepository,
+        protected SmartButton $smartButton,
     ) {}
 
     public function createInvoice($cart, $paymentDetail, $order)
@@ -26,24 +29,25 @@ public function createInvoice($cart, $paymentDetail, $order)
         ) {
             return;
         }
-
+        
         $paymentMethod = $cart->payment->method;
-
         $paymentIsCompleted = false;
 
+        match ($paymentMethod) {
+            'paypal_standard' => $paymentIsCompleted = $this->isNewTransaction($paymentDetail['txn_id']) && $this->checkPaypalPaymentStatus($paymentDetail['txn_id']),
+            'paypal_smart_button' => $paymentIsCompleted = $this->isNewTransaction($paymentDetail['orderID']) && $this->checkSmartButtonPaymentStatus($paymentDetail['orderID']),
+            default => null,
+        };
+        
         if (
-            $paymentMethod == 'paypal_standard'
-            || $paymentMethod == 'paypal_smart_button'
+            $paymentIsCompleted
+            && $order->canInvoice()
         ) {
-            $paymentIsCompleted = $this->checkPaypalPaymentStatus($paymentDetail['transaction_id']);
-        }
-        
-        if ($paymentIsCompleted) {
-            $this->orderRepository->update(['status' => 'processing'], $order->id);
+            request()->merge($paymentDetail);
+            
+            $this->invoiceRepository->create($this->prepareInvoiceData($order));
 
-            if ($order->canInvoice()) {
-                $invoice = $this->invoiceRepository->create($this->prepareInvoiceData($order));
-            }
+            $this->orderRepository->update(['status' => 'processing'], $order->id);
         }
     }
 
@@ -63,37 +67,46 @@ protected function prepareInvoiceData($order)
         return $invoiceData;
     }
 
-    private function checkPaypalPaymentStatus($paymentId)
+    protected function isNewTransaction(string $transactionId): bool
+    {
+        return ! DB::table('order_transactions')->where('transaction_id', $transactionId)->exists();
+    }
+
+    protected function checkPaypalPaymentStatus($paymentId)
     {
         $clientId = core()->getConfigData('sales.payment_methods.paypal_standard.client_id');
         $secretKey = core()->getConfigData('sales.payment_methods.paypal_standard.client_secret');
+        $sandbox = core()->getConfigData('sales.payment_methods.paypal_standard.sandbox');
 
-        if (core()->getConfigData('sales.payment_methods.paypal_standard.sandbox')) {
-            $url = "https://api-m.sandbox.paypal.com/v1/payments/payment/{$paymentId}";
-        } else {
-            $url = "https://api-m.paypal.com/v1/payments/payment/{$paymentId}";
-        }
+        $url = $sandbox
+            ? "https://api-m.sandbox.paypal.com/v1/payments/payment/{$paymentId}"
+            : "https://api-m.paypal.com/v1/payments/payment/{$paymentId}";
 
         $curl = curl_init($url);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($curl, CURLOPT_HTTPHEADER, [
-            'Content-Type: application/json',
-            'Authorization: Basic ' . base64_encode("{$clientId}:{$secretKey}"),
+        curl_setopt_array($curl, [
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_FAILONERROR    => true,
+            CURLOPT_HTTPHEADER     => [
+                'Content-Type: application/json',
+                'Authorization: Basic ' . base64_encode("{$clientId}:{$secretKey}"),
+            ],
         ]);
 
         $response = curl_exec($curl);
-
-        if (curl_errno($curl)) {
-            throw new \Exception('Curl error: ' . curl_error($curl));
-        }
         curl_close($curl);
 
-        $responseData = json_decode($response, true);
-        
-        if (isset($responseData['state']) && $responseData['state'] == 'approved') {
-            return true;
+        if ($response) {
+            $responseData = json_decode($response, true);
+            return $responseData['state'] ?? '' === 'approved';
         }
-
+        
         return false;
     }
+
+    public function checkSmartButtonPaymentStatus(string $orderId): bool
+    {
+        $transactionDetails = json_decode(json_encode($this->smartButton->getOrder($orderId)), true);
+        
+        return $transactionDetails['statusCode'] ?? 0 === 200;
+    }
 }
diff --git a/src/Mutations/Shop/Customer/CheckoutMutation.php b/src/Mutations/Shop/Customer/CheckoutMutation.php
@@ -4,19 +4,20 @@
 
 use Webkul\Core\Rules\PostCode;
 use Webkul\Checkout\Facades\Cart;
+use Illuminate\Support\Facades\DB;
 use Webkul\Core\Rules\PhoneNumber;
 use Webkul\Payment\Facades\Payment;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Webkul\Shipping\Facades\Shipping;
+use Webkul\GraphQLAPI\Helper\PaymentHelper;
 use Webkul\Sales\Transformers\OrderResource;
 use Webkul\Sales\Repositories\OrderRepository;
 use Webkul\Sales\Repositories\InvoiceRepository;
 use Webkul\GraphQLAPI\Validators\CustomException;
 use Nuwave\Lighthouse\Support\Contracts\GraphQLContext;
 use Webkul\CartRule\Repositories\CartRuleCouponRepository;
 use Webkul\GraphQLAPI\Repositories\NotificationRepository;
-use Webkul\GraphQLAPI\Helper\PaymentHelper;
 use Webkul\Customer\Repositories\CustomerAddressRepository;
 
 class CheckoutMutation extends Controller
@@ -461,34 +462,6 @@ public function removeCoupon(mixed $rootValue, array $args, GraphQLContext $cont
      */
     public function saveOrder(mixed $rootValue, array $args, GraphQLContext $context)
     {
-        $mode = core()->getConfigData('sales.payment_methods.paypal_standard.sandbox') ? 'sandbox' : 'live';
-        
-        $clientId = core()->getConfigData('sales.payment_methods.paypal_standard.client_id');
-        $secret = core()->getConfigData('sales.payment_methods.paypal_standard.client_secret');
-
-    // Step 1: Get Access Token
-    $client = new \GuzzleHttp\Client();
-
-    $authResponse = $client->post('https://api.sandbox.paypal.com/v1/oauth2/token', [
-        'auth' => [$clientId, $secret],
-        'form_params' => [
-            'grant_type' => 'client_credentials',
-        ],
-    ]);
-
-    $authData = json_decode($authResponse->getBody(), true);
-    $accessToken = $authData['access_token'];
-
-    // Step 2: Get Sale Info
-    $saleResponse = $client->get("https://api.sandbox.paypal.com/v1/payments/sale/3HV05507FK9784747", [
-        'headers' => [
-            'Authorization' => "Bearer {$accessToken}",
-            'Content-Type'  => 'application/json',
-        ]
-    ]);
-
-    $saleData = json_decode($saleResponse->getBody(), true);
-dd($saleData);
         try {
             if (Cart::hasError()) {
                 throw new CustomException(trans('bagisto_graphql::app.shop.checkout.something-wrong'));
@@ -500,15 +473,14 @@ public function saveOrder(mixed $rootValue, array $args, GraphQLContext $context
 
             $cart = Cart::getCart();
 
-            $data = (new OrderResource($cart))->jsonSerialize();
-
-            $order = $this->orderRepository->create($data);
+            $orderData = (new OrderResource($cart))->jsonSerialize();
+            $order = $this->orderRepository->create($orderData);
 
             if (core()->getConfigData('general.api.pushnotification.private_key')) {
                 $this->prepareNotificationContent($order);
             }
             
-            if ($args['is_payment_completed']) {
+            if (! empty($args['is_payment_completed'])) {
                 $this->paymentHelper->createInvoice($cart, $args, $order);
             }
 
@@ -581,23 +553,4 @@ public function prepareNotificationContent($order)
 
         $this->notificationRepository->sendNotification($data, $notification);
     }
-
-    /**
-     * Prepares order's invoice data for creation
-     *
-     * @param  \Webkul\Sales\Contracts\Order  $order
-     * @return array
-     */
-    public function prepareInvoiceData($order)
-    {
-        $invoiceData = [
-            'order_id' => $order->id,
-        ];
-
-        foreach ($order->items as $item) {
-            $invoiceData['invoice']['items'][$item->id] = $item->qty_to_invoice;
-        }
-
-        return $invoiceData;
-    }
 }
diff --git a/src/graphql/shop/checkout/place_order.graphql b/src/graphql/shop/checkout/place_order.graphql
@@ -4,9 +4,11 @@ extend type Mutation {
         isPaymentCompleted: Boolean = false @rename(attribute: "is_payment_completed")
         error: Boolean = true
         message: String
-        transactionId: String @rename(attribute: "transaction_id")
+        transactionId: String @rename(attribute: "txn_id")
         paymentStatus: String @rename(attribute: "payment_status")
         paymentMethod: String @rename(attribute: "payment_method")
+        paymentType: String @rename(attribute: "payment_type")
+        orderID: String @rename(attribute: "order_id")
     ): PlacedOrderResponse @field(resolver: "Webkul\\GraphQLAPI\\Mutations\\Shop\\Customer\\CheckoutMutation@saveOrder")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10654,7 +10654,7 @@`
`10654`	`10654`	`"body": {`
`10655`	`10655`	`"mode": "graphql",`
`10656`	`10656`	`"graphql": {`
`10657`		- "query": "mutation placeOrder {\n placeOrder (\n isPaymentCompleted: true\n error: false\n message: \"Success\"\n transactionId: \"PAYID-NA3LUPI8RM83901H3162294C\"\n paymentStatus: \"Completed\"\n paymentMethod: \"paypal_standard\"\n\n ) {\n success\n redirectUrl\n selectedMethod\n order {\n id\n customerEmail\n customerFirstName\n customerLastName\n }\n }\n}",
	`10657`	+ "query": "mutation placeOrder {\n placeOrder (\n isPaymentCompleted: true\n # Paypal Standard\n error: false\n message: \"Success\"\n transactionId: \"PAYID-NA3LUPI8RM83901H3162294C\"\n paymentStatus: \"Completed\"\n paymentType: \"instant\"\n paymentMethod: \"paypal_standard\"\n # Paypal Smart Button\n orderID: \"xyz\"\n ) {\n success\n redirectUrl\n selectedMethod\n order {\n id\n customerEmail\n customerFirstName\n customerLastName\n }\n }\n}",
`10658`	`10658`	`"variables": ""`
`10659`	`10659`	`}`
`10660`	`10660`	`},`