From 671a1af8ff8c9eae04aad15fcd201ce54bd489e9 Mon Sep 17 00:00:00 2001
From: Armando Ibarra <aibarrakerzon@gmail.com>
Date: Wed, 3 Aug 2022 00:20:03 -0500
Subject: [PATCH] Added support to ACH and Level 2 & 3 fields Added Palestine
 Country code API Updates: Payments

---
 lib/Checkout/Common/Country.php               |  1 +
 lib/Checkout/Common/PaymentSourceType.php     |  4 ++
 lib/Checkout/Payments/CaptureRequest.php      | 37 +++++++++++++++
 .../Payments/PaymentCustomerRequest.php       | 13 ++++++
 lib/Checkout/Payments/ProcessingSettings.php  | 40 +++++++++++++----
 lib/Checkout/Payments/Product.php             | 16 ++++---
 .../Source/Apm/RequestAlipayPlusCNSource.php  | 14 ------
 .../Apm/RequestAlipayPlusGCashSource.php      | 14 ------
 .../Source/Apm/RequestAlipayPlusHKSource.php  | 14 ------
 .../Source/Apm/RequestAlipayPlusSource.php    | 45 +++++++++++++++++++
 .../Request/Source/RequestIdSource.php        |  5 +++
 lib/Checkout/Payments/ShippingDetails.php     |  5 +++
 .../RequestApmPaymentsIntegrationTest.php     | 26 +++++++++++
 13 files changed, 178 insertions(+), 56 deletions(-)
 create mode 100644 lib/Checkout/Payments/PaymentCustomerRequest.php
 delete mode 100644 lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusCNSource.php
 delete mode 100644 lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusGCashSource.php
 delete mode 100644 lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusHKSource.php
 create mode 100644 lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusSource.php

diff --git a/lib/Checkout/Common/Country.php b/lib/Checkout/Common/Country.php
index b4ed09f5..4ea4137b 100644
--- a/lib/Checkout/Common/Country.php
+++ b/lib/Checkout/Common/Country.php
@@ -255,4 +255,5 @@ final class Country
     public static $YE = "YE";
     public static $ZM = "ZM";
     public static $ZW = "ZW";
+    public static $PS = "PS";
 }
diff --git a/lib/Checkout/Common/PaymentSourceType.php b/lib/Checkout/Common/PaymentSourceType.php
index 07928508..f1c5b848 100644
--- a/lib/Checkout/Common/PaymentSourceType.php
+++ b/lib/Checkout/Common/PaymentSourceType.php
@@ -38,4 +38,8 @@ class PaymentSourceType
     public static $alipay_cn = "alipay_cn";
     public static $gcash = "gcash";
     public static $wechatpay = "wechatpay";
+    public static $dana = "dana";
+    public static $kakaopay = "kakaopay";
+    public static $truemoney = "truemoney";
+    public static $tng = "tng";
 }
diff --git a/lib/Checkout/Payments/CaptureRequest.php b/lib/Checkout/Payments/CaptureRequest.php
index bdb1cde7..2671b77d 100644
--- a/lib/Checkout/Payments/CaptureRequest.php
+++ b/lib/Checkout/Payments/CaptureRequest.php
@@ -2,6 +2,8 @@
 
 namespace Checkout\Payments;
 
