Merge pull request #28 from grininc/bugfix/magento-2.4.7-compatibility

Update SalesRuleValidator and ValidateByToken for Coupon Code Validation
grininc · Sep 9, 2024 · 497329d · 497329d
2 parents 3f79a71 + 6dc4987
commit 497329d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Model/SalesRuleValidator.php b/Model/SalesRuleValidator.php
@@ -32,13 +32,15 @@ public function __construct(Request $request, SystemConfig $systemConfig)
     }
 
     /**
-     * @param Rule $rule
-     * @param string $couponCode
+     * @param  Rule  $rule
+     * @param  array $couponCode
      * @return bool
      */
-    public function isValid(Rule $rule, string $couponCode): bool
+    public function isValid(Rule $rule, array $couponCode): bool
     {
-        if ($rule->getData('is_grin_only') && ($rule->getPrimaryCoupon()->getCode() === $couponCode)) {
+        $code = $rule->getPrimaryCoupon()->getCode();
+
+        if ($code !== null && $rule->getData('is_grin_only') && in_array($code, $couponCode)) {
             return $this->request->getHeader(self::TOKEN_HEADER) === $this->systemConfig->getSalesRuleToken();
         }
 

diff --git a/Plugin/Magento/SalesRule/Model/RulesApplier/ValidateByToken.php b/Plugin/Magento/SalesRule/Model/RulesApplier/ValidateByToken.php
@@ -41,7 +41,7 @@ public function aroundApplyRules(
         $couponCode
     ): array {
         foreach ($rules as $rule) {
-            if (!$this->salesRuleValidator->isValid($rule, (string) $couponCode)) {
+            if (!$this->salesRuleValidator->isValid($rule, $couponCode)) {
                 return $proceed($item, [], $skipValidation, $couponCode);
             }
         }