From 55efbc0ac3e22b5108bb2c4084e5fca1696f70e5 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Wed, 22 Nov 2017 13:18:24 +0800
Subject: [PATCH 01/34] renamed all namespaces

---
 README.md                                     |  14 +-
 composer.json                                 |  21 ++-
 docs/ASSEMBLIES.md                            |   4 +-
 docs/INSTALLATION.md                          | 152 +++++++++---------
 docs/TRANSACTIONS.md                          |  10 +-
 docs/UPDATES.md                               |  22 +--
 docs/USAGE.md                                 |  14 +-
 phpunit.xml                                   |   4 +-
 .../DatabaseTableReservedException.php        |   2 +-
 .../Commands/DependencyNotFoundException.php  |   2 +-
 src/Exceptions/InvalidMovementException.php   |   2 +-
 src/Exceptions/InvalidPartException.php       |   2 +-
 src/Exceptions/InvalidQuantityException.php   |   2 +-
 .../InvalidTransactionStateException.php      |   2 +-
 src/Exceptions/NoUserLoggedInException.php    |   2 +-
 src/Exceptions/NotEnoughStockException.php    |   2 +-
 src/Exceptions/SkuAlreadyExistsException.php  |   2 +-
 .../StockAlreadyExistsException.php           |   2 +-
 src/Exceptions/StockNotFoundException.php     |   2 +-
 src/Helper.php                                |   4 +-
 src/Interfaces/StateableInterface.php         |   2 +-
 src/InventoryServiceProvider.php              |   2 +-
 src/Models/BaseModel.php                      |   2 +-
 src/Models/Category.php                       |   6 +-
 src/Models/Inventory.php                      |   8 +-
 src/Models/InventorySku.php                   |   4 +-
 src/Models/InventoryStock.php                 |   4 +-
 src/Models/InventoryStockMovement.php         |   4 +-
 src/Models/InventoryTransaction.php           |   6 +-
 src/Models/InventoryTransactionHistory.php    |   4 +-
 src/Models/Location.php                       |   2 +-
 src/Models/Metric.php                         |   2 +-
 src/Models/Supplier.php                       |   4 +-
 src/Traits/AssemblyTrait.php                  |  12 +-
 src/Traits/CategoryTrait.php                  |   2 +-
 src/Traits/CommonMethodsTrait.php             |   4 +-
 src/Traits/InventorySkuTrait.php              |   2 +-
 src/Traits/InventoryStockMovementTrait.php    |   4 +-
 src/Traits/InventoryStockTrait.php            |  10 +-
 src/Traits/InventoryTrait.php                 |  12 +-
 .../InventoryTransactionHistoryTrait.php      |   4 +-
 src/Traits/InventoryTransactionTrait.php      |  24 +--
 src/Traits/InventoryVariantTrait.php          |   2 +-
 src/Traits/SupplierTrait.php                  |   2 +-
 tests/FunctionalTestCase.php                  |   4 +-
 45 files changed, 204 insertions(+), 195 deletions(-)

diff --git a/README.md b/README.md
index 728f1dc4..258aad45 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 # Inventory
 
