Merge pull request #459 from omise/release-v3.5.1

Preparing release of v3.5.1

.github/CODEOWNERS

@@ -1,10 +1 @@
-# Lines starting with '#' are comments.
-# Each line is a file pattern followed by one or more owners.
-
-# Order is important. The last matching pattern has the most precedence.
-# So if a pull request only touches javascript files, only these owners
-# will be requested to review.
-# example: *.js    @octocat @github/js
-
-# These owners will be the default owners for everything in the repo.
-* @aashishgurung @ajzkk
+* @omise/maintainers

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## [v3.5.1 _(Nov, 24, 2023)_](https://github.com/omise/omise-magento/releases/tag/v3.5.1)
+- Updated OCBC digital logo. (PR: [#457](https://github.com/omise/omise-magento/pull/457))
+- Remove zero_interest_installments option from installment banks other than Maybank. (PR: [#458](https://github.com/omise/omise-magento/pull/458))
+
 ## [v3.5.0 _(Oct, 24, 2023)_](https://github.com/omise/omise-magento/releases/tag/v3.5.0)
 - Added QR expires count down for promptpay. (PR: [#453](https://github.com/omise/omise-magento/pull/453))
 

Gateway/Request/APMBuilder.php

@@ -179,8 +179,7 @@ public function build(array $buildSubject)
                     self::SOURCE_TYPE              => $installmentId,
                     self::SOURCE_INSTALLMENT_TERMS => $method->getAdditionalInformation(
                         InstallmentDataAssignObserver::TERMS
-                    ),
-                    self::ZERO_INTEREST_INSTALLMENTS => ('installment_mbb' === $installmentId)
+                    )
                 ];
                 break;
             case Truemoney::CODE:

Gateway/Request/PaymentDataBuilder.php

@@ -10,6 +10,7 @@
 use Omise\Payment\Model\Config\Cc;
 use Omise\Payment\Model\Config\Config;
 use Omise\Payment\Block\Adminhtml\System\Config\Form\Field\Webhook;
+use Omise\Payment\Model\Capabilities;
 
 class PaymentDataBuilder implements BuilderInterface
 {
@@ -53,14 +54,20 @@ class PaymentDataBuilder implements BuilderInterface
      */
     private $money;
 
+    private $capabilities;
+
     /**
      * @param \Omise\Payment\Helper\OmiseHelper $omiseHelper
      * @param Omise\Payment\Model\Config\Cc $ccConfig
      */
-    public function __construct(Cc $ccConfig, OmiseMoney $money)
-    {
+    public function __construct(
+        Cc $ccConfig,
+        OmiseMoney $money,
+        Capabilities $capabilities
+    ) {
         $this->money = $money;
         $this->ccConfig = $ccConfig;
+        $this->capabilities = $capabilities;
     }
 
     /**
@@ -99,8 +106,9 @@ public function build(array $buildSubject)
             $requestBody[self::WEBHOOKS_ENDPOINT] = [$webhookUrl];
         }
 
-        if (Installment::CODE === $method->getMethod()) {
-            $requestBody[self::ZERO_INTEREST_INSTALLMENTS] = $this->isZeroInterestInstallment($method);
+        // Set zero_interest_installment to true for installment Maybank only
+        if ($this->enableZeroInterestInstallments($method)) {
+            $requestBody[self::ZERO_INTEREST_INSTALLMENTS] = true;
         }
 
         if (Cc::CODE === $method->getMethod()) {
@@ -110,9 +118,13 @@ public function build(array $buildSubject)
         return $requestBody;
     }
 
-    public function isZeroInterestInstallment($method)
+    /**
+     * Set zero_interest_installment to true for installment Maybank
+     */
+    public function enableZeroInterestInstallments($method)
     {
+        $isInstallment = Installment::CODE === $method->getMethod();
         $installmentId = $method->getAdditionalInformation(InstallmentDataAssignObserver::OFFSITE);
-        return ('installment_mbb' === $installmentId);
+        return $isInstallment && (Installment::MBB_ID === $installmentId);
     }
 }

Test/Unit/PaymentDataBuilderTest.php

@@ -18,6 +18,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Omise\Payment\Model\Config\Installment;
 use Omise\Payment\Model\Config\Promptpay;
+use Omise\Payment\Model\Capabilities;
 
 class PaymentDataBuilderTest extends TestCase
 {
@@ -30,6 +31,7 @@ class PaymentDataBuilderTest extends TestCase
     private $configMock;
     private $storeManagerMock;
     private $storeMock;
+    private $capabilities;
 
     protected function setUp(): void
     {
@@ -42,6 +44,7 @@ protected function setUp(): void
         $this->orderMock = m::mock(OrderInterface::class);
         $this->storeManagerMock =  m::mock(StoreManagerInterface::class);
         $this->storeMock =  m::mock(StoreInterface::class);
+        $this->capabilities = m::mock(Capabilities::class);
     }
 
     /**
@@ -97,7 +100,11 @@ public function testBuild($paymentMethod, $expectedMetadata)
         $this->paymentDataMock->shouldReceive('getOrder')->andReturn($this->orderMock);
         $this->paymentDataMock->shouldReceive('getPayment')->andReturn($this->paymentMock);
 
-        $model = new PaymentDataBuilder($this->ccConfigMock, $this->omiseMoneyMock);
+        $model = new PaymentDataBuilder(
+            $this->ccConfigMock,
+            $this->omiseMoneyMock,
+            $this->capabilities
+        );
         $result = $model->build(['payment' => $this->paymentDataMock]);
 
         $this->assertEquals(100000, $result['amount']);

composer.json

@@ -9,7 +9,7 @@
             "email": "[email protected]"
         }
     ],
-    "version": "3.5.0",
+    "version": "3.5.1",
     "minimum-stability": "stable",
     "type": "magento2-module",
     "license": "MIT",

etc/module.xml

@@ -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.5.0">
+    <module name="Omise_Payment" setup_version="3.5.1">
       <sequence>
         <module name="Magento_Sales"/>
         <module name="Magento_Payment"/>

view/frontend/web/css/styles.css

@@ -151,11 +151,6 @@
     background-size: contain;
 }
 
-/** MayBank **/
-/* #omise_offsite_installmentForm .mbb {
-    background: #007bc4;
-} */
-
 #omise_offsite_installmentForm img.mbb {
     background: url('../images/fpx-maybank.svg');
 }
@@ -171,7 +166,7 @@ div.ocbc_pao {
 }
 
 div.ocbc_digital {
-    background-image: url('../images/ocbc_digital.png');
+    background-image: url('../images/ocbc_digital.svg');
     width: 30px;
     height: 30px;
     float: right;

view/frontend/web/js/view/payment/method-renderer/omise-offsite-ocbc-digital-method.js

@@ -23,8 +23,8 @@ define(
             code: 'omise_offsite_ocbc_digital',
             restrictedToCurrencies: ['sgd'],
             logo: {
-                file: "images/ocbc_digital.png",
-                width: "80",
+                file: "images/ocbc_digital.svg",
+                width: "30",
                 height: "30",
                 name: "ocbc_digital"
             }