From 85ec17cb74c7378a82a8cd063ebbc097d510a419 Mon Sep 17 00:00:00 2001
From: Lucian Turiac <lucian.turiac@arnia.ro>
Date: Mon, 17 Oct 2022 12:08:24 +0300
Subject: [PATCH 1/2] BP-1977 - Wechatpay Refactor

---
 Gateway/Request/LocaleDataBuilder.php |  31 +++++++
 etc/config.xml                        |   4 +-
 etc/di.xml                            | 119 +++++++++++++++++++++++++-
 3 files changed, 151 insertions(+), 3 deletions(-)
 create mode 100644 Gateway/Request/LocaleDataBuilder.php

diff --git a/Gateway/Request/LocaleDataBuilder.php b/Gateway/Request/LocaleDataBuilder.php
new file mode 100644
index 000000000..b3df6e46b
--- /dev/null
+++ b/Gateway/Request/LocaleDataBuilder.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Buckaroo\Magento2\Gateway\Request;
+
+use Magento\Sales\Api\Data\OrderAddressInterface;
+
+class LocaleDataBuilder extends AbstractDataBuilder
+{
+    public function build(array $buildSubject): array
+    {
+        parent::initialize($buildSubject);
+
+        return ['locale' => $this->getLocaleCode()];
+    }
+
+    private function getLocaleCode(): string
+    {
+        $country = $this->getOrder()->getBillingAddress()->getCountryId();
+
+        if ($country == 'CN') {
+            $localeCode = 'zh-CN';
+        } elseif ($country == 'TW') {
+            $localeCode = 'zh-TW';
+        } else {
+            $localeCode = 'en-US';
+        }
+        return $localeCode;
+    }
+}
diff --git a/etc/config.xml b/etc/config.xml
index 2a278215b..9c9d66c3f 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -768,7 +768,7 @@
 
             <buckaroo_magento2_wechatpay>
                 <active>0</active>
-                <model>Buckaroo\Magento2\Model\Method\Wechatpay</model>
+                <model>WechatpayFacade</model>
                 <order_status>pending</order_status>
                 <title>Buckaroo WeChatPay</title>
                 <allowspecific>0</allowspecific>
@@ -903,7 +903,7 @@
                 <can_use_internal>1</can_use_internal>
                 <can_use_checkout>1</can_use_checkout>
             </buckaroo_magento2_tinka>
-            
+
              <buckaroo_magento2_creditclick>
                 <active>0</active>
                 <model>CreditClickFacade</model>
diff --git a/etc/di.xml b/etc/di.xml
index 24ae37c02..9828b17ee 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -617,7 +617,7 @@
         <arguments>
             <argument name="requestBuilder" xsi:type="object">BuckarooOrderRequest</argument>
             <argument name="transferFactory" xsi:type="object">Buckaroo\Magento2\Gateway\Http\SDKTransferFactory</argument>
-            <argument name="client" xsi:type="object">Buckaroo\Magento2\Gateway\Http\Client\TransactionPay</argument>
+            <argument name="client" xsi:type="object">Buckaroo\Magento2\Gateway\Http\Client\TransactionPayRemainder</argument>
             <argument name="handler" xsi:type="object">OrderResponseHandler</argument>
             <argument name="validator" xsi:type="object">Buckaroo\Magento2\Gateway\Validator\ResponseCodeSDKValidator</argument>
             <argument name="errorMessageMapper" xsi:type="object">Buckaroo\Magento2\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
@@ -2757,4 +2757,121 @@
 
     <!-- END CreditClick Commands infrastructure -->
     <!-- END Payment Method: CreditClick -->
