Merge pull request #404 from magento-folks/checkout

[Folks] Checkout bug-fixes and improvements

Author: Korshenko, Olexii(okorshenko)

app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml renamed to app/code/Magento/Captcha/view/frontend/layout/checkout_index_index.xml

@@ -43,7 +43,7 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create();
-        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Set Name')]);
+        $fieldset = $form->addFieldset('set_name', ['legend' => __('Edit Product Template Name')]);
         $fieldset->addField(
             'attribute_set_name',
             'text',

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php

@@ -27,7 +27,7 @@ protected function _prepareLayout()
             'addButton',
             'Magento\Backend\Block\Widget\Button',
             [
-                'label' => __('Add New Set'),
+                'label' => __('Add Product Template'),
                 'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',
                 'class' => 'add primary add-set'
             ]

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php

@@ -37,7 +37,7 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Catalog::catalog_products');
-        $resultPage->getConfig()->getTitle()->set((__('Products')));
+        $resultPage->getConfig()->getTitle()->prepend(__('Catalog'));
         return $resultPage;
     }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php

@@ -144,7 +144,7 @@ public function isWishlistActive()
      */
     public function getCheckoutUrl()
     {
-        return $this->getUrl('checkout/onepage', ['_secure' => true]);
+        return $this->getUrl('checkout', ['_secure' => true]);
     }
 
     /**

app/code/Magento/Checkout/Block/Cart.php

@@ -88,7 +88,7 @@ public function getImageHtmlTemplate()
      */
     public function getCheckoutUrl()
     {
-        return $this->getUrl('checkout/onepage');
+        return $this->getUrl('checkout');
     }
 
     /**

app/code/Magento/Checkout/Block/Cart/Sidebar.php

@@ -63,6 +63,12 @@ public function process($jsLayout)
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children']
         )) {
+            if (!isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
+                ['payment']['children']['payments-list']['children'])) {
+                $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
+                ['payment']['children']['payments-list']['children'] = [];
+            }
+
             $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children']['payments-list']['children'] =
                 array_merge_recursive(
@@ -111,6 +117,7 @@ private function processPaymentConfiguration(array &$configuration, array $eleme
                     'component' => 'Magento_Checkout/js/view/billing-address',
                     'displayArea' => 'billing-address-form-' . $paymentCode,
                     'provider' => 'checkoutProvider',
+                    'deps' => 'checkoutProvider',
                     'dataScopePrefix' => 'billingAddress' . $paymentCode,
                     'sortOrder' => 1,
                     'children' => [
@@ -162,7 +169,7 @@ private function processPaymentConfiguration(array &$configuration, array $eleme
                                     'telephone' => [
                                         'config' => [
                                             'tooltip' => [
-                                                'description' => 'For delivery Questions',
+                                                'description' => 'For delivery questions.',
                                             ],
                                         ],
                                     ],

app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php

@@ -45,7 +45,7 @@ public function __construct(
      */
     public function getCheckoutUrl()
     {
-        return $this->getUrl('checkout/onepage');
+        return $this->getUrl('checkout');
     }
 
     /**

app/code/Magento/Checkout/Block/Onepage/Link.php

@@ -4,7 +4,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Checkout\Controller\Onepage;
+namespace Magento\Checkout\Controller\Index;
 
 class Index extends \Magento\Checkout\Controller\Onepage
 {

app/code/Magento/Checkout/Controller/Onepage/Index.php renamed to app/code/Magento/Checkout/Controller/Index/Index.php

@@ -180,14 +180,14 @@ protected function _expireAjax()
     {
         $quote = $this->getOnepage()->getQuote();
         if (!$quote->hasItems() || $quote->getHasError() || !$quote->validateMinimumAmount()) {
-            return false;
+            return true;
         }
         $action = $this->getRequest()->getActionName();
         if ($this->_objectManager->get('Magento\Checkout\Model\Session')->getCartWasUpdated(true)
             &&
             !in_array($action, ['index', 'progress'])
         ) {
-            return false;
+            return true;
         }
 
         return false;