Removed pointsciti and installment_citi (#476)

Co-authored-by: Aashish <[email protected]>
omise · Apr 9, 2024 · 1838599 · 1838599
1 parent 76bfd3e
commit 1838599
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 154 deletions.
diff --git a/Gateway/Request/APMBuilder.php b/Gateway/Request/APMBuilder.php
@@ -23,7 +23,6 @@
 use Omise\Payment\Model\Config\Truemoney;
 use Omise\Payment\Model\Config\Alipayplus;
 use Omise\Payment\Model\Config\DuitnowOBW;
-use Omise\Payment\Model\Config\Pointsciti;
 use Omise\Payment\Model\Config\Installment;
 use Omise\Payment\Model\Config\Mobilebanking;
 use Omise\Payment\Model\Config\Rabbitlinepay;
@@ -224,11 +223,6 @@ public function build(array $buildSubject)
                     self::SOURCE_TYPE => 'promptpay'
                 ];
                 break;
-            case Pointsciti::CODE:
-                $paymentInfo[self::SOURCE] = [
-                    self::SOURCE_TYPE => 'points_citi'
-                ];
-                break;
             case Fpx::CODE:
                 $paymentInfo[self::SOURCE] = [
                     self::SOURCE_TYPE => 'fpx',

diff --git a/Helper/OmiseHelper.php b/Helper/OmiseHelper.php
@@ -28,7 +28,6 @@
 use Omise\Payment\Model\Config\Truemoney;
 use Omise\Payment\Model\Config\Alipayplus;
 use Omise\Payment\Model\Config\DuitnowOBW;
-use Omise\Payment\Model\Config\Pointsciti;
 use Omise\Payment\Model\Config\CcGooglePay;
 use Omise\Payment\Model\Config\Installment;
 use Omise\Payment\Model\Config\Mobilebanking;
@@ -49,7 +48,6 @@ class OmiseHelper extends AbstractHelper
         Internetbanking::CODE,
         Installment::CODE,
         Truemoney::CODE,
-        Pointsciti::CODE,
         Fpx::CODE,
         Alipayplus::ALIPAY_CODE,
         Alipayplus::ALIPAYHK_CODE,
@@ -119,7 +117,6 @@ class OmiseHelper extends AbstractHelper
         Alipay::ID => Alipay::CODE,
         Truemoney::ID => Truemoney::CODE,
         Truemoney::JUMPAPP_ID => Truemoney::CODE,
-        Pointsciti::ID => Pointsciti::CODE,
         Fpx::ID => Fpx::CODE,
         Alipayplus::ALIPAY_ID => Alipayplus::ALIPAY_CODE,
         Alipayplus::ALIPAYHK_ID => Alipayplus::ALIPAYHK_CODE,
@@ -148,7 +145,6 @@ class OmiseHelper extends AbstractHelper
         // offsite installment banking payment
         Installment::BAY_ID => Installment::CODE,
         Installment::BBL_ID => Installment::CODE,
-        Installment::CITI_ID => Installment::CODE,
         Installment::UOB_ID => Installment::CODE,
         Installment::FIRST_CHOICE_ID => Installment::CODE,
         Installment::KBANK_ID => Installment::CODE,
@@ -186,7 +182,6 @@ class OmiseHelper extends AbstractHelper
         Internetbanking::CODE => "Internet Banking Payment",
         Installment::CODE => "Installment Payment",
         Truemoney::CODE => "TrueMoney Payment",
-        Pointsciti::CODE => "Citi Pay with Points",
         Fpx::CODE => "FPX Payment",
         Alipayplus::ALIPAY_CODE => "Alipay (Alipay+ Partner) Payment",
         Alipayplus::ALIPAYHK_CODE => "AlipayHK (Alipay+ Partner) Payment",

diff --git a/Model/Config/Installment.php b/Model/Config/Installment.php
@@ -19,8 +19,6 @@ class Installment extends Config
 
     const BBL_ID = "installment_bbl";
 
-    const CITI_ID = "installment_citi";
-
     const FIRST_CHOICE_ID = "installment_first_choice";
 
     const KBANK_ID = "installment_kbank";

diff --git a/Model/Config/Pointsciti.php b/Model/Config/Pointsciti.php
diff --git a/Test/Unit/Gateway/Request/APMBuilders/AlipayAPMBuilderTest.php b/Test/Unit/Gateway/Request/APMBuilders/AlipayAPMBuilderTest.php
@@ -15,7 +15,6 @@
 use Omise\Payment\Model\Config\MaybankQR;
 use Omise\Payment\Model\Config\Touchngo;
 use Omise\Payment\Model\Config\Promptpay;
-use Omise\Payment\Model\Config\Pointsciti;
 use Omise\Payment\Model\Config\Paynow;
 use Omise\Payment\Model\Config\Tesco;
 use Omise\Payment\Model\Config\Rabbitlinepay;
@@ -99,7 +98,6 @@ public function apmRequiringOnlySourceTypeDataProvider()
             [Tesco::CODE, Tesco::ID],
             [Paynow::CODE, Paynow::ID],
             [Promptpay::CODE, Promptpay::ID],
-            [Pointsciti::CODE, Pointsciti::ID],
             [Rabbitlinepay::CODE, Rabbitlinepay::ID],
             [Boost::CODE, Boost::ID],
             [DuitnowQR::CODE, DuitnowQR::ID],

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -179,35 +179,6 @@
                         </depends>
                     </field>
                 </group>
-                <group id="omise_offsite_pointsciti" translate="label" sortOrder="190" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Enable Citi Pay with Points</label>
-                    <comment>Enable customers to pay using Citi Pay with Points payment method</comment>
-                    <field id="active" translate="label comment" type="select" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Enable/Disable</label>
-                        <comment>Enable Citi Pay with Points Payment Solution.</comment>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <config_path>payment/omise_offsite_pointsciti/active</config_path>
-                    </field>
-                    <field id="title" translate="label" type="text" sortOrder="210" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Title</label>
-                        <comment>This controls the title which the user sees during checkout.</comment>
-                        <config_path>payment/omise_offsite_pointsciti/title</config_path>
-                    </field>
-                    <field id="allowspecific" translate="label comment" type="select" sortOrder="211" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Allowed Countries</label>
-                        <config_path>payment/omise_offsite_pointsciti/allowspecific</config_path>
-                        <source_model>Magento\Payment\Model\Config\Source\Allspecificcountries</source_model>
-                        <comment>If not set to all, guest customers will not have a billing country and may not be able to check out.</comment>
-                    </field>
-                    <field id="specificcountry" translate="label" type="multiselect" sortOrder="212" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Payment from specific countries</label>
-                        <config_path>payment/omise_offsite_pointsciti/specificcountry</config_path>
-                        <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
-                        <depends>
-                            <field id="allowspecific">1</field>
-                        </depends>
-                    </field>
-                </group>
                 <group id="omise_offline_tesco" translate="label" sortOrder="220" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Lotus's Bill Payment</label>
                     <comment>Enable customers to pay for products in Lotus's Stores.</comment>

diff --git a/etc/config.xml b/etc/config.xml
@@ -89,20 +89,6 @@
                 <payment_action>order</payment_action>
             </omise_offline_promptpay>
 
-            <omise_offsite_pointsciti>
-                <active>0</active>
-                <title>Citi Pay with Points</title>
-                <model>OmisePointscitiAdapter</model>
-                <is_gateway>1</is_gateway>
-                <can_initialize>1</can_initialize>
-                <can_use_checkout>1</can_use_checkout>
-                <can_capture>1</can_capture>
-                <can_review_payment>1</can_review_payment>
-                <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
-                <can_refund>1</can_refund>
-                <payment_action>authorize_capture</payment_action>
-            </omise_offsite_pointsciti>
-
             <omise_offsite_installment>
                 <active>0</active>
                 <title>Installment</title>

diff --git a/etc/di.xml b/etc/di.xml
@@ -576,54 +576,6 @@
     </virtualType>
     <!-- /Value Handler -->
 
-    <!--  Citi Points payment solution-->
-    <virtualType name="OmisePointscitiAdapter" type="Magento\Payment\Model\Method\Adapter">
-        <arguments>
-            <argument name="code" xsi:type="const">Omise\Payment\Model\Config\Pointsciti::CODE</argument>
-            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
-            <argument name="infoBlockType" xsi:type="string">Magento\Payment\Block\Info</argument>
-            <argument name="valueHandlerPool" xsi:type="object">OmiseAPMPointscitiValueHandlerPool</argument>
-            <argument name="validatorPool" xsi:type="object">OmiseAPMPointscitiValidatorPool</argument>
-            <argument name="commandPool" xsi:type="object">OmiseAPMCommandPool</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Citi Points :: Value Handler Pool -->
-    <virtualType name="OmiseAPMPointscitiValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="default" xsi:type="string">OmiseAPMPointscitiConfigValueHandler</item>
-            </argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMPointscitiValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
-        <arguments>
-            <argument name="validators" xsi:type="array">
-                <item name="country" xsi:type="string">OmiseAPMPointscitiCountryValidator</item>
-            </argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMPointscitiCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
-        <arguments>
-            <argument name="config" xsi:type="object">OmiseAPMPointscitiConfig</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMPointscitiConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
-        <arguments>
-            <argument name="configInterface" xsi:type="object">OmiseAPMPointscitiConfig</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMPointscitiConfig" type="Magento\Payment\Gateway\Config\Config">
-        <arguments>
-            <argument name="methodCode" xsi:type="const">Omise\Payment\Model\Config\Pointsciti::CODE</argument>
-        </arguments>
-    </virtualType>
-    <!-- /Value Handler -->
-
     <!--  Pay Now payment solution-->
     <virtualType name="OmisePaynowAdapter" type="Magento\Payment\Model\Method\Adapter">
         <arguments>

diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -35,9 +35,6 @@
                                                                         <item name="omise_offsite_alipay" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
-                                                                        <item name="omise_offsite_pointsciti" xsi:type="array">
-                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-                                                                        </item>
                                                                         <item name="omise_offline_tesco" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-pointsciti-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-pointsciti-method.js