-[![Travis CI](https://img.shields.io/travis/stevebauman/inventory/v1.7.5.svg?style=flat-square)](https://travis-ci.org/stevebauman/inventory)
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/stevebauman/inventory.svg?style=flat-square)](https://scrutinizer-ci.com/g/stevebauman/inventory/?branch=master)
+[![Travis CI](https://img.shields.io/travis/trexology/laravel-inventory/v1.7.5.svg?style=flat-square)](https://travis-ci.org/trexology/laravel-inventory)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/trexology/laravel-inventory.svg?style=flat-square)](https://scrutinizer-ci.com/g/trexology/laravel-inventory/?branch=master)
 [![SensioLabsInsight](https://img.shields.io/sensiolabs/i/69e0abf0-cd74-4d4d-b40c-e943c4a7eea9.svg?style=flat-square)](https://insight.sensiolabs.com/projects/69e0abf0-cd74-4d4d-b40c-e943c4a7eea9)
-[![Latest Stable Version](https://img.shields.io/packagist/v/stevebauman/inventory.svg?style=flat-square)](https://packagist.org/packages/stevebauman/inventory)
-[![Total Downloads](https://img.shields.io/packagist/dt/stevebauman/inventory.svg?style=flat-square)](https://packagist.org/packages/stevebauman/inventory)
-[![License](https://img.shields.io/packagist/l/stevebauman/inventory.svg?style=flat-square)](https://packagist.org/packages/stevebauman/inventory)
+[![Latest Stable Version](https://img.shields.io/packagist/v/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
+[![Total Downloads](https://img.shields.io/packagist/dt/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
+[![License](https://img.shields.io/packagist/l/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
 
 ## Index
 
-[![Join the chat at https://gitter.im/stevebauman/inventory](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/stevebauman/inventory?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/trexology/laravel-inventory](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/trexology/laravel-inventory?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 <ul>
     <li>
@@ -93,7 +93,7 @@ you can simply use the built in models.
 
 Recommended:
 
-- [Stevebauman/Revision](http://www.github.com/stevebauman/revision) (For tracking Category and Location changes to stocks)
+- [Trexology/Revision](http://www.github.com/stevebauman/revision) (For tracking Category and Location changes to stocks)
 
 If you need another Auth driver supported, please send a pull request or create an issue.
 
diff --git a/composer.json b/composer.json
index 0320274e..d0253888 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
-    "name": "stevebauman/inventory",
+    "name": "trexology/laravel-inventory",
     "description": "Inventory management using Laravel 4 / 5",
     "keywords": ["laravel", "inventory", "inventory-management"],
     "authors": [
         {
-            "name": "Steve Bauman",
-            "email": "steven_bauman@outlook.com"
+            "name": "Trex Lim",
+            "email": "trexlim@gmail.com"
         }
     ],
     "license": "MIT",
@@ -23,14 +23,23 @@
     },
     "autoload": {
         "psr-4": {
-            "Stevebauman\\Inventory\\": "src/"
+            "Trexology\\Inventory\\": "src/"
         }
     },
     "autoload-dev":
     {
         "psr-4": {
-            "Stevebauman\\Inventory\\Tests\\": "tests/"
+            "Trexology\\Inventory\\Tests\\": "tests/"
         }
     },
-    "minimum-stability": "stable"
+    "minimum-stability": "stable",
+    "extra": {
+    "laravel": {
+      "providers": [
+        "Trexology\\Inventory\\InventoryServiceProvider"
+      ],
+      "aliases": {
+      }
+    }
+  }
 }
diff --git a/docs/ASSEMBLIES.md b/docs/ASSEMBLIES.md
index 690d126c..4ef2d53e 100644
--- a/docs/ASSEMBLIES.md
+++ b/docs/ASSEMBLIES.md
@@ -153,7 +153,7 @@ When adding parts to your items assembly, you have to make sure you're aware of
 
 #### InvalidPartException
 
-The exception `Stevebauman\Inventory\Exceptions\InvalidPartException` is thrown when you try to add a part to an assembly
+The exception `Trexology\Inventory\Exceptions\InvalidPartException` is thrown when you try to add a part to an assembly
 that contains itself. This exception prevents infinite recursive queries. For example:
 
     $tables = Inventory::create([
@@ -222,7 +222,7 @@ resource intensive on larger assemblies. However this validation is completely n
 
 #### InvalidQuantityException
 
-As such when managing stock quantities, you will receive an `Stevebauman\Inventory\Exceptions\InvalidQuantityException` if
+As such when managing stock quantities, you will receive an `Trexology\Inventory\Exceptions\InvalidQuantityException` if
 and invalid quantity is entered inside any assembly methods that accept a quantity, for example:
 
     // All below methods throw InvalidQuantityException
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index 724a5f29..2069716c 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -7,50 +7,50 @@ multiple cascade delete paths are present on foreign keys, and you'll need to mo
 
 Add inventory to your `composer.json` file:
 
-    "stevebauman/inventory" : "1.7.*"
+    "trexology/laravel-inventory" : "1.8.*"
 
 Now perform a `composer update` on your project's source.
 
 Then insert the service provider in your `app/config/app.php` config file:
 
-    'Stevebauman\Inventory\InventoryServiceProvider'
+    'Trexology\Inventory\InventoryServiceProvider'
 
 If you want to customize the database tables, you can publish the migration and run it yourself:
 
-    php artisan migrate:publish stevebauman/inventory
+    php artisan migrate:publish trexology/laravel-inventory
 
 And then run the migration:
 
     php artisan migrate
-    
+
 Otherwise you can run the install command:
 
     php artisan inventory:install
-    
+
 Be sure to publish the configuration if you'd like to customize inventory:
-    
-    php artisan config:publish stevebauman/inventory
-    
+
+    php artisan config:publish trexology/laravel-inventory
+
 ### Installation (Laravel 5)
 
 Add inventory to your `composer.json` file:
 
-    "stevebauman/inventory" : "1.7.*"
+    "trexology/laravel-inventory" : "1.8.*"
 
 Now perform a `composer update` on your project's source.
 
-Then insert the service provider in your `config/app.php` config file:
+Then insert the service provider in your `config/app.php` config file: (Skip this step if you are on 5.5 and above)
+
+    'Trexology\Inventory\InventoryServiceProvider'
 
-    'Stevebauman\Inventory\InventoryServiceProvider'
-    
 Either publish the assets to customize the database tables using:
 
     php artisan vendor:publish
-   
+
 And then run the migrations:
 
     php artisan migrate
-    
+
 Or use the inventory install command:
 
     php artisan inventory:install
@@ -63,8 +63,8 @@ If you don't need to create & customize your models, I've included pre-built mod
 
 If you'd like to use them you'll have include them in your use statements:
 
-    use Stevebauman\Inventory\Models\Inventory;
-    
+    use Trexology\Inventory\Models\Inventory;
+
     class InventoryController extends BaseController
     {
         /*
@@ -73,16 +73,16 @@ If you'd like to use them you'll have include them in your use statements:
         * @var Inventory
         */
         protected $inventory;
-    
+
         public function __construct(Inventory $inventory)
         {
             $this->inventory = $inventory;
         }
-        
+
         public function create()
         {
             $item = new $this->inventory;
-            
+
             // etc...
         }
     }
@@ -103,29 +103,29 @@ Metric:
     {
         protected $table = 'metrics';
     }
-    
+
 Location:
-    
+
     use Baum\Node;
-    
-    class Location extends Node 
+
+    class Location extends Node
     {
         protected $table = 'locations';
     }
 
 Category:
 
-    use Stevebauman\Inventory\Traits\CategoryTrait;
+    use Trexology\Inventory\Traits\CategoryTrait;
     use Baum\Node;
-    
+
     class Category extends Node
     {
         use CategoryTrait;
-        
+
         protected $table = 'categories';
-        
+
         protected $scoped = ['belongs_to'];
-        
+
         public function inventories()
         {
             return $this->hasMany('Inventory', 'category_id');
@@ -134,14 +134,14 @@ Category:
 
 Supplier:
 
-    use Stevebauman\Inventory\Traits\SupplierTrait;
-    
+    use Trexology\Inventory\Traits\SupplierTrait;
+
     class Supplier extends BaseModel
     {
         use SupplierTrait;
-    
+
         protected $table = 'suppliers';
-        
+
         public function items()
         {
             return $this->belongsToMany('Inventory', 'inventory_suppliers', 'supplier_id')->withTimestamps();
@@ -150,81 +150,81 @@ Supplier:
 
 Inventory:
 
-    use Stevebauman\Inventory\Traits\AssemblyTrait;
-    use Stevebauman\Inventory\Traits\InventoryTrait;
-    use Stevebauman\Inventory\Traits\InventoryVariantTrait;
-    
+    use Trexology\Inventory\Traits\AssemblyTrait;
+    use Trexology\Inventory\Traits\InventoryTrait;
+    use Trexology\Inventory\Traits\InventoryVariantTrait;
+
     class Inventory extends Model
     {
         use InventoryTrait;
         use InventoryVariantTrait;
         use AssemblyTrait;
-    
+
         protected $table = 'inventories';
-        
+
         public function category()
         {
             return $this->hasOne('Category', 'id', 'category_id');
         }
-        
+
         public function metric()
         {
             return $this->hasOne('Metric', 'id', 'metric_id');
         }
-        
+
         public function sku()
         {
             return $this->hasOne('InventorySku', 'inventory_id', 'id');
         }
-        
+
         public function stocks()
         {
             return $this->hasMany('InventoryStock', 'inventory_id');
         }
-        
+
         public function suppliers()
         {
             return $this->belongsToMany('Supplier', 'inventory_suppliers', 'inventory_id')->withTimestamps();
         }
-        
+
         public function assemblies()
         {
             return $this->belongsToMany($this, 'inventory_assemblies', 'inventory_id', 'part_id')
                 ->withPivot(['quantity'])->withTimestamps();
         }
     }
-    
+
 InventorySku:
 
-    use Stevebauman\Inventory\Traits\InventorySkuTrait;
-    
+    use Trexology\Inventory\Traits\InventorySkuTrait;
+
     class InventorySku extends Model
     {
         use InventorySkuTrait;
-    
+
         protected $table = 'inventory_skus';
-        
+
         protected $fillable = array(
             'inventory_id',
             'code',
         );
-        
+
         public function item()
         {
             return $this->belongsTo('Inventory', 'inventory_id', 'id');
         }
     }
-    
+
 InventoryStock:
 
-    use Stevebauman\Inventory\Traits\InventoryStockTrait;
-    
+    use Trexology\Inventory\Traits\InventoryStockTrait;
+
     class InventoryStock extends Model
     {
         use InventoryStockTrait;
-    
+
         protected $table = 'inventory_stocks';
-        
+
         protected $fillable = array(
             'inventory_id',
             'location_id',
@@ -233,7 +233,7 @@ InventoryStock:
             'row',
             'bin',
         );
-    
+
         public function item()
         {
             return $this->belongsTo('Inventory', 'inventory_id', 'id');
@@ -243,12 +243,12 @@ InventoryStock:
         {
             return $this->hasMany('InventoryStockMovement', 'stock_id');
         }
-        
+
         public function transactions()
         {
             return $this->hasMany('InventoryTransaction', 'stock_id', 'id');
         }
-        
+
         public function location()
         {
             return $this->hasOne('Location', 'id', 'location_id');
@@ -257,14 +257,14 @@ InventoryStock:
 
 InventoryStockMovement:
 
-    use Stevebauman\Inventory\Traits\InventoryStockMovementTrait;
-    
+    use Trexology\Inventory\Traits\InventoryStockMovementTrait;
+
     class InventoryStockMovement extends Model
     {
         use InventoryStockMovementTrait;
-        
+
         protected $table = 'inventory_stock_movements';
-        
+
         protected $fillable = array(
             'stock_id',
             'user_id',
@@ -273,24 +273,24 @@ InventoryStockMovement:
             'cost',
             'reason',
         );
-        
+
         public function stock()
         {
             return $this->belongsTo('InventoryStock', 'stock_id', 'id');
         }
     }
-    
+
 InventoryTransaction:
-    
-    use Stevebauman\Inventory\Traits\InventoryTransactionTrait;
-    use Stevebauman\Inventory\Interfaces\StateableInterface;
-    
+
+    use Trexology\Inventory\Traits\InventoryTransactionTrait;
+    use Trexology\Inventory\Interfaces\StateableInterface;
+
     class InventoryTransaction extends BaseModel implements StateableInterface
     {
         use InventoryTransactionTrait;
-    
+
         protected $table = 'inventory_transactions';
-    
+
         protected $fillable = array(
             'user_id',
             'stock_id',
@@ -298,7 +298,7 @@ InventoryTransaction:
             'state',
             'quantity',
         );
-    
+
         public function stock()
         {
             return $this->belongsTo('InventoryStock', 'stock_id', 'id');
@@ -309,17 +309,17 @@ InventoryTransaction:
             return $this->hasMany('InventoryTransactionHistory', 'transaction_id', 'id');
         }
     }
-    
+
 InventoryTransactionHistory:
 
-    use Stevebauman\Inventory\Traits\InventoryTransactionHistoryTrait;
-    
+    use Trexology\Inventory\Traits\InventoryTransactionHistoryTrait;
+
     class InventoryTransactionHistory extends BaseModel
     {
         use InventoryTransactionHistoryTrait;
-        
+
         protected $table = 'inventory_transaction_histories';
-    
+
         protected $fillable = array(
             'user_id',
             'transaction_id',
@@ -328,7 +328,7 @@ InventoryTransactionHistory:
             'quantity_before',
             'quantity_after',
         );
-    
+
         public function transaction()
         {
             return $this->belongsTo('InventoryTransaction', 'transaction_id', 'id');
diff --git a/docs/TRANSACTIONS.md b/docs/TRANSACTIONS.md
index 8ae35e5a..226fea66 100644
--- a/docs/TRANSACTIONS.md
+++ b/docs/TRANSACTIONS.md
@@ -253,7 +253,7 @@ You also <b>can not</b> mix inventory orders with inventory holds/releasing/remo
 Transactions must be kept within their 'scope of use', and a new transaction must be created if a new operation
 needs to take place.
 
-With any method that requires a quantity, a `Stevebauman\Inventory\Exceptions\InvalidQuantityException` will be thrown
+With any method that requires a quantity, a `Trexology\Inventory\Exceptions\InvalidQuantityException` will be thrown
 if the quantity supplied is invalid. For example, these would all throw the above exception:
 
     $transaction->reserved('120 pieces');
@@ -261,7 +261,7 @@ if the quantity supplied is invalid. For example, these would all throw the abov
     $transaction->reserved('a120');
     $transaction->reserved('12..0');
     
-With any method that requires a removal of stock from the inventory, a `Stevebauman\Inventory\Exceptions\NotEnoughStockException` will
+With any method that requires a removal of stock from the inventory, a `Trexology\Inventory\Exceptions\NotEnoughStockException` will
 be thrown if the quantity supplied is over the amount inside the current stock. For example, these would all throw the above exception:
 
     $stock->put(100);
@@ -281,16 +281,16 @@ These are easy to guard against however, you can just place the transaction meth
     try
     {
         $transaction->reserve($quantity);
-    } catch(Stevebauman\Inventory\Exceptions\InvalidQuantityException $e)
+    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException $e)
     {
         return 'Invalid quantity was supplied. Please enter a valid quantity.';
-    } catch(Stevebauman\Inventory\Exceptions\NotEnoughStockException $e)
+    } catch(Trexology\Inventory\Exceptions\NotEnoughStockException $e)
     {
         return "There wasn't enough stock to reserve: $quantity";
     }
 
 States can be set manually, however it's definitely not recommended. Setting a state manually may throw an
-`Stevebauman\Inventory\Exceptions\InvalidTransactionStateException`, if the state is not one of the constants
+`Trexology\Inventory\Exceptions\InvalidTransactionStateException`, if the state is not one of the constants
 shown above. For example:
 
     // This will fail
diff --git a/docs/UPDATES.md b/docs/UPDATES.md
index 31ec6494..fbd885f2 100644
--- a/docs/UPDATES.md
+++ b/docs/UPDATES.md
@@ -32,7 +32,7 @@ If you <b>have</b> modified the migrations and ran them yourself, you will have
 
 ##### Laravel 4:
 
-    php artisan migrate:publish --package="stevebauman/inventory"
+    php artisan migrate:publish --package="trexology/laravel-inventory"
 
 ##### Laravel 5:
 
@@ -86,7 +86,7 @@ If you're using custom migrations you will need to re-publish the inventory migr
 
 ##### Laravel 4:
 
-    php artisan migrate:publish --package="stevebauman/inventory"
+    php artisan migrate:publish --package="trexology/laravel-inventory"
 
 ##### Laravel 5:
 
@@ -116,7 +116,7 @@ If you have customized the included migrations, you'll have to publish the new o
 
 ##### Laravel 4:
 
-    php artisan migrate:publish --package="stevebauman/inventory"
+    php artisan migrate:publish --package="trexology/laravel-inventory"
 
 ##### Laravel 5:
 
@@ -139,7 +139,7 @@ Now you're good to go to use the new update!
 
 No migrations were added to this release, you can jump to `1.5.*` with no issues.
 
-However, the exception `Stevebauman\Inventory\Exceptions\StockIsSufficientException` has been removed.
+However, the exception `Trexology\Inventory\Exceptions\StockIsSufficientException` has been removed.
 
 It is no longer thrown when there is enough stock for a back-order. Simply remove it from your
 try/catch statement.
@@ -154,7 +154,7 @@ Follow standard update migration procedure:
 
 ##### Laravel 4:
 
-    php artisan migrate:publish --package="stevebauman/inventory"
+    php artisan migrate:publish --package="trexology/laravel-inventory"
 
 ##### Laravel 5:
 
@@ -166,7 +166,7 @@ Then run the migration using:
 
 If you're using your own models, be sure to insert the new trait on your `Inventory` model:
     
-    use Stevebauman\Inventory\Traits\InventoryVariantTrait;
+    use Trexology\Inventory\Traits\InventoryVariantTrait;
     
     class Inventory extends Eloquent {
         use InventoryVariantTrait;
@@ -178,7 +178,7 @@ If you're using the built in models, it's already included.
 
 In update `1.7`, assembly functionality has been added. This update comes with 2 new migrations, and a new trait.
 
-The new trait added is named `Stevebauman\Inventory\Traits\AssemblyTrait`. This trait will need to be inserted into
+The new trait added is named `Trexology\Inventory\Traits\AssemblyTrait`. This trait will need to be inserted into
 your `Inventory` model if you wish to use the assembly functionality.
 
 The first migration adds the column `is_assembly (bool)` to your `inventories` table. It is defaulted to `false`.
@@ -190,7 +190,7 @@ These migrations are non-destructive, so follow the standard update procedure:
 
 ##### Laravel 4:
 
-    php artisan migrate:publish --package="stevebauman/inventory"
+    php artisan migrate:publish --package="trexology/laravel-inventory"
 
 ##### Laravel 5:
 
@@ -202,9 +202,9 @@ Then run the migration using:
     
 Once you've ran the migrations, insert the new Assembly trait into your inventory model:
 
-    use Stevebauman\Inventory\Traits\AssemblyTrait;
-    use Stevebauman\Inventory\Traits\InventoryVariantTrait;
-    use Stevebauman\Inventory\Traits\InventoryTrait;
+    use Trexology\Inventory\Traits\AssemblyTrait;
+    use Trexology\Inventory\Traits\InventoryVariantTrait;
+    use Trexology\Inventory\Traits\InventoryTrait;
     
     class Inventory extends Eloquent
     {
diff --git a/docs/USAGE.md b/docs/USAGE.md
index e4622c34..39b207c0 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -191,14 +191,14 @@ There are some built in 'questions' you can ask your retrieved records. Many mor
     /*
     * Returns true if the quantity entered is less than or equal to the amount of available stock.
     *
-    * This will throw a Stevebauman\Inventory\Exceptions\NotEnoughStockException if there is not enough
+    * This will throw a Trexology\Inventory\Exceptions\NotEnoughStockException if there is not enough
     */
     $stock->hasEnoughStock($quantity = 0);
     
     /*
     * Returns true if the quantity entered is a valid quantity for updating the stock with.
     *
-    * This will throw a Stevebauman\Inventory\Exceptions\InvalidQuantityException if it is not valid
+    * This will throw a Trexology\Inventory\Exceptions\InvalidQuantityException if it is not valid
     */
     $stock->isValidQuantity($quantity);
 
@@ -295,7 +295,7 @@ the method `createSku($code, $overwrite = false)` on your Inventory record like
 This function contains no validation besides checking if an item already has an SKU, so you can create your own
 ways of generating unique SKU's.
 
-If an item already has an SKU, and `createSku($code)` is called, then an `Stevebauman\Inventory\Exceptions\SkuAlreadyExistsException`
+If an item already has an SKU, and `createSku($code)` is called, then an `Trexology\Inventory\Exceptions\SkuAlreadyExistsException`
 will be thrown.
 
 If you'd like to overwrite the SKU if it exists, pass in `true` into the second argument in the function like so:
@@ -409,7 +409,7 @@ Occurs when you're trying to take more stock than available. Use a try/catch blo
         
         return "Successfully removed $quantity";
         
-    } catch(Stevebauman\Inventory\Exceptions\NotEnoughStockException)
+    } catch(Trexology\Inventory\Exceptions\NotEnoughStockException)
     {
         return "There wasn't enough stock to perform this action. Please try again.";
     }
@@ -424,7 +424,7 @@ Occurs when a stock of the item already exists at the specified location. Use a
         
         return "Successfully moved stock to $location->name";
         
-    } catch(Stevebauman\Inventory\Exceptions\StockAlreadyExistsException)
+    } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException)
     {
         return "Stock already exists at this location. Please try again.";
     }
@@ -443,7 +443,7 @@ occurring, or you can use a try/catch block when processing actions involving qu
         
         return "Successfully added $quantity";
         
-    } catch(Stevebauman\Inventory\Exceptions\InvalidQuantityException)
+    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException)
     {
         return "The quantity you entered is invalid. Please try again.";
     }
@@ -578,7 +578,7 @@ The trait:
     
 On your models:
     
-    use Stevebauman\Inventory\Traits\InventoryTrait;
+    use Trexology\Inventory\Traits\InventoryTrait;
     
     class Inventory extends Eloquent
     {
diff --git a/phpunit.xml b/phpunit.xml
index 50d47596..3834a800 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,9 +12,9 @@
 >
     <filter>
         <whitelist>
-            <directory>src/Stevebauman/Inventory</directory>
+            <directory>src/trexology/laravel-inventory</directory>
             <exclude>
-                <file>src/Stevebauman/Inventory/InventoryServiceProvider.php</file>
+                <file>src/trexology/laravel-inventory/InventoryServiceProvider.php</file>
             </exclude>
         </whitelist>
     </filter>
diff --git a/src/Exceptions/Commands/DatabaseTableReservedException.php b/src/Exceptions/Commands/DatabaseTableReservedException.php
index 6f9a6f81..97d2fce5 100644
--- a/src/Exceptions/Commands/DatabaseTableReservedException.php
+++ b/src/Exceptions/Commands/DatabaseTableReservedException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions\Commands;
+namespace Trexology\Inventory\Exceptions\Commands;
 
 class DatabaseTableReservedException extends \Exception
 {
diff --git a/src/Exceptions/Commands/DependencyNotFoundException.php b/src/Exceptions/Commands/DependencyNotFoundException.php
index a6408e2a..cd5a6b0d 100644
--- a/src/Exceptions/Commands/DependencyNotFoundException.php
+++ b/src/Exceptions/Commands/DependencyNotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions\Commands;
+namespace Trexology\Inventory\Exceptions\Commands;
 
 class DependencyNotFoundException extends \Exception
 {
diff --git a/src/Exceptions/InvalidMovementException.php b/src/Exceptions/InvalidMovementException.php
index 9d5f85fd..e780a17f 100644
--- a/src/Exceptions/InvalidMovementException.php
+++ b/src/Exceptions/InvalidMovementException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class InvalidMovementException extends \Exception
 {
diff --git a/src/Exceptions/InvalidPartException.php b/src/Exceptions/InvalidPartException.php
index 1cecb373..63ea56bc 100644
--- a/src/Exceptions/InvalidPartException.php
+++ b/src/Exceptions/InvalidPartException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class InvalidPartException extends \Exception
 {
diff --git a/src/Exceptions/InvalidQuantityException.php b/src/Exceptions/InvalidQuantityException.php
index 8de761c4..2e0b65a2 100644
--- a/src/Exceptions/InvalidQuantityException.php
+++ b/src/Exceptions/InvalidQuantityException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class InvalidQuantityException extends \Exception
 {
diff --git a/src/Exceptions/InvalidTransactionStateException.php b/src/Exceptions/InvalidTransactionStateException.php
index 8655df3f..aa9cee0d 100644
--- a/src/Exceptions/InvalidTransactionStateException.php
+++ b/src/Exceptions/InvalidTransactionStateException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class InvalidTransactionStateException extends \Exception
 {
diff --git a/src/Exceptions/NoUserLoggedInException.php b/src/Exceptions/NoUserLoggedInException.php
index dd4516aa..fd444a3c 100644
--- a/src/Exceptions/NoUserLoggedInException.php
+++ b/src/Exceptions/NoUserLoggedInException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class NoUserLoggedInException extends \Exception
 {
diff --git a/src/Exceptions/NotEnoughStockException.php b/src/Exceptions/NotEnoughStockException.php
index c07974e6..8ccbacdd 100644
--- a/src/Exceptions/NotEnoughStockException.php
+++ b/src/Exceptions/NotEnoughStockException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class NotEnoughStockException extends \Exception
 {
diff --git a/src/Exceptions/SkuAlreadyExistsException.php b/src/Exceptions/SkuAlreadyExistsException.php
index 7400b5ae..fb3f59da 100644
--- a/src/Exceptions/SkuAlreadyExistsException.php
+++ b/src/Exceptions/SkuAlreadyExistsException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class SkuAlreadyExistsException extends \Exception
 {
diff --git a/src/Exceptions/StockAlreadyExistsException.php b/src/Exceptions/StockAlreadyExistsException.php
index 46f2b18b..ffc0d903 100644
--- a/src/Exceptions/StockAlreadyExistsException.php
+++ b/src/Exceptions/StockAlreadyExistsException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class StockAlreadyExistsException extends \Exception
 {
diff --git a/src/Exceptions/StockNotFoundException.php b/src/Exceptions/StockNotFoundException.php
index 45c0f998..345d5762 100644
--- a/src/Exceptions/StockNotFoundException.php
+++ b/src/Exceptions/StockNotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Exceptions;
+namespace Trexology\Inventory\Exceptions;
 
 class StockNotFoundException extends \Exception
 {
diff --git a/src/Helper.php b/src/Helper.php
index e89bc793..620a3278 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory;
+namespace Trexology\Inventory;
 
-use Stevebauman\Inventory\Exceptions\NoUserLoggedInException;
+use Trexology\Inventory\Exceptions\NoUserLoggedInException;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
diff --git a/src/Interfaces/StateableInterface.php b/src/Interfaces/StateableInterface.php
index 83d6eb22..ba3a2de2 100644
--- a/src/Interfaces/StateableInterface.php
+++ b/src/Interfaces/StateableInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Interfaces;
+namespace Trexology\Inventory\Interfaces;
 
 /**
  * The Stateable Interface used for stateable Inventory Transaction models.
diff --git a/src/InventoryServiceProvider.php b/src/InventoryServiceProvider.php
index 69a5d28b..fb6d3ead 100644
--- a/src/InventoryServiceProvider.php
+++ b/src/InventoryServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory;
+namespace Trexology\Inventory;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
index 43fe346c..66b9ae9d 100644
--- a/src/Models/BaseModel.php
+++ b/src/Models/BaseModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
diff --git a/src/Models/Category.php b/src/Models/Category.php
index 5848fd64..06fdb58a 100644
--- a/src/Models/Category.php
+++ b/src/Models/Category.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\CategoryTrait;
+use Trexology\Inventory\Traits\CategoryTrait;
 use Baum\Node;
 
 class Category extends Node
@@ -23,6 +23,6 @@ class Category extends Node
      */
     public function inventories()
     {
-        return $this->hasMany('Stevebauman\Inventory\Models\Inventory', 'category_id', 'id');
+        return $this->hasMany('Trexology\Inventory\Models\Inventory', 'category_id', 'id');
     }
 }
diff --git a/src/Models/Inventory.php b/src/Models/Inventory.php
index c2dd6750..8c6096aa 100644
--- a/src/Models/Inventory.php
+++ b/src/Models/Inventory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\AssemblyTrait;
-use Stevebauman\Inventory\Traits\InventoryVariantTrait;
-use Stevebauman\Inventory\Traits\InventoryTrait;
+use Trexology\Inventory\Traits\AssemblyTrait;
+use Trexology\Inventory\Traits\InventoryVariantTrait;
+use Trexology\Inventory\Traits\InventoryTrait;
 
 class Inventory extends Model
 {
diff --git a/src/Models/InventorySku.php b/src/Models/InventorySku.php
index f8b30a0d..c5d25745 100644
--- a/src/Models/InventorySku.php
+++ b/src/Models/InventorySku.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\InventorySkuTrait;
+use Trexology\Inventory\Traits\InventorySkuTrait;
 
 class InventorySku extends Model
 {
diff --git a/src/Models/InventoryStock.php b/src/Models/InventoryStock.php
index a0e3b7b1..56fd1fb6 100644
--- a/src/Models/InventoryStock.php
+++ b/src/Models/InventoryStock.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\InventoryStockTrait;
+use Trexology\Inventory\Traits\InventoryStockTrait;
 
 class InventoryStock extends Model
 {
diff --git a/src/Models/InventoryStockMovement.php b/src/Models/InventoryStockMovement.php
index 7520f1f7..b70a0271 100644
--- a/src/Models/InventoryStockMovement.php
+++ b/src/Models/InventoryStockMovement.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\InventoryStockMovementTrait;
+use Trexology\Inventory\Traits\InventoryStockMovementTrait;
 
 class InventoryStockMovement extends Model
 {
diff --git a/src/Models/InventoryTransaction.php b/src/Models/InventoryTransaction.php
index db1f44fd..896f100a 100644
--- a/src/Models/InventoryTransaction.php
+++ b/src/Models/InventoryTransaction.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\InventoryTransactionTrait;
-use Stevebauman\Inventory\Interfaces\StateableInterface;
+use Trexology\Inventory\Traits\InventoryTransactionTrait;
+use Trexology\Inventory\Interfaces\StateableInterface;
 
 class InventoryTransaction extends Model implements StateableInterface
 {
diff --git a/src/Models/InventoryTransactionHistory.php b/src/Models/InventoryTransactionHistory.php
index 0bc2c45a..f059b660 100644
--- a/src/Models/InventoryTransactionHistory.php
+++ b/src/Models/InventoryTransactionHistory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\InventoryTransactionHistoryTrait;
+use Trexology\Inventory\Traits\InventoryTransactionHistoryTrait;
 
 class InventoryTransactionHistory extends Model
 {
diff --git a/src/Models/Location.php b/src/Models/Location.php
index cd550894..0f8836ce 100644
--- a/src/Models/Location.php
+++ b/src/Models/Location.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
 use Baum\Node;
 
diff --git a/src/Models/Metric.php b/src/Models/Metric.php
index 21e96d45..edf14228 100644
--- a/src/Models/Metric.php
+++ b/src/Models/Metric.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
 class Metric extends Model
 {
diff --git a/src/Models/Supplier.php b/src/Models/Supplier.php
index 3331f589..9a31497e 100644
--- a/src/Models/Supplier.php
+++ b/src/Models/Supplier.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Models;
+namespace Trexology\Inventory\Models;
 
-use Stevebauman\Inventory\Traits\SupplierTrait;
+use Trexology\Inventory\Traits\SupplierTrait;
 
 class Supplier extends Model
 {
diff --git a/src/Traits/AssemblyTrait.php b/src/Traits/AssemblyTrait.php
index cb34d6f6..eb720a12 100644
--- a/src/Traits/AssemblyTrait.php
+++ b/src/Traits/AssemblyTrait.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
-use Stevebauman\Inventory\Exceptions\InvalidPartException;
+use Trexology\Inventory\Exceptions\InvalidPartException;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -157,7 +157,7 @@ public function getAssemblyItemsList($recursive = true, $depth = 0)
      * @param int|float|string $quantity
      * @param array            $extra
      *
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      *
      * @return $this
      */
@@ -196,7 +196,7 @@ public function addAssemblyItem(Model $part, $quantity = 1, array $extra = [])
      * @param int|float|string $quantity
      * @param array            $extra
      *
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      *
      * @return int
      */
@@ -223,7 +223,7 @@ public function addAssemblyItems(array $parts, $quantity = 1, array $extra = [])
      * @param int|float|string $quantity
      * @param array            $extra
      *
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      *
      * @return $this|bool
      */
@@ -260,7 +260,7 @@ public function updateAssemblyItem($part, $quantity = 1, array $extra = [])
      * @param int|float|string $quantity
      * @param array            $extra
      *
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      *
      * @return int
      */
diff --git a/src/Traits/CategoryTrait.php b/src/Traits/CategoryTrait.php
index 252babdf..1af75f8a 100644
--- a/src/Traits/CategoryTrait.php
+++ b/src/Traits/CategoryTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
 trait CategoryTrait
 {
diff --git a/src/Traits/CommonMethodsTrait.php b/src/Traits/CommonMethodsTrait.php
index 3b6dd5db..2e7987ce 100644
--- a/src/Traits/CommonMethodsTrait.php
+++ b/src/Traits/CommonMethodsTrait.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Lang;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
-use Stevebauman\Inventory\Exceptions\InvalidQuantityException;
+use Trexology\Inventory\Exceptions\InvalidQuantityException;
 
 trait CommonMethodsTrait
 {
diff --git a/src/Traits/InventorySkuTrait.php b/src/Traits/InventorySkuTrait.php
index 44766b8d..b72c9ec2 100644
--- a/src/Traits/InventorySkuTrait.php
+++ b/src/Traits/InventorySkuTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
 trait InventorySkuTrait
 {
diff --git a/src/Traits/InventoryStockMovementTrait.php b/src/Traits/InventoryStockMovementTrait.php
index c48c8f2d..1ed774ec 100644
--- a/src/Traits/InventoryStockMovementTrait.php
+++ b/src/Traits/InventoryStockMovementTrait.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
-use Stevebauman\Inventory\Helper;
+use Trexology\Inventory\Helper;
 use Illuminate\Database\Eloquent\Model;
 
 trait InventoryStockMovementTrait
diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 423e78bc..05dbf0a4 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
-use Stevebauman\Inventory\Exceptions\NotEnoughStockException;
-use Stevebauman\Inventory\Exceptions\InvalidMovementException;
-use Stevebauman\Inventory\Exceptions\InvalidQuantityException;
-use Stevebauman\Inventory\Helper;
+use Trexology\Inventory\Exceptions\NotEnoughStockException;
+use Trexology\Inventory\Exceptions\InvalidMovementException;
+use Trexology\Inventory\Exceptions\InvalidQuantityException;
+use Trexology\Inventory\Helper;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
diff --git a/src/Traits/InventoryTrait.php b/src/Traits/InventoryTrait.php
index ba6190b3..343c8f20 100644
--- a/src/Traits/InventoryTrait.php
+++ b/src/Traits/InventoryTrait.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
-use Stevebauman\Inventory\Exceptions\SkuAlreadyExistsException;
-use Stevebauman\Inventory\Exceptions\StockNotFoundException;
-use Stevebauman\Inventory\Exceptions\StockAlreadyExistsException;
-use Stevebauman\Inventory\Helper;
+use Trexology\Inventory\Exceptions\SkuAlreadyExistsException;
+use Trexology\Inventory\Exceptions\StockNotFoundException;
+use Trexology\Inventory\Exceptions\StockAlreadyExistsException;
+use Trexology\Inventory\Helper;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
@@ -208,7 +208,7 @@ public function isInStock()
      *
      * @throws StockAlreadyExistsException
      * @throws StockNotFoundException
-     * @throws \Stevebauman\Inventory\Exceptions\NoUserLoggedInException
+     * @throws \Trexology\Inventory\Exceptions\NoUserLoggedInException
      *
      * @return Model
      */
diff --git a/src/Traits/InventoryTransactionHistoryTrait.php b/src/Traits/InventoryTransactionHistoryTrait.php
index 45dc5c91..a94e10d1 100644
--- a/src/Traits/InventoryTransactionHistoryTrait.php
+++ b/src/Traits/InventoryTransactionHistoryTrait.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
-use Stevebauman\Inventory\Helper;
+use Trexology\Inventory\Helper;
 use Illuminate\Database\Eloquent\Model;
 
 trait InventoryTransactionHistoryTrait
diff --git a/src/Traits/InventoryTransactionTrait.php b/src/Traits/InventoryTransactionTrait.php
index 03014fa3..717b5dbb 100644
--- a/src/Traits/InventoryTransactionTrait.php
+++ b/src/Traits/InventoryTransactionTrait.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
-
-use Stevebauman\Inventory\Exceptions\InvalidQuantityException;
-use Stevebauman\Inventory\Exceptions\NotEnoughStockException;
-use Stevebauman\Inventory\Exceptions\StockNotFoundException;
-use Stevebauman\Inventory\Exceptions\InvalidTransactionStateException;
-use Stevebauman\Inventory\InventoryServiceProvider;
-use Stevebauman\Inventory\Helper;
+namespace Trexology\Inventory\Traits;
+
+use Trexology\Inventory\Exceptions\InvalidQuantityException;
+use Trexology\Inventory\Exceptions\NotEnoughStockException;
+use Trexology\Inventory\Exceptions\StockNotFoundException;
+use Trexology\Inventory\Exceptions\InvalidTransactionStateException;
+use Trexology\Inventory\InventoryServiceProvider;
+use Trexology\Inventory\Helper;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Lang;
 
@@ -236,8 +236,8 @@ public function isRemoved()
      * @param string           $reason
      * @param int|float|string $cost
      *
-     * @throws \Stevebauman\Inventory\Exceptions\NotEnoughStockException
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\NotEnoughStockException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      * @throws InvalidTransactionStateException
      *
      * @return $this|bool
@@ -277,8 +277,8 @@ public function checkout($quantity = 0, $reason = '', $cost = 0)
      * @param string           $reason
      * @param int|float|string $cost
      *
-     * @throws \Stevebauman\Inventory\Exceptions\NotEnoughStockException
-     * @throws \Stevebauman\Inventory\Exceptions\InvalidQuantityException
+     * @throws \Trexology\Inventory\Exceptions\NotEnoughStockException
+     * @throws \Trexology\Inventory\Exceptions\InvalidQuantityException
      * @throws InvalidTransactionStateException
      *
      * @return $this|bool
diff --git a/src/Traits/InventoryVariantTrait.php b/src/Traits/InventoryVariantTrait.php
index 6af4ca9c..c0bddf9e 100644
--- a/src/Traits/InventoryVariantTrait.php
+++ b/src/Traits/InventoryVariantTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/src/Traits/SupplierTrait.php b/src/Traits/SupplierTrait.php
index 1c7ee0f6..960a51cd 100644
--- a/src/Traits/SupplierTrait.php
+++ b/src/Traits/SupplierTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Traits;
+namespace Trexology\Inventory\Traits;
 
 trait SupplierTrait
 {
diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php
index f6130dfc..9728548d 100644
--- a/tests/FunctionalTestCase.php
+++ b/tests/FunctionalTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stevebauman\Inventory\Tests;
+namespace Trexology\Inventory\Tests;
 
 use Orchestra\Testbench\TestCase;
 
@@ -29,7 +29,7 @@ protected function getEnvironmentSetup($app)
     protected function getPackageProviders()
     {
         return [
-            'Inventory' => 'Stevebauman\Inventory\InventoryServiceProvider',
+            'Inventory' => 'Trexology\Inventory\InventoryServiceProvider',
         ];
     }
 }

From 425d9ba44daa37c10a908d4c9176b973ced60a8f Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Mon, 27 Nov 2017 14:21:43 +0800
Subject: [PATCH 02/34] rename migration file rename module name

---
 docs/INSTALLATION.md                             | 16 ++++++++--------
 .../2014_07_31_123201_create_metrics_table.php   |  2 +-
 ...2014_07_31_123204_create_categories_table.php |  2 +-
 .../2014_07_31_123204_create_locations_table.php |  2 +-
 .../{Category.php => InventoryCategory.php}      |  2 +-
 .../{Location.php => InventoryLocation.php}      |  2 +-
 src/Models/{Metric.php => InventoryMetric.php}   |  2 +-
 .../{Supplier.php => InventorySupplier.php}      |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename src/Models/{Category.php => InventoryCategory.php} (93%)
 rename src/Models/{Location.php => InventoryLocation.php} (92%)
 rename src/Models/{Metric.php => InventoryMetric.php} (89%)
 rename src/Models/{Supplier.php => InventorySupplier.php} (91%)

diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index 2069716c..ef27c244 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -97,28 +97,28 @@ Create the models, but keep in mind the models need:
 
 You are free to modify anything else (such as table names, model names, namespace etc!).
 
-Metric:
+InventoryMetric:
 
-    class Metric extends Model
+    class InventoryMetric extends Model
     {
         protected $table = 'metrics';
     }
 
-Location:
+InventoryLocation:
 
     use Baum\Node;
 
-    class Location extends Node
+    class InventoryLocation extends Node
     {
         protected $table = 'locations';
     }
 
-Category:
+InventoryCategory:
 
     use Trexology\Inventory\Traits\CategoryTrait;
     use Baum\Node;
 
-    class Category extends Node
+    class InventoryCategory extends Node
     {
         use CategoryTrait;
 
@@ -132,11 +132,11 @@ Category:
         }
     }
 
-Supplier:
+InventorySupplier:
 
     use Trexology\Inventory\Traits\SupplierTrait;
 
-    class Supplier extends BaseModel
+    class InventorySupplier extends BaseModel
     {
         use SupplierTrait;
 
diff --git a/src/Migrations/2014_07_31_123201_create_metrics_table.php b/src/Migrations/2014_07_31_123201_create_metrics_table.php
index e2b438b9..7208fae0 100644
--- a/src/Migrations/2014_07_31_123201_create_metrics_table.php
+++ b/src/Migrations/2014_07_31_123201_create_metrics_table.php
@@ -10,7 +10,7 @@ class CreateMetricsTable extends Migration
      */
     public function up()
     {
-        Schema::create('metrics', function (Blueprint $table) {
+        Schema::create('inventory_metrics', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
 
diff --git a/src/Migrations/2014_07_31_123204_create_categories_table.php b/src/Migrations/2014_07_31_123204_create_categories_table.php
index efd386e5..ea5fd25b 100644
--- a/src/Migrations/2014_07_31_123204_create_categories_table.php
+++ b/src/Migrations/2014_07_31_123204_create_categories_table.php
@@ -10,7 +10,7 @@ class CreateCategoriesTable extends Migration
      */
     public function up()
     {
-        Schema::create('categories', function (Blueprint $table) {
+        Schema::create('inventory_categories', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
             $table->integer('parent_id')->nullable()->index();
diff --git a/src/Migrations/2014_07_31_123204_create_locations_table.php b/src/Migrations/2014_07_31_123204_create_locations_table.php
index 94dd7884..e4270b17 100644
--- a/src/Migrations/2014_07_31_123204_create_locations_table.php
+++ b/src/Migrations/2014_07_31_123204_create_locations_table.php
@@ -10,7 +10,7 @@ class CreateLocationsTable extends Migration
      */
     public function up()
     {
-        Schema::create('locations', function (Blueprint $table) {
+        Schema::create('inventory_locations', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
             $table->integer('parent_id')->nullable()->index();
diff --git a/src/Models/Category.php b/src/Models/InventoryCategory.php
similarity index 93%
rename from src/Models/Category.php
rename to src/Models/InventoryCategory.php
index 06fdb58a..e4e68db4 100644
--- a/src/Models/Category.php
+++ b/src/Models/InventoryCategory.php
@@ -5,7 +5,7 @@
 use Trexology\Inventory\Traits\CategoryTrait;
 use Baum\Node;
 
-class Category extends Node
+class InventoryCategory extends Node
 {
     use CategoryTrait;
 
diff --git a/src/Models/Location.php b/src/Models/InventoryLocation.php
similarity index 92%
rename from src/Models/Location.php
rename to src/Models/InventoryLocation.php
index 0f8836ce..5a05971d 100644
--- a/src/Models/Location.php
+++ b/src/Models/InventoryLocation.php
@@ -4,7 +4,7 @@
 
 use Baum\Node;
 
-class Location extends Node
+class InventoryLocation extends Node
 {
     /**
      * The scoped location attributes.
diff --git a/src/Models/Metric.php b/src/Models/InventoryMetric.php
similarity index 89%
rename from src/Models/Metric.php
rename to src/Models/InventoryMetric.php
index edf14228..ecd8386a 100644
--- a/src/Models/Metric.php
+++ b/src/Models/InventoryMetric.php
@@ -2,7 +2,7 @@
 
 namespace Trexology\Inventory\Models;
 
-class Metric extends Model
+class InventoryMetric extends Model
 {
     /**
      * The hasMany inventory items relationship.
diff --git a/src/Models/Supplier.php b/src/Models/InventorySupplier.php
similarity index 91%
rename from src/Models/Supplier.php
rename to src/Models/InventorySupplier.php
index 9a31497e..3705da56 100644
--- a/src/Models/Supplier.php
+++ b/src/Models/InventorySupplier.php
@@ -4,7 +4,7 @@
 
 use Trexology\Inventory\Traits\SupplierTrait;
 
-class Supplier extends Model
+class InventorySupplier extends Model
 {
     use SupplierTrait;
 

From c859643df1fc069d8e0936e0256fd17a07b73148 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Mon, 27 Nov 2017 17:50:48 +0800
Subject: [PATCH 03/34] updated README moved register Lang folder to boot
 function in service provider

---
 README.md                        | 13 +------------
 docs/INSTALLATION.md             |  8 ++++----
 src/InventoryServiceProvider.php |  8 +++++---
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 258aad45..0ac6c3fa 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,5 @@
 # Inventory
 
-[![Travis CI](https://img.shields.io/travis/trexology/laravel-inventory/v1.7.5.svg?style=flat-square)](https://travis-ci.org/trexology/laravel-inventory)
-[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/trexology/laravel-inventory.svg?style=flat-square)](https://scrutinizer-ci.com/g/trexology/laravel-inventory/?branch=master)
-[![SensioLabsInsight](https://img.shields.io/sensiolabs/i/69e0abf0-cd74-4d4d-b40c-e943c4a7eea9.svg?style=flat-square)](https://insight.sensiolabs.com/projects/69e0abf0-cd74-4d4d-b40c-e943c4a7eea9)
-[![Latest Stable Version](https://img.shields.io/packagist/v/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
-[![Total Downloads](https://img.shields.io/packagist/dt/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
-[![License](https://img.shields.io/packagist/l/trexology/laravel-inventory.svg?style=flat-square)](https://packagist.org/packages/trexology/laravel-inventory)
-
-## Index
-
-[![Join the chat at https://gitter.im/trexology/laravel-inventory](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/trexology/laravel-inventory?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 <ul>
     <li>
         <a href="#description">Description</a>
@@ -93,7 +82,7 @@ you can simply use the built in models.
 
 Recommended:
 
-- [Trexology/Revision](http://www.github.com/stevebauman/revision) (For tracking Category and Location changes to stocks)
+- [Stevebauman/Revision](http://www.github.com/stevebauman/revision) (For tracking Category and Location changes to stocks)
 
 If you need another Auth driver supported, please send a pull request or create an issue.
 
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index ef27c244..902a16b2 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -5,9 +5,9 @@ multiple cascade delete paths are present on foreign keys, and you'll need to mo
 
 ### Installation (Laravel 4)
 
-Add inventory to your `composer.json` file:
+Run the following command:
 
-    "trexology/laravel-inventory" : "1.8.*"
+    composer require trexology/laravel-inventory
 
 Now perform a `composer update` on your project's source.
 
@@ -33,9 +33,9 @@ Be sure to publish the configuration if you'd like to customize inventory:
 
 ### Installation (Laravel 5)
 
-Add inventory to your `composer.json` file:
+Run the following command:
 
-    "trexology/laravel-inventory" : "1.8.*"
+    composer require trexology/laravel-inventory
 
 Now perform a `composer update` on your project's source.
 
diff --git a/src/InventoryServiceProvider.php b/src/InventoryServiceProvider.php
index fb6d3ead..924535c0 100644
--- a/src/InventoryServiceProvider.php
+++ b/src/InventoryServiceProvider.php
@@ -13,14 +13,16 @@ class InventoryServiceProvider extends ServiceProvider
      */
     const VERSION = '1.8.0';
 
+    public function boot() {
+      // Load the inventory translations from the inventory lang folder
+      $this->loadTranslationsFrom(__DIR__.'/Lang', 'inventory');
+    }
+
     /**
      * {@inheritdoc}
      */
     public function register()
     {
-        // Load the inventory translations from the inventory lang folder
-        $this->loadTranslationsFrom(__DIR__.'/Lang', 'inventory');
-
         // Assign the configuration as publishable, and tag it as 'config'
         $this->publishes([
             __DIR__.'/Config/config.php' => config_path('inventory.php'),

From 86ccf0fbbd316a397e4e6dae229ce565e397ae02 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Tue, 28 Nov 2017 11:47:03 +0800
Subject: [PATCH 04/34] rename migration file name

---
 ...=> 2014_07_31_123201_create_inventory_metrics_table.php} | 4 ++--
 ...2014_07_31_123204_create_inventory_categories_table.php} | 4 ++--
 ... 2014_07_31_123204_create_inventory_locations_table.php} | 4 ++--
 .../2014_07_31_123213_create_inventory_tables.php           | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename src/Migrations/{2014_07_31_123201_create_metrics_table.php => 2014_07_31_123201_create_inventory_metrics_table.php} (87%)
 rename src/Migrations/{2014_07_31_123204_create_categories_table.php => 2014_07_31_123204_create_inventory_categories_table.php} (89%)
 rename src/Migrations/{2014_07_31_123204_create_locations_table.php => 2014_07_31_123204_create_inventory_locations_table.php} (89%)

diff --git a/src/Migrations/2014_07_31_123201_create_metrics_table.php b/src/Migrations/2014_07_31_123201_create_inventory_metrics_table.php
similarity index 87%
rename from src/Migrations/2014_07_31_123201_create_metrics_table.php
rename to src/Migrations/2014_07_31_123201_create_inventory_metrics_table.php
index 7208fae0..7a0353ff 100644
--- a/src/Migrations/2014_07_31_123201_create_metrics_table.php
+++ b/src/Migrations/2014_07_31_123201_create_inventory_metrics_table.php
@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateMetricsTable extends Migration
+class CreateInventoryMetricsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -29,6 +29,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('metrics');
+        Schema::dropIfExists('inventory_metrics');
     }
 }
diff --git a/src/Migrations/2014_07_31_123204_create_categories_table.php b/src/Migrations/2014_07_31_123204_create_inventory_categories_table.php
similarity index 89%
rename from src/Migrations/2014_07_31_123204_create_categories_table.php
rename to src/Migrations/2014_07_31_123204_create_inventory_categories_table.php
index ea5fd25b..3ef688c1 100644
--- a/src/Migrations/2014_07_31_123204_create_categories_table.php
+++ b/src/Migrations/2014_07_31_123204_create_inventory_categories_table.php
@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateCategoriesTable extends Migration
+class CreateInventoryCategoriesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -32,6 +32,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('categories');
+        Schema::dropIfExists('inventory_categories');
     }
 }
diff --git a/src/Migrations/2014_07_31_123204_create_locations_table.php b/src/Migrations/2014_07_31_123204_create_inventory_locations_table.php
similarity index 89%
rename from src/Migrations/2014_07_31_123204_create_locations_table.php
rename to src/Migrations/2014_07_31_123204_create_inventory_locations_table.php
index e4270b17..0ec6c760 100644
--- a/src/Migrations/2014_07_31_123204_create_locations_table.php
+++ b/src/Migrations/2014_07_31_123204_create_inventory_locations_table.php
@@ -3,7 +3,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateLocationsTable extends Migration
+class CreateInventoryLocationsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -32,6 +32,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('locations');
+        Schema::dropIfExists('inventory_locations');
     }
 }
diff --git a/src/Migrations/2014_07_31_123213_create_inventory_tables.php b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
index 8126e279..8d5b9c6c 100644
--- a/src/Migrations/2014_07_31_123213_create_inventory_tables.php
+++ b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
@@ -21,7 +21,7 @@ public function up()
             $table->string('name');
             $table->text('description')->nullable();
 
-            $table->foreign('category_id')->references('id')->on('categories')
+            $table->foreign('category_id')->references('id')->on('inventory_categories')
                 ->onUpdate('restrict')
                 ->onDelete('set null');
 
@@ -29,7 +29,7 @@ public function up()
                 ->onUpdate('restrict')
                 ->onDelete('set null');
 
-            $table->foreign('metric_id')->references('id')->on('metrics')
+            $table->foreign('metric_id')->references('id')->on('inventory_metrics')
                 ->onUpdate('restrict')
                 ->onDelete('cascade');
         });
@@ -61,7 +61,7 @@ public function up()
                 ->onUpdate('restrict')
                 ->onDelete('cascade');
 
-            $table->foreign('location_id')->references('id')->on('locations')
+            $table->foreign('location_id')->references('id')->on('inventory_locations')
                 ->onUpdate('restrict')
                 ->onDelete('cascade');
         });

From dc76c320c35f82e4360aff996d286cb38616d1be Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Tue, 5 Dec 2017 14:36:24 +0800
Subject: [PATCH 05/34] made a few changes

---
 composer.json                                 |  12 +-
 docs/INSTALLATION.md                          |   4 +-
 docs/USAGE.md                                 | 220 +++++++++---------
 ...4_07_31_123204_create_locations_table.php} |   6 +-
 ...4_07_31_123213_create_inventory_tables.php |   3 +-
 src/Models/Inventory.php                      |  11 +-
 src/Models/InventoryCategory.php              |   4 +
 src/Models/InventoryMetric.php                |   4 +
 .../{InventoryLocation.php => Location.php}   |   2 +-
 src/Traits/InventoryTrait.php                 |   2 +-
 10 files changed, 142 insertions(+), 126 deletions(-)
 rename src/Migrations/{2014_07_31_123204_create_inventory_locations_table.php => 2014_07_31_123204_create_locations_table.php} (82%)
 rename src/Models/{InventoryLocation.php => Location.php} (92%)

diff --git a/composer.json b/composer.json
index d0253888..1b4d06fc 100644
--- a/composer.json
+++ b/composer.json
@@ -34,12 +34,12 @@
     },
     "minimum-stability": "stable",
     "extra": {
-    "laravel": {
-      "providers": [
-        "Trexology\\Inventory\\InventoryServiceProvider"
-      ],
-      "aliases": {
+      "laravel": {
+        "providers": [
+          "Trexology\\Inventory\\InventoryServiceProvider"
+        ],
+        "aliases": {
+        }
       }
     }
-  }
 }
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index 902a16b2..a7bafee5 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -104,11 +104,11 @@ InventoryMetric:
         protected $table = 'metrics';
     }
 
-InventoryLocation:
+Location:
 
     use Baum\Node;
 
-    class InventoryLocation extends Node
+    class Location extends Node
     {
         protected $table = 'locations';
     }
diff --git a/docs/USAGE.md b/docs/USAGE.md
index 39b207c0..3a96d0fd 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -3,62 +3,62 @@
 First you'll have to create a metric that your Inventory is measured by:
 
     $metric = new Metric;
-    
+
     $metric->name = 'Litres';
     $metric->symbol = 'L';
     $metric->save();
-    
+
 Now, create a category to store the inventory record under:
 
     $category = new Category;
-    
+
     $category->name = 'Drinks';
     $category->save();
-    
+
 Then, you'll create an inventory record, and assign the metric and category we just created:
-    
+
     $item = new Inventory;
-    
+
     $item->metric_id = $metric->id;
     $item->category_id = $category->id;
     $item->name = 'Milk';
     $item->description = 'Delicious milk';
     $item->save();
-    
+
 Now we have our inventory item created. We have to add stock, but to add stock we need to create a Location to bind the stock to:
 
     $location = new Location;
-    
+
     $location->name = 'Warehouse';
     $location->save();
 
 #### Creating and Adding Stock
 
 Now we can add stock to our inventory by supplying a number (int or string), and the location (Location object):
-    
+
     /*
     * Creating a stock will automatically create a stock movement, no matter which method is used below.
     */
-    
+
     $item->createStockOnLocation(20, $location);
-    
+
     /*
-    * Or instantiate a new stock. This will automatically 
+    * Or instantiate a new stock. This will automatically
     * assign the location ID and inventory ID to the new stock
     * record so we don't have to.
     */
-    
+
     $stock = $item->newStockOnLocation($location);
     $stock->quantity = 20;
     $stock->cost = '5.20';
     $stock->reason = 'I bought some';
     $stock->save();
-    
+
     /*
     * Or we can create a stock manually.
     * If you want to set the cost and reason for the creation of the stock, be sure to do so
     */
-    
+
     $stock = new InventoryStock;
     $stock->inventory_id = $item->id;
     $stock->location_id = $location->id;
@@ -72,22 +72,22 @@ Now we can add stock to our inventory by supplying a number (int or string), and
 So, we've successfully added stock to our inventory item, now let's add some more quantity to it:
 
     $location = Location::find(1);
-    
+
     $item = Inventory::find(1);
-    
+
     $stock = $item->getStockFromLocation($location);
-    
+
     /*
     * Reason and cost are always optional
     */
     $reason = 'I bought some';
     $cost = '5.20';
-    
+
     /*
     * Remember, you're adding the amount of your metric, in this case Litres
     */
     $stock->put(3, $reason, $cost);
-    
+
     /*
     * Or you can use the add, they both perform the same function
     */
@@ -98,9 +98,9 @@ So, we've successfully added stock to our inventory item, now let's add some mor
 We've added quantity to our stock, now lets take some away:
 
     $reason = 'I drank it';
-    
+
     $stock->take(15, $reason);
-    
+
     /*
     * Or you can use remove, they both perform the same function
     */
@@ -111,22 +111,22 @@ We've added quantity to our stock, now lets take some away:
 Actually hang on, we definitely didn't drink that much, let's roll it back:
 
     $stock->rollback();
-    
+
     /*
-    * We can also rollback specific movements, this is recommended 
+    * We can also rollback specific movements, this is recommended
     * so you know which movement you're rolling back. You may want to
     * rollback the last movement, but if a movement is created during a rollback,
     * it won't take this into account.
     */
     $movement = InventoryStockMovement::find(2);
-    
+
     $stock->rollback($movement);
-    
+
     // Or we can even trigger a rollback on the specific movement:
-    
+
     $movement->rollback();
-    
-Now that we've added stock to our inventory, and made some changes, all changes are automatically tracked. 
+
+Now that we've added stock to our inventory, and made some changes, all changes are automatically tracked.
 If an exception occurs during a stock change, it is automatically reversed using Laravel's built in database transactions.
 
 If you look at your database, inside your `inventory_stock_movements` table, you should see 4 records:
@@ -141,15 +141,15 @@ Another situation you might run into, is rolling back a specific movement and re
 occurred AFTER the inserted movement. This is called a recursive rollback. This is how it's performed:
 
     $movement = InventoryStockMovement::find(3);
-    
+
     $stock = InventoryStock::find(1);
-    
+
     /*
     * Passing in true to the second argument will rollback all movements that happened after the inserted rollback,
     * including itself.
     */
     $stock->rollback($movement, true);
-    
+
     /*
     * Or on the movement itself:
     */
@@ -168,17 +168,17 @@ There are some built in 'questions' you can ask your retrieved records. Many mor
 ####Inventory
 
     $item = Inventory::find(1);
-    
+
     /*
     * Returns true/false it the total stock of the item is greater than 0
     */
     $item->isInStock();
-    
+
     /*
     * Returns true/false if the item has a metric assigned to it
     */
     $item->hasMetric();
-    
+
     /*
     * Returns true/false if the item has an SKU
     */
@@ -187,14 +187,14 @@ There are some built in 'questions' you can ask your retrieved records. Many mor
 ####Stock
 
     $stock = InventoryStock::find(1);
-    
+
     /*
     * Returns true if the quantity entered is less than or equal to the amount of available stock.
     *
     * This will throw a Trexology\Inventory\Exceptions\NotEnoughStockException if there is not enough
     */
     $stock->hasEnoughStock($quantity = 0);
-    
+
     /*
     * Returns true if the quantity entered is a valid quantity for updating the stock with.
     *
@@ -211,7 +211,7 @@ by disabling it inside the configuration.
 
 From Google:
 
-'Stock Keeping Unit - SKU' A store's or catalog's product and service identification code, often portrayed 
+'Stock Keeping Unit - SKU' A store's or catalog's product and service identification code, often portrayed
 as a machine-readable bar code that helps the item to be tracked for inventory.
 
 ### How does inventory create the SKU?
@@ -228,7 +228,7 @@ always unique.
 
 ### What happens when an inventory item doesn't have a category?
 
-If an inventory item does not have a category, no SKU is generated. Once you assign a category to the inventory, 
+If an inventory item does not have a category, no SKU is generated. Once you assign a category to the inventory,
 it will be automatically generated.
 
 ### What happens if the category name is short?
@@ -237,7 +237,7 @@ If the categories name is below the number of characters set in the configuratio
 For example, an item with a category named 'D', and an item ID of 1 (one), this will be generated:
 
     D00001
-    
+
 A category name needs to be at least 1 (one) character in length to generate a valid SKU.
 
 ### How do I get the SKU from an item?
@@ -245,9 +245,9 @@ A category name needs to be at least 1 (one) character in length to generate a v
 Easy, just ask the item using the laravel accessor:
 
     $item = Inventory::find(1);
-    
+
     $item->sku_code;
-    
+
 Or use the method:
 
     $item->getSku();
@@ -258,9 +258,9 @@ Regenerating an SKU will delete the previous items SKU and create another. This
 You can perform this like so:
 
     $item = Inventory::find(1);
-        
+
     $item->regenerateSku();
-    
+
 If regenerating an SKU fails, the items previous SKU will be restored. An example of this might be, an item's category
 has changed to a category with no name. Then you call `regenerateSku()`, however this fails due to the category's name
 not meeting at least 1 (one) character in length, so the previous items SKU is restored.
@@ -272,7 +272,7 @@ If the item does not have an SKU and `regenerateSku()` is called, then an SKU wi
 You can generate an sku yourself like so:
 
     $item = Inventory::find(1);
-            
+
     $item->generateSku();
 
 If an item already has an SKU, or SKU generation was successful, it will return the current SKU record.
@@ -289,7 +289,7 @@ If you'd like to create your own SKU's, disable sku generation in the configurat
 the method `createSku($code, $overwrite = false)` on your Inventory record like so:
 
     $item = Inventory::find(1);
-    
+
     $item->createSku('my own sku');
 
 This function contains no validation besides checking if an item already has an SKU, so you can create your own
@@ -301,14 +301,14 @@ will be thrown.
 If you'd like to overwrite the SKU if it exists, pass in `true` into the second argument in the function like so:
 
     $item = Inventory::find(1);
-    
+
     // The current sku record will be updated if one exists with the new code
-    $sku = $item->createSku('my own sku', true); 
+    $sku = $item->createSku('my own sku', true);
 
 If you'd like to update your custom SKU, you can just call the `updateSku($code)` method like so:
 
     $item = Inventory::find(1);
-    
+
     $sku = $item->updateSku('my new sku code');
 
 Calling `updateSku($code)` will also create an SKU if one doesn't exist.
@@ -326,10 +326,10 @@ In update 1.3 you can now add Suppliers easily to an inventory item.
 First we'll create a supplier:
 
     $supplier = new Supplier;
-    
+
     //Mandatory fields
     $supplier->name = 'Drink Supplier';
-    
+
     //Optional fields
     $supplier->address = '123 Fake Street';
     $supplier->postal_code = 'N8J 2K7';
@@ -342,31 +342,31 @@ First we'll create a supplier:
     $supplier->contact_phone = '555 555-5555';
     $supplier->contact_fax = '555 555-5555';
     $supplier->contact_email = 'john.doe@email.com';
-    
+
     $supplier->save();
-    
+
 Now we can add the supplier to an item using the `Inventory` model helper function `addSupplier($supplier)`:
 
     $item = Inventory::find(1);
-    
+
     $item->addSupplier($supplier);
-    
+
     //Or we can use the suppliers ID
     $item->addSupplier(1);
-    
+
     //Adding multiple suppliers at once
     $item->addSuppliers(array($supplier));
-    
+
 We can also remove suppliers using:
 
     $item->removeSupplier($supplier);
-    
+
     //Or we can use the suppliers ID
     $item->removeSupplier(1);
-    
+
     //Removing multiple suppliers at once
     $item->removeSuppliers(array($supplier));
-    
+
     //Removing all suppliers from an item
     $item->removeAllSuppliers();
 
@@ -374,16 +374,16 @@ The inverse can also be done on the supplier model:
 
     $supplier->addItem($item);
     $supplier->addItem(1);
-    
+
     $supplier->addItems(array($item));
     $supplier->addItems(array(1, 2, 3));
-    
+
     $supplier->removeItem($item);
     $supplier->removeItem(1);
-    
+
     $supplier->removeItems(array($item));
     $supplier->removeItems(array(1, 2, 3));
-    
+
     $supplier->removeAllItems();
 
 ## Exceptions
@@ -396,20 +396,20 @@ Here is a list of method's along with their exceptions that they can throw.
 
 ### NoUserLoggedInException
 
-Occurs when a user ID cannot be retrieved from Sentry, Sentinel, or built in Auth driver 
+Occurs when a user ID cannot be retrieved from Sentry, Sentinel, or built in Auth driver
 (doesn't apply when `allow_no_user` is enabled)
 
 ### NotEnoughStockException
 
 Occurs when you're trying to take more stock than available. Use a try/catch block when processing take/remove actions:
-    
-    try 
+
+    try
     {
         $stock->take($quantity);
-        
+
         return "Successfully removed $quantity";
-        
-    } catch(Trexology\Inventory\Exceptions\NotEnoughStockException)
+
+    } catch(Trexology\Inventory\Exceptions\NotEnoughStockException $e)
     {
         return "There wasn't enough stock to perform this action. Please try again.";
     }
@@ -421,9 +421,9 @@ Occurs when a stock of the item already exists at the specified location. Use a
     try
     {
         $stock->moveTo($location);
-        
+
         return "Successfully moved stock to $location->name";
-        
+
     } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException)
     {
         return "Stock already exists at this location. Please try again.";
@@ -431,18 +431,18 @@ Occurs when a stock of the item already exists at the specified location. Use a
 
 ### InvalidQuantityException
 
-Occurs when a non-numerical value is entered as the quantity, such as `'30L'`, `'a20.0'`. Strings (as long as they're numeric), 
+Occurs when a non-numerical value is entered as the quantity, such as `'30L'`, `'a20.0'`. Strings (as long as they're numeric),
 integers and doubles/decimals/floats are always valid. You can use laravel's built in validation to prevent this exception from
 occurring, or you can use a try/catch block when processing actions involving quantity:
 
-    try 
+    try
     {
         $quantity = '20 Litres'; //This will cause an exception
-        
+
         $stock->add($quantity);
-        
+
         return "Successfully added $quantity";
-        
+
     } catch(Trexology\Inventory\Exceptions\InvalidQuantityException)
     {
         return "The quantity you entered is invalid. Please try again.";
@@ -463,18 +463,18 @@ Occurs when a movement cannot be found, or the specified movement is not a subcl
 All methods used on the inventory can throw a `NoUserLoggedInException` if `allow_no_user` is disabled inside the configuration.
 
     /**
-    * @throws NoUserLoggedInException 
+    * @throws NoUserLoggedInException
     */
 
 #### Inventory Model Methods
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws InvalidLocationException
     * @throws StockAlreadyExistsException
     */
     $item->createStockOnLocation($quantity, $location, $reason = '', $cost = 0, $aisle = NULL, $row = NULL, $bin = NULL);
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws InvalidLocationException
@@ -482,7 +482,7 @@ All methods used on the inventory can throw a `NoUserLoggedInException` if `allo
     */
     $item->takeFromLocation($quantity, $location, $reason = '');
     $item->removeFromLocation($quantity, $locations =  array(), $reason = '');
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws InvalidLocationException
@@ -490,27 +490,27 @@ All methods used on the inventory can throw a `NoUserLoggedInException` if `allo
     */
     $item->takeFromManyLocations($quantity, $locations =  array(), $reason = '');
     $item->removeFromManyLocations($quantity, $locations =  array(), $reason = '');
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws InvalidLocationException
     */
     $item->putToLocation($quantity, $location, $reason = '', $cost = 0);
     $item->addToLocation($quantity, $location, $reason = '', $cost = 0);
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws InvalidLocationException
     */
     $item->putToManyLocations($quantity, $locations = array(), $reason = '', $cost = 0);
     $item->addToManyLocations($quantity, $locations = array(), $reason = '', $cost = 0);
-    
+
     /**
     * @throws InvalidLocationException
     * @throws StockAlreadyExistsException
     */
     $item->moveStock($fromLocation, $toLocation);
-   
+
     /**
     * @throws InvalidLocationException
     * @throws StockNotFoundException
@@ -523,26 +523,26 @@ All methods used on the inventory can throw a `NoUserLoggedInException` if `allo
     * @throws InvalidQuantityException
     */
     $stock->updateQuantity($quantity, $reason= '', $cost = 0);
-    
+
     /**
     * @throws InvalidQuantityException
     * @throws NotEnoughStockException
     */
     $stock->take($quantity, $reason = '');
     $stock->remove($quantity, $reason= '');
-    
+
     /**
     * @throws InvalidQuantityException
     */
     $stock->add($quantity, $reason = '', $cost = 0);
     $stock->put($quantity, $reason = '', $cost = 0);
-    
+
     /**
     * @throws InvalidLocationException
     * @throws StockAlreadyExistsException
     */
     $stock->moveTo($location);
-    
+
     /**
     * @throws NotEnoughStockException
     */
@@ -562,7 +562,7 @@ Integration with Sentry, Sentinel and Laravel's auth driver is built in, so inve
 tagged to the current logged in user. However, you turn this off if you'd like in the config file under:
 
     'allow_no_user' => false //Set to true
-    
+
 If you're using another form of authentication, you can always override the `protected static function getCurrentUserId()`
 that is included on each trait by your own `UserIdentificationTrait`. For example:
 
@@ -575,21 +575,21 @@ The trait:
             // Return the current users ID using your own method
         }
     }
-    
+
 On your models:
-    
+
     use Trexology\Inventory\Traits\InventoryTrait;
-    
+
     class Inventory extends Eloquent
     {
         //Place the trait on your model
         use MyUserIdentificationTrait;
-        
+
         use InventoryTrait;
-        
+
         protected $table = 'inventories';
     }
-    
+
 ## Misc Functions and Uses
 
 #### Helpful Scopes
@@ -606,30 +606,30 @@ Place this inside your `Inventory` model. You can also use this implementation f
     public function scopeCategory($query, $category_id = NULL)
     {
         if ($category_id) {
-        
+
             /*
              * Get descendants and self inventory category nodes
              */
             $categories = $this->category()->find($category_id)->getDescendantsAndSelf();
-            
+
             /*
              * Perform a subquery on main query
              */
             $query->where(function ($query) use ($categories) {
-            
+
                 /*
                  * For each category, apply a orWhere query to the subquery
                  */
                 foreach ($categories as $category) {
                     $query->orWhere('category_id', $category->id);
                 }
-                
+
                 return $query;
-                
+
             });
         }
     }
-    
+
 Using this will effectively allow you to see all of the inventory from a parent category.
 
 #### Helpful Accessors
@@ -668,7 +668,7 @@ You can simply create 2 Accessors. Place this accessor on the `InventoryStock` m
 
         return NULL;
     }
-    
+
 Place this accessor on the `InventoryStockMovement` model:
 
     /**
@@ -690,19 +690,19 @@ Place this accessor on the `InventoryStockMovement` model:
             return 'None';
         }
     }
-    
+
 Now, inside your view to display stock records you can use:
 
     @if($stocks->count() > 0)
-    
+
         @foreach($stocks as $stock)
-    
+
             {{ $stock->last_movement }} // Will display in format '+ 20 (Stock was Added) - Reason: Stock check'
-    
+
         @endforeach
-    
+
     @else
-        
+
         There are no stocks to display for this item.
-        
+
     @endif
diff --git a/src/Migrations/2014_07_31_123204_create_inventory_locations_table.php b/src/Migrations/2014_07_31_123204_create_locations_table.php
similarity index 82%
rename from src/Migrations/2014_07_31_123204_create_inventory_locations_table.php
rename to src/Migrations/2014_07_31_123204_create_locations_table.php
index 0ec6c760..94dd7884 100644
--- a/src/Migrations/2014_07_31_123204_create_inventory_locations_table.php
+++ b/src/Migrations/2014_07_31_123204_create_locations_table.php
@@ -3,14 +3,14 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateInventoryLocationsTable extends Migration
+class CreateLocationsTable extends Migration
 {
     /**
      * Run the migrations.
      */
     public function up()
     {
-        Schema::create('inventory_locations', function (Blueprint $table) {
+        Schema::create('locations', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
             $table->integer('parent_id')->nullable()->index();
@@ -32,6 +32,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('inventory_locations');
+        Schema::dropIfExists('locations');
     }
 }
diff --git a/src/Migrations/2014_07_31_123213_create_inventory_tables.php b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
index 8d5b9c6c..ffff7824 100644
--- a/src/Migrations/2014_07_31_123213_create_inventory_tables.php
+++ b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
@@ -61,7 +61,7 @@ public function up()
                 ->onUpdate('restrict')
                 ->onDelete('cascade');
 
-            $table->foreign('location_id')->references('id')->on('inventory_locations')
+            $table->foreign('location_id')->references('id')->on('locations')
                 ->onUpdate('restrict')
                 ->onDelete('cascade');
         });
@@ -76,6 +76,7 @@ public function up()
             $table->decimal('before', 8, 2)->default(0);
             $table->decimal('after', 8, 2)->default(0);
             $table->decimal('cost', 8, 2)->default(0)->nullable();
+            $table->morphs('receiver')->nullable();
             $table->string('reason')->nullable();
 
             $table->foreign('stock_id')->references('id')->on('inventory_stocks')
diff --git a/src/Models/Inventory.php b/src/Models/Inventory.php
index 8c6096aa..f0092e9e 100644
--- a/src/Models/Inventory.php
+++ b/src/Models/Inventory.php
@@ -18,6 +18,13 @@ class Inventory extends Model
      * @var string
      */
     protected $table = 'inventories';
+    protected $fillable = [
+  							'name',
+  							'description',
+                'category_id',
+                'metric_id',
+                'user_id'
+  						];
 
     /**
      * The hasOne category relationship.
@@ -26,7 +33,7 @@ class Inventory extends Model
      */
     public function category()
     {
-        return $this->hasOne(Category::class);
+        return $this->hasOne(InventoryCategory::class,'id','category_id');
     }
 
     /**
@@ -36,7 +43,7 @@ public function category()
      */
     public function metric()
     {
-        return $this->hasOne(Metric::class);
+        return $this->hasOne(InventoryMetric::class,'id','metric_id');
     }
 
     /**
diff --git a/src/Models/InventoryCategory.php b/src/Models/InventoryCategory.php
index e4e68db4..c44ba9aa 100644
--- a/src/Models/InventoryCategory.php
+++ b/src/Models/InventoryCategory.php
@@ -9,6 +9,10 @@ class InventoryCategory extends Node
 {
     use CategoryTrait;
 
+    protected $fillable = [
+                'name',
+              ];
+
     /**
      * The scoped category attrbiutes.
      *
diff --git a/src/Models/InventoryMetric.php b/src/Models/InventoryMetric.php
index ecd8386a..b81c54e5 100644
--- a/src/Models/InventoryMetric.php
+++ b/src/Models/InventoryMetric.php
@@ -4,6 +4,10 @@
 
 class InventoryMetric extends Model
 {
+  protected $fillable = [
+              'name',
+              'symbol',
+            ];
     /**
      * The hasMany inventory items relationship.
      *
diff --git a/src/Models/InventoryLocation.php b/src/Models/Location.php
similarity index 92%
rename from src/Models/InventoryLocation.php
rename to src/Models/Location.php
index 5a05971d..0f8836ce 100644
--- a/src/Models/InventoryLocation.php
+++ b/src/Models/Location.php
@@ -4,7 +4,7 @@
 
 use Baum\Node;
 
-class InventoryLocation extends Node
+class Location extends Node
 {
     /**
      * The scoped location attributes.
diff --git a/src/Traits/InventoryTrait.php b/src/Traits/InventoryTrait.php
index 343c8f20..53ac8290 100644
--- a/src/Traits/InventoryTrait.php
+++ b/src/Traits/InventoryTrait.php
@@ -164,7 +164,7 @@ public function hasSku()
      */
     public function hasCategory()
     {
-        if ($this->category) {
+        if ($this->inventoryCategory) {
             return true;
         }
 

From 970f095a056b47649b18c74e731a8ec783592595 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Wed, 6 Dec 2017 16:13:15 +0800
Subject: [PATCH 06/34] change README

---
 docs/USAGE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/USAGE.md b/docs/USAGE.md
index 3a96d0fd..2c4e2a14 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -424,7 +424,7 @@ Occurs when a stock of the item already exists at the specified location. Use a
 
         return "Successfully moved stock to $location->name";
 
-    } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException)
+    } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException $e)
     {
         return "Stock already exists at this location. Please try again.";
     }
@@ -443,7 +443,7 @@ occurring, or you can use a try/catch block when processing actions involving qu
 
         return "Successfully added $quantity";
 
-    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException)
+    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException $e)
     {
         return "The quantity you entered is invalid. Please try again.";
     }

From f9e1f57eeef8b16cd50a159b4e80786e130bb8a0 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 7 Dec 2017 17:08:57 +0800
Subject: [PATCH 07/34] added receiver function to stock movement

---
 docs/USAGE.md                                 |  4 +--
 ...4_07_31_123213_create_inventory_tables.php |  2 +-
 src/Traits/InventoryStockTrait.php            | 28 +++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/docs/USAGE.md b/docs/USAGE.md
index 2c4e2a14..3a96d0fd 100644
--- a/docs/USAGE.md
+++ b/docs/USAGE.md
@@ -424,7 +424,7 @@ Occurs when a stock of the item already exists at the specified location. Use a
 
         return "Successfully moved stock to $location->name";
 
-    } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException $e)
+    } catch(Trexology\Inventory\Exceptions\StockAlreadyExistsException)
     {
         return "Stock already exists at this location. Please try again.";
     }
@@ -443,7 +443,7 @@ occurring, or you can use a try/catch block when processing actions involving qu
 
         return "Successfully added $quantity";
 
-    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException $e)
+    } catch(Trexology\Inventory\Exceptions\InvalidQuantityException)
     {
         return "The quantity you entered is invalid. Please try again.";
     }
diff --git a/src/Migrations/2014_07_31_123213_create_inventory_tables.php b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
index ffff7824..49314d14 100644
--- a/src/Migrations/2014_07_31_123213_create_inventory_tables.php
+++ b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
@@ -76,7 +76,7 @@ public function up()
             $table->decimal('before', 8, 2)->default(0);
             $table->decimal('after', 8, 2)->default(0);
             $table->decimal('cost', 8, 2)->default(0)->nullable();
-            $table->morphs('receiver')->nullable();
+            $table->nullableMorphs('receiver');
             $table->string('reason')->nullable();
 
             $table->foreign('stock_id')->references('id')->on('inventory_stocks')
diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 05dbf0a4..f74d0346 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -28,6 +28,13 @@ trait InventoryStockTrait
      */
     public $cost = 0;
 
+    /**
+     * Stores the receiver object.
+     *
+     * @varObject
+     */
+    public $receiver = null;
+
     /**
      * Stores the quantity before an update.
      *
@@ -117,7 +124,7 @@ public function postCreate()
      */
     public function postUpdate()
     {
-        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost);
+        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver);
     }
 
     /**
@@ -149,9 +156,9 @@ public function updateQuantity($quantity, $reason = '', $cost = 0)
      *
      * @return $this|bool
      */
-    public function remove($quantity, $reason = '', $cost = 0)
+    public function remove($quantity, $reason = '', $cost = 0, $receiver = null)
     {
-        return $this->take($quantity, $reason, $cost);
+        return $this->take($quantity, $reason, $cost, $receiver);
     }
 
     /**
@@ -166,9 +173,9 @@ public function remove($quantity, $reason = '', $cost = 0)
      *
      * @return $this|bool
      */
-    public function take($quantity, $reason = '', $cost = 0)
+    public function take($quantity, $reason = '', $cost = 0, $receiver = null)
     {
-        return $this->processTakeOperation($quantity, $reason, $cost);
+        return $this->processTakeOperation($quantity, $reason, $cost, $receiver);
     }
 
     /**
@@ -385,7 +392,7 @@ protected function processUpdateQuantityOperation($quantity, $reason = '', $cost
      *
      * @return $this|bool
      */
-    protected function processTakeOperation($taking, $reason = '', $cost = 0)
+    protected function processTakeOperation($taking, $reason = '', $cost = 0, $receiver = null)
     {
         if($this->isValidQuantity($taking) && $this->hasEnoughStock($taking)) {
             $available = $this->getAttribute('quantity');
@@ -407,8 +414,9 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0)
 
             $this->setCost($cost);
 
-            $this->dbStartTransaction();
+            $this->receiver = $receiver;
 
+            $this->dbStartTransaction();
             try {
                 if ($this->save()) {
                     $this->dbCommitTransaction();
@@ -594,13 +602,17 @@ protected function processRecursiveRollbackOperation(Model $movement)
      *
      * @return bool|Model
      */
-    protected function generateStockMovement($before, $after, $reason = '', $cost = 0)
+    protected function generateStockMovement($before, $after, $reason = '', $cost = 0, $receiver = null)
     {
         $movement = $this->movements()->getRelated()->newInstance();
 
         $movement->setAttribute('stock_id', $this->getKey());
         $movement->setAttribute('before', $before);
         $movement->setAttribute('after', $after);
+        if ($receiver) {
+          $movement->setAttribute('receiver_id', $receiver->id);
+          $movement->setAttribute('receiver_type', get_class($receiver));
+        }
         $movement->setAttribute('reason', $reason);
         $movement->setAttribute('cost', $cost);
 

From b1075378b074a2fe5134a6ad92cd4a4f819cf5eb Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 14 Dec 2017 14:44:33 +0800
Subject: [PATCH 08/34] handle rollback receiver storage

---
 src/Traits/InventoryStockTrait.php | 49 ++++++++++++++++++------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index f74d0346..f6692c99 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -29,11 +29,12 @@ trait InventoryStockTrait
     public $cost = 0;
 
     /**
-     * Stores the receiver object.
+     * Stores the receiver params.
      *
-     * @varObject
+     * @var string
      */
-    public $receiver = null;
+    public $receiver_id = null;
+    public $receiver_type = null;
 
     /**
      * Stores the quantity before an update.
@@ -114,7 +115,7 @@ public static function bootInventoryStockTrait()
      */
     public function postCreate()
     {
-        $this->generateStockMovement(0, $this->getAttribute('quantity'), $this->reason, $this->cost);
+        $this->generateStockMovement(0, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type);
     }
 
     /**
@@ -124,7 +125,7 @@ public function postCreate()
      */
     public function postUpdate()
     {
-        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver);
+        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type);
     }
 
     /**
@@ -156,9 +157,9 @@ public function updateQuantity($quantity, $reason = '', $cost = 0)
      *
      * @return $this|bool
      */
-    public function remove($quantity, $reason = '', $cost = 0, $receiver = null)
+    public function remove($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
-        return $this->take($quantity, $reason, $cost, $receiver);
+        return $this->take($quantity, $reason, $cost, $receiver_id, $receiver_type);
     }
 
     /**
@@ -173,9 +174,9 @@ public function remove($quantity, $reason = '', $cost = 0, $receiver = null)
      *
      * @return $this|bool
      */
-    public function take($quantity, $reason = '', $cost = 0, $receiver = null)
+    public function take($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
-        return $this->processTakeOperation($quantity, $reason, $cost, $receiver);
+        return $this->processTakeOperation($quantity, $reason, $cost, $receiver_id, $receiver_type);
     }
 
     /**
@@ -187,9 +188,9 @@ public function take($quantity, $reason = '', $cost = 0, $receiver = null)
      *
      * @return $this
      */
-    public function add($quantity, $reason = '', $cost = 0)
+    public function add($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
-        return $this->put($quantity, $reason, $cost);
+        return $this->put($quantity, $reason, $cost, $receiver_id, $receiver_type);
     }
 
     /**
@@ -203,9 +204,9 @@ public function add($quantity, $reason = '', $cost = 0)
      *
      * @return $this
      */
-    public function put($quantity, $reason = '', $cost = 0)
+    public function put($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
-        return $this->processPutOperation($quantity, $reason, $cost);
+        return $this->processPutOperation($quantity, $reason, $cost, $receiver_id, $receiver_type);
     }
 
     /**
@@ -392,7 +393,7 @@ protected function processUpdateQuantityOperation($quantity, $reason = '', $cost
      *
      * @return $this|bool
      */
-    protected function processTakeOperation($taking, $reason = '', $cost = 0, $receiver = null)
+    protected function processTakeOperation($taking, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
         if($this->isValidQuantity($taking) && $this->hasEnoughStock($taking)) {
             $available = $this->getAttribute('quantity');
@@ -414,7 +415,8 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
 
             $this->setCost($cost);
 
-            $this->receiver = $receiver;
+            $this->receiver_id = $receiver_id;
+            $this->receiver_type = $receiver_type;
 
             $this->dbStartTransaction();
             try {
@@ -444,7 +446,7 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
      *
      * @return $this|bool
      */
-    protected function processPutOperation($putting, $reason = '', $cost = 0)
+    protected function processPutOperation($putting, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
         if($this->isValidQuantity($putting)) {
             $current = $this->getAttribute('quantity');
@@ -463,6 +465,9 @@ protected function processPutOperation($putting, $reason = '', $cost = 0)
 
             $this->setCost($cost);
 
+            $this->receiver_id = $receiver_id;
+            $this->receiver_type = $receiver_type;
+
             $this->dbStartTransaction();
 
             try {
@@ -525,6 +530,7 @@ protected function processMoveOperation(Model $location)
     protected function processRollbackOperation(Model $movement, $recursive = false)
     {
         if ($recursive) {
+            dd(false);
             return $this->processRecursiveRollbackOperation($movement);
         }
 
@@ -537,6 +543,9 @@ protected function processRollbackOperation(Model $movement, $recursive = false)
 
         $this->setReason($reason);
 
+        $this->receiver_id = $movement->receiver_id;
+        $this->receiver_type = $movement->receiver_type;
+
         if ($this->rollbackCostEnabled()) {
             $this->setCost($movement->getAttribute('cost'));
 
@@ -602,16 +611,16 @@ protected function processRecursiveRollbackOperation(Model $movement)
      *
      * @return bool|Model
      */
-    protected function generateStockMovement($before, $after, $reason = '', $cost = 0, $receiver = null)
+    protected function generateStockMovement($before, $after, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
     {
         $movement = $this->movements()->getRelated()->newInstance();
 
         $movement->setAttribute('stock_id', $this->getKey());
         $movement->setAttribute('before', $before);
         $movement->setAttribute('after', $after);
-        if ($receiver) {
-          $movement->setAttribute('receiver_id', $receiver->id);
-          $movement->setAttribute('receiver_type', get_class($receiver));
+        if ($receiver_id && $receiver_type) {
+          $movement->setAttribute('receiver_id', $receiver_id);
+          $movement->setAttribute('receiver_type', $receiver_type);
         }
         $movement->setAttribute('reason', $reason);
         $movement->setAttribute('cost', $cost);

From 25e27f7ebf06d780037f480b14ddf52f1a5cacc0 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 14 Dec 2017 16:13:58 +0800
Subject: [PATCH 09/34] changed logic for rollback

---
 src/Traits/InventoryStockTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index f6692c99..e6f1910d 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -530,11 +530,11 @@ protected function processMoveOperation(Model $location)
     protected function processRollbackOperation(Model $movement, $recursive = false)
     {
         if ($recursive) {
-            dd(false);
             return $this->processRecursiveRollbackOperation($movement);
         }
 
-        $this->setAttribute('quantity', $movement->getAttribute('before'));
+        $amt = $movement->getAttribute('after')- $movement->getAttribute('before');
+        $this->setAttribute('quantity', $this->quantity - $amt);
 
         $reason = Lang::get('inventory::reasons.rollback', [
             'id' => $movement->getOriginal('id'),

From dc41180e79d5ce50a0621776856ca998c97880e2 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Mon, 29 Jan 2018 12:45:36 +0800
Subject: [PATCH 10/34] added new DB field added return stock logic

---
 ...4_07_31_123213_create_inventory_tables.php |  1 +
 src/Traits/InventoryStockMovementTrait.php    | 12 +++++++
 src/Traits/InventoryStockTrait.php            | 36 +++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/src/Migrations/2014_07_31_123213_create_inventory_tables.php b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
index 49314d14..9e9e1b1d 100644
--- a/src/Migrations/2014_07_31_123213_create_inventory_tables.php
+++ b/src/Migrations/2014_07_31_123213_create_inventory_tables.php
@@ -78,6 +78,7 @@ public function up()
             $table->decimal('cost', 8, 2)->default(0)->nullable();
             $table->nullableMorphs('receiver');
             $table->string('reason')->nullable();
+            $table->boolean('returned')->default(0);
 
             $table->foreign('stock_id')->references('id')->on('inventory_stocks')
                 ->onUpdate('restrict')
diff --git a/src/Traits/InventoryStockMovementTrait.php b/src/Traits/InventoryStockMovementTrait.php
index 1ed774ec..0d64d500 100644
--- a/src/Traits/InventoryStockMovementTrait.php
+++ b/src/Traits/InventoryStockMovementTrait.php
@@ -40,4 +40,16 @@ public function rollback($recursive = false)
     {
         return $this->stock->rollback($this, $recursive);
     }
+
+    /**
+     * Rolls back the current movement.
+     *
+     * @param bool $recursive
+     *
+     * @return mixed
+     */
+    public function returnStock($collect_amt, $collect_reason, $dispose_amt, $dispose_reason)
+    {
+        return $this->stock->returnStock($this, $collect_amt, $collect_reason, $dispose_amt, $dispose_reason);
+    }
 }
diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index e6f1910d..0961efd9 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -245,6 +245,42 @@ public function rollback($movement = null, $recursive = false)
         return false;
     }
 
+    /**
+     * Return stock assigned to an entity. Stock may be disposed of during the process of returning
+     *
+     * @param mixed $movement
+     * @param bool  $recursive
+     *
+     * @return $this|bool
+     */
+    public function returnStock($movement, $collect_amt, $collect_reason, $dispose_amt, $dispose_reason)
+    {
+        if (!$movement) {
+            $movement = $this->getLastMovement();
+        }
+
+        $amt = $movement->getAttribute('before') - $movement->getAttribute('after');
+        $balance = $amt - $dispose_amt - $collect_amt;
+        if ($amt > 0 && $balance >= 0) {
+          $movement->returned = true; // Prevent duplicate return for this movements
+          $movement->save();
+
+          // $reason = Lang::get('inventory::reasons.rollback', [
+          //     'id' => $movement->getOriginal('id'),
+          //     'date' => $movement->getOriginal('created_at'),
+          // ]);
+          $bal_reason = "Balance leftover from returning stock";
+          $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type);
+          $this->take($dispose_amt,$dispose_reason);
+          if ($balance > 0) {
+            $this->take($balance,$bal_reason,0,$movement->receiver_id,$movement->receiver_type);
+          }
+
+        }
+
+        return false;
+    }
+
     /**
      * Rolls back a specific movement.
      *

From 97b75c89075dfca60e69e36aba69803dba117c15 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Wed, 7 Feb 2018 09:43:10 +0800
Subject: [PATCH 11/34] change wordings for balance from stock restribution

---
 src/Traits/InventoryStockTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 0961efd9..7cfe6667 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -269,7 +269,7 @@ public function returnStock($movement, $collect_amt, $collect_reason, $dispose_a
           //     'id' => $movement->getOriginal('id'),
           //     'date' => $movement->getOriginal('created_at'),
           // ]);
-          $bal_reason = "Balance leftover from returning stock";
+          $bal_reason = "Balance leftover from stock redistribution. (id: $movement->id)";
           $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type);
           $this->take($dispose_amt,$dispose_reason);
           if ($balance > 0) {

From 7a9d0eca3a2b05a4148e9b53b92ee3447de5e0ca Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 8 Feb 2018 15:39:31 +0800
Subject: [PATCH 12/34] added serial number tracking logic

---
 .../2017_02_08_115523_add_serial_number.php   | 35 ++++++++++
 src/Models/InventoryStock.php                 |  4 ++
 src/Models/InventoryStockMovement.php         |  4 ++
 src/Traits/InventoryStockTrait.php            | 69 ++++++++++++-------
 4 files changed, 89 insertions(+), 23 deletions(-)
 create mode 100644 src/Migrations/2017_02_08_115523_add_serial_number.php

diff --git a/src/Migrations/2017_02_08_115523_add_serial_number.php b/src/Migrations/2017_02_08_115523_add_serial_number.php
new file mode 100644
index 00000000..aa8e0fb1
--- /dev/null
+++ b/src/Migrations/2017_02_08_115523_add_serial_number.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSerialNumber extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('inventory_stocks', function (Blueprint $table) {
+            $table->text('serial')->nullable()->after('bin');
+        });
+
+        Schema::table('inventory_stock_movements', function (Blueprint $table) {
+            $table->text('serial')->nullable()->after('returned');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('inventory_stocks', function (Blueprint $table) {
+            $table->dropColumn('serial');
+        });
+
+        Schema::table('inventory_stock_movements', function (Blueprint $table) {
+            $table->dropColumn('serial');
+        });
+    }
+}
diff --git a/src/Models/InventoryStock.php b/src/Models/InventoryStock.php
index 56fd1fb6..7172d413 100644
--- a/src/Models/InventoryStock.php
+++ b/src/Models/InventoryStock.php
@@ -8,6 +8,10 @@ class InventoryStock extends Model
 {
     use InventoryStockTrait;
 
+    protected $casts = [
+        'serial' => 'array',
+    ];
+
     /**
      * The belongsTo inventory item relationship.
      *
diff --git a/src/Models/InventoryStockMovement.php b/src/Models/InventoryStockMovement.php
index b70a0271..1fad5e3f 100644
--- a/src/Models/InventoryStockMovement.php
+++ b/src/Models/InventoryStockMovement.php
@@ -8,6 +8,10 @@ class InventoryStockMovement extends Model
 {
     use InventoryStockMovementTrait;
 
+    protected $casts = [
+        'serial' => 'array',
+    ];
+    
     /**
      * The belongsTo stock relationship.
      *
diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 7cfe6667..4b7a4673 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -43,6 +43,13 @@ trait InventoryStockTrait
      */
     protected $beforeQuantity = 0;
 
+    /**
+     * Serial Number for stock movment
+     *
+     * @var Array
+     */
+    public $movementSerial = [];
+
     /**
      * The hasOne location relationship.
      *
@@ -115,7 +122,7 @@ public static function bootInventoryStockTrait()
      */
     public function postCreate()
     {
-        $this->generateStockMovement(0, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type);
+        $this->generateStockMovement(0, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type, $this->movementSerial);
     }
 
     /**
@@ -125,7 +132,7 @@ public function postCreate()
      */
     public function postUpdate()
     {
-        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type);
+        $this->generateStockMovement($this->beforeQuantity, $this->getAttribute('quantity'), $this->reason, $this->cost, $this->receiver_id, $this->receiver_type, $this->movementSerial);
     }
 
     /**
@@ -157,9 +164,9 @@ public function updateQuantity($quantity, $reason = '', $cost = 0)
      *
      * @return $this|bool
      */
-    public function remove($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    public function remove($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
-        return $this->take($quantity, $reason, $cost, $receiver_id, $receiver_type);
+        return $this->take($quantity, $reason, $cost, $receiver_id, $receiver_type, $serial);
     }
 
     /**
@@ -174,9 +181,9 @@ public function remove($quantity, $reason = '', $cost = 0, $receiver_id = null,
      *
      * @return $this|bool
      */
-    public function take($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    public function take($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
-        return $this->processTakeOperation($quantity, $reason, $cost, $receiver_id, $receiver_type);
+        return $this->processTakeOperation($quantity, $reason, $cost, $receiver_id, $receiver_type, $serial);
     }
 
     /**
@@ -188,9 +195,9 @@ public function take($quantity, $reason = '', $cost = 0, $receiver_id = null, $r
      *
      * @return $this
      */
-    public function add($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    public function add($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
-        return $this->put($quantity, $reason, $cost, $receiver_id, $receiver_type);
+        return $this->put($quantity, $reason, $cost, $receiver_id, $receiver_type, $serial);
     }
 
     /**
@@ -204,9 +211,9 @@ public function add($quantity, $reason = '', $cost = 0, $receiver_id = null, $re
      *
      * @return $this
      */
-    public function put($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    public function put($quantity, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
-        return $this->processPutOperation($quantity, $reason, $cost, $receiver_id, $receiver_type);
+        return $this->processPutOperation($quantity, $reason, $cost, $receiver_id, $receiver_type,$serial);
     }
 
     /**
@@ -253,7 +260,7 @@ public function rollback($movement = null, $recursive = false)
      *
      * @return $this|bool
      */
-    public function returnStock($movement, $collect_amt, $collect_reason, $dispose_amt, $dispose_reason)
+    public function returnStock($movement, $collect_amt, $collect_reason, $collect_serial, $dispose_amt, $dispose_reason,$dispose_serial)
     {
         if (!$movement) {
             $movement = $this->getLastMovement();
@@ -265,15 +272,17 @@ public function returnStock($movement, $collect_amt, $collect_reason, $dispose_a
           $movement->returned = true; // Prevent duplicate return for this movements
           $movement->save();
 
-          // $reason = Lang::get('inventory::reasons.rollback', [
+          // $bal_reason = Lang::get('inventory::reasons.rollback', [
           //     'id' => $movement->getOriginal('id'),
           //     'date' => $movement->getOriginal('created_at'),
           // ]);
           $bal_reason = "Balance leftover from stock redistribution. (id: $movement->id)";
-          $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type);
-          $this->take($dispose_amt,$dispose_reason);
+
+          $bal_serial = array_diff($movement->serial, $collect_serial,$dispose_serial);
+          $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type,$collect_serial);
+          $this->take($dispose_amt,$dispose_reason,$dispose_serial);
           if ($balance > 0) {
-            $this->take($balance,$bal_reason,0,$movement->receiver_id,$movement->receiver_type);
+            $this->take($balance,$bal_reason,0,$movement->receiver_id,$movement->receiver_type,$bal_serial);
           }
 
         }
@@ -429,7 +438,7 @@ protected function processUpdateQuantityOperation($quantity, $reason = '', $cost
      *
      * @return $this|bool
      */
-    protected function processTakeOperation($taking, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    protected function processTakeOperation($taking, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
         if($this->isValidQuantity($taking) && $this->hasEnoughStock($taking)) {
             $available = $this->getAttribute('quantity');
@@ -444,13 +453,18 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
             if ((float) $left === (float) $available && !$this->allowDuplicateMovementsEnabled()) {
                 return $this;
             }
-
             $this->setAttribute('quantity', $left);
 
-            $this->setReason($reason);
+            if (is_string($serial)) {
+              $serial = explode(',', $serial);
+            }
+            if ($this->serial) {
+              $this->serial = array_diff($this->serial,$serial);
+            }
 
+            $this->movementSerial = $serial;
+            $this->setReason($reason);
             $this->setCost($cost);
-
             $this->receiver_id = $receiver_id;
             $this->receiver_type = $receiver_type;
 
@@ -482,7 +496,7 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
      *
      * @return $this|bool
      */
-    protected function processPutOperation($putting, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    protected function processPutOperation($putting, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
         if($this->isValidQuantity($putting)) {
             $current = $this->getAttribute('quantity');
@@ -495,12 +509,20 @@ protected function processPutOperation($putting, $reason = '', $cost = 0, $recei
                 return $this;
             }
 
+            if (is_string($serial)) {
+              $serial = explode(',', $serial);
+            }
+            if ($this->serial) {
+              $this->serial = array_merge($this->serial,$serial);
+            }
+            else{
+              $this->serial = $serial;
+            }
             $this->quantity = $total;
 
+            $this->movementSerial = $serial;
             $this->setReason($reason);
-
             $this->setCost($cost);
-
             $this->receiver_id = $receiver_id;
             $this->receiver_type = $receiver_type;
 
@@ -647,7 +669,7 @@ protected function processRecursiveRollbackOperation(Model $movement)
      *
      * @return bool|Model
      */
-    protected function generateStockMovement($before, $after, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null)
+    protected function generateStockMovement($before, $after, $reason = '', $cost = 0, $receiver_id = null, $receiver_type = null, $serial = null)
     {
         $movement = $this->movements()->getRelated()->newInstance();
 
@@ -660,6 +682,7 @@ protected function generateStockMovement($before, $after, $reason = '', $cost =
         }
         $movement->setAttribute('reason', $reason);
         $movement->setAttribute('cost', $cost);
+        $movement->setAttribute('serial', $serial);
 
         if($movement->save()) {
             return $movement;

From 4c94608d90902e79377f930b49c589184695f22c Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Tue, 13 Feb 2018 15:03:28 +0800
Subject: [PATCH 13/34] handle serial number when creating new inventory

---
 src/Traits/InventoryTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Traits/InventoryTrait.php b/src/Traits/InventoryTrait.php
index 53ac8290..fc712caa 100644
--- a/src/Traits/InventoryTrait.php
+++ b/src/Traits/InventoryTrait.php
@@ -212,7 +212,7 @@ public function isInStock()
      *
      * @return Model
      */
-    public function createStockOnLocation($quantity, Model $location, $reason = '', $cost = 0, $aisle = null, $row = null, $bin = null)
+    public function createStockOnLocation($quantity, Model $location, $reason = '', $cost = 0, $serial = null, $aisle = null, $row = null, $bin = null)
     {
         try {
             // We want to make sure stock doesn't exist on the specified location already
@@ -235,7 +235,7 @@ public function createStockOnLocation($quantity, Model $location, $reason = '',
             $stock->setAttribute('bin', $bin);
 
             if($stock->save()) {
-                return $stock->put($quantity, $reason, $cost);
+                return $stock->put($quantity, $reason, $cost, null, null, $serial);
             }
         }
 

From 82aab6efb1d902cc22b9a1eb103c3f34ceff7b85 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Wed, 7 Mar 2018 11:53:20 +0800
Subject: [PATCH 14/34] fixed explode serial ignore space

---
 src/Traits/InventoryStockTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 4b7a4673..ae15631f 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -510,7 +510,7 @@ protected function processPutOperation($putting, $reason = '', $cost = 0, $recei
             }
 
             if (is_string($serial)) {
-              $serial = explode(',', $serial);
+              $serial = preg_split('@,@', $serial, NULL, PREG_SPLIT_NO_EMPTY);
             }
             if ($this->serial) {
               $this->serial = array_merge($this->serial,$serial);

From b8ffef27d5630385d94b0b9cc3bc4e21665b7ac6 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Mon, 23 Apr 2018 15:29:25 +0800
Subject: [PATCH 15/34] handle adding inventory with 0 quantity

---
 src/Traits/InventoryTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/InventoryTrait.php b/src/Traits/InventoryTrait.php
index fc712caa..6161593c 100644
--- a/src/Traits/InventoryTrait.php
+++ b/src/Traits/InventoryTrait.php
@@ -234,7 +234,7 @@ public function createStockOnLocation($quantity, Model $location, $reason = '',
             $stock->setAttribute('row', $row);
             $stock->setAttribute('bin', $bin);
 
-            if($stock->save()) {
+            if($stock->save() && $quantity > 0) {
                 return $stock->put($quantity, $reason, $cost, null, null, $serial);
             }
         }

From a6ad45f784dc70d6059970af291067522292ab9a Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 3 May 2018 15:33:13 +0800
Subject: [PATCH 16/34] handle serial number coming from
 inventoryStockmentTrait

---
 src/Traits/InventoryStockMovementTrait.php |  4 ++--
 src/Traits/InventoryStockTrait.php         | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Traits/InventoryStockMovementTrait.php b/src/Traits/InventoryStockMovementTrait.php
index 0d64d500..0aaee101 100644
--- a/src/Traits/InventoryStockMovementTrait.php
+++ b/src/Traits/InventoryStockMovementTrait.php
@@ -48,8 +48,8 @@ public function rollback($recursive = false)
      *
      * @return mixed
      */
-    public function returnStock($collect_amt, $collect_reason, $dispose_amt, $dispose_reason)
+    public function returnStock($collect_amt, $collect_reason, $collect_serial, $dispose_amt, $dispose_reason, $dispose_serial)
     {
-        return $this->stock->returnStock($this, $collect_amt, $collect_reason, $dispose_amt, $dispose_reason);
+        return $this->stock->returnStock($this, $collect_amt, $collect_reason, $collect_serial, $dispose_amt, $dispose_reason, $dispose_serial);
     }
 }
diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index ae15631f..2a960e5c 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -269,22 +269,24 @@ public function returnStock($movement, $collect_amt, $collect_reason, $collect_s
         $amt = $movement->getAttribute('before') - $movement->getAttribute('after');
         $balance = $amt - $dispose_amt - $collect_amt;
         if ($amt > 0 && $balance >= 0) {
-          $movement->returned = true; // Prevent duplicate return for this movements
-          $movement->save();
-
           // $bal_reason = Lang::get('inventory::reasons.rollback', [
           //     'id' => $movement->getOriginal('id'),
           //     'date' => $movement->getOriginal('created_at'),
           // ]);
           $bal_reason = "Balance leftover from stock redistribution. (id: $movement->id)";
 
-          $bal_serial = array_diff($movement->serial, $collect_serial,$dispose_serial);
+          $bal_serial = null;
+          if (is_array($collect_serial) && is_array($dispose_serial)) {
+            $bal_serial = array_diff($movement->serial, $collect_serial,$dispose_serial);
+          }
           $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type,$collect_serial);
-          $this->take($dispose_amt,$dispose_reason,$dispose_serial);
+          $this->take($dispose_amt,$dispose_reason,0,null,null,$dispose_serial);
           if ($balance > 0) {
             $this->take($balance,$bal_reason,0,$movement->receiver_id,$movement->receiver_type,$bal_serial);
           }
 
+          $movement->returned = true; // Prevent duplicate return for this movements
+          $movement->save();
         }
 
         return false;
@@ -456,9 +458,9 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
             $this->setAttribute('quantity', $left);
 
             if (is_string($serial)) {
-              $serial = explode(',', $serial);
+              $serial = preg_split('@,@', $serial, NULL, PREG_SPLIT_NO_EMPTY);
             }
-            if ($this->serial) {
+            if ($this->serial && is_array($serial)) {
               $this->serial = array_diff($this->serial,$serial);
             }
 
@@ -512,10 +514,10 @@ protected function processPutOperation($putting, $reason = '', $cost = 0, $recei
             if (is_string($serial)) {
               $serial = preg_split('@,@', $serial, NULL, PREG_SPLIT_NO_EMPTY);
             }
-            if ($this->serial) {
+            if ($this->serial && is_array($serial)) {
               $this->serial = array_merge($this->serial,$serial);
             }
-            else{
+            else {
               $this->serial = $serial;
             }
             $this->quantity = $total;

From b46b629a13f454975322cb1db646a9062eca3f34 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Fri, 4 May 2018 15:36:56 +0800
Subject: [PATCH 17/34] change BaseModel php class name from Model to BaseModel

---
 src/Models/BaseModel.php                   | 2 +-
 src/Models/Inventory.php                   | 2 +-
 src/Models/InventoryMetric.php             | 2 +-
 src/Models/InventorySku.php                | 2 +-
 src/Models/InventoryStock.php              | 2 +-
 src/Models/InventoryStockMovement.php      | 4 ++--
 src/Models/InventorySupplier.php           | 2 +-
 src/Models/InventoryTransaction.php        | 2 +-
 src/Models/InventoryTransactionHistory.php | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
index 66b9ae9d..13864308 100644
--- a/src/Models/BaseModel.php
+++ b/src/Models/BaseModel.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class Model extends Eloquent
+class BaseModel extends Eloquent
 {
     //
 }
diff --git a/src/Models/Inventory.php b/src/Models/Inventory.php
index f0092e9e..3932710e 100644
--- a/src/Models/Inventory.php
+++ b/src/Models/Inventory.php
@@ -6,7 +6,7 @@
 use Trexology\Inventory\Traits\InventoryVariantTrait;
 use Trexology\Inventory\Traits\InventoryTrait;
 
-class Inventory extends Model
+class Inventory extends BaseModel
 {
     use InventoryTrait;
     use InventoryVariantTrait;
diff --git a/src/Models/InventoryMetric.php b/src/Models/InventoryMetric.php
index b81c54e5..9c86efe5 100644
--- a/src/Models/InventoryMetric.php
+++ b/src/Models/InventoryMetric.php
@@ -2,7 +2,7 @@
 
 namespace Trexology\Inventory\Models;
 
-class InventoryMetric extends Model
+class InventoryMetric extends BaseModel
 {
   protected $fillable = [
               'name',
diff --git a/src/Models/InventorySku.php b/src/Models/InventorySku.php
index c5d25745..193b0e8a 100644
--- a/src/Models/InventorySku.php
+++ b/src/Models/InventorySku.php
@@ -4,7 +4,7 @@
 
 use Trexology\Inventory\Traits\InventorySkuTrait;
 
-class InventorySku extends Model
+class InventorySku extends BaseModel
 {
     use InventorySkuTrait;
 
diff --git a/src/Models/InventoryStock.php b/src/Models/InventoryStock.php
index 7172d413..7c44182e 100644
--- a/src/Models/InventoryStock.php
+++ b/src/Models/InventoryStock.php
@@ -4,7 +4,7 @@
 
 use Trexology\Inventory\Traits\InventoryStockTrait;
 
-class InventoryStock extends Model
+class InventoryStock extends BaseModel
 {
     use InventoryStockTrait;
 
diff --git a/src/Models/InventoryStockMovement.php b/src/Models/InventoryStockMovement.php
index 1fad5e3f..c7509cd1 100644
--- a/src/Models/InventoryStockMovement.php
+++ b/src/Models/InventoryStockMovement.php
@@ -4,14 +4,14 @@
 
 use Trexology\Inventory\Traits\InventoryStockMovementTrait;
 
-class InventoryStockMovement extends Model
+class InventoryStockMovement extends BaseModel
 {
     use InventoryStockMovementTrait;
 
     protected $casts = [
         'serial' => 'array',
     ];
-    
+
     /**
      * The belongsTo stock relationship.
      *
diff --git a/src/Models/InventorySupplier.php b/src/Models/InventorySupplier.php
index 3705da56..aee3199b 100644
--- a/src/Models/InventorySupplier.php
+++ b/src/Models/InventorySupplier.php
@@ -4,7 +4,7 @@
 
 use Trexology\Inventory\Traits\SupplierTrait;
 
-class InventorySupplier extends Model
+class InventorySupplier extends BaseModel
 {
     use SupplierTrait;
 
diff --git a/src/Models/InventoryTransaction.php b/src/Models/InventoryTransaction.php
index 896f100a..d0faddf8 100644
--- a/src/Models/InventoryTransaction.php
+++ b/src/Models/InventoryTransaction.php
@@ -5,7 +5,7 @@
 use Trexology\Inventory\Traits\InventoryTransactionTrait;
 use Trexology\Inventory\Interfaces\StateableInterface;
 
-class InventoryTransaction extends Model implements StateableInterface
+class InventoryTransaction extends BaseModel implements StateableInterface
 {
     use InventoryTransactionTrait;
 
diff --git a/src/Models/InventoryTransactionHistory.php b/src/Models/InventoryTransactionHistory.php
index f059b660..63c09f1b 100644
--- a/src/Models/InventoryTransactionHistory.php
+++ b/src/Models/InventoryTransactionHistory.php
@@ -4,7 +4,7 @@
 
 use Trexology\Inventory\Traits\InventoryTransactionHistoryTrait;
 
-class InventoryTransactionHistory extends Model
+class InventoryTransactionHistory extends BaseModel
 {
     use InventoryTransactionHistoryTrait;
 

From 9e2df20e1214a4c15841487243d2a71296b03bc5 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 24 May 2018 15:59:11 +0800
Subject: [PATCH 18/34] fixed null serial number when put into warehouse

---
 src/Traits/InventoryStockTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 2a960e5c..3e4bdba4 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -517,7 +517,7 @@ protected function processPutOperation($putting, $reason = '', $cost = 0, $recei
             if ($this->serial && is_array($serial)) {
               $this->serial = array_merge($this->serial,$serial);
             }
-            else {
+            elseif (!$this->serial) {
               $this->serial = $serial;
             }
             $this->quantity = $total;

From ccc3db3b5788a587279e1f113559963ac09a32d5 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Thu, 24 May 2018 16:46:39 +0800
Subject: [PATCH 19/34] handle empty string for serial number

---
 src/Traits/InventoryStockTrait.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 3e4bdba4..ca4ab835 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -458,8 +458,9 @@ protected function processTakeOperation($taking, $reason = '', $cost = 0, $recei
             $this->setAttribute('quantity', $left);
 
             if (is_string($serial)) {
-              $serial = preg_split('@,@', $serial, NULL, PREG_SPLIT_NO_EMPTY);
+              $serial = preg_split("/\s*,\s*/", trim($serial), -1, PREG_SPLIT_NO_EMPTY);
             }
+
             if ($this->serial && is_array($serial)) {
               $this->serial = array_diff($this->serial,$serial);
             }
@@ -512,7 +513,7 @@ protected function processPutOperation($putting, $reason = '', $cost = 0, $recei
             }
 
             if (is_string($serial)) {
-              $serial = preg_split('@,@', $serial, NULL, PREG_SPLIT_NO_EMPTY);
+              $serial = preg_split("/\s*,\s*/", trim($serial), -1, PREG_SPLIT_NO_EMPTY);
             }
             if ($this->serial && is_array($serial)) {
               $this->serial = array_merge($this->serial,$serial);

From 956446f69cedc89c68196aff0dc1eed6a184ac9a Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Fri, 8 Jun 2018 10:54:34 +0800
Subject: [PATCH 20/34] change default message for serial number changes

---
 src/Traits/InventoryStockTrait.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index ca4ab835..433c8381 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -103,6 +103,12 @@ public static function bootInventoryStockTrait()
             // so we can create generate an update with it.
             $model->beforeQuantity = $model->getOriginal('quantity');
 
+            // Check if a serial number has been changed,
+            $original = json_decode($model->getOriginal('serial'));
+            if ($model->serial != $original && $model->quantity == $model->getOriginal('quantity')) {
+              $model->reason = "Serial number adjustment";
+            }
+
             // Check if a reason has been set, if not let's
             // retrieve the default change reason.
             if (!$model->reason) {

From 1731427fa5cc6121dd37f29659109bfd1dd908ad Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Wed, 29 Aug 2018 15:18:36 +0800
Subject: [PATCH 21/34] fixed a bug where collect or dispose serial is null and
 not an array

---
 src/Traits/InventoryStockTrait.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 433c8381..3fad5182 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -268,6 +268,9 @@ public function rollback($movement = null, $recursive = false)
      */
     public function returnStock($movement, $collect_amt, $collect_reason, $collect_serial, $dispose_amt, $dispose_reason,$dispose_serial)
     {
+        $collect_serial = is_null($collect_serial) ? [] : $collect_serial;
+        $dispose_serial = is_null($dispose_serial) ? [] : $dispose_serial;
+
         if (!$movement) {
             $movement = $this->getLastMovement();
         }

From 24b53265071be905fb2505cfd74f3b5816326264 Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Fri, 7 Sep 2018 11:36:49 +0800
Subject: [PATCH 22/34] fixed a bug for null $movement_serial

---
 src/Traits/InventoryStockTrait.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 3fad5182..6d4dd724 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -270,6 +270,7 @@ public function returnStock($movement, $collect_amt, $collect_reason, $collect_s
     {
         $collect_serial = is_null($collect_serial) ? [] : $collect_serial;
         $dispose_serial = is_null($dispose_serial) ? [] : $dispose_serial;
+        $movement_serial = is_null($movement->serial) ? [] : $dispose_serial;
 
         if (!$movement) {
             $movement = $this->getLastMovement();
@@ -286,7 +287,7 @@ public function returnStock($movement, $collect_amt, $collect_reason, $collect_s
 
           $bal_serial = null;
           if (is_array($collect_serial) && is_array($dispose_serial)) {
-            $bal_serial = array_diff($movement->serial, $collect_serial,$dispose_serial);
+            $bal_serial = array_diff($movement_serial, $collect_serial,$dispose_serial);
           }
           $this->put($amt,$collect_reason,0,$movement->receiver_id,$movement->receiver_type,$collect_serial);
           $this->take($dispose_amt,$dispose_reason,0,null,null,$dispose_serial);

From 17b9a8e090a762eef3b4017d2170b72b494687ba Mon Sep 17 00:00:00 2001
From: Trex Lim <trexlim@gmail.com>
Date: Mon, 29 Oct 2018 18:13:23 +0800
Subject: [PATCH 23/34] Fix a bug for stock redistribution serial number

---
 src/Traits/InventoryStockTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
index 6d4dd724..2333be8d 100644
--- a/src/Traits/InventoryStockTrait.php
+++ b/src/Traits/InventoryStockTrait.php
@@ -270,7 +270,7 @@ public function returnStock($movement, $collect_amt, $collect_reason, $collect_s
     {
         $collect_serial = is_null($collect_serial) ? [] : $collect_serial;
         $dispose_serial = is_null($dispose_serial) ? [] : $dispose_serial;
-        $movement_serial = is_null($movement->serial) ? [] : $dispose_serial;
+        $movement_serial = is_null($movement->serial) ? [] : $movement->serial;
 
         if (!$movement) {
             $movement = $this->getLastMovement();

From ccc10ea541152fb16a1f421053828f00dc001c4b Mon Sep 17 00:00:00 2001
From: Trexology <trexlim@gmail.com>
Date: Wed, 17 Mar 2021 11:20:15 +0800
Subject: [PATCH 24/34] Update CommonMethodsTrait.php

---
 src/Traits/CommonMethodsTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/CommonMethodsTrait.php b/src/Traits/CommonMethodsTrait.php
index 2e7987ce..29f8ae53 100644
--- a/src/Traits/CommonMethodsTrait.php
+++ b/src/Traits/CommonMethodsTrait.php
@@ -63,7 +63,7 @@ public function isValidQuantity($quantity)
      */
     protected function fireEvent($name, $args = [])
     {
-        return Event::fire((string) $name, (array) $args);
+        return Event::dispatch((string) $name, (array) $args);
     }
 
     /**

From c2489f76f2294e987ffbd069341698e8fe9a2c27 Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Wed, 17 Mar 2021 16:49:54 +0800
Subject: [PATCH 25/34] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1b4d06fc..c2d4646d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/database": "5.*",
-        "illuminate/support": "5.*",
+        "illuminate/support": "5.*|^6.",
         "baum/baum": "1.1.*"
     },
     "require-dev": {

From 2583ba828b9aed4d79bd786543971380a54d807c Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Wed, 17 Mar 2021 17:50:13 +0800
Subject: [PATCH 26/34] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c2d4646d..66934aa6 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.4.0",
         "illuminate/database": "5.*",
-        "illuminate/support": "5.*|^6.",
+        "illuminate/support": "5.*|^6.0",
         "baum/baum": "1.1.*"
     },
     "require-dev": {

From e49114738a26553b8e9a68ef12db3a6b45314ac8 Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Thu, 18 Mar 2021 12:13:27 +0800
Subject: [PATCH 27/34] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 66934aa6..cb423dd3 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.4.0",
-        "illuminate/database": "5.*",
+        "illuminate/database": "5.*|^6.0",
         "illuminate/support": "5.*|^6.0",
         "baum/baum": "1.1.*"
     },

From 0b543f0ca8e537cc742ae16278222122e0062e22 Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Thu, 18 Mar 2021 14:25:29 +0800
Subject: [PATCH 28/34] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cb423dd3..7d6d778d 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "php": ">=5.4.0",
         "illuminate/database": "5.*|^6.0",
         "illuminate/support": "5.*|^6.0",
-        "baum/baum": "1.1.*"
+        "baum/baum": "^2.0@alpha*"
     },
     "require-dev": {
         "orchestra/testbench": "3.1.*"

From 63cdaebeeb876cd0c145fbe0dbfa425c5d7420e1 Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Thu, 18 Mar 2021 14:28:21 +0800
Subject: [PATCH 29/34] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7d6d778d..80bb2888 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "php": ">=5.4.0",
         "illuminate/database": "5.*|^6.0",
         "illuminate/support": "5.*|^6.0",
-        "baum/baum": "^2.0@alpha*"
+        "baum/baum": "^2.0@alpha"
     },
     "require-dev": {
         "orchestra/testbench": "3.1.*"

From e08adab035717412babac36f6c092d2a4a3ab15b Mon Sep 17 00:00:00 2001
From: ckhsu428 <ckhsu428@gmail.com>
Date: Fri, 19 Mar 2021 10:16:52 +0800
Subject: [PATCH 30/34] Update InventoryCategory.php

---
 src/Models/InventoryCategory.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Models/InventoryCategory.php b/src/Models/InventoryCategory.php
index c44ba9aa..0f4abe92 100644
--- a/src/Models/InventoryCategory.php
+++ b/src/Models/InventoryCategory.php
@@ -29,4 +29,24 @@ public function inventories()
     {
         return $this->hasMany('Trexology\Inventory\Models\Inventory', 'category_id', 'id');
     }
+    
+    /**
+     * Override the "default" left column name.
+     *
+     * @return string
+     */
+    public function getDefaultLeftColumnName()
+    {
+      return 'lft';
+    }
+
+    /**
+     * Override the "default" right column name.
+     *
+     * @return string
+     */
+    public function getDefaultRightColumnName()
+    {
+        return 'rgt';
+    }
 }

From a3a5b9e25f1ffe98983df71060341f9b51d0b6e1 Mon Sep 17 00:00:00 2001
From: Trexology <trexlim@gmail.com>
Date: Wed, 19 Oct 2022 09:45:49 +0800
Subject: [PATCH 31/34] Update composer.json

---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 80bb2888..b2a539ff 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,8 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0",
-        "illuminate/database": "5.*|^6.0",
-        "illuminate/support": "5.*|^6.0",
+        "php": "^7.1.3 || ^8.0"
+        "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0"
         "baum/baum": "^2.0@alpha"
     },
     "require-dev": {

From 871ee853d1c1c814bff56dfe19db3cf58f69302d Mon Sep 17 00:00:00 2001
From: Trexology <trexlim@gmail.com>
Date: Wed, 19 Oct 2022 09:48:59 +0800
Subject: [PATCH 32/34] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b2a539ff..196c890a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.1.3 || ^8.0"
-        "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0"
+        "php": "^7.1.3 || ^8.0",
+        "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
         "baum/baum": "^2.0@alpha"
     },
     "require-dev": {

From 78e932d7d417f8abaed3b95689850d4ba88daa43 Mon Sep 17 00:00:00 2001
From: Trexology <trexlim@gmail.com>
Date: Thu, 27 Oct 2022 14:10:40 +0800
Subject: [PATCH 33/34] Update Location.php

change column name for Location model
---
 src/Models/Location.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Models/Location.php b/src/Models/Location.php
index 0f8836ce..5c5b5153 100644
--- a/src/Models/Location.php
+++ b/src/Models/Location.php
@@ -12,6 +12,22 @@ class Location extends Node
      * @var array
      */
     protected $scoped = ['belongs_to'];
+    
+    
+    public function getDefaultLeftColumnName()
+    {
+      return 'lft';
+    }
+
+    /**
+     * Override the "default" right column name.
+     *
+     * @return string
+     */
+    public function getDefaultRightColumnName()
+    {
+        return 'rgt';
+    }
 
     /**
      * The hasMany stocks relationship.
@@ -22,4 +38,6 @@ public function stocks()
     {
         return $this->hasMany(InventoryStock::class, 'location_id', 'id');
     }
+    
+    
 }

From 87f14220ae75ef20bf8f845edf6ad1793ef778ee Mon Sep 17 00:00:00 2001
From: Trexology <trexlim@gmail.com>
Date: Thu, 27 Oct 2022 14:52:51 +0800
Subject: [PATCH 34/34] Update InventoryStock.php

change relationship
---
 src/Models/InventoryStock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/InventoryStock.php b/src/Models/InventoryStock.php
index 7c44182e..4712d4bf 100644
--- a/src/Models/InventoryStock.php
+++ b/src/Models/InventoryStock.php
@@ -49,6 +49,6 @@ public function transactions()
      */
     public function location()
     {
-        return $this->hasOne(Location::class);
+        return $this->belongsTo(Location::class);
     }
 }