wip

conedevelopment · Mar 20, 2024 · fd50ef7 · fd50ef7
1 parent b73d7db
commit fd50ef7
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 60 deletions.
diff --git a/src/Gateway/CashDriver.php b/src/Gateway/CashDriver.php
@@ -2,48 +2,10 @@
 
 namespace Cone\Bazar\Gateway;
 
-use Cone\Bazar\Models\Order;
-use Cone\Bazar\Models\Transaction;
-use Exception;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-
-class CashDriver extends Driver
+class CashDriver extends ManualDriver
 {
     /**
      * The driver name.
      */
     protected string $name = 'cash';
-
-    /**
-     * Process the payment.
-     */
-    public function pay(Order $order, ?float $amount = null, array $attributes = []): Transaction
-    {
-        $transaction = parent::pay($order, $amount, array_merge(['key' => Str::random()], $attributes));
-
-        $transaction->markAsCompleted();
-
-        return $transaction;
-    }
-
-    /**
-     * Process the refund.
-     */
-    public function refund(Order $order, ?float $amount = null, array $attributes = []): Transaction
-    {
-        $transaction = parent::refund($order, $amount, array_merge(['key' => Str::random()], $attributes));
-
-        $transaction->markAsCompleted();
-
-        return $transaction;
-    }
-
-    /**
-     * Handle the notification request.
-     */
-    public function handleNotification(Request $request): Response
-    {
-        throw new Exception('This payment gateway does not support payment notifications.');
-    }
 }
diff --git a/src/Gateway/Driver.php b/src/Gateway/Driver.php
@@ -13,6 +13,7 @@
 use Illuminate\Http\Response as HttpResponse;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\Str;
 use Throwable;
 
 abstract class Driver extends BaseDriver
@@ -27,15 +28,15 @@ abstract class Driver extends BaseDriver
      */
     public function pay(Order $order, ?float $amount = null, array $attributes = []): Transaction
     {
-        return $order->pay($amount, $this->name, $attributes);
+        return $order->pay($amount, $this->name, array_merge(['key' => Str::random()], $attributes));
     }
 
     /**
      * Process the refund.
      */
     public function refund(Order $order, ?float $amount = null, array $attributes = []): Transaction
     {
-        return $order->refund($amount, $this->name, $attributes);
+        return $order->refund($amount, $this->name, array_merge(['key' => Str::random()], $attributes));
     }
 
     /**

diff --git a/src/Gateway/ManualDriver.php b/src/Gateway/ManualDriver.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Cone\Bazar\Gateway;
+
+use Cone\Bazar\Models\Order;
+use Cone\Bazar\Models\Transaction;
+use Exception;
+use Illuminate\Http\Request;
+
+class ManualDriver extends Driver
+{
+    /**
+     * The driver name.
+     */
+    protected string $name = 'manual';
+
+    /**
+     * Process the payment.
+     */
+    public function pay(Order $order, ?float $amount = null, array $attributes = []): Transaction
+    {
+        $transaction = parent::pay($order, $amount, $attributes);
+
+        $transaction->markAsCompleted();
+
+        return $transaction;
+    }
+
+    /**
+     * Process the refund.
+     */
+    public function refund(Order $order, ?float $amount = null, array $attributes = []): Transaction
+    {
+        $transaction = parent::refund($order, $amount, $attributes);
+
+        $transaction->markAsCompleted();
+
+        return $transaction;
+    }
+
+    /**
+     * Handle the notification request.
+     */
+    public function handleNotification(Request $request): Response
+    {
+        throw new Exception('This payment gateway does not support payment notifications.');
+    }
+}
diff --git a/src/Gateway/TransferDriver.php b/src/Gateway/TransferDriver.php
@@ -2,11 +2,8 @@
 
 namespace Cone\Bazar\Gateway;
 
-use Cone\Bazar\Models\Order;
-use Cone\Bazar\Models\Transaction;
 use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
 
 class TransferDriver extends Driver
 {
@@ -15,22 +12,6 @@ class TransferDriver extends Driver
      */
     protected string $name = 'transfer';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function pay(Order $order, ?float $amount = null, array $attributes = []): Transaction
-    {
-        return parent::pay($order, $amount, array_merge(['key' => Str::random()], $attributes));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function refund(Order $order, ?float $amount = null, array $attributes = []): Transaction
-    {
-        return parent::refund($order, $amount, array_merge(['key' => Str::random()], $attributes));
-    }
-
     /**
      * {@inheritdoc}
      */