Merge pull request #5952 from magento-tango/TANGO-PR-07-29-2020_23

TANGO PR-07-29-2020 v23

Author: zakdma

app/code/Magento/Checkout/view/frontend/web/js/region-updater.js

@@ -56,6 +56,9 @@ define([
             if (this.options.isMultipleCountriesAllowed) {
                 this.element.parents('div.field').show();
                 this.element.on('change', $.proxy(function (e) {
+                    // clear region inputs on country change
+                    $(this.options.regionListId).val('');
+                    $(this.options.regionInputId).val('');
                     this._updateRegion($(e.target).val());
                 }, this));
 
@@ -165,9 +168,6 @@ define([
             this._clearError();
             this._checkRegionRequired(country);
 
-            $(regionList).find('option:selected').removeAttr('selected');
-            regionInput.val('');
-
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);

app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php

@@ -10,6 +10,8 @@
 
 /**
  * Class AddComment
+ *
+ * Controller responsible for addition of the order comment to the order
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
@@ -42,6 +44,7 @@ public function execute()
                     );
                 }
 
+                $order->setStatus($data['status']);
                 $notify = $data['is_customer_notified'] ?? false;
                 $visible = $data['is_visible_on_front'] ?? false;
 

app/code/Magento/Sales/Model/Order/Config.php

@@ -52,7 +52,7 @@ class Config
      */
     protected $maskStatusesMapping = [
         \Magento\Framework\App\Area::AREA_FRONTEND => [
-            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,
+            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
             \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
         ]
     ];

dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php

@@ -50,4 +50,28 @@ public function testCorrectCompleteStatusInStatesList()
 
         $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
     }
+
+    /**
+     * Test Mask Status For Area
+     *
+     * @param string $code
+     * @param string $expected
+     * @dataProvider dataProviderForTestMaskStatusForArea
+     */
+    public function testMaskStatusForArea(string $code, string $expected)
+    {
+        $result = $this->orderConfig->getStatusFrontendLabel($code);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestMaskStatusForArea()
+    {
+        return [
+            ['fraud', 'Suspected Fraud'],
+            ['processing', 'Processing'],
+        ];
+    }
 }

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js

@@ -51,7 +51,8 @@ define([
             '': '',
             'US': 'United States',
             'GB': 'United Kingdom',
-            'DE': 'Germany'
+            'DE': 'Germany',
+            'IT': 'Italy'
         },
         regions = {
             '': 'Please select a region, state or province.'
@@ -202,5 +203,41 @@ define([
             expect($(regionSelectEl).is(':visible')).toBe(false);
             expect($(regionInputEl).is(':visible')).toBe(false);
         });
+        it('Check that initial values are not overwritten - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            $(postalCodeEl).val('L13 0AL');
+            init();
+            expect($(countryEl).val()).toBe('GB');
+            expect($(regionInputEl).val()).toBe('Liverpool');
+            expect($(postalCodeEl).val()).toBe('L13 0AL');
+        });
+        it('Check that initial values are not overwritten - region select', function () {
+            $(countryEl).val('US');
+            $(postalCodeEl).val('99501');
+            init({
+                defaultRegion: '2'
+            });
+            expect($(countryEl).val()).toBe('US');
+            expect($(regionSelectEl).find('option:selected').text()).toBe('Alaska');
+            expect($(postalCodeEl).val()).toBe('99501');
+        });
+        it('Check that region values are cleared out on country change - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            init();
+            $(countryEl).val('IT').change();
+            expect($(countryEl).val()).toBe('IT');
+            expect($(regionInputEl).val()).toBe('');
+        });
+        it('Check that region values are cleared out on country change - region select', function () {
+            $(countryEl).val('US');
+            init({
+                defaultRegion: '2'
+            });
+            $(countryEl).val('DE').change();
+            expect($(countryEl).val()).toBe('DE');
+            expect($(regionSelectEl).val()).toBe('');
+        });
     });
 });