+
+
+    <!-- Payment Method: Wechatpay -->
+    <!-- Wechatpay Payment Method Facade configuration -->
+    <virtualType name="WechatpayFacade" type="Buckaroo\Magento2\Model\Method\BuckarooAdapter">
+        <arguments>
+            <argument name="code" xsi:type="const">Buckaroo\Magento2\Model\ConfigProvider\Method\Wechatpay::CODE</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Buckaroo\Magento2\Block\Info</argument>
+            <argument name="valueHandlerPool" xsi:type="object">WechatpayValueHandlerPool</argument>
+            <argument name="validatorPool" xsi:type="object">WechatpayValidatorPool</argument>
+            <argument name="commandPool" xsi:type="object">WechatpayGatewayCommandPool</argument>
+            <argument name="usesRedirect" xsi:type="boolean">true</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Wechatpay Value handlers infrastructure -->
+    <virtualType name="WechatpayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">WechatpayConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Configuration reader -->
+    <virtualType name="WechatpayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">Buckaroo\Magento2\Model\ConfigProvider\Method\Wechatpay</argument>
+        </arguments>
+    </virtualType>
+    <!-- END Wechatpay Value handlers infrastructure -->
+
+    <!-- Wechatpay validators infrastructure -->
+    <virtualType name="WechatpayValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="country" xsi:type="string">WechatpayCountryValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="WechatpayCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
+        <arguments>
+            <argument name="config" xsi:type="object">Buckaroo\Magento2\Model\ConfigProvider\Method\Wechatpay</argument>
+        </arguments>
+    </virtualType>
+    <!-- END Wechatpay validators infrastructure -->
+
+    <!-- Wechatpay Commands infrastructure -->
+    <virtualType name="WechatpayGatewayCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="order" xsi:type="string">WechatpayOrderCommand</item>
+                <item name="refund" xsi:type="string">BuckarooRefundCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Wechatpay Order Command -->
+    <virtualType name="WechatpayOrderCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">WechatpayOrderRequest</argument>
+            <argument name="transferFactory" xsi:type="object">Buckaroo\Magento2\Gateway\Http\SDKTransferFactory</argument>
+            <argument name="client" xsi:type="object">Buckaroo\Magento2\Gateway\Http\Client\TransactionPay</argument>
+            <argument name="handler" xsi:type="object">OrderResponseHandler</argument>
+            <argument name="validator" xsi:type="object">Buckaroo\Magento2\Gateway\Validator\ResponseCodeSDKValidator</argument>
+            <argument name="errorMessageMapper" xsi:type="object">Buckaroo\Magento2\Gateway\ErrorMapper\VirtualErrorMessageMapper</argument>
+        </arguments>
+    </virtualType>
+
+    <!-- Wechatpay Order Command - Request Builder -->
+    <virtualType name="WechatpayOrderRequest" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="order_request" xsi:type="string">BuckarooOrderRequest</item>
+                <item name="locale" xsi:type="string">Buckaroo\Magento2\Gateway\Request\LocaleDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="CustomerWechatpayDataBuilder" type="Buckaroo\Magento2\Gateway\Request\BuckarooBuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="billing" xsi:type="string">WechatpayBillingDataBuilder</item>
+                <item name="shipping" xsi:type="string">WechatpayShippingDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="WechatpayBillingDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="recipient" xsi:type="string">Buckaroo\Magento2\Gateway\Request\Recipient\WechatpayDataBuilder</item>
+                <item name="address" xsi:type="string">Buckaroo\Magento2\Gateway\Request\BillingAddressDataBuilder</item>
+                <item name="phone" xsi:type="string">Buckaroo\Magento2\Gateway\Request\PhoneDataBuilder</item>
+                <item name="email" xsi:type="string">Buckaroo\Magento2\Gateway\Request\EmailAddressDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="WechatpayShippingDataBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="recipient" xsi:type="string">WechatpayShippingRecipientDataBuilder</item>
+                <item name="address" xsi:type="string">Buckaroo\Magento2\Gateway\Request\ShippingAddressDataBuilder</item>
+                <item name="phone" xsi:type="string">PhoneShippingDataBuilder</item>
+                <item name="email" xsi:type="string">EmailAddressShippingDataBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="WechatpayShippingRecipientDataBuilder" type="Buckaroo\Magento2\Gateway\Request\Recipient\WechatpayDataBuilder">
+        <arguments>
+            <argument name="addressType" xsi:type="string">shipping</argument>
+        </arguments>
+    </virtualType>
+    <!-- END Wechatpay Order Command -->
+    <!-- END Wechatpay Commands infrastructure -->
+    <!-- END Payment Method: Wechatpay -->
 </config>

From 096ccd02520cddbea378e7db24025fb4f24cd051 Mon Sep 17 00:00:00 2001
From: Lucian Turiac <lucian.turiac@arnia.ro>
Date: Wed, 26 Oct 2022 11:54:49 +0300
Subject: [PATCH 2/2] Remove duplicate voucher item

---
 etc/di.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/etc/di.xml b/etc/di.xml
index 0d4c858c3..38cc1327f 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -378,10 +378,6 @@
                     <item name="type" xsi:type="string">voucher</item>
                     <item name="model" xsi:type="string">Buckaroo\Magento2\Model\ConfigProvider\Method\Voucher</item>
                 </item>
-                <item name="voucher" xsi:type="array">
-                    <item name="type" xsi:type="string">voucher</item>
-                    <item name="model" xsi:type="string">Buckaroo\Magento2\Model\ConfigProvider\Method\Voucher</item>
-                </item>
             </argument>
         </arguments>
     </type>