Merge branch '1.x' into vi-translations

lunarphp · Jan 13, 2025 · e9c9462 · e9c9462
2 parents 5985a7d + 1952a4a
commit e9c9462
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/core/src/Managers/DiscountManager.php b/packages/core/src/Managers/DiscountManager.php
@@ -122,6 +122,10 @@ public function getDiscounts(?Cart $cart = null): Collection
             $this->channel($defaultChannel);
         }
 
+        if ($cart && $customerGroups = $cart->customer?->customerGroups) {
+            $this->customerGroup($customerGroups);
+        }
+
         if ($this->customerGroups->isEmpty() && $defaultGroup = CustomerGroup::getDefault()) {
             $this->customerGroup($defaultGroup);
         }

diff --git a/packages/core/src/Search/ProductOptionIndexer.php b/packages/core/src/Search/ProductOptionIndexer.php
@@ -29,7 +29,7 @@ public function makeAllSearchableUsing(Builder $query): Builder
 
     public function toSearchableArray(Model $model): array
     {
-        $data['id'] = $model->id;
+        $data['id'] = (string) $model->id;
 
         // Loop for add option name
         foreach ($model->name as $locale => $name) {

diff --git a/packages/table-rate-shipping/src/Resolvers/ShippingRateResolver.php b/packages/table-rate-shipping/src/Resolvers/ShippingRateResolver.php
@@ -118,7 +118,7 @@ public function state($state): self
     /**
      * Set the value for the postcode.
      */
-    public function postcode(string $postcode): self
+    public function postcode(?string $postcode): self
     {
         $this->postcode = $postcode;