+use Checkout\Common\MarketplaceData;
+
 class CaptureRequest
 {
     /**
@@ -19,6 +21,41 @@ class CaptureRequest
      */
     public $reference;
 
+    /**
+     * @var PaymentCustomerRequest
+     */
+    public $customer;
+
+    /**
+     * @var string
+     */
+    public $description;
+
+    /**
+     * @var BillingDescriptor
+     */
+    public $billing_descriptor;
+
+    /**
+     * @var ShippingDetails
+     */
+    public $shipping;
+
+    /**
+     * @var array of Checkout\Payments\Product
+     */
+    public $items;
+
+    /**
+     * @var MarketplaceData
+     */
+    public $marketplace;
+
+    /**
+     * @var ProcessingSettings
+     */
+    public $processing;
+
     /**
      * @var array
      */
diff --git a/lib/Checkout/Payments/PaymentCustomerRequest.php b/lib/Checkout/Payments/PaymentCustomerRequest.php
new file mode 100644
index 00000000..b9980620
--- /dev/null
+++ b/lib/Checkout/Payments/PaymentCustomerRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Checkout\Payments;
+
+use Checkout\Common\CustomerRequest;
+
+class PaymentCustomerRequest extends CustomerRequest
+{
+    /**
+     * @var string
+     */
+    public $tax_number;
+}
diff --git a/lib/Checkout/Payments/ProcessingSettings.php b/lib/Checkout/Payments/ProcessingSettings.php
index e6fbe87b..93c569b7 100644
--- a/lib/Checkout/Payments/ProcessingSettings.php
+++ b/lib/Checkout/Payments/ProcessingSettings.php
@@ -5,24 +5,24 @@
 class ProcessingSettings
 {
     /**
-     * @var bool
+     * @var string
      */
-    public $aft;
+    public $order_id;
 
     /**
-     * @var string value of MerchantInitiatedReason
+     * @var int
      */
-    public $merchant_initiated_reason;
+    public $tax_amount;
 
     /**
-     * @var DLocalProcessingSettings
+     * @var int
      */
-    public $dlocal;
+    public $discount_amount;
 
     /**
      * @var int
      */
-    public $tax_amount;
+    public $duty_amount;
 
     /**
      * @var int
@@ -30,15 +30,25 @@ class ProcessingSettings
     public $shipping_amount;
 
     /**
-     * @var Aggregator
+     * @var int
      */
-    public $aggregator;
+    public $shipping_tax_amount;
+
+    /**
+     * @var bool
+     */
+    public $aft;
 
     /**
      * @var string value of PreferredSchema
      */
     public $preferred_scheme;
 
+    /**
+     * @var string value of MerchantInitiatedReason
+     */
+    public $merchant_initiated_reason;
+
     /**
      * @var string value of ProductType
      */
@@ -103,4 +113,16 @@ class ProcessingSettings
      * @var array of AirlineData
      */
     public $airline_data;
+
+    /**
+     * @var DLocalProcessingSettings
+     */
+    public $dlocal;
+
+    /**
+     * @var Aggregator
+     */
+    public $aggregator;
+
+
 }
diff --git a/lib/Checkout/Payments/Product.php b/lib/Checkout/Payments/Product.php
index 2b01d5f2..61d74966 100644
--- a/lib/Checkout/Payments/Product.php
+++ b/lib/Checkout/Payments/Product.php
@@ -27,12 +27,12 @@ class Product
     /**
      * @var string
      */
-    public $image_url;
+    public $commodity_code;
 
     /**
      * @var string
      */
-    public $url;
+    public $unit_of_measure;
 
     /**
      * @var int
@@ -52,15 +52,21 @@ class Product
     /**
      * @var string
      */
-    public $sku;
+    public $wxpay_goods_id;
 
     /**
      * @var string
      */
-    public $goods_id;
+    public $image_url;
 
     /**
      * @var string
      */
-    public $wxpay_goods_id;
+    public $url;
+
+    /**
+     * @var string
+     */
+    public $sku;
+
 }
diff --git a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusCNSource.php b/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusCNSource.php
deleted file mode 100644
index e9a1c996..00000000
--- a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusCNSource.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Checkout\Payments\Request\Source\Apm;
-
-use Checkout\Common\PaymentSourceType;
-use Checkout\Payments\Request\Source\AbstractRequestSource;
-
-class RequestAlipayPlusCNSource extends AbstractRequestSource
-{
-    public function __construct()
-    {
-        parent::__construct(PaymentSourceType::$alipay_cn);
-    }
-}
diff --git a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusGCashSource.php b/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusGCashSource.php
deleted file mode 100644
index a70902f6..00000000
--- a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusGCashSource.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Checkout\Payments\Request\Source\Apm;
-
-use Checkout\Common\PaymentSourceType;
-use Checkout\Payments\Request\Source\AbstractRequestSource;
-
-class RequestAlipayPlusGCashSource extends AbstractRequestSource
-{
-    public function __construct()
-    {
-        parent::__construct(PaymentSourceType::$gcash);
-    }
-}
diff --git a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusHKSource.php b/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusHKSource.php
deleted file mode 100644
index 66d1fe96..00000000
--- a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusHKSource.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Checkout\Payments\Request\Source\Apm;
-
-use Checkout\Common\PaymentSourceType;
-use Checkout\Payments\Request\Source\AbstractRequestSource;
-
-class RequestAlipayPlusHKSource extends AbstractRequestSource
-{
-    public function __construct()
-    {
-        parent::__construct(PaymentSourceType::$alipay_hk);
-    }
-}
diff --git a/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusSource.php b/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusSource.php
new file mode 100644
index 00000000..395244ea
--- /dev/null
+++ b/lib/Checkout/Payments/Request/Source/Apm/RequestAlipayPlusSource.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Checkout\Payments\Request\Source\Apm;
+
+use Checkout\Common\PaymentSourceType;
+use Checkout\Payments\Request\Source\AbstractRequestSource;
+
+class RequestAlipayPlusSource extends AbstractRequestSource
+{
+    public static function requestAlipayPlusCNSource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$alipay_cn);
+    }
+
+    public static function requestAlipayPlusGCashSource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$gcash);
+    }
+
+    public static function requestAlipayPlusHKSource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$alipay_hk);
+    }
+
+    public static function requestAlipayPlusDanaSource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$dana);
+    }
+
+    public static function requestAlipayPlusKakaoPaySource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$kakaopay);
+    }
+
+    public static function requestAlipayPlusTrueMoneySource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$truemoney);
+    }
+
+    public static function requestAlipayPlusTNGSource()
+    {
+        return new RequestAlipayPlusSource(PaymentSourceType::$tng);
+    }
+
+}
diff --git a/lib/Checkout/Payments/Request/Source/RequestIdSource.php b/lib/Checkout/Payments/Request/Source/RequestIdSource.php
index ecb1f414..9465a721 100644
--- a/lib/Checkout/Payments/Request/Source/RequestIdSource.php
+++ b/lib/Checkout/Payments/Request/Source/RequestIdSource.php
@@ -21,4 +21,9 @@ public function __construct()
      * @var string
      */
     public $cvv;
