diff --git a/Gateway/Request/APMBuilder.php b/Gateway/Request/APMBuilder.php index 6a8d0c2c..55b7744e 100644 --- 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 index 88a3c45e..2fed167a 100644 --- 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 index 79908737..9fc0f494 100644 --- 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 deleted file mode 100644 index 836a746c..00000000 --- a/Model/Config/Pointsciti.php +++ /dev/null @@ -1,18 +0,0 @@ - - - - Enable customers to pay using Citi Pay with Points payment method - - - Enable Citi Pay with Points Payment Solution. - Magento\Config\Model\Config\Source\Yesno - payment/omise_offsite_pointsciti/active - - - - This controls the title which the user sees during checkout. - payment/omise_offsite_pointsciti/title - - - - payment/omise_offsite_pointsciti/allowspecific - Magento\Payment\Model\Config\Source\Allspecificcountries - If not set to all, guest customers will not have a billing country and may not be able to check out. - - - - payment/omise_offsite_pointsciti/specificcountry - Magento\Directory\Model\Config\Source\Country - - 1 - - - Enable customers to pay for products in Lotus's Stores. diff --git a/etc/config.xml b/etc/config.xml index a06a71b7..d07b5b41 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -89,20 +89,6 @@ order - - 0 - Citi Pay with Points - OmisePointscitiAdapter - 1 - 1 - 1 - 1 - 1 - 1 - 1 - authorize_capture - - 0 Installment diff --git a/etc/di.xml b/etc/di.xml index 13ceb0d8..353e2e8e 100644 --- a/etc/di.xml +++ b/etc/di.xml @@ -576,54 +576,6 @@ - - - - Omise\Payment\Model\Config\Pointsciti::CODE - Magento\Payment\Block\Form - Magento\Payment\Block\Info - OmiseAPMPointscitiValueHandlerPool - OmiseAPMPointscitiValidatorPool - OmiseAPMCommandPool - - - - - - - - OmiseAPMPointscitiConfigValueHandler - - - - - - - - OmiseAPMPointscitiCountryValidator - - - - - - - OmiseAPMPointscitiConfig - - - - - - OmiseAPMPointscitiConfig - - - - - - Omise\Payment\Model\Config\Pointsciti::CODE - - - - diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml index cbf0b71c..cbcf1ec2 100644 --- a/view/frontend/layout/checkout_index_index.xml +++ b/view/frontend/layout/checkout_index_index.xml @@ -35,9 +35,6 @@ true - - true - true 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 deleted file mode 100644 index 502cc9fe..00000000 --- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-pointsciti-method.js +++ /dev/null @@ -1,27 +0,0 @@ -define( - [ - 'ko', - 'Omise_Payment/js/view/payment/omise-offsite-method-renderer', - 'Magento_Checkout/js/view/payment/default', - 'Magento_Checkout/js/model/quote', - ], - function ( - ko, - Base, - Component, - quote - ) { - 'use strict'; - - return Component.extend(Base).extend({ - defaults: { - template: 'Omise_Payment/payment/offsite-pointsciti-form' - }, - - isPlaceOrderActionAllowed: ko.observable(quote.billingAddress() != null), - - code: 'omise_offsite_pointsciti', - restrictedToCurrencies: ['thb'] - }); - } -);