chore: merge master, resolve conflicts keeping v3

2026-11-14 13:51:44 +00:00 · 2026-06-13 14:33:14 +10:00
parent 01189993f2 7427ce953a
commit bfdea648ae
2 changed files with 20 additions and 1 deletions
@@ -159,4 +159,23 @@
        expect($this->cart->getContent()->count())->toEqual(0, 'Cart content should be 0');
        expect(MockCartModel::all()->count())->toEqual(0, 'The carts database table should have 0 rows');
    });
+
+    test('can clear cart conditions after clearing the cart', function () {
+        $condition = new CartCondition([
+            'name' => '10% Off',
+            'type' => 'coupon',
+            'target' => 'subtotal',
+            'value' => '-10%',
+        ]);
+
+        $this->cart->add(1, 'Sample Item', 100.99, 2, []);
+        $this->cart->condition($condition);
+
+        $this->cart->clear();
+
+        // This was throwing "Call to a member function save() on array"
+        // because clear() replaced $this->session with a plain array
+        expect(fn () => $this->cart->clearCartConditions())->not->toThrow(Error::class);
+        expect($this->cart->getConditions())->toBeEmpty();
+    });
 });