We will work on Apr 26th (Saturday) and will be off from Apr 30th (Wednesday) until May 2nd (Friday) for public holiday in our country

Commit 001e3328 authored by Attila Kiss's avatar Attila Kiss Committed by GitHub

Merge branch 'develop' into PW-2332

parents 722ef207 7025e6c6
...@@ -78,6 +78,7 @@ define( ...@@ -78,6 +78,7 @@ define(
var isValid = ko.observable(false); var isValid = ko.observable(false);
return Component.extend({ return Component.extend({
isPlaceOrderActionAllowed: ko.observable(quote.billingAddress() != null),
defaults: { defaults: {
template: 'Adyen_Payment/payment/oneclick-form', template: 'Adyen_Payment/payment/oneclick-form',
recurringDetailReference: '', recurringDetailReference: '',
...@@ -195,7 +196,7 @@ define( ...@@ -195,7 +196,7 @@ define(
isButtonActive: function () { isButtonActive: function () {
return self.isActive() && this.getCode() == self.isChecked() && self.isBillingAgreementChecked() && this.placeOrderAllowed(); return self.isActive() && this.getCode() == self.isChecked() && self.isBillingAgreementChecked() && this.placeOrderAllowed() && self.isPlaceOrderActionAllowed();
}, },
/** /**
* Custom place order function * Custom place order function
...@@ -528,7 +529,6 @@ define( ...@@ -528,7 +529,6 @@ define(
if (quote.paymentMethod().method == paymentMethod()) { if (quote.paymentMethod().method == paymentMethod()) {
return recurringDetailReference(); return recurringDetailReference();
} }
return null; return null;
}), }),
placeOrderHandler: null, placeOrderHandler: null,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment