From 0ff4e82ec522f4258dbadc7d9a11c342972bd552 Mon Sep 17 00:00:00 2001
From: Aashish Gurung <101558497+aashishgurung@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:56:20 +0700
Subject: [PATCH 1/4] Resolve issue of payment failing on installment when
 total amount is updated after selecting payment (#485)

* Resolve issue of failing installment amount when cart is updated changing total amount.

* Resolve installment payment issue in WooCommerce blocks.
---
 .../javascripts/omise-payment-form-handler.js |  2 +-
 .../js/build/omise_installment.asset.php      |  2 +-
 .../assets/js/build/omise_installment.js      |  2 +-
 .../blocks/assets/js/omise-installment.js     | 28 +++++++++++++++++--
 includes/class-omise-capabilities.php         |  2 +-
 templates/payment/form-installment.php        |  1 +
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/assets/javascripts/omise-payment-form-handler.js b/assets/javascripts/omise-payment-form-handler.js
index 317537a2..db5a3970 100755
--- a/assets/javascripts/omise-payment-form-handler.js
+++ b/assets/javascripts/omise-payment-form-handler.js
@@ -257,7 +257,7 @@
 			showOmiseInstallmentForm({
 				element: omiseInstallmentElement,
 				publicKey: omise_installment_params.key,
-				amount: omise_installment_params.amount,
+				amount: OMISE_UPDATED_CART_AMOUNT,
 				locale: LOCALE,
 				onSuccess: handleCreateOrder,
 				onError: (error) => {
diff --git a/includes/blocks/assets/js/build/omise_installment.asset.php b/includes/blocks/assets/js/build/omise_installment.asset.php
index 521aa0a0..5d88bbbf 100644
--- a/includes/blocks/assets/js/build/omise_installment.asset.php
+++ b/includes/blocks/assets/js/build/omise_installment.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => 'c95a8877d63c5c3bb2fda93273b0a81a');
\ No newline at end of file
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => 'e2436da6ade36f0dc6835eb771337040');
\ No newline at end of file
diff --git a/includes/blocks/assets/js/build/omise_installment.js b/includes/blocks/assets/js/build/omise_installment.js
index 1c956852..84f607e0 100644
--- a/includes/blocks/assets/js/build/omise_installment.js
+++ b/includes/blocks/assets/js/build/omise_installment.js
@@ -1 +1 @@
-(()=>{"use strict";const e=window.React,t=window.wp.element,n=window.wp.i18n,s=window.wp.htmlEntities,a=window.wc.wcBlocksRegistry,l=(0,window.wc.wcSettings.getSetting)("omise_installment_data",{}),o=(0,s.decodeEntities)(l.title)||"No title set",r=a=>{const{eventRegistration:o,emitResponse:r}=a,{onPaymentSetup:c,onCheckoutValidation:i,onCheckoutFail:m}=o,u=(0,s.decodeEntities)(l.description||""),{installments_enabled:d,total_amount:w,public_key:p}=l.data,E=(0,n.__)("Purchase Amount is lower than the monthly minimum payment amount.","omise"),y=(0,t.useRef)(null),f=(0,t.useRef)(null),h=(0,t.useRef)(null),R=()=>{if(d){let e=l.locale.toLowerCase();e=["en","th","ja"].includes(e)?e:"en",showOmiseInstallmentForm({element:y.current,publicKey:p,amount:w,locale:e,onSuccess:e=>{f.current=e},onError:e=>{h.current=e}})}};return(0,t.useEffect)((()=>{R()}),[d]),(0,t.useEffect)((()=>i((()=>(OmiseCard.requestCardToken(),!0)))),[i]),(0,t.useEffect)((()=>m((()=>(f.current=null,R(),!0)))),[m]),(0,t.useEffect)((()=>{const e=c((async()=>await new Promise(((e,t)=>{const n=setInterval((()=>{if(f.current){clearInterval(n);try{const t={type:r.responseTypes.SUCCESS,meta:{paymentMethodData:{omise_source:f.current.source,omise_token:f.current.token}}};e(t)}catch(e){clearInterval(n);const s={type:r.responseTypes.ERROR,message:e.message};t(s)}}}),1e3)}))));return()=>e()}),[c]),(0,e.createElement)(e.Fragment,null,u&&(0,e.createElement)("p",null,u),d?(0,e.createElement)("div",{ref:y,id:"omise-installment",style:{width:"100%",maxWidth:"400px"}}):(0,e.createElement)("p",null,E))};(0,a.registerPaymentMethod)({name:l.name||"",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:n}=t.components;return(0,e.createElement)(n,{text:o})}),null),content:(0,e.createElement)(r,null),edit:(0,e.createElement)(r,null),canMakePayment:()=>l.is_active,ariaLabel:o,supports:{features:l.supports}})})();
\ No newline at end of file
+(()=>{"use strict";const e=window.React,t=window.wp.element,n=window.wp.i18n,a=window.wp.htmlEntities,s=window.wc.wcBlocksRegistry,r=(0,window.wc.wcSettings.getSetting)("omise_installment_data",{}),l=(0,a.decodeEntities)(r.title)||"No title set",{select:o,subscribe:c}=window.wp.data,i=window.wc.wcBlocksData.CART_STORE_KEY,u=s=>{const{eventRegistration:l,emitResponse:u}=s,{onPaymentSetup:m,onCheckoutValidation:w,onCheckoutFail:d}=l,p=(0,a.decodeEntities)(r.description||""),{installments_enabled:E,total_amount:f,public_key:y}=r.data,h=(0,n.__)("Purchase Amount is lower than the monthly minimum payment amount.","omise"),_=(0,t.useRef)(null),R=(0,t.useRef)(null),g=(0,t.useRef)(null),C=(0,t.useRef)(null),k=()=>{if(E){const e=o(i).getCartData();C.current=e.totals.total_price;let t=r.locale.toLowerCase();t=["en","th","ja"].includes(t)?t:"en",_.current.innerHTML="",showOmiseInstallmentForm({element:_.current,publicKey:y,amount:C.current,locale:t,onSuccess:e=>{R.current=e},onError:e=>{g.current=e}})}},b=()=>{const e=o(i).getCartData();C.current=e.totals.total_price,k()};return(0,t.useEffect)((()=>c(b,i)),[i]),(0,t.useEffect)((()=>{k()}),[E]),(0,t.useEffect)((()=>w((()=>(OmiseCard.requestCardToken(),!0)))),[w]),(0,t.useEffect)((()=>d((()=>(R.current=null,k(),!0)))),[d]),(0,t.useEffect)((()=>{const e=m((async()=>await new Promise(((e,t)=>{const n=setInterval((()=>{if(R.current){clearInterval(n);try{const t={type:u.responseTypes.SUCCESS,meta:{paymentMethodData:{omise_source:R.current.source,omise_token:R.current.token}}};e(t)}catch(e){clearInterval(n);const a={type:u.responseTypes.ERROR,message:e.message};t(a)}}}),1e3)}))));return()=>e()}),[m]),(0,e.createElement)(e.Fragment,null,p&&(0,e.createElement)("p",null,p),E?(0,e.createElement)("div",{ref:_,id:"omise-installment",style:{width:"100%",maxWidth:"400px"}}):(0,e.createElement)("p",null,h))};(0,s.registerPaymentMethod)({name:r.name||"",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:n}=t.components;return(0,e.createElement)(n,{text:l})}),null),content:(0,e.createElement)(u,null),edit:(0,e.createElement)(u,null),canMakePayment:()=>r.is_active,ariaLabel:l,supports:{features:r.supports}})})();
\ No newline at end of file
diff --git a/includes/blocks/assets/js/omise-installment.js b/includes/blocks/assets/js/omise-installment.js
index 36309701..e0a0daed 100644
--- a/includes/blocks/assets/js/omise-installment.js
+++ b/includes/blocks/assets/js/omise-installment.js
@@ -1,4 +1,4 @@
-import {useEffect, useRef} from '@wordpress/element';
+import {useEffect, useRef, useState} from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { decodeEntities } from '@wordpress/html-entities';
 import { registerPaymentMethod } from '@woocommerce/blocks-registry';
