rework gateway

config/bazar.php

@@ -57,12 +57,12 @@
         'default' => env('BAZAR_GATEWAY_DRIVER', 'transfer'),
         'drivers' => [
             'cash' => [
-                'success_url' => '/',
-                'failed_url' => '/',
+                'success_url' => '/?order={order}&status=success',
+                'failure_url' => '/?order={order}&status=failed',
             ],
             'transfer' => [
-                'success_url' => '/',
-                'failed_url' => '/',
+                'success_url' => '/?order={order}&status=success',
+                'failure_url' => '/?order={order}&status=failed',
             ],
         ],
     ],

routes/web.php

@@ -0,0 +1,8 @@
+<?php
+
+use Cone\Bazar\Http\Controllers\GatewayController;
+use Illuminate\Support\Facades\Route;
+
+// Gateway
+Route::any('/gateway/{driver}/capture', [GatewayController::class, 'capture'])->name('gateway.capture');
+Route::any('/gateway/{driver}/notification', [GatewayController::class, 'notification'])->name('gateway.notification');

src/BazarServiceProvider.php

@@ -56,10 +56,27 @@ public function boot(): void
             $this->registerPublishes();
         }
 
+        if (! $this->app->routesAreCached()) {
+            $this->registerRoutes();
+        }
+
         $this->registerEvents();
         $this->registerViews();
     }
 
+    /**
+     * Register routes.
+     */
+    protected function registerRoutes(): void
+    {
+        $this->app['router']
+            ->prefix('bazar')
+            ->as('bazar.')
+            ->group(function (): void {
+                $this->loadRoutesFrom(__DIR__.'/../routes/auth.php');
+            });
+    }
+
     /**
      * Register views.
      */
@@ -103,7 +120,7 @@ protected function registerCommands(): void
     protected function registerEvents(): void
     {
         $this->app['events']->listen(Logout::class, Listeners\ClearCookies::class);
-        $this->app['events']->listen(Events\CheckoutProcessed::class, Listeners\PlaceOrder::class);
-        $this->app['events']->listen(Events\CheckoutProcessed::class, Listeners\RefreshInventory::class);
+        $this->app['events']->listen(Events\PaymentCaptured::class, Listeners\PlaceOrder::class);
+        $this->app['events']->listen(Events\PaymentCaptured::class, Listeners\RefreshInventory::class);
     }
 }

src/Cart/Driver.php

@@ -250,8 +250,8 @@ public function isEmpty(): bool
      */
     public function checkout(string $driver): Response
     {
-        return App::call(function (Request $request) use ($driver): Response {
-            return Gateway::driver($driver)->checkout($request, $this->getModel()->toOrder());
+        return App::call(static function (Request $request) use ($driver): Response {
+            return Gateway::driver($driver)->handleCheckout($request);
         });
     }
 

src/Events/CheckoutFailed.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Cone\Bazar\Events;
+
+use Cone\Bazar\Models\Order;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class CheckoutFailed
+{
+    use Dispatchable;
+
+    /**
+     * The order instance.
+     */
+    public Order $order;
+
+    /**
+     * The gateway driver.
+     */
+    public string $driver;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(string $driver, Order $order)
+    {
+        $this->driver = $driver;
+        $this->order = $order;
+    }
+}

src/Events/CheckoutProcessed.php

@@ -14,11 +14,17 @@ class CheckoutProcessed
      */
     public Order $order;
 
+    /**
+     * The gateway driver.
+     */
+    public string $driver;
+
     /**
      * Create a new event instance.
      */
-    public function __construct(Order $order)
+    public function __construct(string $driver, Order $order)
     {
+        $this->driver = $driver;
         $this->order = $order;
     }
 }

src/Events/PaymentCaptureFailed.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Cone\Bazar\Events;
+
+use Cone\Bazar\Models\Order;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class PaymentCaptureFailed
+{
+    use Dispatchable;
+
+    /**
+     * The order instance.
+     */
+    public Order $order;
+
+    /**
+     * The gateway driver.
+     */
+    public string $driver;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(string $driver, Order $order)
+    {
+        $this->driver = $driver;
+        $this->order = $order;
+    }
+}

src/Events/PaymentCaptured.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Cone\Bazar\Events;
+
+use Cone\Bazar\Models\Order;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class PaymentCaptured
+{
+    use Dispatchable;
+
+    /**
+     * The order instance.
+     */
+    public Order $order;
+
+    /**
+     * The gateway driver.
+     */
+    public string $driver;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(string $driver, Order $order)
+    {
+        $this->driver = $driver;
+        $this->order = $order;
+    }
+}

src/Gateway/CashDriver.php

@@ -2,10 +2,8 @@
 
 namespace Cone\Bazar\Gateway;
 
-use Cone\Bazar\Events\CheckoutProcessed;
 use Cone\Bazar\Models\Order;
 use Cone\Bazar\Models\Transaction;
-use Illuminate\Http\Request;
 
 class CashDriver extends Driver
 {
@@ -19,42 +17,18 @@ class CashDriver extends Driver
      */
     public function pay(Order $order, ?float $amount = null, array $attributes = []): Transaction
     {
-        $transaction = parent::pay($order, $amount, array_merge($attributes, [
+        return parent::pay($order, $amount, array_merge($attributes, [
             'completed_at' => time(),
         ]));
-
-        $order->markAs(Order::PENDING);
-
-        return $transaction;
     }
 
     /**
      * Process the refund.
      */
     public function refund(Order $order, ?float $amount = null, array $attributes = []): Transaction
     {
-        $transaction = parent::refund($order, $amount, array_merge($attributes, [
+        return parent::refund($order, $amount, array_merge($attributes, [
             'completed_at' => time(),
         ]));
-
-        $order->markAs(Order::REFUNDED);
-
-        return $transaction;
-    }
-
-    /**
-     * Handle the checkout request.
-     */
-    public function checkout(Request $request, Order $order): Response
-    {
-        $response = parent::checkout($request, $order);
-
-        $url = $order->status === Order::PENDING
-            ? $this->config['success_url']
-            : $this->config['failed_url'];
-
-        CheckoutProcessed::dispatch($order);
-
-        return $response->url($url);
     }
 }