From 56e3e556be6f092e07dc8a6930d01547d94f27eb Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Tue, 28 Jul 2015 13:10:49 +0300
Subject: [PATCH] MAGETWO-40559: [GITHUB] 1.0.0 Beta 1 JS Error when click 'Go
 to Checkout' button #1508

---
 .../Customer/Autentication/ConfigPlugin.php   | 37 -------------------
 app/code/Magento/Checkout/etc/frontend/di.xml |  4 --
 .../frontend/templates/onepage/link.phtml     |  2 +-
 .../frontend/web/js/proceed-to-checkout.js    |  2 +-
 4 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php

diff --git a/app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php b/app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php
deleted file mode 100644
index 834942a4d0719..0000000000000
--- a/app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Checkout\Model\Customer\Autentication;
-
-class ConfigPlugin
-{
-    /**
-     * @var \Magento\Framework\UrlInterface
-     */
-    protected $urlBuilder;
-
-    /**
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     */
-    public function __construct(\Magento\Framework\UrlInterface $urlBuilder)
-    {
-        $this->urlBuilder = $urlBuilder;
-    }
-
-    /**
-     * @param \Magento\Customer\Block\Account\AuthenticationPopup $subject
-     * @param array $result
-     * @return array
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterGetConfig(
-        \Magento\Customer\Block\Account\AuthenticationPopup $subject,
-        array  $result
-    ) {
-        $result['checkoutUrl'] = $this->urlBuilder->getUrl('checkout');
-        return $result;
-    }
-}
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index d0fa0a402b7e0..7afa91b1a8bbd 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -18,10 +18,6 @@
         <plugin name="checkout-session-depersonalize"
                 type="Magento\Checkout\Model\Layout\DepersonalizePlugin" sortOrder="20"/>
     </type>
-    <type name="Magento\Customer\Block\Account\AuthenticationPopup">
-        <plugin name="authentication-popup-checkout-url"
-                type="Magento\Checkout\Model\Customer\Autentication\ConfigPlugin" sortOrder="20"/>
-    </type>
     <type name="Magento\Customer\CustomerData\SectionPoolInterface">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
index 72b8a5bf5023a..04a295afdce88 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
@@ -10,7 +10,7 @@
     <button type="button"
             data-role="proceed-to-checkout"
             title="<?php echo __('Proceed to Checkout') ?>"
-            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{}}'
+            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?php echo $block->getCheckoutUrl(); ?>"}}'
             class="action primary checkout<?php echo($block->isDisabled()) ? ' disabled' : ''; ?>"
             <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
         <span><?php echo __('Proceed to Checkout') ?></span>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
index e053dc80d9cc6..8441f18a1fb39 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js
@@ -19,7 +19,7 @@ define([
                     authenticationPopup.showModal();
                     return false;
                 }
-                location.href = window.authenticationPopup.checkoutUrl;
+                location.href = config.checkoutUrl;
             });
 
         };