From b08187244fc6585fb45a6f6ab07f16364f0a3790 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@ebay.com>
Date: Fri, 16 Oct 2015 20:27:57 +0300
Subject: [PATCH] MAGETWO-44084: There is no block/message on frontend for
"accept cookies" if Cookie Restriction Mode = Yes
---
.../view/frontend/web/js/action/set-billing-address.js | 4 +++-
.../testsuite/Magento/Test/Js/_files/blacklist/magento.txt | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-billing-address.js
index faf798bf988..2090bdabfe6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-billing-address.js
@@ -55,10 +55,12 @@ define(
serviceUrl, JSON.stringify(payload)
).done(
function () {
+ var deferred = null;
+
if (!quote.isVirtual()) {
getTotalsAction([]);
} else {
- var deferred = $.Deferred();
+ deferred = $.Deferred();
getPaymentInformationAction(deferred);
$.when(deferred).done(function () {
fullScreenLoader.stopLoader();
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
index 02aa8c3d205..473a08355e6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -173,10 +173,9 @@ app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summ
app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
app/code/Magento/ConfigurableProduct/view/frontend/requirejs-config.js
app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
-app/code/Magento/Cookie/View/adminhtml/requirejs-config.js
-app/code/Magento/Cookie/View/frontend/requirejs-config.js
-app/code/Magento/Cookie/View/frontend/web/js/notices.js
-app/code/Magento/Cookie/View/frontend/web/js/require-cookie.js
+app/code/Magento/Cookie/view/adminhtml/requirejs-config.js
+app/code/Magento/Cookie/view/frontend/requirejs-config.js
+app/code/Magento/Cookie/view/frontend/web/js/require-cookie.js
app/code/Magento/Customer/view/adminhtml/requirejs-config.js
app/code/Magento/Customer/view/adminhtml/web/edit/tab/js/addresses.js
app/code/Magento/Customer/view/frontend/requirejs-config.js
--
GitLab