diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js b/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
index ca9d6493a16740f1a43555d84459df4403bd3c88..9005015d2460e12c5462551aecce97f1bd31c003 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/full-screen-loader.js
@@ -24,7 +24,7 @@ define([
/**
* Stop full page loader action
*
- * @param {Boolean} forceStop
+ * @param {Boolean} [forceStop]
*/
stopLoader: function (forceStop) {
var $elem = $(containerId),
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 1876f07830ba7b55df25230bc256b829f65b2fc3..90cb60186e34e3730ae6d068b34e4002add00a6c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -23,7 +23,8 @@
<label>Express Checkout</label>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
<field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
- <label>Email Associated with PayPal Merchant Account</label>
+ <label>Email Associated with PayPal Merchant Account (Optional)</label>
+ <frontend_class>not-required</frontend_class>
<comment>
<![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
</comment>
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
index ed5744feb6ce84df31a5a59b42f520bb97316792..d1e294c9a8f0c1dc4edf82e52cbe509b09da8fbe 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/cancel-coupon.js
@@ -17,16 +17,20 @@ define(
'mage/storage',
'Magento_Checkout/js/action/get-payment-information',
'Magento_Checkout/js/model/totals',
- 'mage/translate'
+ 'mage/translate',
+ 'Magento_Checkout/js/model/full-screen-loader'
],
- function ($, quote, urlManager, errorProcessor, messageContainer, storage, getPaymentInformationAction, totals, $t) {
+ function ($, quote, urlManager, errorProcessor, messageContainer, storage, getPaymentInformationAction, totals, $t,
+ fullScreenLoader) {
'use strict';
- return function (isApplied, isLoading) {
+ return function (isApplied) {
var quoteId = quote.getQuoteId(),
url = urlManager.getCancelCouponUrl(quoteId),
message = $t('Your coupon was successfully removed.');
+
messageContainer.clear();
+ fullScreenLoader.startLoader();
return storage.delete(
url,
@@ -39,6 +43,7 @@ define(
$.when(deferred).done(function () {
isApplied(false);
totals.isLoading(false);
+ fullScreenLoader.stopLoader();
});
messageContainer.addSuccessMessage({
'message': message
@@ -47,12 +52,9 @@ define(
).fail(
function (response) {
totals.isLoading(false);
+ fullScreenLoader.stopLoader();
errorProcessor.process(response, messageContainer);
}
- ).always(
- function () {
- isLoading(false);
- }
);
};
}
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
index 606fe4013ea762c5460c49202907463d7c7952f2..a2b7ff19f2139ffa7e23b37eda039d5b9ccc32a8 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/action/set-coupon-code.js
@@ -18,25 +18,22 @@ define(
'mage/storage',
'mage/translate',
'Magento_Checkout/js/action/get-payment-information',
- 'Magento_Checkout/js/model/totals'
+ 'Magento_Checkout/js/model/totals',
+ 'Magento_Checkout/js/model/full-screen-loader'
],
function (
- ko,
- $,
- quote,
- urlManager,
- errorProcessor,
- messageContainer,
- storage,
- $t,
- getPaymentInformationAction,
- totals
+ ko, $, quote, urlManager, errorProcessor, messageContainer, storage, $t, getPaymentInformationAction, totals,
+ fullScreenLoader
) {
'use strict';
- return function (couponCode, isApplied, isLoading) {
- var quoteId = quote.getQuoteId();
- var url = urlManager.getApplyCouponUrl(couponCode, quoteId);
- var message = $t('Your coupon was successfully applied.');
+
+ return function (couponCode, isApplied) {
+ var quoteId = quote.getQuoteId(),
+ url = urlManager.getApplyCouponUrl(couponCode, quoteId),
+ message = $t('Your coupon was successfully applied.');
+
+ fullScreenLoader.startLoader();
+
return storage.put(
url,
{},
@@ -45,19 +42,22 @@ define(
function (response) {
if (response) {
var deferred = $.Deferred();
- isLoading(false);
+
isApplied(true);
totals.isLoading(true);
getPaymentInformationAction(deferred);
$.when(deferred).done(function () {
+ fullScreenLoader.stopLoader();
totals.isLoading(false);
});
- messageContainer.addSuccessMessage({'message': message});
+ messageContainer.addSuccessMessage({
+ 'message': message
+ });
}
}
).fail(
function (response) {
- isLoading(false);
+ fullScreenLoader.stopLoader();
totals.isLoading(false);
errorProcessor.process(response, messageContainer);
}
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js b/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
index 8e8c0798ff3b59ce0ffa0a803242abe1d02fcee7..6dc973a7a1e4298469251f71f6e26f09a95cc5d0 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/view/payment/discount.js
@@ -13,49 +13,53 @@ define(
],
function ($, ko, Component, quote, setCouponCodeAction, cancelCouponAction) {
'use strict';
- var totals = quote.getTotals();
- var couponCode = ko.observable(null);
+
+ var totals = quote.getTotals(),
+ couponCode = ko.observable(null),
+ isApplied = ko.observable(couponCode() != null);
+
if (totals()) {
couponCode(totals()['coupon_code']);
}
- var isApplied = ko.observable(couponCode() != null);
- var isLoading = ko.observable(false);
+
return Component.extend({
defaults: {
template: 'Magento_SalesRule/payment/discount'
},
couponCode: couponCode,
+
/**
* Applied flag
*/
isApplied: isApplied,
- isLoading: isLoading,
+
/**
* Coupon code application procedure
*/
apply: function() {
if (this.validate()) {
- isLoading(true);
- setCouponCodeAction(couponCode(), isApplied, isLoading);
+ setCouponCodeAction(couponCode(), isApplied);
}
},
+
/**
* Cancel using coupon
*/
cancel: function() {
if (this.validate()) {
- isLoading(true);
couponCode('');
- cancelCouponAction(isApplied, isLoading);
+ cancelCouponAction(isApplied);
}
},
+
/**
* Coupon form validation
*
- * @returns {boolean}
+ * @returns {Boolean}
*/
- validate: function() {
+ validate: function () {
var form = '#discount-form';
+
return $(form).validation() && $(form).validation('isValid');
}
});
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index d6bc4c764d5714382d017adce856deaf84c8b3ff..4ba38906fe9c1e98c8d248574585cc01ef815914 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -15,7 +15,7 @@
<!-- ko foreach: getRegion('messages') -->
<!-- ko template: getTemplate() --><!-- /ko -->
<!--/ko-->
- <form class="form form-discount" id="discount-form" data-bind="blockLoader: isLoading">
+ <form class="form form-discount" id="discount-form">
<div class="payment-option-inner">
<div class="field">
<label class="label" for="discount-code">
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
index f1776d2bf933e17d63006948795418309348ffe3..cad6dda90459845718bc3ab1e3ac2952cca16640 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment.php
@@ -85,6 +85,7 @@ class Payment extends Block
$paymentLabelSelector = sprintf($this->paymentMethodLabel, $payment['method']);
try {
+ $this->waitForElementNotVisible($this->waitElement);
$this->waitForElementVisible($paymentLabelSelector);
} catch (\Exception $exception) {
throw new \Exception('Such payment method is absent.');
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php
index d83ae0c53ec0a575ba11280b9a8731bbe23a6f8a..6e4849669568851cbe4787766c6cf8b2f630e9e6 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/ExpressCheckout.php
@@ -20,8 +20,6 @@ class ExpressCheckout extends Block
* @var array
*/
private $fields = [
- 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_alternative_payment_methods_express_' .
- 'checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account',
'API Username' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
'required_express_checkout_required_express_checkout_api_username',
'API Password' => '#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_' .
@@ -72,8 +70,6 @@ class ExpressCheckout extends Block
*/
public function specifyCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
- ->setValue('test@test.com');
$this->_rootElement->find($this->fields['API Username'])->setValue('1');
$this->_rootElement->find($this->fields['API Password'])->setValue('1');
$this->_rootElement->find($this->fields['API Signature'])->setValue('1');
@@ -86,7 +82,6 @@ class ExpressCheckout extends Block
*/
public function clearCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
$this->_rootElement->find($this->fields['API Username'])->setValue('');
$this->_rootElement->find($this->fields['API Password'])->setValue('');
$this->_rootElement->find($this->fields['API Signature'])->setValue('');
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php
index de6eb107c61ce5e6b63451abdea0473351ddde43..f1af6acb6174e1b462651b7887d80159d6910952 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowLink.php
@@ -20,8 +20,6 @@ class PayflowLink extends Block
* @var array
*/
private $fields = [
- 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_payflow_link_us_' .
- 'payflow_link_required_payflow_link_payflow_link_business_account',
'Partner' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
'link_partner',
'Vendor' => '#payment_us_paypal_payment_gateways_payflow_link_us_payflow_link_required_payflow_link_payflow_' .
@@ -60,8 +58,6 @@ class PayflowLink extends Block
*/
public function specifyCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
- ->setValue('test@test.com');
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ class PayflowLink extends Block
*/
public function clearCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
$this->_rootElement->find($this->fields['Partner'])->setValue('');
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
$this->_rootElement->find($this->fields['User'])->setValue('');
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
index e3b01aa3af9a0dfa4517ad3fe4b527eec9d30ad0..1db07ac435a37ed9c9d9d237f62b7debed956861 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PayflowPro.php
@@ -20,8 +20,6 @@ class PayflowPro extends Block
* @var array
*/
private $fields = [
- 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_' .
- 'with_express_checkout_paypal_payflow_required_paypal_payflow_api_settings_business_account',
'Partner' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
'required_paypal_payflow_api_settings_partner',
'Vendor' => '#payment_us_paypal_payment_gateways_paypal_payflowpro_with_express_checkout_paypal_payflow_' .
@@ -60,8 +58,6 @@ class PayflowPro extends Block
*/
public function specifyCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
- ->setValue('test@test.com');
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ class PayflowPro extends Block
*/
public function clearCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
$this->_rootElement->find($this->fields['Partner'])->setValue('');
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
$this->_rootElement->find($this->fields['User'])->setValue('');
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php
index cd6d1a5b1b38a016382ffa2e68ab73bd566c4116..87adb729a1646e6eb5b61e8e167d2eed20111e4e 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsAdvanced.php
@@ -20,8 +20,6 @@ class PaymentsAdvanced extends Block
* @var array
*/
private $fields = [
- 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_payflow_advanced_' .
- 'required_settings_payments_advanced_business_account',
'Partner' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner',
'Vendor' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor',
'User' => '#payment_us_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user',
@@ -54,8 +52,6 @@ class PaymentsAdvanced extends Block
*/
public function specifyCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
- ->setValue('test@test.com');
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -69,7 +65,6 @@ class PaymentsAdvanced extends Block
*/
public function clearCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
$this->_rootElement->find($this->fields['Partner'])->setValue('');
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
$this->_rootElement->find($this->fields['User'])->setValue('');
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
index cd146aa8f809cf5de0cbddcb02be83a19e59928f..55fd7444ba50ad8dbf9662b758b10d7a70ee6c6d 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/Block/System/Config/PaymentsPro.php
@@ -20,8 +20,6 @@ class PaymentsPro extends Block
* @var array
*/
private $fields = [
- 'Email Associated with PayPal Merchant Account' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_' .
- 'payflow_required_paypal_payflow_api_settings_business_account',
'Partner' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
'settings_partner',
'Vendor' => '#payment_us_paypal_group_all_in_one_wpp_usuk_paypal_payflow_required_paypal_payflow_api_' .
@@ -60,8 +58,6 @@ class PaymentsPro extends Block
*/
public function specifyCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])
- ->setValue('test@test.com');
$this->_rootElement->find($this->fields['Partner'])->setValue('1');
$this->_rootElement->find($this->fields['Vendor'])->setValue('1');
$this->_rootElement->find($this->fields['User'])->setValue('1');
@@ -75,7 +71,6 @@ class PaymentsPro extends Block
*/
public function clearCredentials()
{
- $this->_rootElement->find($this->fields['Email Associated with PayPal Merchant Account'])->setValue('');
$this->_rootElement->find($this->fields['Partner'])->setValue('');
$this->_rootElement->find($this->fields['Vendor'])->setValue('');
$this->_rootElement->find($this->fields['User'])->setValue('');
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index f9f8f1ffba91a55536c9d2221b68dc85b702e7f0..19feb33748c840b6c87f506ffd450897e2ace286 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -593,7 +593,8 @@
<label>Express Checkout</label>
<frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
<field id="business_account" translate="label comment tooltip" showInDefault="1" showInWebsite="1" sortOrder="5">
- <label>Email Associated with PayPal Merchant Account</label>
+ <label>Email Associated with PayPal Merchant Account (Optional)</label>
+ <frontend_class>not-required</frontend_class>
<comment>
<![CDATA[<a href="http://www.magentocommerce.com/paypal">Start accepting payments via PayPal!</a>]]>
</comment>