From a28d062507c90cae80ca8b69fc66410886277cbc Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Mon, 13 May 2019 11:14:08 +0700
Subject: [PATCH 1/3] seperated observables for each installment option

---
 .../omise-offsite-installment-method.js       | 20 +++++++++--
 .../payment/offsite-installment-form.html     | 34 +++++++++----------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
index ed65b22ec..9eb8c76ce 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
@@ -46,12 +46,28 @@ define(
                 this._super()
                     .observe([
                         'omiseOffsite',
-                        'installmentTerms'
+                        'installmentTermsFC',
+                        'installmentTermsKTC',
+                        'installmentTermsKBank',
+                        'installmentTermsBBL',
+                        'installmentTermsBAY',
                     ]);
 
                 return this;
             },
 
+            areTermsSelected() {
+                 return this.installmentTermsBBL() || this.installmentTermsKBank() || this.installmentTermsFC() || this.installmentTermsKTC() || this.installmentTermsBAY();
+            },
+
+            resetTerms() {
+                this.installmentTermsBBL(null);
+                this.installmentTermsKBank(null);
+                this.installmentTermsFC(null);
+                this.installmentTermsKTC(null);
+                this.installmentTermsBAY(null);
+            },
+
             /**
              * Get a checkout form data
              *
@@ -62,7 +78,7 @@ define(
                     'method': this.item.method,
                     'additional_data': {
                         'offsite': this.omiseOffsite(),
-                        'terms': this.installmentTerms()
+                        'terms': this.installmentTermsFC() || this.installmentTermsKTC() ||  this.installmentTermsKBank() || this.installmentTermsBBL() || this.installmentTermsBAY()
                     }
                 };
             },
diff --git a/view/frontend/web/template/payment/offsite-installment-form.html b/view/frontend/web/template/payment/offsite-installment-form.html
index 8f5e03f90..e0caef6db 100644
--- a/view/frontend/web/template/payment/offsite-installment-form.html
+++ b/view/frontend/web/template/payment/offsite-installment-form.html
@@ -52,9 +52,9 @@
                             },
                             checked: omiseOffsite,
                             click: function(data, event) { 
-                                    installmentTerms(null); 
-                                    return true; 
-                                }" />
+                                resetTerms();
+                                return true;
+                            }" />
                         <label for="omise_offsite_installment_ktc">
                             <div class="omise-logo-wrapper ktc">
                                 <img class="ktc" />
@@ -66,7 +66,7 @@
                         <select style="margin-top:10px" data-bind="options: getInstallmentTerms('ktc'),
                                         optionsText: item,
                                         valueAllowUnset: true,
-                                        value: installmentTerms,
+                                        value: installmentTermsKTC,
                                         visible: omiseOffsite() === 'installment_ktc',
                                         optionsCaption: 'Choose number of montly payments'"></select>
                     </li>
@@ -79,8 +79,8 @@
                             },
                             checked: omiseOffsite,
                             click: function(data, event) { 
-                                installmentTerms(null); 
-                                return true; 
+                                resetTerms();
+                                return true;
                             };" />
                         <label for="omise_offsite_installment_first_choice">
                             <div class="omise-logo-wrapper fc">
@@ -93,7 +93,7 @@
                         <select style="margin-top:10px" data-bind="options: getInstallmentTerms('first_choice'),
                                         optionsText: item;
                                         valueAllowUnset: true,
-                                        value: installmentTerms,
+                                        value: installmentTermsFC,
                                         visible: omiseOffsite() === 'installment_first_choice',
                                         optionsCaption: 'Choose number of montly payments'"></select>
                     </li>
@@ -106,8 +106,8 @@
                             },
                             checked: omiseOffsite,
                             click: function(data, event) { 
-                                installmentTerms(null); 
-                                return true; 
+                                resetTerms();
+                                return true;
                             };" />
                         <label for="omise_offsite_installment_kbank">
                             <div class="omise-logo-wrapper kbank">
@@ -120,7 +120,7 @@
                         <select style="margin-top:10px" data-bind="options: getInstallmentTerms('kbank'),
                                         optionsText: item,
                                         valueAllowUnset: true,
-                                        value: installmentTerms,
+                                        value: installmentTermsKBank,
                                         visible: omiseOffsite() === 'installment_kbank',
                                         optionsCaption: 'Choose number of montly payments'"></select>
 
@@ -134,8 +134,8 @@
                             },
                             checked: omiseOffsite,
                             click: function(data, event) { 
-                                installmentTerms(null); 
-                                return true; 
+                                resetTerms();
+                                return true;
                             };" />
                         <label for="omise_offsite_installment_bbl">
                             <div class="omise-logo-wrapper bbl">
@@ -148,7 +148,7 @@
                         <select style="margin-top:10px" data-bind="options: getInstallmentTerms('bbl'),
                                         optionsText: item,
                                         valueAllowUnset:true,
-                                        value: installmentTerms,
+                                        value: installmentTermsBBL,
                                         visible: omiseOffsite() === 'installment_bbl',
                                         optionsCaption: 'Choose number of montly payments'"></select>
                     </li>
@@ -160,8 +160,8 @@
                             },
                             checked: omiseOffsite,
                             click: function(data, event) { 
-                                installmentTerms(null); 
-                                return true; 
+                                resetTerms();
+                                return true;
                             };" />
                         <label for="omise_offsite_installment_bay">
                             <div class="omise-logo-wrapper bay">
@@ -174,7 +174,7 @@
                         <select style="margin-top:10px" data-bind="options: getInstallmentTerms('bay'),
                                         optionsText: item,
                                         valueAllowUnset:true,
-                                        value: installmentTerms,
+                                        value: installmentTermsBAY,
                                         visible: omiseOffsite() === 'installment_bay',
                                         optionsCaption: 'Choose number of montly payments'"></select>
                     </li>
@@ -193,7 +193,7 @@
                         click: placeOrder,
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()},
-                        enable: (getCode() == isChecked()) && omiseOffsite() && installmentTerms()">
+                        enable: (getCode() == isChecked()) && omiseOffsite() && areTermsSelected() ">
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>

From df7b554f210001e510cac23ad4cc98df19585cf0 Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Mon, 13 May 2019 11:43:49 +0700
Subject: [PATCH 2/3] JS installments / small code refactoring, renamed
 functions and reused existing code

---
 .../omise-offsite-installment-method.js                | 10 ++++++++--
 .../web/template/payment/offsite-installment-form.html |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
index 9eb8c76ce..b92bf2a17 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
@@ -56,10 +56,16 @@ define(
                 return this;
             },
 
-            areTermsSelected() {
+            /**
+             * Check if terms are selected
+             */
+            getTerms() {
                  return this.installmentTermsBBL() || this.installmentTermsKBank() || this.installmentTermsFC() || this.installmentTermsKTC() || this.installmentTermsBAY();
             },
 
