From 844e661849645fefd1b3c567a95ca61203e58294 Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Thu, 2 Jul 2015 12:07:27 +0300
Subject: [PATCH] MAGETWO-39446: "Place Order" button should be disabled until
billing address is set
---
.../Checkout/view/frontend/web/js/view/billing-address.js | 2 +-
.../Checkout/view/frontend/web/js/view/payment/default.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index 93a5a281662..4a060c33fdf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -39,7 +39,7 @@ define(
this._super()
.observe({
selectedAddress: null,
- isAddressDetailsVisible: quote.shippingAddress() != null,
+ isAddressDetailsVisible: quote.billingAddress() != null,
isAddressFormVisible: !customer.isLoggedIn() || addressOptions.length == 1,
isAddressSameAsShipping: false
});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
index 1734a79d09f..4c93ab6c7e1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
@@ -17,7 +17,7 @@ define(
'use strict';
return Component.extend({
redirectAfterPlaceOrder: true,
- isPlaceOrderActionAllowed: ko.observable(true),
+ isPlaceOrderActionAllowed: ko.observable(quote.billingAddress() != null),
/**
* Initialize view.
*
--
GitLab