Merge pull request #542 from magento-folks/MAGETWO-40559

[Folks] MAGETWO-40559: [GITHUB] 1.0.0 Beta 1 JS Error when click 'Go to Checkout...
magento · Aug 19, 2015 · 5fbc6b4 · 5fbc6b4
2 parents 85ab7c3 + 56e3e55
commit 5fbc6b4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 43 deletions.
diff --git a/app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php b/app/code/Magento/Checkout/Model/Customer/Autentication/ConfigPlugin.php
diff --git 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
@@ -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
@@ -19,7 +19,7 @@ define([
                     authenticationPopup.showModal();
                     return false;
                 }
-                location.href = window.authenticationPopup.checkoutUrl;
+                location.href = config.checkoutUrl;
             });
 
         };