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.

Sign up for GitHub

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

Fix for unable to select some installment terms #195

Merged
merged 3 commits into from
May 13, 2019
Merged

Fix for unable to select some installment terms #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a28d062
seperated observables for each installment option
jacstn May 13, 2019
df7b554
JS installments / small code refactoring, renamed functions and reuse…
jacstn May 13, 2019
c1f249e
change function description
jacstn May 13, 2019
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
28 changes: 26 additions & 2 deletions view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,36 @@ define(
this._super()
.observe([
'omiseOffsite',
'installmentTerms'
'installmentTermsFC',
'installmentTermsKTC',
'installmentTermsKBank',
'installmentTermsBBL',
'installmentTermsBAY',
]);

return this;
},

/**
* Get installment terms
*
* @return {string|null}
*/
getTerms() {
return this.installmentTermsBBL() || this.installmentTermsKBank() || this.installmentTermsFC() || this.installmentTermsKTC() || this.installmentTermsBAY();
},

/**
* Reset selected terms
*/
resetTerms() {
this.installmentTermsBBL(null);
this.installmentTermsKBank(null);
this.installmentTermsFC(null);
this.installmentTermsKTC(null);
this.installmentTermsBAY(null);
},

/**
* Get a checkout form data
*
Expand All @@ -62,7 +86,7 @@ define(
'method': this.item.method,
'additional_data': {
'offsite': this.omiseOffsite(),
'terms': this.installmentTerms()
'terms': this.getTerms()
}
};
},
Expand Down
34 changes: 17 additions & 17 deletions view/frontend/web/template/payment/offsite-installment-form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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>

Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -193,7 +193,7 @@
click: placeOrder,
attr: {title: $t('Place Order')},
css: {disabled: !isPlaceOrderActionAllowed()},
enable: (getCode() == isChecked()) && omiseOffsite() && installmentTerms()">
enable: (getCode() == isChecked()) && omiseOffsite() && getTerms() ">
<span data-bind="i18n: 'Place Order'"></span>
</button>
</div>
Expand Down