Remove OCBC PAO. (#480)

Co-authored-by: Aashish <[email protected]>
omise · May 7, 2024 · e2eb271 · e2eb271
1 parent ceac7c6
commit e2eb271
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 170 deletions.
diff --git a/Cron/OrderSyncStatus.php b/Cron/OrderSyncStatus.php
@@ -33,7 +33,6 @@ class OrderSyncStatus
         "omise_offsite_internetbanking",
         "omise_offsite_mobilebanking",
         "omise_offsite_rabbitlinepay",
-        "omise_offsite_ocbcpao",
         "omise_offsite_ocbc_digital",
         "omise_offsite_grabpay",
         "omise_offsite_boost",

diff --git a/Gateway/Request/APMBuilder.php b/Gateway/Request/APMBuilder.php
@@ -12,7 +12,6 @@
 use Omise\Payment\Model\Config\Config;
 use Omise\Payment\Model\Config\Paynow;
 use Omise\Payment\Model\Config\Grabpay;
-use Omise\Payment\Model\Config\Ocbcpao;
 use Omise\Payment\Model\Config\OcbcDigital;
 use Omise\Payment\Model\Config\Touchngo;
 use Omise\Payment\Helper\ReturnUrlHelper;
@@ -278,12 +277,6 @@ public function build(array $buildSubject)
                     self::SOURCE_TYPE => 'rabbit_linepay'
                 ];
                 break;
-            case Ocbcpao::CODE:
-                $paymentInfo[self::SOURCE] = [
-                    self::SOURCE_TYPE => 'mobile_banking_ocbc_pao',
-                    self::PLATFORM_TYPE => $this->requestHelper->getPlatformType(),
-                ];
-                break;
             case OcbcDigital::CODE:
                 $paymentInfo[self::SOURCE] = [
                     self::SOURCE_TYPE => OcbcDigital::ID,

diff --git a/Helper/OmiseHelper.php b/Helper/OmiseHelper.php
@@ -18,7 +18,6 @@
 use Omise\Payment\Model\Config\PayPay;
 use Magento\Store\Model\ScopeInterface;
 use Omise\Payment\Model\Config\Grabpay;
-use Omise\Payment\Model\Config\Ocbcpao;
 use Omise\Payment\Model\Config\OcbcDigital;
 use Omise\Payment\Model\Config\Touchngo;
 use Omise\Payment\Model\Config\DuitnowQR;
@@ -57,7 +56,6 @@ class OmiseHelper extends AbstractHelper
         Touchngo::CODE,
         Mobilebanking::CODE,
         Rabbitlinepay::CODE,
-        Ocbcpao::CODE,
         OcbcDigital::CODE,
         Grabpay::CODE,
         Boost::CODE,
@@ -125,7 +123,6 @@ class OmiseHelper extends AbstractHelper
         Alipayplus::KAKAOPAY_ID => Alipayplus::KAKAOPAY_CODE,
         Touchngo::ID => Touchngo::CODE,
         Rabbitlinepay::ID => Rabbitlinepay::CODE,
-        Ocbcpao::ID => Ocbcpao::CODE,
         OcbcDigital::ID => OcbcDigital::CODE,
         Grabpay::ID => Grabpay::CODE,
         Boost::ID => Boost::CODE,
@@ -191,7 +188,6 @@ class OmiseHelper extends AbstractHelper
         Touchngo::CODE => "Touch`n Go eWallet Payment",
         Mobilebanking::CODE => "Mobile Banking Payment",
         Rabbitlinepay::CODE => "Rabbit LINE Pay Payment",
-        Ocbcpao::CODE => "OCBC Pay Anyone Payment",
         OcbcDigital::CODE => "OCBC Digital Payment",
         Grabpay::CODE => "GrabPay Payment",
         Boost::CODE => "Boost Payment",

diff --git a/Model/Config/Ocbcpao.php b/Model/Config/Ocbcpao.php
diff --git a/Test/Unit/Gateway/Request/APMBuilders/AlipayAPMBuilderTest.php b/Test/Unit/Gateway/Request/APMBuilders/AlipayAPMBuilderTest.php
@@ -8,7 +8,6 @@
 use Omise\Payment\Model\Config\Alipay;
 use Omise\Payment\Model\Config\Alipayplus;
 use Omise\Payment\Model\Config\OcbcDigital;
-use Omise\Payment\Model\Config\Ocbcpao;
 use Omise\Payment\Model\Config\Grabpay;
 use Omise\Payment\Model\Config\Boost;
 use Omise\Payment\Model\Config\DuitnowQR;
@@ -115,7 +114,6 @@ public function apmRequiringPlatformTypDataProvider()
             [Alipayplus::KAKAOPAY_CODE, Alipayplus::KAKAOPAY_ID],
             [Grabpay::CODE, Grabpay::ID],
             [OcbcDigital::CODE, OcbcDigital::ID],
-            [Ocbcpao::CODE, Ocbcpao::ID],
             [Touchngo::CODE, Touchngo::ID],
         ];
     }

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -612,35 +612,6 @@
                         </depends>
                     </field>
                 </group>
