Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.7.1 #481

Merged
merged 4 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## [v3.7.1 _(May, 8, 2024)_](https://github.com/omise/omise-magento/releases/tag/v3.7.1)
- Fixed minimum installment amount for installment_bay and installment_kbank (PR: [#479](https://github.com/omise/omise-magento/pull/479))
- Remove OCBC PAO (PR: [#480](https://github.com/omise/omise-magento/pull/480))

## [v3.7.0 _(Apr, 9, 2024)_](https://github.com/omise/omise-magento/releases/tag/v3.7.0)
- Added WeChat Pay (PR: [#475](https://github.com/omise/omise-magento/pull/475))
- Removed Pay with Points and Citi installment (PR: [#476](https://github.com/omise/omise-magento/pull/476))
Expand Down
1 change: 0 additions & 1 deletion Cron/OrderSyncStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 0 additions & 7 deletions Gateway/Request/APMBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions Helper/OmiseHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,7 +56,6 @@ class OmiseHelper extends AbstractHelper
Touchngo::CODE,
Mobilebanking::CODE,
Rabbitlinepay::CODE,
Ocbcpao::CODE,
OcbcDigital::CODE,
Grabpay::CODE,
Boost::CODE,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 0 additions & 18 deletions Model/Config/Ocbcpao.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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],
];
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"email": "[email protected]"
}
],
"version": "3.7.0",
"version": "3.7.1",
"minimum-stability": "stable",
"type": "magento2-module",
"license": "MIT",
Expand Down
29 changes: 0 additions & 29 deletions etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 0 additions & 14 deletions etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
50 changes: 1 addition & 49 deletions etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Omise_Payment" setup_version="3.7.0">
<module name="Omise_Payment" setup_version="3.7.1">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Payment"/>
Expand Down
3 changes: 0 additions & 3 deletions view/frontend/layout/checkout_index_index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 0 additions & 10 deletions view/frontend/web/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file removed view/frontend/web/images/ocbc_pao.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ define(
*/
getInstallmentMinimum: function (id) {
return {
'kbank': 500,
'kbank': 300,
'bbl': 500,
'bay': 300,
'bay': 500,
'first_choice': 300,
'ktc': 300,
'scb': 500,
Expand Down

This file was deleted.

Loading