add apple pay

Author: darbaoui

config/hyperpay.php

@@ -5,6 +5,8 @@
 
     'entityIdMada' => env('ENTITY_ID_MADA'),
 
+    'entityIdApplePay' => env('ENTITY_ID_APPLE_PAY'),
+
     'entityId' => env('ENTITY_ID'),
 
     'access_token' => env('ACCESS_TOKEN'),

src/LaravelHyperpay.php

@@ -63,15 +63,24 @@ public function __construct(GuzzleClient $client)
     }
 
     /**
-     * Set the mada entityId in the paramaters that used to prepare the checkout.
+     * Set the mada entityId in the parameters that used to prepare the checkout.
      *
      * @return void
      */
     public function mada()
     {
         $this->config['entityId'] = config('hyperpay.entityIdMada');
     }
-
+    
+    /**
+     * Set the apple pay entityId in the parameters that used to prepare the checkout.
+     *
+     * @return void
+     */
+    public function setApplePayEntityId()
+    {
+        $this->config['entityId'] = config('hyperpay.entityIdApplePay');
+    }
     /**
      * Add billing data to the payment body.
      *
@@ -103,6 +112,10 @@ public function checkout(array $trackable_data, Model $user, $amount, $brand, Re
         if (strtolower($this->brand) == 'mada') {
             $this->mada();
         }
+        
+        if (strtolower($this->brand) == 'applepay') {
+            $this->setApplePayEntityId();
+        }
 
         $trackable_data = array_merge($trackable_data, [
             'amount' => $amount,

src/Support/HttpParameters.php

@@ -97,11 +97,17 @@ protected function getBillingParameters($billing): array
     protected function getEntityId($id)
     {
         $transaction = (new TransactionBuilder())->findByIdOrCheckoutId($id);
+        
         $entityId = config('hyperpay.entityId');
+
         if ($transaction->brand === 'mada') {
             $entityId = config('hyperpay.entityIdMada');
         }
 
+        if ($transaction->brand === 'applepay') {
+            $entityId = config('hyperpay.entityIdApplePay');
+        }
+
         return $entityId;
     }
 }

src/Support/TransactionBuilder.php

@@ -33,7 +33,7 @@ public function __construct($owner = null)
      */
     public function create(array $transactionData)
     {
-        $this->currentUserCleanOldPendingTransaction();
+        $this->currentUserCleanOldPendingTransaction($transactionData);
 
         $transaction = $this->owner->transactions()->create([
             'id' => Arr::get($transactionData, 'merchantTransactionId'),
@@ -81,6 +81,10 @@ protected function getBrand($entityId)
             return 'mada';
         }
 
+        if ($entityId == config('hyperpay.entityIdApplePay')) {
+            return 'applepay';
+        }
+
         return 'default';
     }
 
@@ -89,9 +93,9 @@ protected function getBrand($entityId)
      *
      * @return void
      */
-    protected function currentUserCleanOldPendingTransaction()
+    protected function currentUserCleanOldPendingTransaction(array $transactionData)
     {
-        $transaction = $this->owner->transactions()->where('status', 'pending')->first();
+        $transaction = $this->owner->transactions()->where('status', 'pending')->whereBrand($this->getBrand($transactionData['entityId']))->first();
         if ($transaction) {
             $transaction->delete();
         }