-                <group id="omise_offsite_ocbcpao" translate="label" sortOrder="495" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Enable OCBC Pay Anyone Payment</label>
-                    <comment>Enable customers to pay using OCBC Pay Anyone payment method</comment>
-                    <field id="active" translate="label comment" type="select" sortOrder="496" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Enable/Disable</label>
-                        <comment>Enable OCBC Pay Anyone payment method.</comment>
-                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                        <config_path>payment/omise_offsite_ocbcpao/active</config_path>
-                    </field>
-                    <field id="title" translate="label" type="text" sortOrder="497" 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_ocbcpao/title</config_path>
-                    </field>
-                    <field id="allowspecific" translate="label comment" type="select" sortOrder="498" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Allowed Countries</label>
-                        <config_path>payment/omise_offsite_ocbcpao/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="499" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Payment from specific countries</label>
-                        <config_path>payment/omise_offsite_ocbcpao/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_offsite_ocbc_digital" translate="label" sortOrder="495" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable OCBC Digital Payment</label>
                     <comment>Enable customers to pay using OCBC Digital payment method</comment>

diff --git a/etc/config.xml b/etc/config.xml
@@ -273,20 +273,6 @@
                 <payment_action>authorize_capture</payment_action>
             </omise_offsite_rabbitlinepay>
 
-            <omise_offsite_ocbcpao>
-                <active>0</active>
-                <title>OCBC Pay Anyone</title>
-                <model>OmiseOcbcpaoAdapter</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_ocbcpao>
-
             <omise_offsite_ocbc_digital>
                 <active>0</active>
                 <title>OCBC Digital</title>

diff --git a/etc/di.xml b/etc/di.xml
@@ -767,56 +767,8 @@
         </arguments>
     </virtualType>
     <!-- /Rabbitlinepay :: Value Handler Pool-->
-
-    <!--  Ocbc Pao payment solution-->
-    <virtualType name="OmiseOcbcpaoAdapter" type="Magento\Payment\Model\Method\Adapter">
-        <arguments>
-            <argument name="code" xsi:type="const">Omise\Payment\Model\Config\Ocbcpao::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">OmiseAPMOcbcpaoValueHandlerPool</argument>
-            <argument name="validatorPool" xsi:type="object">OmiseAPMOcbcpaoValidatorPool</argument>
-            <argument name="commandPool" xsi:type="object">OmiseAPMCommandPool</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Ocbc Pao :: Value Handler Pool -->
-    <virtualType name="OmiseAPMOcbcpaoValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
-        <arguments>
-            <argument name="handlers" xsi:type="array">
-                <item name="default" xsi:type="string">OmiseAPMOcbcpaoConfigValueHandler</item>
-            </argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMOcbcpaoValidatorPool" type="Magento\Payment\Gateway\Validator\ValidatorPool">
-        <arguments>
-            <argument name="validators" xsi:type="array">
-                <item name="country" xsi:type="string">OmiseAPMOcbcpaoCountryValidator</item>
-            </argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMOcbcpaoCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
-        <arguments>
-            <argument name="config" xsi:type="object">OmiseAPMOcbcpaoConfig</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMOcbcpaoConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
-        <arguments>
-            <argument name="configInterface" xsi:type="object">OmiseAPMOcbcpaoConfig</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="OmiseAPMOcbcpaoConfig" type="Magento\Payment\Gateway\Config\Config">
-        <arguments>
-            <argument name="methodCode" xsi:type="const">Omise\Payment\Model\Config\Ocbcpao::CODE</argument>
-        </arguments>
-    </virtualType>
-    <!-- /Ocbc Pao :: Value Handler Pool-->
 
-     <!--  Ocbc Digital payment solution-->
+    <!--  Ocbc Digital payment solution-->
     <virtualType name="OmiseOcbcDigitalAdapter" type="Magento\Payment\Model\Method\Adapter">
         <arguments>
             <argument name="code" xsi:type="const">Omise\Payment\Model\Config\OcbcDigital::CODE</argument>

diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -80,9 +80,6 @@
                                                                         <item name="omise_offsite_rabbitlinepay" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
-                                                                        <item name="omise_offsite_ocbcpao" xsi:type="array">
-                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-                                                                        </item>
                                                                         <item name="omise_offsite_ocbc_digital" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>

diff --git a/view/frontend/web/css/styles.css b/view/frontend/web/css/styles.css
@@ -155,16 +155,6 @@
     background: url('../images/fpx-maybank.svg');
 }
 
-/** OCBC PAO **/
-div.ocbc_pao {
-    background-image: url('../images/ocbc_pao.png');
-    width: 30px;
-    height: 30px;
-    float: right;
-    background-size: contain;
-    background-repeat: no-repeat;
-}
-
 div.ocbc_digital {
     background-image: url('../images/ocbc_digital.svg');
     width: 30px;

diff --git a/view/frontend/web/images/ocbc_pao.png b/view/frontend/web/images/ocbc_pao.png
diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-ocbcpao-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-ocbcpao-method.js