@@ -11,6 +11,9 @@ const Label = ( props ) => {
     return <PaymentMethodLabel text={ label } />
 }
 
+const {select, subscribe} = window.wp.data;
+const cartStoreKey = window.wc.wcBlocksData.CART_STORE_KEY;
+
 const InstallmentPaymentMethod = (props) => {
     const {eventRegistration, emitResponse} = props;
     const {onPaymentSetup, onCheckoutValidation, onCheckoutFail} = eventRegistration;
@@ -20,17 +23,26 @@ const InstallmentPaymentMethod = (props) => {
     const el = useRef(null);
     const wlbInstallmentRef = useRef(null);
     const cardFormErrors = useRef(null);
+    const totalAmount = useRef(null);
 
     const loadInstallmentForm = () => {
         if (installments_enabled) {
+            // Getting the new total price that might be updated when shipping method
+            // was updated while other payment method was selected
+            const cart = select( cartStoreKey ).getCartData();
+            totalAmount.current = cart.totals.total_price
+
             let locale = settings.locale.toLowerCase();
             let supportedLocales = ['en', 'th', 'ja'];
             locale = supportedLocales.includes(locale) ? locale : 'en';
 
+            // removing previous iframe if there is any
+            el.current.innerHTML = "";
+
             showOmiseInstallmentForm({
                 element: el.current,
                 publicKey: public_key,
-                amount: total_amount,
+                amount: totalAmount.current,
                 locale,
                 onSuccess: (payload) => {
                     wlbInstallmentRef.current = payload;
@@ -42,6 +54,18 @@ const InstallmentPaymentMethod = (props) => {
         }
     }
 
+    // Update total amount on cart update. We need this to send the update amount to the source API
+    const onCartChange = () => {
+        const cart = select( cartStoreKey ).getCartData();
+        totalAmount.current = cart.totals.total_price;
+        loadInstallmentForm()
+    }
+
+    useEffect(() => {
+        const unsubscribe = subscribe( onCartChange, cartStoreKey );
+        return unsubscribe;
+    }, [cartStoreKey])
+
     useEffect(() => {
         loadInstallmentForm();
 	}, [installments_enabled])
diff --git a/includes/class-omise-capabilities.php b/includes/class-omise-capabilities.php
index 7a73b086..1dcda951 100644
--- a/includes/class-omise-capabilities.php
+++ b/includes/class-omise-capabilities.php
@@ -98,7 +98,7 @@ public static function isFromCheckoutPage()
 			return false;
 		}
 
-		$endpoints = ['checkout', 'batch'];
+		$endpoints = ['checkout', 'batch', 'cart/select-shipping-rate'];
 
 		foreach($endpoints as $endpoint) {
 			if (trim($wp->request) !== '') {
diff --git a/templates/payment/form-installment.php b/templates/payment/form-installment.php
index 4c91c551..fb014769 100644
--- a/templates/payment/form-installment.php
+++ b/templates/payment/form-installment.php
@@ -3,6 +3,7 @@
 if ( ! empty( $viewData['installments_enabled'] ) ) : ?>
 	<div id="omise-installment" style="width:100%; max-width: 400px;"></div>
 	<script>
+		window.OMISE_UPDATED_CART_AMOUNT= `<?php echo $viewData['total_amount']; ?>`;
 		window.LOCALE = `<?php echo get_locale(); ?>`;
 		window.OMISE_CUSTOM_FONT_OTHER = 'Other';
 	</script>

From e60ca9861c46dea96eff92d232496cbef87c9d7c Mon Sep 17 00:00:00 2001
From: Aashish Gurung <101558497+aashishgurung@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:09:05 +0700
Subject: [PATCH 2/4] Fix Duitnow bank list issue (#486)

* Fix duitnow bank list issue

* Include test for get_bank_list()
---
 .../js/build/omise_duitnow_obw.asset.php      |  2 +-
 .../assets/js/build/omise_duitnow_obw.js      |  2 +-
 .../blocks/assets/js/omise-duitnow-obw.js     |  2 +-
 .../gateways/omise-block-duitnow-obw.php      |  6 +-
 .../class-omise-payment-duitnow-obw.php       | 85 +++++++++++++++++--
 .../blocks/gateways/traits/mock-gateways.php  |  7 ++
 .../class-omise-payment-duitnow-obw-test.php  | 85 ++++++++++++++++++-
 7 files changed, 169 insertions(+), 20 deletions(-)

diff --git a/includes/blocks/assets/js/build/omise_duitnow_obw.asset.php b/includes/blocks/assets/js/build/omise_duitnow_obw.asset.php
index 28f44fb9..aa42cd09 100644
--- a/includes/blocks/assets/js/build/omise_duitnow_obw.asset.php
+++ b/includes/blocks/assets/js/build/omise_duitnow_obw.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => '9895ac689bce188c4a74717ce7c149c5');
\ No newline at end of file
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities', 'wp-i18n'), 'version' => 'b1a7ad893b10317f131d580cebf99812');
\ No newline at end of file
diff --git a/includes/blocks/assets/js/build/omise_duitnow_obw.js b/includes/blocks/assets/js/build/omise_duitnow_obw.js
index 02028bd0..de7d53fc 100644
--- a/includes/blocks/assets/js/build/omise_duitnow_obw.js
+++ b/includes/blocks/assets/js/build/omise_duitnow_obw.js
@@ -1 +1 @@
-(()=>{"use strict";const e=window.React,t=window.wp.element,n=(window.wp.i18n,window.wp.htmlEntities),a=window.wc.wcBlocksRegistry,s=(0,window.wc.wcSettings.getSetting)("omise_duitnow_obw_data",{}),l=(0,n.decodeEntities)(s.title)||"No title set",o=a=>{const{eventRegistration:l,emitResponse:o}=a,{onPaymentSetup:c}=l,r=(0,n.decodeEntities)(s.description||""),{banks:i}=s.data,[m,p]=(0,t.useState)(null);return(0,t.useEffect)((()=>{const e=c((async()=>{if(!m)return{type:o.responseTypes.ERROR,message:"Select a bank"};try{return{type:o.responseTypes.SUCCESS,meta:{paymentMethodData:{bank:m}}}}catch(e){return{type:o.responseTypes.ERROR,message:e.message}}}));return()=>e()}),[o.responseTypes.ERROR,o.responseTypes.SUCCESS,c,m]),(0,e.createElement)(e.Fragment,null,r&&(0,e.createElement)("p",null,r),(0,e.createElement)("fieldset",{id:"omise-form-installment"},(0,e.createElement)("div",{className:"fpx-select-bank"},(0,e.createElement)("label",{htmlFor:"fpx-select-bank"},"Select Bank"),(0,e.createElement)("select",{className:"fpx-bank-logo default",id:"duitnow-obw-select-bank",name:"source[bank]",defaultValue:"",onChange:e=>{p(e.target.value)}},(0,e.createElement)("option",{value:"",disabled:!0},"-- Select your option --"),i.map((t=>(0,e.createElement)("option",{key:t.code,className:t.code,value:t.code},t.name)))))))};(0,a.registerPaymentMethod)({name:s.name||"",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:n}=t.components;return(0,e.createElement)(n,{text:l})}),null),content:(0,e.createElement)(o,null),edit:(0,e.createElement)(o,null),canMakePayment:()=>s.is_active,ariaLabel:l,supports:{features:s.supports}})})();
\ No newline at end of file
+(()=>{"use strict";const e=window.React,t=window.wp.element,n=(window.wp.i18n,window.wp.htmlEntities),a=window.wc.wcBlocksRegistry,s=(0,window.wc.wcSettings.getSetting)("omise_duitnow_obw_data",{}),l=(0,n.decodeEntities)(s.title)||"No title set",o=a=>{const{eventRegistration:l,emitResponse:o}=a,{onPaymentSetup:c}=l,r=(0,n.decodeEntities)(s.description||""),{banks:i}=s.data,[m,p]=(0,t.useState)(null);return(0,t.useEffect)((()=>{const e=c((async()=>{if(!m)return{type:o.responseTypes.ERROR,message:"Select a bank"};try{return{type:o.responseTypes.SUCCESS,meta:{paymentMethodData:{bank:m}}}}catch(e){return{type:o.responseTypes.ERROR,message:e.message}}}));return()=>e()}),[o.responseTypes.ERROR,o.responseTypes.SUCCESS,c,m]),(0,e.createElement)(e.Fragment,null,r&&(0,e.createElement)("p",null,r),(0,e.createElement)("fieldset",{id:"omise-form-installment"},(0,e.createElement)("div",{className:"fpx-select-bank"},(0,e.createElement)("label",{htmlFor:"fpx-select-bank"},"Select Bank"),(0,e.createElement)("select",{className:"fpx-bank-logo default",id:"duitnow-obw-select-bank",name:"source[bank]",defaultValue:"",onChange:e=>{p(e.target.value)}},(0,e.createElement)("option",{value:"",disabled:!0},"-- Select your option --"),Object.values(i).map((t=>(0,e.createElement)("option",{key:t.code,className:t.code,value:t.code},t.name)))))))};(0,a.registerPaymentMethod)({name:s.name||"",label:(0,e.createElement)((t=>{const{PaymentMethodLabel:n}=t.components;return(0,e.createElement)(n,{text:l})}),null),content:(0,e.createElement)(o,null),edit:(0,e.createElement)(o,null),canMakePayment:()=>s.is_active,ariaLabel:l,supports:{features:s.supports}})})();
\ No newline at end of file
diff --git a/includes/blocks/assets/js/omise-duitnow-obw.js b/includes/blocks/assets/js/omise-duitnow-obw.js
index 810ad9ae..f3bbad51 100644
--- a/includes/blocks/assets/js/omise-duitnow-obw.js
+++ b/includes/blocks/assets/js/omise-duitnow-obw.js
@@ -63,7 +63,7 @@ const DuitNowOBWPaymentMethod = (props) => {
                 >
                     <option value="" disabled={true}>-- Select your option --</option> 
                     {
-                        banks.map((bank) => (
+                        Object.values(banks).map((bank) => (
                             <option
                                 key={bank['code']}
                                 className={bank['code']}
diff --git a/includes/blocks/gateways/omise-block-duitnow-obw.php b/includes/blocks/gateways/omise-block-duitnow-obw.php
index 6e420395..cf951153 100644
--- a/includes/blocks/gateways/omise-block-duitnow-obw.php
+++ b/includes/blocks/gateways/omise-block-duitnow-obw.php
@@ -9,10 +9,6 @@ class Omise_Block_DuitNow_OBW extends Omise_Block_Payment {
     protected $name = 'omise_duitnow_obw';
 
     public function set_additional_data() {
-        if (!$this->gateway->backend) {
-            $this->gateway->init_payment_config();
-        }
-        
-        $this->additional_data = [ 'banks' => $this->gateway->backend->banks ];
+        $this->additional_data = [ 'banks' => $this->gateway->get_bank_list() ];
     }
 }
diff --git a/includes/gateway/class-omise-payment-duitnow-obw.php b/includes/gateway/class-omise-payment-duitnow-obw.php
index bca5fb44..c2dff515 100644
--- a/includes/gateway/class-omise-payment-duitnow-obw.php
+++ b/includes/gateway/class-omise-payment-duitnow-obw.php
@@ -21,8 +21,6 @@ public function __construct()
 		$this->restricted_countries = array('MY');
 		$this->source_type          = 'duitnow_obw';
 
-		$this->init_payment_config();
-
 		add_action('woocommerce_api_' . $this->id . '_callback', 'Omise_Callback::execute');
 		add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
 		add_action('woocommerce_order_action_' . $this->id . '_sync_payment', array($this, 'sync_payment'));
@@ -58,11 +56,82 @@ public function init_form_fields()
 		);
 	}
 
-	public function init_payment_config() {
-		$capabilities = Omise_Capabilities::retrieve();
-		$this->backend = $capabilities
-			? $capabilities->getBackendByType($this->source_type)
-			: null;
+	public function get_bank_list()
+	{
+		return [
+			'affin' => [
+				'code' => 'affin',
+				'name' => 'Affin Bank'
+			],
+			'alliance' => [
+				'code' => 'alliance',
+				'name' => 'Alliance Bank'
+			],
+			'agro' => [
+				'code' => 'agro',
+				'name' => 'Agrobank'
+			],
+			'ambank' => [
+				'code' => 'ambank',
+				'name' => 'AmBank'
+			],
+			'cimb' => [
+				'code' => 'cimb',
+				'name' => 'CIMB Bank'
+			],
+			'islam' => [
+				'code' => 'islam',
+				'name' => 'Bank Islam'
+			],
+			'rakyat' => [
+				'code' => 'rakyat',
+				'name' => 'Bank Rakyat'
+			],
+			'muamalat' => [
+				'code' => 'muamalat',
+				'name' => 'Bank Muamalat'
+			],
+			'bsn' => [
+				'code' => 'bsn',
+				'name' => 'Bank Simpanan Nasional'
+			],
+			'hongleong' => [
+				'code' => 'hongleong',
+				'name' => 'Hong Leong'
+			],
+			'hsbc' => [
+				'code' => 'hsbc',
+				'name' => 'HSBC Bank'
+			],
+			'kfh' => [
+				'code' => 'kfh',
+				'name' => 'Kuwait Finance House'
+			],
+			'maybank2u' => [
+				'code' => 'maybank2u',
+				'name' => 'Maybank'
+			],
+			'ocbc' => [
+				'code' => 'ocbc',
+				'name' => 'OCBC'
+			],
+			'public' => [
+				'code' => 'public',
+				'name' => 'Public Bank'
+			],
+			'rhb' => [
+				'code' => 'rhb',
+				'name' => 'RHB Bank'
+			],
+			'sc' => [
+				'code' => 'sc',
+				'name' => 'Standard Chartered'
+			],
+			'uob' => [
+				'code' => 'uob',
+				'name' => 'United Overseas Bank'
+			],
+		];
 	}
 
 	/**
@@ -73,7 +142,7 @@ public function payment_fields()
 		parent::payment_fields();
 		Omise_Util::render_view(
 			'templates/payment/form-duitnow-obw.php',
-			[ 'duitnow_obw_banklist' => !$this->backend ? $this->backend->banks : [] ]
+			[ 'duitnow_obw_banklist' => $this->get_bank_list() ]
 		);
 	}
 
diff --git a/tests/unit/includes/blocks/gateways/traits/mock-gateways.php b/tests/unit/includes/blocks/gateways/traits/mock-gateways.php
index f01d76c2..2c6e1233 100644
--- a/tests/unit/includes/blocks/gateways/traits/mock-gateways.php
+++ b/tests/unit/includes/blocks/gateways/traits/mock-gateways.php
@@ -50,6 +50,13 @@ public function get_view_data() {
                                 'currency' => 'thb',
                             ];
                         }
+
+                        public function get_bank_list() {
+                            return [
+                                'bank1',
+                                'bank2',
+                            ];
+                        }
                     };
 
                     $gateway->backend = new class {
diff --git a/tests/unit/includes/gateway/class-omise-payment-duitnow-obw-test.php b/tests/unit/includes/gateway/class-omise-payment-duitnow-obw-test.php
index 29019ac0..9dc40398 100644
--- a/tests/unit/includes/gateway/class-omise-payment-duitnow-obw-test.php
+++ b/tests/unit/includes/gateway/class-omise-payment-duitnow-obw-test.php
@@ -6,14 +6,11 @@
 
 class Omise_Payment_DuitNow_OBW_Test extends Omise_Offsite_Test
 {
-    private $omise_capability_mock;
-
     public function setUp(): void
     {
         $this->sourceType = 'duitnow_obw';
         parent::setUp();
         Monkey\Functions\expect('add_action');
-        $this->omise_capability_mock = Mockery::mock('alias:Omise_Capabilities');
         require_once __DIR__ . '/../../../../includes/gateway/class-omise-payment-duitnow-obw.php';
     }
 
@@ -25,9 +22,89 @@ function sanitize_text_field() {
             }
         }
 
-        $this->omise_capability_mock->shouldReceive('retrieve')->once();
         $_POST['source'] = ['bank' => 'SCB'];
         $obj = new Omise_Payment_DuitNow_OBW();
         $this->getChargeTest($obj);
     }
+
+    public function testGetBankList()
+    {
+        $expected = [
+			'affin' => [
+				'code' => 'affin',
+				'name' => 'Affin Bank'
+			],
+			'alliance' => [
+				'code' => 'alliance',
+				'name' => 'Alliance Bank'
+			],
+			'agro' => [
+				'code' => 'agro',
+				'name' => 'Agrobank'
+			],
+			'ambank' => [
+				'code' => 'ambank',
+				'name' => 'AmBank'
+			],
+			'cimb' => [
+				'code' => 'cimb',
+				'name' => 'CIMB Bank'
+			],
+			'islam' => [
+				'code' => 'islam',
+				'name' => 'Bank Islam'
+			],
+			'rakyat' => [
+				'code' => 'rakyat',
+				'name' => 'Bank Rakyat'
+			],
+			'muamalat' => [
+				'code' => 'muamalat',
+				'name' => 'Bank Muamalat'
+			],
+			'bsn' => [
+				'code' => 'bsn',
+				'name' => 'Bank Simpanan Nasional'
+			],
+			'hongleong' => [
+				'code' => 'hongleong',
+				'name' => 'Hong Leong'
+			],
+			'hsbc' => [
+				'code' => 'hsbc',
+				'name' => 'HSBC Bank'
+			],
+			'kfh' => [
+				'code' => 'kfh',
+				'name' => 'Kuwait Finance House'
+			],
+			'maybank2u' => [
+				'code' => 'maybank2u',
+				'name' => 'Maybank'
+			],
+			'ocbc' => [
+				'code' => 'ocbc',
+				'name' => 'OCBC'
+			],
+			'public' => [
+				'code' => 'public',
+				'name' => 'Public Bank'
+			],
+			'rhb' => [
+				'code' => 'rhb',
+				'name' => 'RHB Bank'
+			],
+			'sc' => [
+				'code' => 'sc',
+				'name' => 'Standard Chartered'
+			],
+			'uob' => [
+				'code' => 'uob',
+				'name' => 'United Overseas Bank'
+			],
+		];
+        $obj = new Omise_Payment_DuitNow_OBW();
+        $bankList = $obj->get_bank_list();
+        $this->assertEquals($expected, $bankList);
+    }
 }

From bff271534325f276f337ef2d57c343176b581044 Mon Sep 17 00:00:00 2001
From: Aashish Gurung <101558497+aashishgurung@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:22:23 +0700
Subject: [PATCH 3/4] whitelist /cart endpoint for capability API. (#487)

---
 includes/class-omise-capabilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-omise-capabilities.php b/includes/class-omise-capabilities.php
index 1dcda951..4de958a7 100644
--- a/includes/class-omise-capabilities.php
+++ b/includes/class-omise-capabilities.php
@@ -98,7 +98,7 @@ public static function isFromCheckoutPage()
 			return false;
 		}
 
-		$endpoints = ['checkout', 'batch', 'cart/select-shipping-rate'];
+		$endpoints = ['checkout', 'batch', 'cart', 'cart/select-shipping-rate'];
 
 		foreach($endpoints as $endpoint) {
 			if (trim($wp->request) !== '') {

From a3a9b8fcc397945ca4d0a17f7325ed7b8c4f8ff2 Mon Sep 17 00:00:00 2001
From: Aashish <aashish@opn.ooo>
Date: Tue, 12 Nov 2024 15:07:28 +0700
Subject: [PATCH 4/4] Prepare release of v6.0.1

---
 CHANGELOG.md          | 5 +++++
 omise-woocommerce.php | 4 ++--
 readme.txt            | 8 +++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e72cd630..a46313c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## [v6.0.1 _(Nov 12, 2024)_](https://github.com/omise/omise-woocommerce/releases/tag/v6.0.1)
+- Resolve issue of payment failing on installment when total amount is updated after selecting payment. (PR: [#485](https://github.com/omise/omise-woocommerce/pull/485))
+- Fix Duitnow bank list issue. (PR: [#486](https://github.com/omise/omise-woocommerce/pull/486))
+- Resolve the issue where no payment methods are displayed when the browser's back button is clicked from an issuer page. (PR: [#487](https://github.com/omise/omise-woocommerce/pull/487))
+
 ## [v6.0.0 _(Nov 5, 2024)_](https://github.com/omise/omise-woocommerce/releases/tag/v6.0.0)
 - Support WooCommerce block. (PR: [#470](https://github.com/omise/omise-woocommerce/pull/470))
 - Fix the loading issue in WooCommerce block cart. (PR: [#477](https://github.com/omise/omise-woocommerce/pull/477))
diff --git a/omise-woocommerce.php b/omise-woocommerce.php
index 766b9014..b78ddac6 100644
--- a/omise-woocommerce.php
+++ b/omise-woocommerce.php
@@ -4,7 +4,7 @@
  * Plugin Name: Opn Payments
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     6.0.0
+ * Version:     6.0.1
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
  * Text Domain: omise
@@ -23,7 +23,7 @@ class Omise
 	 *
 	 * @var string
 	 */
-	public $version = '6.0.0';
+	public $version = '6.0.1';
 
 	/**
 	 * The Omise Instance.
diff --git a/readme.txt b/readme.txt
index f716007f..c72b7f8f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Opn Payments
 Tags: opn payments, payment, payment gateway, woocommerce plugin, omise, opn, installment, internet banking, alipay, paynow, truemoney, woocommerce payment
 Requires at least: 4.3.1
 Tested up to: 6.6.2
-Stable tag: 6.0.0
+Stable tag: 6.0.1
 License: MIT
 License URI: https://opensource.org/licenses/MIT
 
@@ -34,6 +34,12 @@ From there:
 
 == Changelog ==
 
+= 6.0.1 =
+
+- Resolve issue of payment failing on installment when total amount is updated after selecting payment. (PR: [#485](https://github.com/omise/omise-woocommerce/pull/485))
+- Fix Duitnow bank list issue. (PR: [#486](https://github.com/omise/omise-woocommerce/pull/486))
+- Resolve the issue where no payment methods are displayed when the browser's back button is clicked from an issuer page. (PR: [#487](https://github.com/omise/omise-woocommerce/pull/487))
+
 = 6.0.0 =
 
 - Support WooCommerce block. (PR: [#470](https://github.com/omise/omise-woocommerce/pull/470))