Merge branch 'release/4.0.0'

Author: Skullbock

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_get_cart_manager_from_config":0.1,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_load_facade":0.012,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_get_cart_instances#session":0.164,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_get_cart_instances#cache":0.022,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_get_cart_instances#eloquent":0.209,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_generate_cart_items_ids_consistently":0.143,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_add_to_cart#session":0.01,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_add_to_cart#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_add_to_cart#eloquent":0.164,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_check_if_item_is_in_cart#session":0.019,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_check_if_item_is_in_cart#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_check_if_item_is_in_cart#eloquent":0.012,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_remove_from_cart#session":0.012,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_remove_from_cart#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_remove_from_cart#eloquent":0.014,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_total#session":0.148,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_total#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_total#eloquent":0.014,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_tax#session":0.047,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_tax#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_tax#eloquent":0.015,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_item_discounts#session":0.069,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_item_discounts#cache":0.01,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_item_discounts#eloquent":0.014,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_subtotal_discounts#session":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_subtotal_discounts#cache":0.011,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_subtotal_discounts#eloquent":0.013,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_items_discounts#session":0.01,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_items_discounts#cache":0.01,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_calculate_items_discounts#eloquent":0.012,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_attach_customer_to_cart#session":0.122,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_attach_customer_to_cart#cache":0.014,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_attach_customer_to_cart#eloquent":0.022,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_add_to_cart_storing_in_db":0.014,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::user_add_to_cart_storing_in_db":0.05,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::cart_stored_storing_in_db_for_different_users":0.016,"Weble\\LaravelEcommerce\\Tests\\Cart\\CartTest::can_add_discount_to_cart_storing_in_db":0.013,"Weble\\LaravelEcommerce\\Tests\\Cart\\MultipleCartsTest::stores_different_carts_in_db":0.015,"Weble\\LaravelEcommerce\\Tests\\Cart\\CustomerTest::can_add_to_cart_storing_in_db":0.041,"Weble\\LaravelEcommerce\\Tests\\Cart\\CustomerTest::can_add_to_cart_for_user_storing_in_db":0.015,"Weble\\LaravelEcommerce\\Tests\\Cart\\CustomerTest::can_add_to_cart_for_user_storing_in_db_multiple_times":0.012,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::can_create_order_from_cart":0.067,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::order_has_unique_hash":0.022,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::order_items_are_stored_correctly":0.064,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::uses_state_machine_to_manage_order":0.155,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::order_history_is_stored_correctly":0.019,"Weble\\LaravelEcommerce\\Tests\\Order\\OrderTest::order_creates_payment":0.042,"Weble\\LaravelEcommerce\\Tests\\Tax\\TaxTest::can_get_tax_resolver":0.013,"Weble\\LaravelEcommerce\\Tests\\Tax\\TaxTest::can_get_tax_manager":0.01,"Weble\\LaravelEcommerce\\Tests\\Tax\\TaxTest::can_calculate_tax_for_physical_product":0.032,"Weble\\LaravelEcommerce\\Tests\\Tax\\TaxTest::can_calculate_tax_for_physical_product_with_different_country_eu_private_customer":0.01,"Weble\\LaravelEcommerce\\Tests\\Tax\\TaxTest::can_calculate_tax_for_physical_product_with_different_country_eu_company":0.01}}

src/Cart/Cart.php

@@ -79,13 +79,16 @@ public function clear(): self
         return $this;
     }
 
-    public function add(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null): CartItem
+    public function add(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null, ?Money $price = null): CartItem
     {
         if ($attributes === null) {
             $attributes = collect([]);
         }
 
         $cartItem = CartItem::fromPurchasable($purchasable, $quantity, $attributes);
+        if ($price !== null) {
+            $cartItem->price = $price;
+        }
 
         if ($this->items()->has($cartItem->getId())) {
             $cartItem->quantity += $this->items()->get($cartItem->getId())->quantity;

src/Cart/CartInterface.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Collection;
 use Weble\LaravelEcommerce\Price\HasTotals;
 use Weble\LaravelEcommerce\Purchasable;
+use Cknow\Money\Money;
 
 interface CartInterface extends HasTotals, Arrayable
 {
@@ -17,7 +18,7 @@ public function has(string $cartItemId): bool;
 
     public function clear(): CartInterface;
 
-    public function add(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null): CartItem;
+    public function add(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null, ?Money $price = null): CartItem;
 
     public function remove(CartItem $cartItem): CartInterface;
 

src/Cart/CartItem.php

@@ -46,17 +46,19 @@ public function toJson($options = 0): string
         return json_encode($this->toArray(), $options);
     }
 
-    public static function fromPurchasable(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null): self
+    public static function fromPurchasable(Purchasable $purchasable, float $quantity = 1, ?Collection $attributes = null, ?Money $price = null): self
     {
         if ($attributes === null) {
             $attributes = collect([]);
         }
 
+        $price ??= $purchasable->cartPrice($attributes);
+
         return new static([
             'product'    => $purchasable,
             'attributes' => $attributes,
             'quantity'   => $quantity,
-            'price'      => $purchasable->cartPrice($attributes),
+            'price'      => $price,
             'discounts'  => DiscountCollection::make([]),
         ]);
     }