Fix line fetching in order creation

lunarphp · Sep 17, 2024 · 3cc6722 · 3cc6722
1 parent c4381dc
commit 3cc6722
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/core/src/Pipelines/Order/Creation/CreateOrderLines.php b/packages/core/src/Pipelines/Order/Creation/CreateOrderLines.php
@@ -5,6 +5,7 @@
 use Closure;
 use Lunar\Models\Order;
 use Lunar\Models\OrderLine;
+use Lunar\Utils\Arr;
 
 class CreateOrderLines
 {
@@ -23,8 +24,13 @@ public function handle(Order $order, Closure $next)
 
         foreach ($cart->lines as $cartLine) {
             $orderLine = $order->lines->first(function ($line) use ($cartLine) {
-                return $line->purchasable_id == $cartLine->purchasable_id &&
-                    $line->purchasable_type == $cartLine->purchasable_type;
+                $diff = Arr::diff($line->meta, $cartLine->meta);
+
+                return empty($diff->new) &&
+                    empty($diff->edited) &&
+                    empty($diff->removed) &&
+                    $line->purchasable_type == $cartLine->purchasable_type &&
+                    $line->purchasable_id == $cartLine->purchasable_id;
             }) ?: new OrderLine;
 
             $orderLine->fill([

diff --git a/packages/core/src/Pipelines/Order/Creation/MapDiscountBreakdown.php b/packages/core/src/Pipelines/Order/Creation/MapDiscountBreakdown.php
@@ -4,6 +4,7 @@
 
 use Closure;
 use Lunar\Models\Order;
+use Lunar\Utils\Arr;
 
 class MapDiscountBreakdown
 {
@@ -18,7 +19,12 @@ public function handle(Order $order, Closure $next)
 
         foreach ($order->lines as $orderLine) {
             $cartLine = $cart->lines->first(function ($cartLine) use ($orderLine) {
-                return $cartLine->purchasable_type == $orderLine->purchasable_type &&
+                $diff = Arr::diff($cartLine->meta, $orderLine->meta);
+
+                return empty($diff->new) &&
+                    empty($diff->edited) &&
+                    empty($diff->removed) &&
+                    $cartLine->purchasable_type == $orderLine->purchasable_type &&
                     $cartLine->purchasable_id == $orderLine->purchasable_id;
             });