chore: bump version to 2.1.0

Database Support

.github/workflows/php-formatting.yml

@@ -1,25 +0,0 @@
-name: PHP Formatting
-
-on: pull_request
-
-jobs:
-  php-formatting:
-    runs-on: ubuntu-latest
-    steps:
-        - uses: actions/checkout@v4
-        - name: "Run Pint"
-          uses: aglipanci/laravel-pint-action@latest
-          with:
-            verboseMode: true
-            configPath: "pint.json"
-            pintVersion: 1.17.2
-
-        - name: Commit changes
-          uses: stefanzweifel/git-auto-commit-action@v5
-          with:
-            commit_message: "Apply Laravel Pint"
-            commit_options: '--no-verify --signoff'
-            file_pattern: "*.php"
-            commit_user_name: "Pixel Tech"
-            commit_user_email: "tech@wearepixel.com.au"
-            commit_author: "Pixel Tech<tech@wearepixel.com.au>"

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['8.1','8.2', '8.3']
+        php: ['8.3', '8.4', '8.5']
         stability: [prefer-stable]
 
     steps:

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Pixel Digital Pty Ltd <hello@wearepixel.com.au>
+Copyright (c) Joel Male <joel@joelmale.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,41 +1,72 @@
+<a name="top"></a>
+[![Laravel Cart](./docs/laravel-cart.png)](https://joelmale.com)
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/wearepixel/laravel-cart.svg?style=flat-square)](https://packagist.org/packages/wearepixel/laravel-cart)
 [![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/wearepixel/laravel-cart/tests.yml?branch=master&label=Tests)](https://github.com/wearepixel/laravel-cart/actions?query=workflow%3ATests+branch%3Amaster)
 [![Total Downloads](https://img.shields.io/packagist/dt/wearepixel/laravel-cart.svg?style=flat-square)](https://packagist.org/packages/wearepixel/laravel-cart)
+[![GitHub last commit](https://img.shields.io/github/last-commit/wearepixel/laravel-cart)](#)
 [![License](https://poser.pugx.org/wearepixel/laravel-cart/license.svg)](https://packagist.org/packages/wearepixel/laravel-cart)
+[![Free](https://img.shields.io/badge/free_for_non_commercial_use-brightgreen)](#-license)
 
 A Cart Implementation for Laravel.
 
-Supported Laravel Versions: 9, 10, 11
+Supported Laravel Versions: 10, 11, and 12.
 
-## Quick Demo
+For Laravel 9.0 and below, please use version [1.0](https://github.com/wearepixel/laravel-cart/releases/tag/1.0.12)
 
-```php
+## Table of Contents
-// Add an item to the cart
+- [Getting Started](#-getting-started)
-\Cart::add(1, 'Product 1', 19.99, 2, ['size' => 'large']);
+- [Demo](#-deni)
+- [Documentation](#-documentation)
+  - [Configuration](#configuration)
+  - [Basic Usage](#basic-usage)
+  - [Conditions](#conditions)
+  - [Cart Items](#cart-items)
+  - [Database Support](#database-support)
+  - [Events](#events)
+- [Credits](#-credits)
+- [License](#-license)
 
-// Get the cart contents
+## 🚀 Getting Started
-$cartContents = \Cart::getContent();
+### 🔥 Installing
-
-// Update item quantity by its id
-\Cart::update(1, ['quantity' => 3]);
-
-// Remove an item from the cart by its id
-\Cart::remove(1);
-
-// Get cart total
-\$total = Cart::getTotal();
-
-// Clear the entire cart
-\Cart::clear();
-```
-
-## Installing
 
 Install the package through [Composer](http://getcomposer.org/).
 
-`composer require "wearepixel/laravel-cart"`
+`composer require wearepixel/laravel-cart`
 
-## Configuration
+## 🧑‍🍳 Demo
+
+```php
+// Add an item to the cart
+\Cart::add(
+    1, // any unique id
+    'Product 1', // product name
+    19.99, // product price
+    2, // quantity
+    ['size' => 'large'] // an array of extra attributes
+);
+
+// get the entire cart
+$cartContents = \Cart::getContent();
+
+// update an item already in the cart
+\Cart::update(
+    1, // the same unique id that was used to add the item
+    ['quantity' => 3] // the quantity to update
+);
+
+// remove the item by its id
+\Cart::remove(1);
+
+// get the total of the cart
+$total = Cart::getTotal();
+
+// clear it all when you've finished (like when you've stored the order)
+\Cart::clear();
+```
+
+## 📚 Documentation
+
+### ⚙️ Configuration
 
 You can publish the configuration file to customize various options.
 
@@ -43,7 +74,7 @@ ## Configuration
 php artisan vendor:publish --provider="Wearepixel\Cart\CartServiceProvider" --tag="config"
 ```
 
-### Formatting Numbers
+#### Formatting Numbers
 
 The package by default does not use round to format numbers, and instead returns the number using floatval().
 
@@ -56,7 +87,7 @@ ### Formatting Numbers
 'round_mode' => env('LARAVEL_CART_ROUND_MODE', 'down'),
 ```
 
-### Decimals
+#### Decimals
 
 You can customize the number of decimals in the configuration file.
 
@@ -66,7 +97,7 @@ ### Decimals
 'decimals' => env('LARAVEL_CART_DECIMALS', 2),
 ```
 
-### Round Mode
+#### Round Mode
 
 The package uses the `round` function to round the prices. You can customize the rounding mode in the configuration file.
 
@@ -76,40 +107,23 @@ ### Round Mode
 'round_mode' => env('LARAVEL_CART_ROUND_MODE', 'down'),
 ```
 
-## HOW TO USE
 
--   [Usage](#usage)
+### Basic Usage
--   [Conditions](#conditions)
--   [Items](#items)
--   [Associating Models](#associating-models)
--   [Instances](#instances)
--   [Exceptions](#exceptions)
--   [Events](#events)
--   [Format Response](#format)
--   [Examples](#examples)
--   [Using Different Storage](#storage)
--   [License](#license)
 
-## Usage
+The cart has a default sessionKey that holds the cart data and stores it in the session, so you can have multiple carts for multiple users.
 
-The cart has a default sessionKey that holds the cart data and stores it in the session. 
+This also serves as a cart unique identifier which you can use to bind a cart to a specific user if you want to.
 
-This
+Make sure to call `\Cart::setSessionKey($sessionKey)` before calling any other cart methods.
-also serves as a cart unique identifier which you can use to bind a cart to a specific user if you want to.
-
-Make sure to call `\Cart::session($sessionKey)` before calling any other cart methods.
 
 Usually this is not required.
 
 ```php
 // Binds the cart to a unique id (user id, session id, etc.)
-\Cart::session(User::first()->id);
+\Cart::setSessionKey(User::first()->id);
-
-// If you don't want to bind the cart on a project level, you can add it to each call
-\Cart::session(User::first()->id)->add(1, 'Product 1', 19.99, 2, ['size' => 'large']);
 ```
 
-### Adding to the cart: **Cart::add()**
+#### Adding to the cart: **Cart::add()**
 
 There are a few ways to add items to the cart.
 
@@ -180,7 +194,7 @@ ### Adding to the cart: **Cart::add()**
 );
 ```
 
-### Updating an item on a cart: **Cart::update()**
+#### Updating an item on a cart: **Cart::update()**
 
 ```php
 Cart::update(
@@ -219,14 +233,14 @@ ### Updating an item on a cart: **Cart::update()**
 );
 ```
 
-### Removing an item on a cart: **Cart::remove()**
+#### Removing an item on a cart: **Cart::remove()**
 
 ```php
 // Remove an item from the cart by its id
 Cart::remove(456);
 ```
 
-### Getting an item on a cart: **Cart::get()**
+#### Getting an item on a cart: **Cart::get()**
 
 ```php
 // Get an item from the cart by its id
@@ -236,7 +250,7 @@ ### Getting an item on a cart: **Cart::get()**
 $summedPrice = Cart::get($itemId)->getPriceSum();
 ```
 
-### Getting the cart content: **Cart::getContent()**
+#### Getting the cart content: **Cart::getContent()**
 
 ```php
 // Returns a collection of the cart's contents
@@ -256,13 +270,13 @@ ### Getting the cart content: **Cart::getContent()**
 $cartTotalQuantity = Cart::getTotalQuantity();
 ```
 
-### Cart subtotal: **Cart::getSubTotal()**
+#### Cart subtotal: **Cart::getSubTotal()**
 
 ```php
 $subTotal = Cart::getSubTotal();
 ```
 
-### Cart subtotal without conditions: **Cart::getSubTotalWithoutConditions()**
+#### Cart subtotal without conditions: **Cart::getSubTotalWithoutConditions()**
 
 ```php
 $subTotalWithoutConditions = Cart::getSubTotalWithoutConditions();
@@ -274,31 +288,43 @@ ### Cart subtotal without conditions: **Cart::getSubTotalWithoutConditions()**
 $total = Cart::getTotal();
 ```
 
-### Check if cart is empty: **Cart::isEmpty()**
+#### Check if cart is empty: **Cart::isEmpty()**
 
 ```php
 Cart::isEmpty();
 ```
 
-### Clearing the Cart: **Cart::clear()**
+#### Clearing the Cart: **Cart::clear()**
+
+This clears all items and conditions from the cart.
 
 ```php
 Cart::clear();
 ```
 
-## Conditions
+#### Clearing the cart items only: **Cart::clearItems()**
 
-Conditions are very useful in terms for adding things like discounts, taxes, shipping costs, etc.
+This clears all items, but keeps the conditions (useful for when you want to keep the conditions but remove the items)
 
-Conditions can be added on the entire cart or on individual items.
+```php
+Cart::clearItems();
+```
+
+### Conditions
+
+Conditions are very useful for adding things like discounts, taxes, shipping, etc.
+
+Conditions can be added on the entire cart or on individual items, and can even be applied only at certain cart values.
 
 Conditions on a cart level should always have a `target` of `subtotal` or `total`. This tells the cart which value to apply the condition to.
 
+You can provide an optional `minimum` value which should be the dollar value in which the target (subtotal or total) needs to be for the condition to be active and impact the cart.
+
 You can also provide an `order` to cart conditions which tells the cart in what order to apply the conditions. Item level conditions do not support the `order` parameter.
 
-### Conditions on the cart
+#### Conditions on the cart
 
-#### Adding a condition to the cart: **Cart::condition()**
+##### Adding a condition to the cart: **Cart::condition()**
 
 ```php
 // Add a single condition to the cart
@@ -349,7 +375,7 @@ #### Adding a condition to the cart: **Cart::condition()**
 Cart::condition($shipping);
 ```
 
-#### Getting conditions on the cart: **Cart::getConditions()**
+##### Getting conditions on the cart: **Cart::getConditions()**
 
 ```php
 // To get all applied conditions on a cart, use below:
@@ -362,34 +388,97 @@ #### Getting conditions on the cart: **Cart::getConditions()**
     $condition->getType(); // the type
     $condition->getValue(); // the value of the condition
     $condition->getOrder(); // the order of the condition
+    $condition->getMinimum(); // the minimum dollar amount of the target, needed to activate the condition
+    $condition->getMaximum(); // the maximum dollar amount of the target, needed to keep the condition active
     $condition->getAttributes(); // the attributes of the condition, returns an empty [] if no attributes added
 }
+```
+
+##### Getting conditions on the cart as an array: **Cart::getConditions(array: true)**
+
+You can get all cart conditions in array format by passing "array: true". This is useful if you want to store the carts conditions on a Livewire component since by default we have collections inside collections for conditions which Livewire does not support.
+
+```php
+$cartConditions = Cart::getConditions(true);
+$cartConditions = Cart::getConditions(active: true);
+
+foreach ($cartConditions as $condition) {
+    $condition['name']; // the name of the condition
+    $condition['type']; // the type
+    $condition['value']; // the value of the condition
+    $condition['order']; // the order of the condition
+    $condition['minimum']; // the minimum dollar amount of the target, needed to activate the condition
+    $condition['maximum']; // the maximum dollar amount of the target, needed to keep the condition active
+    $condition['attributes']; // the attributes of the condition, returns an empty [] if no attributes added
+}
+```
+
+##### Getting conditions by name: **Cart::getCondition($conditionName)**
+
+```php
+$condition = Cart::getCondition('GST');
 
-// You can also get a condition that has been applied on the cart by using its name:
-$condition = Cart::getCondition('Tax: 10%');
 $condition->getTarget(); // the target of which the condition was applied
 $condition->getName(); // the name of the condition
 $condition->getType(); // the type
 $condition->getValue(); // the value of the condition
+$condition->getMinimum(); // the minimum dollar amount of the target, needed to activate the condition
+$condition->getMaximum(); // the maximum dollar amount of the target, needed to keep the condition active
 $condition->getAttributes(); // the attributes of the condition, returns an empty [] if no attributes added
 ```
 
-### Calculating condition value
+##### Getting active conditions on the cart: **Cart::getConditions(active: true)**
+
+You can get only active conditions by passsing `active: true` to the `getConditions()` method.
+
+This will return conditions that are actively being applied to the cart (i.e if they meet their minimum or maximum value)
+
+```php
+$tenPercentOff = new CartCondition([
+    'name' => '10% Off',
+    'type' => 'discount',
+    'target' => 'subtotal',
+    'value' => '-10%',
+    'minimum' => 120,
+    'order' => 1,
+]);
+
+Cart::getConditions(active: true);
+
+// will return "10% Off" if the subtotal of the cart is $200.
+// will return no conditions if the subtotal is $100.
+
+$shipping = new CartCondition([
+    'name' => 'Shipping',
+    'type' => 'discount',
+    'target' => 'subtotal',
+    'value' => '10',
+    'maximum' => 200,
+    'order' => 1,
+]);
+
+Cart::getConditions(active: true);
+
+// will return "Shipping" if the subtotal of the cart is less than or equal 200
+// will return no conditions if the subtotal is $210
+```
+
+##### Calculating condition value
 
 There are 2 ways to calculate the value of a condition:
 
 1. Using the `getCalculatedValue` method on the condition instance
 2. Using the `getCalculatedValueForCondition` method on the cart instance and passing the condition name
 
-#### Using the `getCalculatedValue` method on the condition instance
+##### Using the `getCalculatedValue` method on the condition instance
 
 ```php
 $subTotal = Cart::getSubTotal();
-$condition = Cart::getCondition('VAT 12.5%');
+$condition = Cart::getCondition('10% GST');
 $conditionCalculatedValue = $condition->getCalculatedValue($subTotal);
 ```
 
-#### Using the `getCalculatedValueForCondition` method on the cart instance
+##### Using the `getCalculatedValueForCondition` method on the cart instance
 
 This method automatically calculates the value of a condition by it's name based on the order of the conditions.
 
@@ -422,7 +511,45 @@ #### Using the `getCalculatedValueForCondition` method on the cart instance
 Cart::getCalculatedValueForCondition('Gift Card'); // returns 0 as the coupon discount is applied first and brings the subtotal to 0
 ```
 
-### Condition on items
+##### Adding conditions that activate once a minimum value is met
+
+You can add a `minimum` amount required for a condition to activate.
+
+This is useful for applying discounts only after certain cart values, i.e: 10% off for any purchases over $120.
+
+```php
+$tenPercentOff = new CartCondition([
+    'name' => '10% Off',
+    'type' => 'discount',
+    'target' => 'subtotal',
+    'value' => '-10%',
+    'minimum' => 120,
+    'order' => 1,
+]);
+
+Cart::condition($tenPercentOff)
+```
+
+##### Adding conditions that only activate up to a maximum value
+
+You can add a `maximum` amount required for a condition to activate.
+
+This is useful for applying discounts up until amounts, i.e shipping for anything below $200, and free shipping above.
+
+```php
+$shipping = new CartCondition([
+    'name' => 'Shipping',
+    'type' => 'discount',
+    'target' => 'subtotal',
+    'value' => '12',
+    'maximum' => 200,
+    'order' => 1,
+]);
+
+Cart::condition($shipping)
+```
+
+#### Conditions on items
 
 Item conditions are useful if you have discounts to be applied specifically on an item and not on the whole cart value.
 
@@ -483,7 +610,7 @@ ### Condition on items
 $cartSubTotal = Cart::getSubTotal();
 ```
 
-#### Add condition to existing Item on the cart: **Cart::addItemCondition($productId, $itemCondition)**
+##### Add a condition to an existing item on the cart: **Cart::addItemCondition($productId, $itemCondition)**
 
 Adding Condition to an existing Item on the cart is simple as well.
 
@@ -497,7 +624,7 @@ #### Add condition to existing Item on the cart: **Cart::addItemCondition($produ
 Cart::addItemCondition(456, $condition);
 ```
 
-### Clearing Cart Conditions: **Cart::clearCartConditions()**
+#### Clearing Cart Conditions: **Cart::clearCartConditions()**
 
 This clears all cart level conditions, and does not affect item level conditions.
 
@@ -511,25 +638,25 @@ ### Clearing Cart Conditions: **Cart::clearCartConditions()**
 Cart::clearAllConditions()
 ```
 
-### Remove a specific cart condtion: **Cart::removeCartCondition($conditionName)**
+##### Remove a specific cart condtion: **Cart::removeCartCondition($conditionName)**
 
 ```php
 Cart::removeCartCondition('Summer Sale 5%')
 ```
 
-### Remove a specific item condition: **Cart::removeItemCondition($itemId, $conditionName)**
+##### Remove a specific item condition: **Cart::removeItemCondition($itemId, $conditionName)**
 
 ```php
 Cart::removeItemCondition(456, 'SALE 5%')
 ```
 
-### Clear all item conditions: **Cart::clearItemConditions($itemId)**
+##### Clear all item conditions: **Cart::clearItemConditions($itemId)**
 
 ```php
 Cart::clearItemConditions(456)
 ```
 
-### Get conditions by type: **Cart::getConditionsByType($type)**
+#### Get conditions by type: **Cart::getConditionsByType($type)**
 
 This returns all conditions that has been added to the cart by the type specified.
 
@@ -537,13 +664,13 @@ ### Get conditions by type: **Cart::getConditionsByType($type)**
 $tax = Cart::getConditionsByType('tax');
 ```
 
-### Remove conditions by type: **Cart::removeConditionsByType($type)**
+##### Remove conditions by type: **Cart::removeConditionsByType($type)**
 
 ```php
 Cart::removeConditionsByType('tax');
 ```
 
-## Cart Items
+### Cart Items
 
 The method **Cart::getContent()** returns a collection of items.
 
@@ -565,8 +692,153 @@ ## Cart Items
 $item->getPriceSumWithConditions();
 ```
 
-## Credits
+### Storage Options
 
-Huge credits to the original maintainer of the package, located at [darryldecode/laravelshoppingcart](https://github.com/darryldecode/laravelshoppingcart)
+By default the cart is stored in the session, but there are times you may want to store the cart in the database.
 
-We have forked this package to update it to Laravel 11 and to add some features and support for newer PHP versions.
+For instance, you may want to store the cart in the database so that the cart can be retrieved even after the user logs out or closes the browser, or you may want to add cart timeouts and support for multiple computers.
+
+#### Session
+
+The cart is stored in the session by default, using Laravel's in-built SessionManager.
+
+#### Database Support
+
+To get started, you'll need to create a new model for your Cart, the package requires only 3 columns, but you're free to extend this as you wish and add more columns.
+
+You can utilise the [events](#events) provided by the package to store additional information alongside the cart.
+
+```php
+$table->string('session_id'); // this handles the session id of the cart
+$table->text('items'); // this will store the cart items
+$table->text('conditions'); // this will store the cart level conditions
+```
+
+Then add some json casts to your model and fillable columns:
+
+```php
+protected $guarded = [];
+
+protected $casts = [
+    'items' => 'array',
+    'conditions' => 'array',
+];
+```
+
+Then update the configuration file to use the database driver:
+
+```php
+'driver' => 'database',
+
+'storage' => [
+    'session',
+    'database' => [
+        'model' => \App\Models\Cart::class, // your model here
+        'id' => 'session_id',
+        'items' => 'items',
+        'conditions' => 'conditions',
+    ],
+],
+```
+
+### Events
+
+The package provides a few events that you can listen to in order to manipulate the cart or take actions based on cart events.
+
+#### LaravelCart.Created
+
+This fires every time a cart is instantiated (i.e every time \Cart::add() is called)
+
+```
+Event::listen('LaravelCart.Added', function () {
+    // cart was created
+});
+```
+
+#### LaravelCart.Adding
+
+This fires every time an item is being added to the cart
+
+```
+Event::listen('LaravelCart.Adding', function ($item) {
+    // item is being added
+});
+```
+
+#### LaravelCart.Added
+
+This fires every time an item is successfully added to the cart
+
+```
+Event::listen('LaravelCart.Added', function ($item) {
+    // item was added
+});
+```
+
+#### LaravelCart.Updating
+
+This fires every time an item is being updated
+
+```
+Event::listen('LaravelCart.Updating', function ($item) {
+    // item is being updated
+});
+```
+
+#### LaravelCart.Updated
+
+This fires every time an item is successfully updated
+
+```
+Event::listen('LaravelCart.Updated', function ($item) {
+    // item was updated
+});
+```
+
+#### LaravelCart.Removing
+
+This fires every time an item is being removed
+
+```
+Event::listen('LaravelCart.Removing', function ($item) {
+    // item is being removed
+});
+```
+
+#### LaravelCart.Removed
+
+This fires every time an item is successfully removed
+
+```
+Event::listen('LaravelCart.Removed', function ($item) {
+    // item was removed
+});
+```
+
+#### LaravelCart.Clearing
+
+This fires every time the cart is being cleared
+
+```
+Event::listen('LaravelCart.Clearing', function () {
+    // cart is being cleared
+});
+```
+
+#### LaravelCart.Cleared
+
+This fires every time the cart is successfully cleared
+
+```
+Event::listen('LaravelCart.Cleared', function () {
+    // cart was cleared
+});
+```
+
+## 🫡 Credits
+
+This package was orignally created by [darryldecode](https://github.com/darryldecode) but has since seen almost no updates. I have decided to take the old package and transform it into a new package with new features and updates.
+
+## 📓 License
+
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "wearepixel/laravel-cart",
-  "version": "1.0.6",
+  "version": "2.1.0",
   "description": "A cart implementation for Laravel",
   "keywords": [
     "laravel",
@@ -15,19 +15,21 @@
     },
     {
       "name": "Joel Male",
-      "email": "joel@wearepixel.com.au"
+      "email": "joel@joelmale.com"
     }
   ],
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.3",
-    "illuminate/support": "^9.0|^10.0|^11.0",
+    "illuminate/support": "^11.0|^12.0|^13.0",
-    "illuminate/validation": "^9.0|^10.0|^11.0",
+    "illuminate/auth": "^11.0|^12.0|^13.0",
-    "illuminate/translation": "^9.0|^10.0|^11.0"
+    "illuminate/container": "^11.0|^12.0|^13.0",
+    "illuminate/database": "^11.0|^12.0|^13.0",
+    "illuminate/validation": "^11.0|^12.0|^13.0"
   },
   "require-dev": {
-    "mockery/mockery": "^1.4.2",
+    "mockery/mockery": "^2.0",
-    "laravel/pint": "dev-main",
+    "laravel/pint": "^1.21",
-    "pestphp/pest": "2.35.0",
+    "pestphp/pest": "^3.0",
     "larapack/dd": "dev-master"
   },
   "autoload": {
@@ -35,6 +37,11 @@
       "Wearepixel\\Cart\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
   "minimum-stability": "dev",
   "extra": {
     "laravel": {

config/config.php

@@ -14,15 +14,18 @@
 
     /*
      * ---------------------------------------------------------------
-     * Persistence
+     * Storage
      * ---------------------------------------------------------------
      */
-    'storage' => null,
+    'driver' => 'session',
 
-    /*
+    'storage' => [
-     * ---------------------------------------------------------------
+        'session',
-     * Events
+        'database' => [
-     * ---------------------------------------------------------------
+            'model' => '',
-     */
+            'id' => '',
-    'events' => null,
+            'items' => '',
+            'conditions' => '',
+        ],
+    ],
 ];

phpunit.xml.dist

@@ -14,4 +14,7 @@
       <directory>tests</directory>
     </testsuite>
   </testsuites>
+  <php>
+    <env name="DB_CONNECTION" value="testing"/>
+  </php>
 </phpunit>

src/Cart.php

@@ -10,91 +10,60 @@
 
 class Cart
 {
-    /**
-     * the item storage
-     */
     protected $session;
-
-    /**
-     * the event dispatcher
-     */
     protected $events;
 
-    /**
-     * the cart session key
-     */
     protected $instanceName;
 
-    /**
-     * the session key use for the cart
-     */
-    protected $sessionKey;
-
-    /**
-     * the session key use to persist cart items
-     */
-    protected $sessionKeyCartItems;
-
-    /**
-     * the session key use to persist cart conditions
-     */
-    protected $sessionKeyCartConditions;
-
-    /**
-     * Configuration to pass to ItemCollection
-     */
     protected $config;
 
-    /**
-     * This holds the currently added item id in cart for association
-     */
     protected $currentItemId;
 
-    /**
-     * The number of decimals to use when formatting prices
-     */
     protected $decimals;
-
-    /**
-     * The decimal point character
-     */
     protected $decPoint;
 
-    /**
+    public function __construct($sessionStorage, $events, $instanceName, $sessionKey, $config)
-     * our object constructor
-     */
-    public function __construct($session, $events, $instanceName, $session_key, $config)
     {
+        $this->validateConfig($config);
+
         $this->events = $events;
-        $this->session = $session;
+        $this->session = new CartSession($sessionStorage, $sessionKey, $config);
         $this->instanceName = $instanceName;
-        $this->sessionKey = $session_key;
-        $this->sessionKeyCartItems = $this->sessionKey . '_cart_items';
-        $this->sessionKeyCartConditions = $this->sessionKey . '_cart_conditions';
         $this->config = $config;
         $this->currentItemId = null;
-        $this->fireEvent('created');
+
+        $this->fireEvent('Created');
     }
 
-    /**
+    private function validateConfig($config)
-     * sets the session key
-     *
-     * @param  string  $sessionKey  the session key or identifier
-     * @return $this|bool
-     *
-     * @throws \Exception
-     */
-    public function session($sessionKey)
     {
-        if (! $sessionKey) {
+        if ($config['driver'] == 'database') {
-            throw new \Exception('Session key is required.');
+            if (! isset($config['storage']['database']['model'])) {
+                throw new \Exception('You need to set a model for the database driver in the cart configuration.');
+            }
+
+            if (! isset($config['storage']['database']['id'])) {
+                throw new \Exception('You need to set an id (for the session) for the database driver in the cart configuration.');
+            }
+
+            if (! isset($config['storage']['database']['items'])) {
+                throw new \Exception('You need to set an items key for the database driver in the cart configuration.');
+            }
+
+            if (! isset($config['storage']['database']['conditions'])) {
+                throw new \Exception('You need to set a conditions key for the database driver in the cart configuration.');
+            }
         }
+    }
 
-        $this->sessionKey = $sessionKey;
+    public function getSessionKey(): string
-        $this->sessionKeyCartItems = $this->sessionKey . '_cart_items';
+    {
-        $this->sessionKeyCartConditions = $this->sessionKey . '_cart_conditions';
+        return $this->session->getSessionKey();
+    }
 
-        return $this;
+    public function setSessionKey(string $sessionKey): void
+    {
+        $this->session->setSessionKey($sessionKey);
     }
 
     /**
@@ -109,20 +78,16 @@ public function getInstanceName()
 
     /**
      * get an item on a cart by item ID
-     *
-     * @return mixed
      */
-    public function get($itemId)
+    public function get($itemId): ?ItemCollection
     {
         return $this->getContent()->get($itemId);
     }
 
     /**
-     * check if an item exists by item ID
+     * check if we have this item in the cart by item ID
-     *
-     * @return bool
      */
-    public function has($itemId)
+    public function has($itemId): bool
     {
         return $this->getContent()->has($itemId);
     }
@@ -144,10 +109,9 @@ public function add(
         array|CartCondition $conditions = [],
         ?string $associatedModel = null
     ): self {
-        // check if its an array of items
+        // check if we are adding an array of items
         if (is_array($id)) {
-            // the first argument is an array, now we will need to check if it is a multi dimensional
+            // check if we are adding a multi dimensional array
-            // array, if so, we will iterate through each item and call add again
             if (Helpers::isMultiArray($id)) {
                 foreach ($id as $item) {
                     $this->add(
@@ -175,6 +139,7 @@ public function add(
             return $this;
         }
 
+        // if we are here, we are adding a single item
         $data = [
             'id' => $id,
             'name' => $name,
@@ -191,11 +156,8 @@ public function add(
         // validate data
         $item = $this->validate($data);
 
-        // get the cart
-        $inCart = $this->get($id);
-
         // if the item is already in the cart we will just update it
-        if ($inCart) {
+        if ($this->get($id)) {
             $this->update($id, $item);
         } else {
             $this->addItem($id, $item);
@@ -203,15 +165,37 @@ public function add(
 
         $this->currentItemId = $id;
 
+        // clean up any incomplete items
+        $this->removeInvalidItems();
+
         return $this;
     }
 
+    /**
+     * Remove any incomplete items
+     */
+    public function removeInvalidItems(): bool
+    {
+        $carts = $this->getContent();
+
+        foreach ($carts as $index => $cart) {
+
+            if (! (isset($cart['id'], $cart['name'], $cart['quantity']))) {
+
+                // remove item
+                $this->remove($index);
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Update a cart item with whatever data is passed in
      */
     public function update(int|string $id, array $data): bool
     {
-        if ($this->fireEvent('updating', $data) === false) {
+        if ($this->fireEvent('Updating', 'item', $data) === false) {
             return false;
         }
 
@@ -244,7 +228,7 @@ public function update(int|string $id, array $data): bool
 
         $this->save($cart);
 
-        $this->fireEvent('updated', $item);
+        $this->fireEvent('Updated', 'item', $item);
 
         return true;
     }
@@ -303,7 +287,7 @@ public function remove($id)
     {
         $cart = $this->getContent();
 
-        if ($this->fireEvent('removing', $id) === false) {
+        if ($this->fireEvent('Removing', 'item', $id) === false) {
             return false;
         }
 
@@ -311,32 +295,40 @@ public function remove($id)
 
         $this->save($cart);
 
-        $this->fireEvent('removed', $id);
+        $this->fireEvent('Removed', 'item', $id);
+
+        return true;
+    }
+
+    public function clear()
+    {
+        if ($this->fireEvent('Clearing') === false) {
+            return false;
+        }
+
+        $this->session->clear();
+
+        $this->fireEvent('Cleared');
+
+        return true;
+    }
+
+    public function clearItems()
+    {
+        if ($this->fireEvent('Clearing') === false) {
+            return false;
+        }
+
+        $this->session->clearItems();
+
+        $this->fireEvent('Cleared');
 
         return true;
     }
 
     /**
-     * clear cart
+     * Adds a condition to the cart
-     *
-     * @return bool
      */
-    public function clear()
-    {
-        if ($this->fireEvent('clearing') === false) {
-            return false;
-        }
-
-        $this->session->put(
-            $this->sessionKeyCartItems,
-            []
-        );
-
-        $this->fireEvent('cleared');
-
-        return true;
-    }
-
     /**
      * Adds a condition to the cart
      *
@@ -366,7 +358,9 @@ public function condition(array|CartCondition $condition): self
 
         $conditions->put($condition->getName(), $condition);
 
-        $conditions = $conditions->sortBy(function ($condition, $key) {
+        $conditions = $conditions->reject(function ($condition) {
+            return empty($condition);
+        })->sortBy(function ($condition, $key) {
             return $condition->getOrder();
         });
 
@@ -378,11 +372,34 @@ public function condition(array|CartCondition $condition): self
     /**
      * get conditions applied on the cart
      *
-     * @return CartConditionCollection
+     * @param  bool  $active  - If true, only conditions actually applied on the cart are returned
      */
-    public function getConditions()
+    public function getConditions(bool $array = false, bool $active = false): CartConditionCollection|array
     {
-        return new CartConditionCollection($this->session->get($this->sessionKeyCartConditions));
+        $conditions = new CartConditionCollection($this->session->getConditions());
+
+        $conditions = $conditions->reject(function ($condition) {
+            return empty($condition);
+        })
+            ->transform(function ($condition) {
+                return $condition instanceof CartCondition ? $condition : new CartCondition($condition);
+            });
+
+        if ($active) {
+            return $conditions->filter(function (CartCondition $condition) {
+                $amount = $condition->getTarget() == 'subtotal' ? $this->getSubTotal(false) : $this->getTotal();
+
+                return $condition->getMinimum() === null || $condition->getMinimum() <= $amount;
+            })->filter(function (CartCondition $condition) {
+                $amount = $condition->getTarget() == 'subtotal' ? $this->getSubTotal(false) : $this->getTotal();
+
+                return $condition->getMaximum() === null || $condition->getMaximum() >= $amount;
+            });
+        }
+
+        return $array ? $conditions->map(function (CartCondition $condition) {
+            return $condition->toArray();
+        })->toArray() : $conditions;
     }
 
     /**
@@ -411,12 +428,8 @@ public function getConditionsByType($type)
 
     /**
      * Remove all the condition with the $type specified
-     * Please Note that this will only remove condition added on cart bases, not those conditions added
-     * specifically on an per item bases
-     *
-     * @return $this
      */
-    public function removeConditionsByType($type)
+    public function removeConditionsByType(string $type)
     {
         $this->getConditionsByType($type)->each(function ($condition) {
             $this->removeCartCondition($condition->getName());
@@ -424,12 +437,7 @@ public function removeConditionsByType($type)
     }
 
     /**
-     * removes a condition on a cart by condition name,
+     * Remove a condition from the cart
-     * this can only remove conditions that are added on cart bases not conditions that are added on an item/product.
-     * If you wish to remove a condition that has been added for a specific item/product, you may
-     * use the removeItemCondition(itemId, conditionName) method instead.
-     *
-     * @return void
      */
     public function removeCartCondition($conditionName)
     {
@@ -519,10 +527,7 @@ public function clearItemConditions($itemId)
      */
     public function clearCartConditions(): void
     {
-        $this->session->put(
+        $this->session->putConditions([]);
-            $this->sessionKeyCartConditions,
-            []
-        );
     }
 
     /**
@@ -556,14 +561,10 @@ public function getSubTotalWithoutConditions($formatted = true)
         return Helpers::formatValue(floatval($sum), $formatted, $this->config);
     }
 
-    /**
-     * get cart sub total
-     *
-     * @param  bool  $formatted
-     */
     public function getSubTotal($formatted = true): int|float|string
     {
         $subTotal = 0.00;
+
         // add all the items together with conditions applied
         $subTotalSum = $this->getContent()->sum(function (ItemCollection $item) {
             return $item->getPriceSumWithConditions(false);
@@ -575,6 +576,12 @@ public function getSubTotal($formatted = true): int|float|string
             ->filter(function (CartCondition $condition) {
                 return $condition->getTarget() === 'subtotal';
             })
+            ->filter(function (CartCondition $condition) use ($subTotalSum) {
+                return $condition->getMinimum() === null || $condition->getMinimum() <= $subTotalSum;
+            })
+            ->filter(function (CartCondition $condition) use ($subTotalSum) {
+                return $condition->getMaximum() === null || $condition->getMaximum() >= $subTotalSum;
+            })
             ->sortBy(function (CartCondition $condition) {
                 return $condition->getOrder();
             });
@@ -607,6 +614,15 @@ public function getTotal(): int|float
         $conditionsForTotal = $this->getConditions()
             ->filter(function (CartCondition $condition) {
                 return $condition->getTarget() === 'total';
+            })
+            ->filter(function (CartCondition $condition) use ($subTotal) {
+                return $condition->getMinimum() === null || $condition->getMinimum() <= $subTotal;
+            })
+            ->filter(function (CartCondition $condition) use ($subTotal) {
+                return $condition->getMaximum() === null || $condition->getMaximum() >= $subTotal;
+            })
+            ->sortBy(function (CartCondition $condition) {
+                return $condition->getOrder();
             });
 
         // if no conditions were added, just return the sub total
@@ -614,10 +630,14 @@ public function getTotal(): int|float
             return Helpers::formatValue($subTotal, $this->config['format_numbers'], $this->config);
         }
 
-        $conditionsForTotal->each(function (CartCondition $condition) use ($subTotal, &$total) {
+        $index = 0;
-            $toBeCalculated = $total > 0 ? $total : $subTotal;
+
+        $conditionsForTotal->each(function (CartCondition $condition) use ($subTotal, &$total, &$index) {
+            $toBeCalculated = ($index > 0) ? $total : $subTotal;
 
             $total = $condition->applyCondition($toBeCalculated);
+
+            $index++;
         });
 
         return Helpers::formatValue($total, $this->config['format_numbers'], $this->config);
@@ -665,24 +685,16 @@ public function getTotalQuantity()
         return $count;
     }
 
-    /**
+    public function getContent(): CartCollection
-     * get the cart
-     *
-     * @return CartCollection
-     */
-    public function getContent()
     {
-        return (new CartCollection($this->session->get($this->sessionKeyCartItems)))->reject(function ($item) {
+        return (new CartCollection($this->session->getItems()))->transform(function ($item) {
+            return $item instanceof ItemCollection ? $item : new ItemCollection($item, $this->config);
+        })->reject(function ($item) {
             return ! ($item instanceof ItemCollection);
         });
     }
 
-    /**
+    public function isEmpty($test = null)
-     * check if cart is empty
-     *
-     * @return bool
-     */
-    public function isEmpty()
     {
         return $this->getContent()->isEmpty();
     }
@@ -728,7 +740,7 @@ protected function validate($item)
      */
     protected function addItem($id, $item)
     {
-        if ($this->fireEvent('adding', $item) === false) {
+        if ($this->fireEvent('Adding', 'item', $item) === false) {
             return false;
         }
 
@@ -738,7 +750,7 @@ protected function addItem($id, $item)
 
         $this->save($cart);
 
-        $this->fireEvent('added', $item);
+        $this->fireEvent('Added', 'item', $item);
 
         return true;
     }
@@ -750,7 +762,7 @@ protected function addItem($id, $item)
      */
     protected function save($cart)
     {
-        $this->session->put($this->sessionKeyCartItems, $cart);
+        $this->session->putItems($cart);
     }
 
     /**
@@ -758,7 +770,7 @@ protected function save($cart)
      */
     protected function saveConditions($conditions)
     {
-        $this->session->put($this->sessionKeyCartConditions, $conditions);
+        $this->session->putConditions($conditions);
     }
 
     /**
@@ -829,12 +841,19 @@ public function setDecimals($decimals)
         $this->decimals = $decimals;
     }
 
-    /**
+    protected function fireEvent($name, $type = null, $data = null)
-     * @return mixed
-     */
-    protected function fireEvent($name, $value = [])
     {
-        return $this->events->dispatch($this->getInstanceName() . '.' . $name, array_values([$value, $this]), true);
+        $eventData = [
+            'session_key' => $this->session->sessionKey,
+            'session_driver' => $this->session->driver,
+            'session_model' => $this->session->getSessionModel(),
+        ];
+
+        if ($type) {
+            $eventData[$type] = $data;
+        }
+
+        return $this->events->dispatch('LaravelCart.' . $name, array_values([$eventData, $this]), true);
     }
 
     /**

src/CartCondition.php

@@ -8,15 +8,12 @@
 
 class CartCondition
 {
-    /**
-     * @var array
-     */
     private $args;
 
     /**
      * the parsed raw value of the condition
      */
-    public $parsedRawValue = 0;
+    private $parsedRawValue = 0;
 
     /**
      * @param  array  $args  (name, type, target, value)
@@ -65,6 +62,22 @@ public function getType()
         return $this->args['type'];
     }
 
+    /**
+     * Get the minimum value of this condition
+     */
+    public function getMinimum(): int|float|null
+    {
+        return $this->args['minimum'] ?? null;
+    }
+
+    /**
+     * Get the maximum value of this condition
+     */
+    public function getMaximum(): int|float|null
+    {
+        return $this->args['maximum'] ?? null;
+    }
+
     /**
      * get the additional attributes of a condition
      *
@@ -253,4 +266,9 @@ protected function validate($args)
             throw new InvalidConditionException($validator->messages()->first());
         }
     }
+
+    public function toArray(): array
+    {
+        return $this->args;
+    }
 }

src/CartServiceProvider.php

@@ -35,24 +35,19 @@ public function register()
         $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'cart');
 
         $this->app->singleton('cart', function ($app) {
-            $storageClass = config('cart.storage');
+            $config = config('cart');
-            $eventsClass = config('cart.events');
+            $events = $app['events'];
 
-            $storage = $storageClass ? new $storageClass : $app['session'];
+            $storage = $config['driver'] === 'database'
-            $events = $eventsClass ? new $eventsClass : $app['events'];
+                ? new $config['storage']['database']['model']
-            $instanceName = 'cart';
+                : $app['session'];
-
-            // default session or cart identifier. This will be overridden when calling Cart::session($sessionKey)->add() etc..
-            // like when adding a cart for a specific user name. Session Key can be string or maybe a unique identifier to bind a cart
-            // to a specific user, this can also be a user ID
-            $session_key = '4yTlTDKu3oJOfzD';
 
             return new Cart(
                 $storage,
                 $events,
-                $instanceName,
+                'cart',
-                $session_key,
+                session()->getId(),
-                config('cart')
+                $config
             );
         });
     }

src/CartSession.php

@@ -0,0 +1,174 @@
+<?php
+
+namespace Wearepixel\Cart;
+
+class CartSession
+{
+    private $customStorage;
+
+    public $sessionKey;
+    public $driver;
+
+    private $session;
+
+    private $sessionId = null;
+    private $itemsKey = null;
+    private $conditionsKey = null;
+
+    public function __construct($session, $sessionKey, $config)
+    {
+        $this->sessionKey = $sessionKey;
+        $this->driver = $config['driver'];
+
+        if ($this->driver === 'session') {
+            $this->customStorage = false;
+            $this->session = $session;
+            $this->itemsKey = $this->sessionKey . '_cart_items';
+            $this->conditionsKey = $this->sessionKey . '_cart_conditions';
+        } elseif ($this->driver === 'database') {
+            $this->customStorage = true;
+
+            $this->sessionId = $config['storage']['database']['id'];
+            $this->itemsKey = $config['storage']['database']['items'];
+            $this->conditionsKey = $config['storage']['database']['conditions'];
+
+            $this->session = $session->firstOrNew([$this->sessionId => $this->sessionKey]);
+
+            $this->session[$this->itemsKey] = $this->session[$this->itemsKey] ?? [];
+            $this->session[$this->conditionsKey] = $this->session[$this->conditionsKey] ?? [];
+        }
+    }
+
+    public function isInternalSession($session)
+    {
+        return in_array(is_object($session) ? get_class($session) : $session, [
+            'Illuminate\Session\SessionManager',
+            'Wearepixel\Cart\Tests\Helpers\SessionMock',
+        ]);
+    }
+
+    public function getSessionKey()
+    {
+        return $this->sessionKey;
+    }
+
+    public function setSessionKey(string $sessionKey)
+    {
+        // set the session key and then update the session
+        $this->sessionKey = $sessionKey;
+
+        if ($this->driver == 'session') {
+            $session = $this->session->get($this->itemsKey);
+            $sessionKey = $this->session->get($this->conditionsKey);
+
+            $this->session->forget($this->itemsKey);
+            $this->session->forget($this->conditionsKey);
+
+            $this->itemsKey = $this->sessionKey . '_cart_items';
+            $this->conditionsKey = $this->sessionKey . '_cart_conditions';
+
+            $this->session->put($this->itemsKey, $session);
+            $this->session->put($this->conditionsKey, $sessionKey);
+        } elseif ($this->driver == 'database') {
+            $this->session[$this->sessionId] = $sessionKey;
+            $this->session->save();
+        }
+    }
+
+    public function has($key)
+    {
+        return $this->session->has($key) ?? $this->session;
+    }
+
+    public function getItems()
+    {
+        return $this->driver == 'session' ? $this->session->get($this->itemsKey) : $this->session[$this->itemsKey];
+    }
+
+    public function getConditions()
+    {
+        return $this->driver == 'session' ? $this->session->get($this->conditionsKey) : $this->session[$this->conditionsKey];
+    }
+
+    public function putItems($value)
+    {
+        if ($this->driver == 'session') {
+            return $this->session->put($this->itemsKey, $value);
+        }
+
+        // convert any conditions to arrays
+        $value = is_array($value) ? $value : $value->toArray();
+
+        foreach ($value as $key => $item) {
+            if ($item['conditions']) {
+                if (is_array($item['conditions'])) {
+                    $value[$key]['conditions'] = collect($item['conditions'])->map(function ($condition) {
+                        return $condition->toArray();
+                    });
+                } else {
+                    $value[$key]['conditions'] = $item['conditions']->toArray();
+                }
+            }
+        }
+
+        $this->session[$this->itemsKey] = $value;
+        $this->session->save();
+
+        return $this->session;
+    }
+
+    public function putConditions($value)
+    {
+        if ($this->driver == 'session') {
+            return $this->session->put($this->conditionsKey, $value);
+        }
+
+        if (! empty($value)) {
+            $value = $value->mapWithKeys(function ($condition) {
+                return [$condition->getName() => $condition->toArray()];
+            });
+        }
+
+        $this->session[$this->conditionsKey] = $value;
+        $this->session->save();
+
+        return $this->session;
+    }
+
+    public function clearItems()
+    {
+        if ($this->driver == 'session') {
+            $this->session->forget($this->itemsKey);
+
+            return true;
+        }
+
+        $this->session[$this->itemsKey] = [];
+
+        return $this->session->save();
+    }
+
+    public function clear()
+    {
+        if ($this->driver == 'session') {
+            $this->session->forget($this->itemsKey);
+            $this->session->forget($this->conditionsKey);
+
+            return true;
+        }
+
+        $deleted = $this->session->delete();
+
+        $this->session = [
+            $this->itemsKey => [],
+            $this->conditionsKey => [],
+        ];
+
+        return $deleted;
+    }
+
+    public function getSessionModel()
+    {
+        return $this->session;
+    }
+}

src/ItemCollection.php

@@ -91,7 +91,37 @@ public function getConditions()
             return [];
         }
 
-        return $this['conditions'];
+        $conditionsArray = [];
+
+        $conditions = $this['conditions'];
+
+        // check if we're already an array of CartConditions
+        foreach ($conditions as $key => $condition) {
+            if ($condition instanceof CartCondition) {
+                return $conditions;
+            }
+        }
+
+        $hasSubArray = false;
+
+        foreach ($conditions as $key => $condition) {
+            if (is_array($condition) && ! $condition instanceof CartCondition) {
+                $hasSubArray = true;
+                $conditionsArray[] = new CartCondition($condition);
+            } elseif ($condition instanceof CartCondition) {
+                $conditionsArray[] = $condition;
+            }
+        }
+
+        if (! $hasSubArray) {
+            if ($conditions instanceof CartCondition) {
+                return $conditions;
+            }
+
+            $conditionsArray[] = new CartCondition($conditions);
+        }
+
+        return $conditionsArray;
     }
 
     /**
@@ -108,14 +138,14 @@ public function getPriceWithConditions($formatted = true)
         $processed = 0;
 
         if ($this->hasConditions()) {
-            if (is_array($this->conditions)) {
+            if (is_array($this->getConditions())) {
-                foreach ($this->conditions as $condition) {
+                foreach ($this->getConditions() as $condition) {
                     ($processed > 0) ? $toBeCalculated = $newPrice : $toBeCalculated = $originalPrice;
                     $newPrice = $condition->applyCondition($toBeCalculated);
                     $processed++;
                 }
             } else {
-                $newPrice = $this['conditions']->applyCondition($originalPrice);
+                $newPrice = $this->getConditions()->applyCondition($originalPrice);
             }
 
             return Helpers::formatValue($newPrice, $formatted, $this->config);

tests/Helpers/ConfigConditionsMock.php

@@ -4,6 +4,5 @@
     'format_numbers' => true,
     'decimals' => 2,
     'dec_point' => '.',
-    'thousands_sep' => ',',
+    'driver' => 'session',
-    'use_cents' => false,
 ];

tests/Helpers/ConfigDatabaseMock.php

@@ -0,0 +1,17 @@
+<?php
+
+return [
+    'format_numbers' => true,
+    'decimals' => 2,
+    'round_mode' => 'up',
+    'driver' => 'database',
+    'storage' => [
+        'session',
+        'database' => [
+            'model' => \Wearepixel\Cart\Tests\Helpers\MockCartModel::class,
+            'id' => 'session_id',
+            'items' => 'items',
+            'conditions' => 'conditions',
+        ],
+    ],
+];

tests/Helpers/ConfigMock.php

@@ -4,4 +4,5 @@
     'format_numbers' => true,
     'decimals' => 2,
     'round_mode' => 'up',
+    'driver' => 'session',
 ];

tests/Helpers/ConfigMockOtherFormat.php

@@ -4,5 +4,5 @@
     'format_numbers' => false,
     'decimals' => 3,
     'dec_point' => ',',
-    'thousands_sep' => '.',
+    'driver' => 'session',
 ];

tests/Helpers/MockCartModel.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Wearepixel\Cart\Tests\Helpers;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MockCartModel extends Model
+{
+    protected $fillable = [
+        'session_id',
+        'items',
+        'conditions',
+    ];
+
+    public $timestamps = false;
+
+    protected $casts = [
+        'items' => 'array',
+        'conditions' => 'array',
+    ];
+
+    protected $table = 'carts';
+}

tests/Helpers/SessionMock.php

@@ -20,4 +20,9 @@ public function put($key, $value)
     {
         $this->session[$key] = $value;
     }
+
+    public function forget($key)
+    {
+        unset($this->session[$key]);
+    }
 }

tests/Pest.php

@@ -1,29 +1,5 @@
 <?php
 
-/*
+use Tests\TestCase;
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "pest()" function to bind a different classes or traits.
-|
-*/
 
-// pest()->extend(Tests\TestCase::class)->in('Feature');
+uses(TestCase::class)->in(__DIR__);
-
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
-
-expect()->extend('toBeOne', function () {
-    return $this->toBe(1);
-});

tests/TestCase.php

@@ -1,10 +1,52 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
+use Illuminate\Events\Dispatcher;
+use Illuminate\Container\Container;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Capsule\Manager as DB;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
-abstract class TestCase extends BaseTestCase
+class TestCase extends BaseTestCase
 {
-    //
+    protected DB $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Create a Laravel container
+        $container = Container::getInstance();
+        $dispatcher = new Dispatcher;
+
+        // Setup Capsule (Eloquent ORM)
+        $this->db = new DB($container);
+        $this->db->addConnection([
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
+        $this->db->setAsGlobal();
+        $this->db->bootEloquent();
+        $this->db->getConnection()->setEventDispatcher($dispatcher);
+
+        // Run migrations (optional, for testing models)
+        $this->migrateDatabase();
+    }
+
+    protected function migrateDatabase()
+    {
+        $schema = $this->db->schema();
+
+        $schema->create('carts', function (Blueprint $table) {
+            $table->id();
+            $table->string('session_id');
+            $table->text('items');
+            $table->text('conditions');
+            $table->timestamps();
+        });
+    }
 }

tests/Unit/CartConditionsTest.php

@@ -2,6 +2,7 @@
 
 use Wearepixel\Cart\Cart;
 use Wearepixel\Cart\CartCondition;
+use Wearepixel\Cart\CartConditionCollection;
 use Wearepixel\Cart\Tests\Helpers\SessionMock;
 
 beforeEach(function () {
@@ -21,7 +22,168 @@
     Mockery::close();
 });
 
+describe('conditions', function () {
+    test('can be completely cleared', function () {
+        $siteWideDiscount = new CartCondition([
+            'name' => 'Site Wide Discount',
+            'type' => 'discount',
+            'target' => 'total',
+            'value' => '-5%',
+        ]);
+
+        $giftCard = new CartCondition([
+            'name' => 'Gift Card',
+            'type' => 'gift_card',
+            'target' => 'total',
+            'value' => '-25',
+        ]);
+
+        $itemCondition = new CartCondition([
+            'name' => 'Item Discount',
+            'type' => 'discount',
+            'value' => '-5%',
+        ]);
+
+        $item = [
+            'id' => 1,
+            'name' => 'Backpack',
+            'price' => 168.72,
+            'quantity' => 1,
+            'attributes' => [],
+            'conditions' => [$itemCondition],
+        ];
+
+        $this->cart->add($item);
+
+        $this->cart->condition([$siteWideDiscount, $giftCard]);
+
+        expect($this->cart->getConditions()->count())->toEqual(2, 'Cart should have two conditions');
+        expect($this->cart->get(1)['conditions'])->toHaveCount(1, 'Cart should have one condition');
+
+        $this->cart->clearAllConditions();
+
+        expect($this->cart->getConditions()->count())->toEqual(0, 'Cart should have no conditions now');
+        expect($this->cart->get(1)['conditions'])->toHaveCount(0, 'Cart items should have no conditions now');
+    });
+
+    test('can be converted to array', function () {
+        $condition = new CartCondition([
+            'name' => 'Site Wide Discount',
+            'type' => 'discount',
+            'target' => 'total',
+            'value' => '-5%',
+        ]);
+
+        $this->cart->condition($condition);
+
+        $conditions = $this->cart->getConditions(true);
+
+        expect($conditions)->toHaveCount(1, 'Cart should have one condition');
+        expect($conditions['Site Wide Discount'])->toEqual([
+            'name' => 'Site Wide Discount',
+            'type' => 'discount',
+            'target' => 'total',
+            'value' => '-5%',
+            'order' => 1,
+        ]);
+    });
+
+    test('can be removed by name', function () {
+        $conditionOne = new CartCondition([
+            'name' => '5% Site Wide Sale',
+            'type' => 'sale',
+            'value' => '-5%',
+        ]);
+
+        $conditionTwo = new CartCondition([
+            'name' => 'Mother\'s Day Gift Pack',
+            'type' => 'promo',
+            'value' => '-25',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Body Scrub Kit',
+            'price' => 100,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition([$conditionOne, $conditionTwo]);
+
+        // let's very first the item has 2 conditions in it
+        expect($this->cart->getConditions())->toHaveCount(2, 'The item should have two conditions');
+
+        // now let's remove a condition on that item using the condition name
+        $this->cart->removeCartCondition('5% Site Wide Sale');
+
+        // now we should have only 1 condition left on that item
+        expect($this->cart->getConditions())->toHaveCount(1, 'Item should have one condition left');
+        expect($this->cart->getConditions()->first()->getName())->toEqual('Mother\'s Day Gift Pack');
+    });
+});
+
 describe('cart level conditions', function () {
+    test('can get conditions', function () {
+        $this->cart->add([
+            'id' => 456,
+            'name' => 'Leather Shoes',
+            'price' => 129.99,
+            'quantity' => 1,
+        ]);
+
+        $condition = new CartCondition([
+            'name' => '$5 Discount',
+            'type' => 'tax',
+            'target' => 'subtotal',
+            'value' => '-5',
+        ]);
+
+        $this->cart->condition($condition);
+
+        $conditions = $this->cart->getConditions();
+
+        expect($conditions)->toHaveCount(1, 'Cart should have one condition');
+        expect($conditions)->toBeInstanceOf(CartConditionCollection::class);
+    });
+
+    test('can get conditions by name', function () {
+        $this->cart->add([
+            'id' => 456,
+            'name' => 'Leather Shoes',
+            'price' => 129.99,
+            'quantity' => 1,
+        ]);
+
+        $conditionOne = new CartCondition([
+            'name' => '$5 Discount',
+            'type' => 'tax',
+            'target' => 'subtotal',
+            'value' => '-5',
+        ]);
+
+        $conditionTwo = new CartCondition([
+            'name' => '5% Off',
+            'type' => 'tax',
+            'target' => 'subtotal',
+            'value' => '-5%',
+        ]);
+
+        $this->cart->condition($conditionOne);
+        $this->cart->condition($conditionTwo);
+
+        $conditions = $this->cart->getConditions();
+
+        expect($conditions)->toHaveCount(2, 'Cart should have two conditions');
+        expect($conditions)->toBeInstanceOf(CartConditionCollection::class);
+
+        $condition = $this->cart->getCondition('5% Off');
+
+        expect($condition)->toBeInstanceOf(CartCondition::class);
+        expect($condition->getName())->toEqual('5% Off');
+        expect($condition->getValue())->toEqual('-5%');
+    });
+
     test('can discount the subtotal by dollar amount', function () {
         $this->cart->add([
             'id' => 456,
@@ -792,40 +954,6 @@
         expect($giftCard->getCalculatedValue())->toEqual(0, 'Gift Card value should be 0');
     });
 
-    test('can be cleared', function () {
-        $siteWideDiscount = new CartCondition([
-            'name' => 'Site Wide Discount',
-            'type' => 'discount',
-            'target' => 'total',
-            'value' => '-5%',
-        ]);
-
-        $giftCard = new CartCondition([
-            'name' => 'Gift Card',
-            'type' => 'gift_card',
-            'target' => 'total',
-            'value' => '-25',
-        ]);
-
-        $item = [
-            'id' => 1,
-            'name' => 'Backpack',
-            'price' => 168.72,
-            'quantity' => 1,
-            'attributes' => [],
-        ];
-
-        $this->cart->add($item);
-
-        $this->cart->condition([$siteWideDiscount, $giftCard]);
-
-        expect($this->cart->getConditions()->count())->toEqual(2, 'Cart should have two conditions');
-
-        $this->cart->clearCartConditions();
-
-        expect($this->cart->getConditions()->count())->toEqual(0, 'Cart should have no conditions now');
-    });
-
     test('calculate the subtotal correctly when one condition makes it $0, and the other adds $10', function () {
         $this->cart->add([
             [
@@ -915,10 +1043,218 @@
         expect($this->cart->getSubTotal())->toEqual(10.00, 'Cart should have sub total of 10.00');
         expect($this->cart->getTotal())->toEqual(10.00, 'Cart should have a total of 10.00');
     });
+
+    test('can activate a dollar discount when a minimum amount is met', function () {
+        $condition = new CartCondition([
+            'name' => 'Get $10 off when you spend $100',
+            'type' => 'target',
+            'target' => 'total',
+            'value' => '-10',
+            'minimum' => '100',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition($condition);
+
+        expect($this->cart->getTotal())->toEqual(90, 'Cart should have total of 90');
+
+        $this->cart->clearItems();
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 2,
+            'attributes' => [],
+        ]);
+
+        expect($this->cart->getTotal())->toEqual(170, 'Cart should have total of 170');
+    });
+
+    test('can activate a percentage discount when a minimum amount is met', function () {
+        $condition = new CartCondition([
+            'name' => 'Get 10% off when you spend $100',
+            'type' => 'target',
+            'target' => 'total',
+            'value' => '-10%',
+            'minimum' => '100',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition($condition);
+
+        expect($this->cart->getTotal())->toEqual(90, 'Cart should have total of 90');
+
+        $this->cart->clearItems();
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 2,
+            'attributes' => [],
+        ]);
+
+        expect($this->cart->getTotal())->toEqual(162, 'Cart should have total of 162');
+    });
+
+    test('can remove a dollar value condition when a maximum is met', function () {
+        $condition = new CartCondition([
+            'name' => 'Shipping',
+            'type' => 'target',
+            'target' => 'total',
+            'value' => '18',
+            'maximum' => '160',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition($condition);
+
+        expect($this->cart->getTotal())->toEqual(108, 'Cart should have total of 108');
+
+        $this->cart->clear();
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 2,
+            'attributes' => [],
+        ]);
+
+        expect($this->cart->getTotal())->toEqual(180, 'Cart should have total of 180');
+    });
+
+    test('can remove a percentage condition when a maximum is met', function () {
+        $condition = new CartCondition([
+            'name' => 'Low Cart Tax',
+            'type' => 'target',
+            'target' => 'total',
+            'value' => '10%',
+            'maximum' => '140',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition($condition);
+
+        expect($this->cart->getTotal())->toEqual(99, 'Cart should have total of 99');
+
+        $this->cart->clear();
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 2,
+            'attributes' => [],
+        ]);
+
+        expect($this->cart->getTotal())->toEqual(180, 'Cart should have total of 180');
+    });
+
+    test('return cart conditions only when they are active', function () {
+        $condition = new CartCondition([
+            'name' => 'Get $10 off when you spend $100',
+            'type' => 'target',
+            'target' => 'total',
+            'value' => '-10',
+            'minimum' => '100',
+        ]);
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 1,
+            'attributes' => [],
+        ]);
+
+        $this->cart->condition($condition);
+
+        expect($this->cart->getConditions(active: true))->toHaveCount(0, 'Cart should have 0 conditions');
+
+        $this->cart->clearItems();
+
+        $this->cart->add([
+            'id' => 1,
+            'name' => 'Apple iPhone 15',
+            'price' => 90,
+            'quantity' => 2,
+            'attributes' => [],
+        ]);
+
+        expect($this->cart->getConditions(active: true))->toHaveCount(1, 'Cart should have 1 condition');
+    });
+
+    test('can be removed by condition name', function () {
+        $shipping = new CartCondition([
+            'name' => 'Shipping',
+            'type' => 'shipping',
+            'target' => 'total',
+            'value' => '12',
+        ]);
+
+        $tax = new CartCondition([
+            'name' => 'Tax',
+            'type' => 'tax',
+            'target' => 'total',
+            'value' => '2.50',
+        ]);
+
+        $item = [
+            'id' => 456,
+            'name' => 'Sample Item 1',
+            'price' => 100,
+            'quantity' => 1,
+            'attributes' => [],
+        ];
+
+        $this->cart->add($item);
+
+        $this->cart->condition([$shipping, $tax]);
+
+        // let's prove first we have now two conditions in the cart
+        expect($this->cart->getConditions()->count())->toEqual(2, 'Cart should have two conditions');
+
+        // now let's remove a specific condition by condition name
+        $this->cart->removeCartCondition('Tax');
+
+        // cart should have now only 1 condition
+        expect($this->cart->getConditions()->count())->toEqual(1, 'Cart should have one condition');
+        expect($this->cart->getConditions()->first()->getName())->toEqual('Shipping');
+    });
 });
 
 describe('item level conditions', function () {
-    test('can add an item with a condition', function () {
+    test('can be added to an item', function () {
         $saleCondition = new CartCondition([
             'name' => '5% Discount',
             'type' => 'sale',
@@ -942,6 +1278,41 @@
         expect($this->cart->getTotal())->toEqual(18, 'Cart should have total of 18');
     });
 
+    test('can be removed by name', function () {
+        $itemCondition1 = new CartCondition([
+            'name' => '5% Site Wide Sale',
+            'type' => 'sale',
+            'value' => '-5%',
+        ]);
+
+        $itemCondition2 = new CartCondition([
+            'name' => 'Mother\'s Day Gift Pack',
+            'type' => 'promo',
+            'value' => '-25',
+        ]);
+
+        $item = [
+            'id' => 1,
+            'name' => 'Body Scrub Kit',
+            'price' => 100,
+            'quantity' => 1,
+            'attributes' => [],
+            'conditions' => [$itemCondition1, $itemCondition2],
+        ];
+
+        $this->cart->add($item);
+
+        // let's very first the item has 2 conditions in it
+        expect($this->cart->get(1)['conditions'])->toHaveCount(2, 'The item should have two conditions');
+
+        // now let's remove a condition on that item using the condition name
+        $this->cart->removeItemCondition(1, '5% Site Wide Sale');
+
+        // now we should have only 1 condition left on that item
+        expect($this->cart->get(1)['conditions'])->toHaveCount(1, 'Item should have one condition left');
+        expect($this->cart->get(1)['conditions'][1]->getName())->toEqual('Mother\'s Day Gift Pack');
+    });
+
     test('can add item with multiple negative item conditions', function () {
         $saleCondition = new CartCondition([
             'name' => '5% Sale',
@@ -1082,110 +1453,36 @@
         expect($this->cart->get(1)->getPriceSumWithConditions())->toEqual(0.00, "The item's price should be prevented from going below zero.");
     });
 
-    // test('get cart condition by condition name', function () {
+    test('can be removed by condition name', function () {
-    //     $itemCondition1 = new CartCondition([
+        $heavyItemSurcharge = new CartCondition([
-    //         'name' => 'SALE 5%',
+            'name' => 'Heavy Item Surcharge',
-    //         'type' => 'sale',
+            'type' => 'surcharge',
-    //         'target' => 'total',
+            'value' => '10',
-    //         'value' => '-5%',
+        ]);
-    //     ]);
-    //     $itemCondition2 = new CartCondition([
-    //         'name' => 'Item Gift Pack 25.00',
-    //         'type' => 'promo',
-    //         'target' => 'total',
-    //         'value' => '-25',
-    //     ]);
 
-    //     $item = [
+        $tax = new CartCondition([
-    //         'id' => 456,
+            'name' => 'Tax',
-    //         'name' => 'Sample Item 1',
+            'type' => 'tax',
-    //         'price' => 100,
+            'value' => '10%',
-    //         'quantity' => 1,
+        ]);
-    //         'attributes' => [],
-    //     ];
 
-    //     $this->cart->add($item);
+        $item = [
+            'id' => 12,
+            'name' => 'Beer (1 box)',
+            'price' => 410.60,
+            'quantity' => 1,
+            'attributes' => [],
+            'conditions' => [$heavyItemSurcharge, $tax],
+        ];
 
-    //     $this->cart->condition([$itemCondition1, $itemCondition2]);
+        $this->cart->add($item);
 
-    //     // get a condition applied on cart by condition name
+        expect($this->cart->get(12)['conditions'])->toHaveCount(2, 'Item should have two conditions');
-    //     $condition = $this->cart->getCondition($itemCondition1->getName());
 
-    //     expect('SALE 5%')->toEqual($condition->getName());
+        $this->cart->removeItemCondition(12, 'Tax');
-    //     expect('total')->toEqual($condition->getTarget());
-    //     expect('sale')->toEqual($condition->getType());
-    //     expect('-5%')->toEqual($condition->getValue());
-    // });
 
-    // test('remove cart condition by condition name', function () {
+        expect($this->cart->get(12)['conditions'])->toHaveCount(1, 'Item should have one condition');
-    //     $itemCondition1 = new CartCondition([
+    });
-    //         'name' => 'SALE 5%',
-    //         'type' => 'sale',
-    //         'target' => 'total',
-    //         'value' => '-5%',
-    //     ]);
-    //     $itemCondition2 = new CartCondition([
-    //         'name' => 'Item Gift Pack 25.00',
-    //         'type' => 'promo',
-    //         'target' => 'total',
-    //         'value' => '-25',
-    //     ]);
-
-    //     $item = [
-    //         'id' => 456,
-    //         'name' => 'Sample Item 1',
-    //         'price' => 100,
-    //         'quantity' => 1,
-    //         'attributes' => [],
-    //     ];
-
-    //     $this->cart->add($item);
-
-    //     $this->cart->condition([$itemCondition1, $itemCondition2]);
-
-    //     // let's prove first we have now two conditions in the cart
-    //     expect($this->cart->getConditions()->count())->toEqual(2, 'Cart should have two conditions');
-
-    //     // now let's remove a specific condition by condition name
-    //     $this->cart->removeCartCondition('SALE 5%');
-
-    //     // cart should have now only 1 condition
-    //     expect($this->cart->getConditions()->count())->toEqual(1, 'Cart should have one condition');
-    //     expect($this->cart->getConditions()->first()->getName())->toEqual('Item Gift Pack 25.00');
-    // });
-
-    // test('remove item condition by condition name', function () {
-    //     $itemCondition1 = new CartCondition([
-    //         'name' => 'SALE 5%',
-    //         'type' => 'sale',
-    //         'value' => '-5%',
-    //     ]);
-    //     $itemCondition2 = new CartCondition([
-    //         'name' => 'Item Gift Pack 25.00',
-    //         'type' => 'promo',
-    //         'value' => '-25',
-    //     ]);
-
-    //     $item = [
-    //         'id' => 456,
-    //         'name' => 'Sample Item 1',
-    //         'price' => 100,
-    //         'quantity' => 1,
-    //         'attributes' => [],
-    //         'conditions' => [$itemCondition1, $itemCondition2],
-    //     ];
-
-    //     $this->cart->add($item);
-
-    //     // let's very first the item has 2 conditions in it
-    //     expect($this->cart->get(456)['conditions'])->toHaveCount(2, 'Item should have two conditions');
-
-    //     // now let's remove a condition on that item using the condition name
-    //     $this->cart->removeItemCondition(456, 'SALE 5%');
-
-    //     // now we should have only 1 condition left on that item
-    //     expect($this->cart->get(456)['conditions'])->toHaveCount(1, 'Item should have one condition left');
-    // });
 
     // test('remove item condition by condition name scenario two', function () {
     //     // NOTE: in this scenario, we will add the conditions not in array format
@@ -1556,50 +1853,4 @@
     //     expect($this->cart->getConditions()->first()->getName())->toEqual('Item Gift Pack 20');
     //     expect($this->cart->getConditions()->last()->getName())->toEqual('TAX');
     // });
-
-});
-
-describe('conditions', function () {
-    test('can be completely cleared', function () {
-        $siteWideDiscount = new CartCondition([
-            'name' => 'Site Wide Discount',
-            'type' => 'discount',
-            'target' => 'total',
-            'value' => '-5%',
-        ]);
-
-        $giftCard = new CartCondition([
-            'name' => 'Gift Card',
-            'type' => 'gift_card',
-            'target' => 'total',
-            'value' => '-25',
-        ]);
-
-        $itemCondition = new CartCondition([
-            'name' => 'Item Discount',
-            'type' => 'discount',
-            'value' => '-5%',
-        ]);
-
-        $item = [
-            'id' => 1,
-            'name' => 'Backpack',
-            'price' => 168.72,
-            'quantity' => 1,
-            'attributes' => [],
-            'conditions' => [$itemCondition],
-        ];
-
-        $this->cart->add($item);
-
-        $this->cart->condition([$siteWideDiscount, $giftCard]);
-
-        expect($this->cart->getConditions()->count())->toEqual(2, 'Cart should have two conditions');
-        expect($this->cart->get(1)['conditions'])->toHaveCount(1, 'Cart should have one condition');
-
-        $this->cart->clearAllConditions();
-
-        expect($this->cart->getConditions()->count())->toEqual(0, 'Cart should have no conditions now');
-        expect($this->cart->get(1)['conditions'])->toHaveCount(0, 'Cart items should have no conditions now');
-    });
 });

tests/Unit/CartTest.php

@@ -689,3 +689,15 @@
     expect($this->cart->getTotalQuantity())->toBeInt('Return type should be INT');
     expect($this->cart->getTotalQuantity())->toEqual(12, 'Cart\'s quantity should be 4.');
 });
+
+test('can add to cart and then update the session key', function () {
+    $this->cart->add(1, 'Sample Item', 100.99, 2, []);
+
+    expect($this->cart->getContent()->count())->toEqual(1, 'Cart content should be 1');
+    expect($this->cart->getContent()->first()['id'])->toEqual(1, 'Item added has ID of 1 so first content ID should be 1');
+
+    $this->cart->setSessionKey('new_session_key');
+
+    expect($this->cart->getSessionKey())->toEqual('new_session_key', 'Session key should be updated to new_session_key');
+    expect($this->cart->getContent()->count())->toEqual(1, 'Cart content should still be 1');
+});

tests/Unit/CartTestEventsTest.php

@@ -9,9 +9,9 @@
     Mockery::close();
 });
 
-test('event cart created', function () {
+test('event cart Created', function () {
     $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
 
     $cart = new Cart(
         new SessionMock,
@@ -25,10 +25,10 @@
 });
 
 test('event cart adding', function () {
-    $events = Mockery::mock('Illuminate\Events\Dispatcher');
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->once()->with('cart.adding', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Adding', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->once()->with('cart.added', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Added', Mockery::type('array'), true);
 
     $cart = new Cart(
         new SessionMock,
@@ -44,10 +44,10 @@
 });
 
 test('event cart adding multiple times', function () {
-    $events = Mockery::mock('Illuminate\Events\Dispatcher');
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(2)->with('cart.adding', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(2)->with('LaravelCart.Adding', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(2)->with('cart.added', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(2)->with('LaravelCart.Added', Mockery::type('array'), true);
 
     $cart = new Cart(
         new SessionMock,
@@ -64,10 +64,10 @@
 });
 
 test('event cart adding multiple times scenario two', function () {
-    $events = Mockery::mock('Illuminate\Events\Dispatcher');
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.adding', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Adding', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.added', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Added', Mockery::type('array'), true);
 
     $items = [
         [
@@ -107,12 +107,12 @@
 });
 
 test('event cart remove item', function () {
-    $events = Mockery::mock('Illuminate\Events\Dispatcher');
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.adding', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Adding', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.added', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Added', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(1)->with('cart.removing', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(1)->with('LaravelCart.Removing', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(1)->with('cart.removed', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(1)->with('LaravelCart.Removed', Mockery::type('array'), true);
 
     $items = [
         [
@@ -154,12 +154,12 @@
 });
 
 test('event cart clear', function () {
-    $events = Mockery::mock('Illuminate\Events\Dispatcher');
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
-    $events->shouldReceive('dispatch')->once()->with('cart.created', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Created', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.adding', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Adding', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->times(3)->with('cart.added', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->times(3)->with('LaravelCart.Added', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->once()->with('cart.clearing', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Clearing', Mockery::type('array'), true);
-    $events->shouldReceive('dispatch')->once()->with('cart.cleared', Mockery::type('array'), true);
+    $events->shouldReceive('dispatch')->once()->with('LaravelCart.Cleared', Mockery::type('array'), true);
 
     $items = [
         [

tests/Unit/DatabaseCartTest.php

@@ -0,0 +1,126 @@
+<?php
+
+use Wearepixel\Cart\Cart;
+use Wearepixel\Cart\CartCondition;
+use Wearepixel\Cart\Tests\Helpers\MockCartModel;
+
+beforeEach(function () {
+    $events = Mockery::mock('Illuminate\Contracts\Events\Dispatcher');
+    $events->shouldReceive('dispatch');
+
+    $storage = new MockCartModel;
+
+    $this->cart = new Cart(
+        $storage,
+        $events,
+        'cart',
+        'SAMPLESESSIONKEY',
+        require (__DIR__ . '/../Helpers/ConfigDatabaseMock.php')
+    );
+});
+
+afterEach(function () {
+    Mockery::close();
+});
+
+describe('database cart', function () {
+    test('can add an item', function () {
+        $this->cart->add(1, 'Sample Item', 100.99, 2, []);
+
+        expect($this->cart->isEmpty())->toBeFalse('Cart should not be empty');
+        expect($this->cart->getContent()->count())->toEqual(1, 'Cart content should be 1');
+        expect($this->cart->getContent()->first()['id'])->toEqual(1, 'Item added has ID of 1 so first content ID should be 1');
+        expect($this->cart->getContent()->first()['price'])->toEqual(100.99, 'Item added has price of 100.99 so first content price should be 100.99');
+
+        expect(MockCartModel::all()->count())->toEqual(1, 'The carts database table should have 1 row');
+    });
+
+    test('can add and remove an item', function () {
+        $this->cart->add(1, 'Sample Item', 100.99, 2, []);
+
+        expect($this->cart->isEmpty())->toBeFalse('Cart should not be empty');
+        expect($this->cart->getContent()->count())->toEqual(1, 'Cart content should be 1');
+        expect($this->cart->getContent()->first()['id'])->toEqual(1, 'Item added has ID of 1 so first content ID should be 1');
+        expect($this->cart->getContent()->first()['price'])->toEqual(100.99, 'Item added has price of 100.99 so first content price should be 100.99');
+
+        expect(MockCartModel::all()->count())->toEqual(1, 'The carts database table should have 1 row');
+
+        $this->cart->remove(1);
+
+        $cartModel = MockCartModel::first();
+
+        expect($this->cart->isEmpty())->toBeTrue('Cart should be empty');
+        expect($this->cart->getContent()->count())->toEqual(0, 'Cart content should be 0');
+        expect($cartModel->items)->toEqual([], 'The carts database table should have 0 row');
+    });
+
+    test('can add an item with an item level condition', function () {
+        $saleCondition = new CartCondition([
+            'name' => '5% Discount',
+            'type' => 'sale',
+            'value' => '-5%',
+        ]);
+
+        $item = [
+            'id' => 1,
+            'name' => 'Chicken Curry',
+            'price' => 18.95,
+            'quantity' => 1,
+            'attributes' => [],
+            'conditions' => $saleCondition,
+        ];
+
+        $this->cart->add($item);
+
+        expect($this->cart->get(1)->getPriceSum())->toEqual(18.95);
+        expect($this->cart->get(1)->getPriceSumWithConditions())->toEqual(18);
+        expect($this->cart->getSubTotal())->toEqual(18, 'Cart should have subtotal of 18');
+        expect($this->cart->getTotal())->toEqual(18, 'Cart should have total of 18');
+    });
+
+    test('can add an item with multiple item level conditions', function () {
+        $saleCondition = new CartCondition([
+            'name' => '5% Discount',
+            'type' => 'sale',
+            'value' => '-5%',
+        ]);
+
+        $gstCondition = new CartCondition([
+            'name' => 'GST',
+            'type' => 'gst',
+            'value' => '2.5%',
+        ]);
+
+        $item = [
+            'id' => 1,
+            'name' => 'Chicken Curry',
+            'price' => 18.95,
+            'quantity' => 1,
+            'attributes' => [],
+            'conditions' => [$saleCondition, $gstCondition],
+        ];
+
+        $this->cart->add($item);
+
+        expect($this->cart->get(1)->getPriceSum())->toEqual(18.95);
+        expect($this->cart->get(1)->getPriceSumWithConditions())->toEqual(18.45);
+        expect($this->cart->getSubTotal())->toEqual(18.45, 'Cart should have subtotal of 18.45');
+        expect($this->cart->getTotal())->toEqual(18.45, 'Cart should have total of 18.45');
+    });
+
+    test('can clear a simple cart', function () {
+        $this->cart->add(1, 'Sample Item', 100.99, 2, []);
+
+        expect($this->cart->isEmpty())->toBeFalse('Cart should not be empty');
+        expect($this->cart->getContent()->count())->toEqual(1, 'Cart content should be 1');
+        expect($this->cart->getContent()->first()['id'])->toEqual(1, 'Item added has ID of 1 so first content ID should be 1');
+        expect($this->cart->getContent()->first()['price'])->toEqual(100.99, 'Item added has price of 100.99 so first content price should be 100.99');
+        expect(MockCartModel::all()->count())->toEqual(1, 'The carts database table should have 1 row');
+
+        $this->cart->clear();
+
+        expect($this->cart->isEmpty())->toBeTrue('Cart should be empty');
+        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');
+    });
+});