@@ -160,7 +160,6 @@ public function setValidationFilter(
160
160
Address $ address = null
161
161
) {
162
162
if (!$ this ->getFlag ('validation_filter ' )) {
163
-
164
163
$ this ->prepareSelect ($ websiteId , $ customerGroupId , $ now );
165
164
166
165
$ noCouponRules = $ this ->getNoCouponCodeSelect ();
@@ -169,7 +168,7 @@ public function setValidationFilter(
169
168
$ couponRules = $ this ->getCouponCodeSelect ($ couponCode );
170
169
171
170
$ allAllowedRules = $ this ->getConnection ()->select ();
172
- $ allAllowedRules ->union ([$ noCouponRules , $ couponRules ], \Zend_Db_Select ::SQL_UNION_ALL );
171
+ $ allAllowedRules ->union ([$ noCouponRules , $ couponRules ], Select ::SQL_UNION_ALL );
173
172
174
173
$ wrapper = $ this ->getConnection ()->select ();
175
174
$ wrapper ->from ($ allAllowedRules );
@@ -189,9 +188,9 @@ public function setValidationFilter(
189
188
/**
190
189
* Recreate the default select object for specific needs of salesrule evaluation with coupon codes.
191
190
*
192
- * @param $websiteId
193
- * @param $customerGroupId
194
- * @param $now
191
+ * @param int $websiteId
192
+ * @param int $customerGroupId
193
+ * @param string $now
195
194
*/
196
195
private function prepareSelect ($ websiteId , $ customerGroupId , $ now )
197
196
{
@@ -223,7 +222,7 @@ private function getNoCouponCodeSelect()
223
222
/**
224
223
* Determine all active rules that are valid for the given coupon code.
225
224
*
226
- * @param $couponCode
225
+ * @param string $couponCode
227
226
* @return Select
228
227
*/
229
228
private function getCouponCodeSelect ($ couponCode )
@@ -260,7 +259,9 @@ private function getCouponCodeSelect($couponCode)
260
259
}
261
260
262
261
/**
263
- * @param $couponCode
262
+ * Join coupong table to select.
263
+ *
264
+ * @param string $couponCode
264
265
* @param Select $couponSelect
265
266
*/
266
267
private function joinCouponTable ($ couponCode , Select $ couponSelect )
0 commit comments