Merge pull request #24 from magento-firedrakes/MAGETWO-44160

[Merchant Beta][Firedrakes] Bugfixes
magento · Oct 23, 2015 · f8e1571 · f8e1571
2 parents 77fbc91 + ee348f0
commit f8e1571
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php b/app/code/Magento/SalesRule/Model/Resource/Rule/Collection.php
@@ -89,10 +89,8 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode =
             /* We need to overwrite joinLeft if coupon is applied */
             $this->getSelect()->reset();
             parent::_initSelect();
-
             $this->addWebsiteGroupDateFilter($websiteId, $customerGroupId, $now);
             $select = $this->getSelect();
-
             $connection = $this->getConnection();
             if (strlen($couponCode)) {
                 $select->joinLeft(
@@ -103,8 +101,11 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode =
                     ),
                     ['code']
                 );
-                $select->where('main_table.coupon_type = ? ', \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON);
                 $orWhereConditions = [
+                    $connection->quoteInto(
+                        'main_table.coupon_type = ? ',
+                        \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
+                    ),
                     $connection->quoteInto(
                         '(main_table.coupon_type = ? AND rule_coupons.type = 0)',
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
@@ -118,8 +119,19 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode =
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC
                     ),
                 ];
+                $andWhereConditions = [
+                    $connection->quoteInto(
+                        'rule_coupons.code = ?',
+                        $couponCode
+                    ),
+                    $connection->quoteInto(
+                        '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
+                        $this->_date->date('Y-m-d')
+                    ),
+                ];
                 $orWhereCondition = implode(' OR ', $orWhereConditions);
-                $select->orWhere('(' . $orWhereCondition . ') AND rule_coupons.code = ?', $couponCode);
+                $andWhereCondition = implode(' AND ', $andWhereConditions);
+                $select->where('(' . $orWhereCondition . ') AND ' . $andWhereCondition);
             } else {
                 $this->addFieldToFilter(
                     'main_table.coupon_type',

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -116,7 +116,7 @@
     <?php if ($block->isShowPerPage()): ?>
         <div class="limiter">
             <strong class="limiter-label"><?php echo __('Show') ?></strong>
-            <select id="limiter" data-mage-redirect="{'event':'change'}" class="limiter-options">
+            <select id="limiter" data-mage-init='{"redirectUrl": {"event":"change"}}' class="limiter-options">
                 <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
                     <option value="<?php echo $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
                         selected="selected"<?php endif ?>>

diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Rule/CollectionTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Rule/CollectionTest.php
@@ -36,15 +36,15 @@ public function testSetValidationFilter($couponCode, $expectedItems)
     public function setValidationFilterDataProvider()
     {
         return [
-            'Check type COUPON' => ['coupon_code', ['#1', '#2', '#5']],
+            'Check type COUPON' => ['coupon_code', ['#1', '#5']],
             'Check type NO_COUPON' => ['', ['#2', '#5']],
-            'Check type COUPON_AUTO' => ['coupon_code_auto', ['#2', '#4', '#5']],
-            'Check result with auto generated coupon' => ['autogenerated_3_1', ['#2', '#3', '#5']],
+            'Check type COUPON_AUTO' => ['coupon_code_auto', ['#4', '#5']],
+            'Check result with auto generated coupon' => ['autogenerated_3_1', ['#3', '#5']],
             'Check result with non actual previously generated coupon' => [
                 'autogenerated_2_1',
                 ['#2', '#5'],
             ],
-            'Check result with wrong code' => ['wrong_code', ['#2', '#5']]
+            'Check result with wrong code' => ['wrong_code', ['#5']]
         ];
     }
 }