fix sourceOfFunds and card issue

Author: aemaddin

lib/ThreeDS.php

@@ -5,6 +5,7 @@
 
 use Mastercard\Enums\MastercardApiOperations as ApiOp;
 use Mastercard\Util\Factory;
+use phpDocumentor\Reflection\Types\This;
 
 /**
  * Class ThreeDS
@@ -16,6 +17,9 @@ class ThreeDS extends ApiResource
     const OBJECT_NAME = "3DSecureId";
     const RETURN_OBJECT_NAME = "3DSecure";
 
+    const STATUS_DO_NOT_PROCEED = 'DO_NOT_PROCEED';
+    const STATUS_PROCEED = 'PROCEED';
+
     use ApiOperations\Retrieve;
     use ApiOperations\Update;
 
@@ -100,4 +104,9 @@ public function acsEci()
     {
         return $this['3DSecure']['acsEci'] ?? '';
     }
+
+    public function needToProceed()
+    {
+        return (bool) $this->gatewayRecommendation() == self::STATUS_PROCEED;
+    }
 }

lib/Transaction.php

@@ -23,24 +23,52 @@ class Transaction extends ApiResource
     use ApiOperations\Retrieve;
 
 
+    /**
+     * @param $trans_id
+     * @param $order_id
+     * @param Factory $factory
+     * @param null $opts
+     * @return array|Transaction
+     */
     public static function pay($trans_id, $order_id, Factory $factory, $opts = null)
     {
         $params = $factory->apiOperation(ApiOp::PAY)->get();
         return static::update($order_id, $params, $opts, $trans_id);
     }
 
+    /**
+     * @param $trans_id
+     * @param $order_id
+     * @param Factory $factory
+     * @param null $opts
+     * @return array|Transaction
+     */
     public static function void($trans_id, $order_id, Factory $factory, $opts = null)
     {
         $params = $factory->apiOperation(ApiOp::VOID)->get();
         return static::update($order_id, $params, $opts, $trans_id);
     }
 
+    /**
+     * @param $trans_id
+     * @param $order_id
+     * @param Factory $factory
+     * @param null $opts
+     * @return array|Transaction
+     */
     public static function refund($trans_id, $order_id, Factory $factory, $opts = null)
     {
         $params = $factory->apiOperation(ApiOp::REFUND)->get();
         return static::update($order_id, $params, $opts, $trans_id);
     }
 
+    /**
+     * @param $trans_id
+     * @param $order_id
+     * @param Factory $factory
+     * @param null $opts
+     * @return array|Transaction
+     */
     public static function verify($trans_id, $order_id, Factory $factory, $opts = null)
     {
         $params = $factory->apiOperation(ApiOp::VERIFY)->get();

lib/Util/ObjectBuilder.php

@@ -322,7 +322,12 @@ public function get(): array
         }
 
         if (!empty($this->card) || !empty($this->sourceOfFunds)) {
-            $all_array = array_merge($this->card, $this->sourceOfFunds, $all_array);
+            if (!empty($this->card) && !empty($this->sourceOfFunds)) {
+                $this->card['sourceOfFunds']['type'] = $this->sourceOfFunds['sourceOfFunds']['type'];
+                $all_array = array_merge($this->card, $all_array);
+            } else {
+                $all_array = array_merge($this->card, $this->sourceOfFunds, $all_array);
+            }
         }
 
         if (!empty($this->threeDS)) {