+            /**
+             * Reset selected terms
+             */
             resetTerms() {
                 this.installmentTermsBBL(null);
                 this.installmentTermsKBank(null);
@@ -78,7 +84,7 @@ define(
                     'method': this.item.method,
                     'additional_data': {
                         'offsite': this.omiseOffsite(),
-                        'terms': this.installmentTermsFC() || this.installmentTermsKTC() ||  this.installmentTermsKBank() || this.installmentTermsBBL() || this.installmentTermsBAY()
+                        'terms': this.getTerms()
                     }
                 };
             },
diff --git a/view/frontend/web/template/payment/offsite-installment-form.html b/view/frontend/web/template/payment/offsite-installment-form.html
index e0caef6db..9e4e45fed 100644
--- a/view/frontend/web/template/payment/offsite-installment-form.html
+++ b/view/frontend/web/template/payment/offsite-installment-form.html
@@ -193,7 +193,7 @@
                         click: placeOrder,
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()},
-                        enable: (getCode() == isChecked()) && omiseOffsite() && areTermsSelected() ">
+                        enable: (getCode() == isChecked()) && omiseOffsite() && getTerms() ">
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>

From c1f249e5f6db21d8292364a3d7dbd42c3ecaf8d6 Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Mon, 13 May 2019 12:59:23 +0700
Subject: [PATCH 3/3] change function description

---
 .../method-renderer/omise-offsite-installment-method.js       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
index b92bf2a17..8e2f4983f 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
@@ -57,7 +57,9 @@ define(
             },
 
             /**
-             * Check if terms are selected
+             * Get installment terms
+             * 
+             * @return {string|null}
              */
             getTerms() {
                  return this.installmentTermsBBL() || this.installmentTermsKBank() || this.installmentTermsFC() || this.installmentTermsKTC() || this.installmentTermsBAY();