Merge branch 'checkout_stabilization' into checkout

Olexii Korshenko · Olexii Korshenko · commit a508a77db075 · 2015-07-03T13:33:12.000+03:00
diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
@@ -37,4 +37,7 @@
     <action name="checkout/sidebar/updateItemQty">
         <section name="cart"/>
     </action>
+    <action name="checkout/onepage/saveOrder">
+        <section name="last-ordered-items"/>
+    </action>
 </config>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/action/place-order.js
@@ -9,19 +9,18 @@ define(
         'mage/storage',
         'mage/url',
         'Magento_Checkout/js/model/error-processor',
-        'Magento_Customer/js/model/customer',
-        'underscore'
+        'Magento_Customer/js/model/customer'
     ],
-    function (quote, urlBuilder, storage, url, errorProcessor, customer, _) {
+    function (quote, urlBuilder, storage, url, errorProcessor, customer) {
         'use strict';
 
         return function (paymentData, redirectOnSuccess) {
-            var serviceUrl, payload;
+            var serviceUrl,
+                payload;
 
             redirectOnSuccess = redirectOnSuccess === false ? false : true;
-            /**
-             * Checkout for guest and registered customer.
-             */
+
+            /** Checkout for guest and registered customer. */
             if (!customer.isLoggedIn()) {
                 serviceUrl = urlBuilder.createUrl('/guest-carts/:quoteId/payment-information', {
                     quoteId: quote.getQuoteId()
@@ -40,7 +39,7 @@ define(
                     billingAddress: quote.billingAddress()
                 };
             }
-            storage.post(
+            return storage.post(
                 serviceUrl, JSON.stringify(payload)
             ).done(
                 function () {
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
@@ -26,6 +26,9 @@ define(
             },
             isVisible: ko.observable(quote.isVirtual()),
             quoteIsVirtual: quote.isVirtual(),
+            isPaymentMethodsAvailable: ko.computed(function () {
+                return paymentService.getAvailablePaymentMethods().length > 0;
+            }),
 
             initialize: function () {
                 this._super();
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
@@ -46,14 +46,21 @@ define(
              * Place order.
              */
             placeOrder: function () {
-                var emailValidationResult = customer.isLoggedIn(),
+                var self = this,
+                    placeOrder,
+                    emailValidationResult = customer.isLoggedIn(),
                     loginFormSelector = 'form[data-role=email-with-possible-login]';
                 if (!customer.isLoggedIn()) {
                     $(loginFormSelector).validation();
                     emailValidationResult = Boolean($(loginFormSelector + ' input[name=username]').valid());
                 }
                 if (emailValidationResult && this.validate()) {
-                    placeOrderAction(this.getData(), this.redirectAfterPlaceOrder);
+                    this.isPlaceOrderActionAllowed(false);
+                    placeOrder = placeOrderAction(this.getData(), this.redirectAfterPlaceOrder);
+
+                    $.when(placeOrder).fail(function(){
+                        self.isPlaceOrderActionAllowed(true);
+                    });
                 }
             },
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -69,6 +69,7 @@ define(
                 template: 'Magento_Checkout/shipping'
             },
             visible: ko.observable(!quote.isVirtual()),
+            errorValidationMessage: ko.observable(false),
             isCustomerLoggedIn: customer.isLoggedIn,
             isFormPopUpVisible: formPopUpState.isVisible,
             isFormInline: addressList().length == 0,
@@ -100,12 +101,16 @@ define(
                     stepNavigator.registerStep('shipping', 'Shipping', this.visible, 10);
                 }
 
-                this.isFormPopUpVisible.subscribe(function(value) {
+                this.isFormPopUpVisible.subscribe(function (value) {
                     if (value) {
                         self.getPopUp().openModal();
                     }
                 });
 
+                quote.shippingMethod.subscribe(function (value) {
+                    self.errorValidationMessage(false);
+                });
+
                 return this;
             },
 
@@ -195,7 +200,7 @@ define(
                     emailValidationResult = customer.isLoggedIn();
 
                 if (!quote.shippingMethod()) {
-                    alert($t('Please specify a shipping method'));
+                    this.errorValidationMessage('Please specify a shipping method');
                     return false;
                 }
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -22,11 +22,14 @@
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
-                <div id="checkout-payment-method-load" class="opc-payment">
+                <div id="checkout-payment-method-load" class="opc-payment" data-bind="visible: isPaymentMethodsAvailable">
                     <!-- ko foreach: getRegion('payment-methods-list') -->
                         <!-- ko template: getTemplate() --><!-- /ko -->
                     <!-- /ko -->
                 </div>
+                <div class="no-quotes-block" data-bind="visible: isPaymentMethodsAvailable() == false">
+                    <!-- ko text: $t('No Payment method available.')--><!-- /ko -->
+                </div>
                 <!-- ko foreach: getRegion('afterMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -126,6 +126,11 @@
                     <!-- ko template: getTemplate() --><!-- /ko -->
                     <!-- /ko -->
                 </div>
+                <!-- ko if: errorValidationMessage().length > 0 -->
+                <div class="message notice">
+                    <span><!-- ko text: $t(errorValidationMessage())--><!-- /ko --></span>
+                </div>
+                <!-- /ko -->
                 <div class="actions-toolbar" id="shipping-method-buttons-container">
                     <div class="primary">
                         <button data-role="opc-continue" type="submit" class="button action continue primary">
diff --git a/app/code/Magento/Payment/Model/IframeConfigProvider.php b/app/code/Magento/Payment/Model/IframeConfigProvider.php
@@ -26,6 +26,11 @@ class IframeConfigProvider implements ConfigProviderInterface
      */
     const DEFAULT_YEAR_LENGTH = 2;
 
+    /**
+     * Checkout identifier for transparent iframe payments
+     */
+    const CHECKOUT_IDENTIFIER = 'checkout_flow';
+
     /**
      * @var Repository
      */
@@ -93,7 +98,7 @@ public function getConfig()
                     'dateDelim' => [$this->methodCode => $this->getDateDelim()],
                     'cardFieldsMap' => [$this->methodCode => $this->getCardFieldsMap()],
                     'source' =>  [$this->methodCode => $this->getViewFileUrl('blank.html')],
-                    'controllerName' => [$this->methodCode => $this->getController()],
+                    'controllerName' => [$this->methodCode => self::CHECKOUT_IDENTIFIER],
                     'cgiUrl' => [$this->methodCode => $this->getCgiUrl()],
                     'placeOrderUrl' => [$this->methodCode => $this->getPlaceOrderUrl()],
                     'saveOrderUrl' => [$this->methodCode => $this->getSaveOrderUrl()],
@@ -167,16 +172,6 @@ protected function getViewFileUrl($fileId, array $params = [])
         }
     }
 
-    /**
-     * Retrieve the controller name
-     *
-     * @return string
-     */
-    protected function getController()
-    {
-        return $this->request->getControllerName();
-    }
-
     /**
      * Retrieve place order url on front
      *
diff --git a/app/code/Magento/Sales/etc/frontend/sections.xml b/app/code/Magento/Sales/etc/frontend/sections.xml
@@ -7,9 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../Magento/Customer/etc/sections.xsd">
-    <action name="checkout/onepage/saveOrder">
-        <section name="last-ordered-items"/>
-    </action>
     <action name="sales/guest/reorder">
         <section name="cart"/>
     </action>
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
@@ -17,29 +17,31 @@ define(
         'Magento_Checkout/js/model/error-processor',
         'Magento_Ui/js/model/messageList',
         'mage/storage',
-        'Magento_Checkout/js/action/get-totals'
+        'Magento_Checkout/js/action/get-totals',
+        'mage/translate'
     ],
-    function (ko, $, quote, urlManager, paymentService, errorProcessor, messageList, storage, getTotalsAction) {
+    function (ko, $, quote, urlManager, paymentService, errorProcessor, messageList, storage, getTotalsAction, $t) {
         'use strict';
         return function (isApplied, isLoading) {
             var quoteId = quote.getQuoteId();
             var url = urlManager.getCancelCouponUrl(quoteId);
+            var message = $t('Your coupon was successfully removed');
             messageList.clear();
             return storage.delete(
                 url,
                 false
             ).done(
                 function (response) {
-                    isLoading(false);
                     var deferred = $.Deferred();
-
+                    isLoading(false);
                     getTotalsAction([], deferred);
                     $.when(deferred).done(function() {
                         isApplied(false);
                         paymentService.setPaymentMethods(
                             paymentService.getAvailablePaymentMethods()
                         );
                     });
+                    messageList.addSuccessMessage({'message': message});
                 }
             ).fail(
                 function (response) {
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
@@ -17,31 +17,32 @@ define(
         'Magento_Checkout/js/model/error-processor',
         'Magento_Ui/js/model/messageList',
         'mage/storage',
-        'Magento_Checkout/js/action/get-totals'
+        'Magento_Checkout/js/action/get-totals',
+        'mage/translate'
     ],
-    function (ko, $, quote, urlManager, paymentService, errorProcessor, messageList, storage, getTotalsAction) {
+    function (ko, $, quote, urlManager, paymentService, errorProcessor, messageList, storage, getTotalsAction, $t) {
         'use strict';
         return function (couponCode, isApplied, isLoading) {
             var quoteId = quote.getQuoteId();
             var url = urlManager.getApplyCouponUrl(couponCode, quoteId);
-            messageList.clear();
+            var message = $t('Your coupon was successfully applied');
             return storage.put(
                 url,
                 {},
                 false
             ).done(
                 function (response) {
                     if (response) {
+                        var deferred = $.Deferred();
                         isLoading(false);
                         isApplied(true);
-                        var deferred = $.Deferred();
-
                         getTotalsAction([], deferred);
                         $.when(deferred).done(function() {
                             paymentService.setPaymentMethods(
                                 paymentService.getAvailablePaymentMethods()
                             );
                         });
+                        messageList.addSuccessMessage({'message': message});
                     }
                 }
             ).fail(
diff --git a/app/code/Magento/Ui/view/frontend/web/js/view/messages.js b/app/code/Magento/Ui/view/frontend/web/js/view/messages.js
@@ -2,7 +2,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-define(['uiComponent', '../model/messageList'], function (Component, messages) {
+define(
+    [
+        'ko',
+        'jquery',
+        'uiComponent',
+        '../model/messageList'
+    ],
+    function (ko, $, Component, messages) {
     'use strict';
 
     return Component.extend({
@@ -12,13 +19,27 @@ define(['uiComponent', '../model/messageList'], function (Component, messages) {
         defaults: {
             template: 'Magento_Ui/messages'
         },
+        isHidden: ko.observable(false),
+
+        initialize: function () {
+            this._super();
+            var self = this;
+            this.isHidden.subscribe(function () {
+                if (self.isHidden()) {
+                    setTimeout(function () {
+                        var messageSelector = '[data-role=checkout-messages]';
+                        $(messageSelector).hide('blind', {}, 500)
+                    }, 5000);
+                }
+            });
+        },
 
         /**
          *
          * @returns {*}
          */
         isVisible: function () {
-            return this.errorList().length || this.successList().length;
+            return this.isHidden(this.errorList().length || this.successList().length);
         },
         /**
          * Remove all errors
diff --git a/app/code/Magento/Ui/view/frontend/web/template/messages.html b/app/code/Magento/Ui/view/frontend/web/template/messages.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="messages" data-bind="visible: isVisible(), click: removeAll">
+<div data-role="checkout-messages" class="messages" data-bind="visible: isVisible(), click: removeAll">
     <!-- ko foreach: errorList -->
     <div class="message message-error error">
         <div data-ui-id="checkout-cart-validationmessages-message-error" data-bind="text: $data"></div>
