From 2099ab2e25eee85c1e5fb658688d51155952ce58 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 1 Apr 2016 15:42:21 -0500
Subject: [PATCH 1/8] MAGETWO-51248: Unable to generate coupon codes for Cart
 Price Rules

 -- fix javascript that enables/disables auto coupon generation
---
 .../base/web/js/form/element/coupon-type.js   | 23 +++++++++++++++++++
 .../js/form/element/manage-coupon-codes.js    | 10 +++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
index 914dc4bc8bda3..31c836a638278 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
@@ -20,6 +20,29 @@ define([
             if (this.value() != this.displayOnlyForCouponType) {
                 uiRegistry.get('sales_rule_form.sales_rule_form.rule_information.use_auto_generation').checked(false);
             }
+
+            this.enableDisableFields();
+        },
+
+        /**
+         * Enable/disable fields on Coupons tab
+         */
+        enableDisableFields: function () {
+            var selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
+                    '[id=sales-rule-form-tab-coupons] button',
+                isUseAutoGenerationChecked = uiRegistry
+                    .get('sales_rule_form.sales_rule_form.rule_information.use_auto_generation')
+                    .checked();
+            var couponType = uiRegistry
+                .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
+                .value();
+            var disableAuto = (isUseAutoGenerationChecked && couponType == 2) || (couponType == 3)
+            _.each(
+                document.querySelectorAll(selector),
+                function (element) {
+                    element.disabled = !disableAuto;
+                }
+            );
         }
     });
 });
diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
index 641a1d3605a51..12dc4550d1f7c 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
@@ -28,7 +28,7 @@ define([
                 var useAutoGeneration = uiRegistry.get(
                     'sales_rule_form.sales_rule_form.rule_information.use_auto_generation'
                 );
-
+                
                 useAutoGeneration.on('checked', function () {
                     obj.enableDisableFields();
                 });
@@ -46,14 +46,18 @@ define([
         enableDisableFields: function () {
             var selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
                     '[id=sales-rule-form-tab-coupons] button',
-                isUseAutoGenerationChecked = !uiRegistry
+                isUseAutoGenerationChecked = uiRegistry
                     .get('sales_rule_form.sales_rule_form.rule_information.use_auto_generation')
                     .checked();
 
+            var couponType = uiRegistry
+                .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
+                .value();
+            var disableAuto = (couponType == 3) || isUseAutoGenerationChecked
             _.each(
                 document.querySelectorAll(selector),
                 function (element) {
-                    element.disabled = isUseAutoGenerationChecked;
+                    element.disabled = !disableAuto;
                 }
             );
         }

From 87f27afb8e581f47292303ac16c4685ca12e7f14 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Mon, 4 Apr 2016 16:28:46 -0500
Subject: [PATCH 2/8] MAGETWO-51503: Incorrect comments history time in admin
 order review page

 -- fixed getting the correct time/date from a comment
---
 .../Sales/view/adminhtml/templates/order/comments/view.phtml  | 4 ++--
 .../Sales/view/adminhtml/templates/order/view/history.phtml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index 46f1281e3cc5b..ec8a477dcd0ca 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -53,8 +53,8 @@
     <ul class="note-list">
         <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
                     <?php /* @escapeNotVerified */ echo __('Customer') ?>
                     <?php if ($_comment->getIsCustomerNotified()): ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index ca5f2732c2b00..7d8d633d0fe22 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -72,8 +72,8 @@
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
             <span class="note-list-customer">
                 <?php /* @escapeNotVerified */ echo __('Customer') ?>

From cd02e96a4c44e0785e64b82d8707116bb303b556 Mon Sep 17 00:00:00 2001
From: "Partica, Cristian" <cpartica@magento.com>
Date: Tue, 5 Apr 2016 11:21:16 -0500
Subject: [PATCH 3/8] MAGETWO-50985: [Staging] "Update Cart Price Rule" test
 fails while setting the condition

- fixed css + id selector by doing a partial id and css
- fixed assertion problem on is_active to replace Active to Yes
---
 .../Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml  | 2 +-
 .../app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
index 4a65daba51cda..cc48c0fc1cfb5 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml
@@ -44,7 +44,7 @@
         <strategy>xpath</strategy>
         <fields>
             <conditions_serialized>
-                <selector>#sales_rule_formrule_conditions_fieldset_</selector>
+                <selector>.fieldset[id^="sales_rule_formrule_conditions_fieldset_"]</selector>
                 <input>conditions</input>
             </conditions_serialized>
         </fields>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
index dc9af631e861e..ed8c34e1d09c7 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Handler/SalesRule/Curl.php
@@ -102,8 +102,8 @@ class Curl extends Conditions implements SalesRuleInterface
      */
     protected $mappingData = [
         'is_active' => [
-            'Active' => 1,
-            'Inactive' => 0,
+            'Yes' => 1,
+            'No' => 0,
         ],
         'coupon_type' => [
             'No Coupon' => 1,

From d3845e693e4e485e00004a4d7e058ac5c0c83483 Mon Sep 17 00:00:00 2001
From: Mike Weis <miweis@magento.com>
Date: Thu, 7 Apr 2016 15:24:18 -0500
Subject: [PATCH 4/8] MAGETWO-51248: Unable to generate coupon codes for Cart
 Price Rules

 - fixed static failures
---
 .../base/web/js/form/element/coupon-type.js    | 18 ++++++++++++------
 .../web/js/form/element/manage-coupon-codes.js | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
index 31c836a638278..ea97b910076ac 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/coupon-type.js
@@ -4,9 +4,10 @@
  */
 
 define([
+    'underscore',
     'uiRegistry',
     'Magento_Ui/js/form/element/select'
-], function (uiRegistry, select) {
+], function (_, uiRegistry, select) {
     'use strict';
 
     return select.extend({
@@ -28,15 +29,20 @@ define([
          * Enable/disable fields on Coupons tab
          */
         enableDisableFields: function () {
-            var selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
-                    '[id=sales-rule-form-tab-coupons] button',
-                isUseAutoGenerationChecked = uiRegistry
+            var selector,
+                isUseAutoGenerationChecked,
+                couponType,
+                disableAuto;
+
+            selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
+                    '[id=sales-rule-form-tab-coupons] button';
+            isUseAutoGenerationChecked = uiRegistry
                     .get('sales_rule_form.sales_rule_form.rule_information.use_auto_generation')
                     .checked();
-            var couponType = uiRegistry
+            couponType = uiRegistry
                 .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
                 .value();
-            var disableAuto = (isUseAutoGenerationChecked && couponType == 2) || (couponType == 3)
+            disableAuto = couponType === 3 || isUseAutoGenerationChecked;
             _.each(
                 document.querySelectorAll(selector),
                 function (element) {
diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
index 12dc4550d1f7c..27ed263eb1068 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
@@ -28,7 +28,7 @@ define([
                 var useAutoGeneration = uiRegistry.get(
                     'sales_rule_form.sales_rule_form.rule_information.use_auto_generation'
                 );
-                
+
                 useAutoGeneration.on('checked', function () {
                     obj.enableDisableFields();
                 });
@@ -44,16 +44,20 @@ define([
          * Enable/disable fields on Coupons tab
          */
         enableDisableFields: function () {
-            var selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
-                    '[id=sales-rule-form-tab-coupons] button',
-                isUseAutoGenerationChecked = uiRegistry
+            var selector,
+                isUseAutoGenerationChecked,
+                couponType,
+                disableAuto;
+
+            selector = '[id=sales-rule-form-tab-coupons] input, [id=sales-rule-form-tab-coupons] select, ' +
+                    '[id=sales-rule-form-tab-coupons] button';
+            isUseAutoGenerationChecked = uiRegistry
                     .get('sales_rule_form.sales_rule_form.rule_information.use_auto_generation')
                     .checked();
-
-            var couponType = uiRegistry
+            couponType = uiRegistry
                 .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
                 .value();
-            var disableAuto = (couponType == 3) || isUseAutoGenerationChecked
+            disableAuto = couponType === 3 || isUseAutoGenerationChecked;
             _.each(
                 document.querySelectorAll(selector),
                 function (element) {

From 17fac5afe6bdaa5b0e5c059000c5a5d97aa6e9aa Mon Sep 17 00:00:00 2001
From: "Partica, Cristian" <cpartica@magento.com>
Date: Thu, 7 Apr 2016 16:08:33 -0500
Subject: [PATCH 5/8] MAGETWO-51299: Order from admin is created with error
 while using non-default website

- adding missing additional parameter on the get quote for non default storeId
---
 app/code/Magento/Quote/Model/QuoteRepository.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 65baa1d6740c0..b395bcea40e1f 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -150,7 +150,8 @@ public function getActiveForCustomer($customerId, array $sharedStoreIds = [])
     public function save(\Magento\Quote\Api\Data\CartInterface $quote)
     {
         if ($quote->getId()) {
-            $currentQuote = $this->get($quote->getId());
+            $currentQuote = $this->get($quote->getId(), [$quote->getStoreId()]);
+            $currentQuote->setStoreId($quote->getStoreId());
             // This part has to be refactored
             if ($quote->getBillingAddress()) {
                 $currentQuote->setBillingAddress($quote->getBillingAddress());

From be2e6bc61f0eab8c4167942d816bfd6682ac70e0 Mon Sep 17 00:00:00 2001
From: "Partica, Cristian" <cpartica@magento.com>
Date: Sat, 9 Apr 2016 10:22:44 -0500
Subject: [PATCH 6/8] MAGETWO-51503: Incorrect comments history time in admin
 order review page

- fixing no escape annotation
---
 .../Sales/view/adminhtml/templates/order/comments/view.phtml  | 4 ++--
 .../Sales/view/adminhtml/templates/order/view/history.phtml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index ec8a477dcd0ca..fcf1e4695b564 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -53,8 +53,8 @@
     <ul class="note-list">
         <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date"><?php /* @noEscape */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?php /* @noEscape */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
                     <?php /* @escapeNotVerified */ echo __('Customer') ?>
                     <?php if ($_comment->getIsCustomerNotified()): ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index 7d8d633d0fe22..b08f55a61294d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -72,8 +72,8 @@
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-date"><?php /* @noEscape */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-time"><?php /* @noEscape */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
             <span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
             <span class="note-list-customer">
                 <?php /* @escapeNotVerified */ echo __('Customer') ?>

From af17df6d62280f91d09796012447d8b960268342 Mon Sep 17 00:00:00 2001
From: "Partica, Cristian" <cpartica@magento.com>
Date: Sat, 9 Apr 2016 10:26:17 -0500
Subject: [PATCH 7/8] MAGETWO-51248: Unable to generate coupon codes for Cart
 Price Rules

- added annotation for coupon type condition
---
 .../view/base/web/js/form/element/manage-coupon-codes.js       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
index 27ed263eb1068..db3791ac5089e 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
@@ -57,6 +57,9 @@ define([
             couponType = uiRegistry
                 .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
                 .value();
+            /**
+             * \Magento\Rule\Model\AbstractModel::COUPON_TYPE_AUTO = 3;
+             */
             disableAuto = couponType === 3 || isUseAutoGenerationChecked;
             _.each(
                 document.querySelectorAll(selector),

From 4d029dba531451c97f5c492907de928b6401689f Mon Sep 17 00:00:00 2001
From: "Partica, Cristian" <cpartica@magento.com>
Date: Sat, 9 Apr 2016 11:11:28 -0500
Subject: [PATCH 8/8] MAGETWO-51248: Unable to generate coupon codes for Cart
 Price Rules

- fixing js static
---
 .../view/base/web/js/form/element/manage-coupon-codes.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
index db3791ac5089e..2e4f2defec979 100644
--- a/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
+++ b/app/code/Magento/SalesRule/view/base/web/js/form/element/manage-coupon-codes.js
@@ -39,6 +39,7 @@ define([
         },
 
         /*eslint-enable no-unused-vars*/
+        /*eslint-disable lines-around-comment*/
 
         /**
          * Enable/disable fields on Coupons tab
@@ -58,7 +59,7 @@ define([
                 .get('sales_rule_form.sales_rule_form.rule_information.coupon_type')
                 .value();
             /**
-             * \Magento\Rule\Model\AbstractModel::COUPON_TYPE_AUTO = 3;
+             * \Magento\Rule\Model\AbstractModel::COUPON_TYPE_AUTO
              */
             disableAuto = couponType === 3 || isUseAutoGenerationChecked;
             _.each(