MAGETWO-44800: Inactive Place Order button on Order Review page if Transfer Shipping Options = Yes

Author: dkvashninbay

app/code/Magento/Paypal/Block/Express/Review.php

@@ -9,6 +9,7 @@
 namespace Magento\Paypal\Block\Express;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Model\Quote\Address\Rate;
 
 /**
  * Paypal Express Onepage checkout block
@@ -35,7 +36,7 @@ class Review extends \Magento\Framework\View\Element\Template
     /**
      * Currently selected shipping rate
      *
-     * @var \Magento\Quote\Model\Quote\Address\Rate
+     * @var Rate
      */
     protected $_currentShippingRate = null;
 
@@ -183,13 +184,23 @@ public function renderShippingRateOption($rate, $format = '%s - %s%s', $inclTaxF
     /**
      * Getter for current shipping rate
      *
-     * @return \Magento\Quote\Model\Quote\Address\Rate
+     * @return Rate
      */
     public function getCurrentShippingRate()
     {
         return $this->_currentShippingRate;
     }
 
+    /**
+     * Whether can edit shipping method
+     *
+     * @return bool
+     */
+    public function canEditShippingMethod()
+    {
+        return $this->getData('can_edit_shipping_method') || !$this->getCurrentShippingRate();
+    }
+
     /**
      * Get quote email
      *

app/code/Magento/Paypal/Test/Unit/Block/Express/ReviewTest.php

@@ -7,6 +7,7 @@
 namespace Magento\Paypal\Test\Unit\Block\Express;
 
 use Magento\Paypal\Block\Express\Review;
+use Magento\Quote\Model\Quote\Address\Rate;
 
 class ReviewTest extends \PHPUnit_Framework_TestCase
 {
@@ -177,4 +178,13 @@ public function testGetEmailWhenBillingAddressNotExist()
         $this->model->setQuote($quoteMock);
         $this->assertEquals('', $this->model->getEmail());
     }
+
+    public function testCanEditShippingMethod()
+    {
+        $this->model->setData('can_edit_shipping_method', true);
+        static::assertTrue($this->model->canEditShippingMethod());
+
+        $this->model->setData('can_edit_shipping_method', false);
+        static::assertTrue($this->model->canEditShippingMethod());
+    }
 }

app/code/Magento/Paypal/view/frontend/templates/express/review.phtml

@@ -21,7 +21,7 @@
                         <form method="post" id="shipping-method-form"
                               action="<?php echo $block->escapeUrl($block->getShippingMethodSubmitUrl()); ?>"
                               class="form">
-                            <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()): ?>
+                            <?php if ($block->canEditShippingMethod()): ?>
                                 <?php if ($groups = $block->getShippingRateGroups()): ?>
                                     <?php $currentRate = $block->getCurrentShippingRate(); ?>
                                     <div class="field shipping required">
@@ -162,7 +162,8 @@
                 "shippingSubmitFormSelector": "#shipping-method-form",
                 "shippingSelector": "#shipping-method",
                 "shippingMethodUpdateUrl": "<?php echo $block->escapeUrl($block->getUpdateShippingMethodsUrl()) ?>",
-                "isAjax": <?php /* @noEscape */ echo $block->getUseAjax() ? 'true' : 'false' ?>
+                "isAjax": <?php /* @noEscape */ echo $block->getUseAjax() ? 'true' : 'false' ?>,
+                "canEditShippingMethod": <?php /* @noEscape */ echo $block->canEditShippingMethod() ? 'true' : 'false' ?>
             }
         }
     }

app/code/Magento/Paypal/view/frontend/web/order-review.js

@@ -28,7 +28,8 @@ define([
             updateShippingMethodSubmitSelector: "#update-shipping-method-submit",
             reviewSubmitSelector: "#review-submit",
             shippingMethodUpdateUrl: null,
-            updateOrderSubmitUrl: null
+            updateOrderSubmitUrl: null,
+            canEditShippingMethod: false
         },
 
         /**
@@ -50,7 +51,7 @@ define([
                 .find(this.options.updateShippingMethodSubmitSelector).hide().end()
                 .find(this.options.reviewSubmitSelector).hide();
             this._shippingTobilling();
-            if ($(this.options.shippingSubmitFormSelector).length) {
+            if ($(this.options.shippingSubmitFormSelector).length && this.options.canEditShippingMethod) {
                 this.isShippingSubmitForm = true;
                 $(this.options.shippingSubmitFormSelector).find(this.options.updateShippingMethodSubmitSelector).hide().end()
                     .on('change',