+
+    /**
+     * @var string
+     */
+    public $payment_method;
 }
diff --git a/lib/Checkout/Payments/ShippingDetails.php b/lib/Checkout/Payments/ShippingDetails.php
index ec0e63ef..d7b444df 100644
--- a/lib/Checkout/Payments/ShippingDetails.php
+++ b/lib/Checkout/Payments/ShippingDetails.php
@@ -16,4 +16,9 @@ class ShippingDetails
      * @var Phone
      */
     public $phone;
+
+    /**
+     * @var string
+     */
+    public $from_address_zip;
 }
diff --git a/test/Checkout/Tests/Payments/RequestApmPaymentsIntegrationTest.php b/test/Checkout/Tests/Payments/RequestApmPaymentsIntegrationTest.php
index 6e282106..4b6bf0ff 100644
--- a/test/Checkout/Tests/Payments/RequestApmPaymentsIntegrationTest.php
+++ b/test/Checkout/Tests/Payments/RequestApmPaymentsIntegrationTest.php
@@ -2,6 +2,7 @@
 
 namespace Checkout\Tests\Payments;
 
+use Checkout\CheckoutApiException;
 use Checkout\CheckoutSdk;
 use Checkout\Common\Address;
 use Checkout\Common\Country;
@@ -12,13 +13,38 @@
 use Checkout\Environment;
 use Checkout\Payments\ProcessingSettings;
 use Checkout\Payments\Request\PaymentRequest;
+use Checkout\Payments\Request\Source\Apm\RequestAlipayPlusSource;
 use Checkout\Payments\Request\Source\Apm\RequestIdealSource;
 use Checkout\Payments\Request\Source\Apm\RequestPayPalSource;
 use Checkout\Payments\Request\Source\Apm\RequestSofortSource;
 use Checkout\Payments\Request\Source\Apm\RequestTamaraSource;
+use Exception;
 
 class RequestApmPaymentsIntegrationTest extends AbstractPaymentsIntegrationTest
 {
+    /**
+     * @test
+     */
+    public function shouldMakeAliPayPayment()
+    {
+        $requestSource = RequestAlipayPlusSource::requestAlipayPlusCNSource();
+
+        $paymentRequest = new PaymentRequest();
+        $paymentRequest->reference = $this->randomEmail();
+        $paymentRequest->source = $requestSource;
+        $paymentRequest->capture = true;
+        $paymentRequest->amount = 1000;
+        $paymentRequest->currency = Currency::$EUR;
+        $paymentRequest->success_url = "https://testing.checkout.com/sucess";
+        $paymentRequest->failure_url = "https://testing.checkout.com/failure";
+
+        try {
+            $this->checkoutApi->getPaymentsClient()->requestPayment($paymentRequest);
+        } catch (Exception $ex) {
+            self::assertTrue($ex instanceof CheckoutApiException);
+        }
+    }
+
     /**
      * @test
      */