diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php
new file mode 100644
index 00000000..574200fe
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateShippingPackingListLogic.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+
+use App\Http\Resources\PackingListResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class CreateShippingPackingListLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created PackingList',
+            'message' => 'You have successfully created a new PackingList'
+        ];
+    }
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+     /** @var GeneratesPackingListReferenceNumber */
+    private $generatesPackingListReferenceNumber;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CreatePackingListLogic constructor.
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(
+        CreatePackingListProcessor $createPackingListProcessor, 
+        CreatesTransport $createsTransport, 
+        CreatesSchedule $createsSchedule,
+        CreatePackageProcessor $createPackageProcessor,
+        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, 
+        FetchesOrder $fetchesOrder
+    )
+    {
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
+
+        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+
+        $packingListObject = new PackingListObject(
+            $reference_number, 
+            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, 
+            PackingListType::SHIPPING_PACKING_LIST, 
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        $packages = $request->input('packages');
+
+        foreach ($packages as $key => $row) {
+            $packageObject = new PackageObject(
+                $row['type'], 
+                $row['description'], 
+                $row['width'], 
+                $row['height'], 
+                $row['length'], 
+                $row['weight'], 
+                $row['quantity'], 
+                ApprovalStatus::APPROVED,
+                $row['reference'], 
+            );
+            $this->createPackageProcessor->execute($packageObject, $packingList);
+        }
+
+        return $this->resourceResponse(new PackingListResource($packingList));
+    }
+
+}
diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateWarehousePackingListLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateWarehousePackingListLogic.php
new file mode 100644
index 00000000..5572bbff
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/CreateWarehousePackingListLogic.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace App\Classes\Modules\Orders\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\OrderRoleTypes;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\TransportType;
+
+use App\Http\Resources\PackingListResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class CreateWarehousePackingListLogic extends AbstractControllerLogic
+{
+
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Created Warehouse PackingList',
+            'message' => 'You have successfully created a new Warehouse PackingList'
+        ];
+    }
+
+    /** @var CreatePackingListProcessor */
+    private $createPackingListProcessor;
+
+     /** @var GeneratesPackingListReferenceNumber */
+    private $generatesPackingListReferenceNumber;
+
+    /** @var CreatesTransport */
+    private $createsTransport;
+
+    /** @var CreatePackageProcessor */
+    private $createPackageProcessor;
+
+    /** @var CreatesSchedule */
+    private $createsSchedule;
+
+    /** @var FetchesOrder */
+    private $fetchesOrder;
+
+    /**
+     * CreatePackingListLogic constructor.
+     * @param CreatePackingListProcessor $createPackingListProcessor
+     * @param FetchesOrder $fetchesOrder
+     */
+    public function __construct(
+        CreatePackingListProcessor $createPackingListProcessor, 
+        CreatesTransport $createsTransport, 
+        CreatesSchedule $createsSchedule,
+        CreatePackageProcessor $createPackageProcessor,
+        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, 
+        FetchesOrder $fetchesOrder
+    )
+    {
+        $this->createPackingListProcessor = $createPackingListProcessor;
+        $this->createsTransport = $createsTransport;
+        $this->createsSchedule = $createsSchedule;
+        $this->createPackageProcessor = $createPackageProcessor;
+        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
+        $this->fetchesOrder = $fetchesOrder;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
+
+        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+
+        $packingListObject = new PackingListObject(
+            $reference_number, 
+            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, 
+            PackingListType::WAREHOUSE_RECEIVE_LIST, 
+            ApprovalStatus::PENDING_SUBMISSION
+        );
+        $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
+
+        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $transport = $this->createsTransport->execute($transportObject, $packingList);
+
+        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
+        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
+
+        $packages = $request->input('packages');
+
+        foreach ($packages as $key => $row) {
+            $packageObject = new PackageObject(
+                $row['type'], 
+                $row['description'], 
+                $row['width'], 
+                $row['height'], 
+                $row['length'], 
+                $row['weight'], 
+                $row['quantity'], 
+                ApprovalStatus::APPROVED,
+                $row['reference'], 
+            );
+            $this->createPackageProcessor->execute($packageObject, $packingList);
+        }
+
+        return $this->resourceResponse(new PackingListResource($packingList));
+    }
+
+}
diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
index eee596b0..afd8f3d7 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php
@@ -2,26 +2,24 @@
 
 namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
-use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
-use App\Classes\Modules\Orders\Services\FetchesOrder;
-use App\Classes\Modules\Transports\Services\CreatesTransport;
-use App\Classes\Modules\PackingLists\Services\GeneratesPackingListReferenceNumber;
-use App\Classes\Modules\Schedules\Services\CreatesSchedule;
-use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
-use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
-use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\Orders\Services\FetchesOrder;
+use App\Classes\Modules\PackingLists\Services\Packages\FetchesPackage;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingListPackage;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingListPackage;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Classes\ValueObjects\Constants\TransportType;
 
 use App\Http\Resources\PackingListResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Carbon\Carbon;
 
 class CreatePackingListLogic extends AbstractControllerLogic
 {
@@ -40,18 +38,6 @@ class CreatePackingListLogic extends AbstractControllerLogic
     /** @var CreatePackingListProcessor */
     private $createPackingListProcessor;
 
-     /** @var GeneratesPackingListReferenceNumber */
-    private $generatesPackingListReferenceNumber;
-
-    /** @var CreatesTransport */
-    private $createsTransport;
-
-    /** @var CreatePackageProcessor */
-    private $createPackageProcessor;
-
-    /** @var CreatesSchedule */
-    private $createsSchedule;
-
     /** @var FetchesOrder */
     private $fetchesOrder;
 
@@ -60,20 +46,9 @@ class CreatePackingListLogic extends AbstractControllerLogic
      * @param CreatePackingListProcessor $createPackingListProcessor
      * @param FetchesOrder $fetchesOrder
      */
-    public function __construct(
-        CreatePackingListProcessor $createPackingListProcessor, 
-        CreatesTransport $createsTransport, 
-        CreatesSchedule $createsSchedule,
-        CreatePackageProcessor $createPackageProcessor,
-        GeneratesPackingListReferenceNumber $generatesPackingListReferenceNumber, 
-        FetchesOrder $fetchesOrder
-    )
+    public function __construct(CreatePackingListProcessor $createPackingListProcessor, FetchesOrder $fetchesOrder)
     {
         $this->createPackingListProcessor = $createPackingListProcessor;
-        $this->createsTransport = $createsTransport;
-        $this->createsSchedule = $createsSchedule;
-        $this->createPackageProcessor = $createPackageProcessor;
-        $this->generatesPackingListReferenceNumber = $generatesPackingListReferenceNumber;
         $this->fetchesOrder = $fetchesOrder;
     }
 
@@ -83,42 +58,15 @@ class CreatePackingListLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $order = $this->fetchesOrder->execute(['id' => $request->input('order_id')]);
 
-        $reference_number = $this->generatesPackingListReferenceNumber->execute();
+        $order = $this->fetchesOrder->execute(['reference' => $request->input('reference_number')]);
+
+        $packingListObject = new PackingListObject($request->input('reference_number'), $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, PackingListType::WAREHOUSE_RECEIVE_LIST, ApprovalStatus::PENDING_SUBMISSION);
 
-        $packingListObject = new PackingListObject(
-            $reference_number, 
-            $order->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee->id, 
-            PackingListType::WAREHOUSE_RECEIVE_LIST, 
-            ApprovalStatus::PENDING_SUBMISSION
-        );
         $packingList = $this->createPackingListProcessor->execute($packingListObject, $order);
 
-        $transportObject = new TransportObject(TransportType::LAND, null, $request->input('tracking'), Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $transport = $this->createsTransport->execute($transportObject, $packingList);
-
-        $scheduleObject = new ScheduleObject(Carbon::parse($request->input('receive_date')), Carbon::parse($request->input('receive_date')), ApprovalStatus::APPROVED);
-        $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
-
-        $packages = $request->input('packages');
-
-        foreach ($packages as $key => $row) {
-            $packageObject = new PackageObject(
-                $row['type'], 
-                $row['description'], 
-                $row['width'], 
-                $row['height'], 
-                $row['length'], 
-                $row['weight'], 
-                $row['quantity'], 
-                ApprovalStatus::APPROVED,
-                $row['reference'], 
-            );
-            $this->createPackageProcessor->execute($packageObject, $packingList);
-        }
-
         return $this->resourceResponse(new PackingListResource($packingList));
+
     }
 
 }
diff --git a/app/Http/Controllers/Orders/CreateShippingPackingListController.php b/app/Http/Controllers/Orders/CreateShippingPackingListController.php
new file mode 100644
index 00000000..01c28124
--- /dev/null
+++ b/app/Http/Controllers/Orders/CreateShippingPackingListController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\CreateShippingPackingListLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateShippingPackingListController
+{
+    /**
+     * @param Request $request
+     * @param CreateShippingPackingListLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateShippingPackingListLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Orders/CreateWarehousePackingListController.php b/app/Http/Controllers/Orders/CreateWarehousePackingListController.php
new file mode 100644
index 00000000..a986e328
--- /dev/null
+++ b/app/Http/Controllers/Orders/CreateWarehousePackingListController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Orders;
+
+use App\Classes\Modules\Orders\ControllersLogic\CreateWarehousePackingListLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateWarehousePackingListController
+{
+    /**
+     * @param Request $request
+     * @param CreateWarehousePackingListLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateWarehousePackingListLogic $logic): JsonResponse
+    {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php
index e3a66981..297cb6dd 100644
--- a/app/Http/Resources/OrderResource.php
+++ b/app/Http/Resources/OrderResource.php
@@ -32,13 +32,7 @@ class OrderResource extends JsonResource
                 'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()),
                 $this->mergeWhen($this->relationLoaded('parcels'), [
                     'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
-                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) {
-                            return $query->whereHas('transports', function($query){
-                                return $query->whereHas('schedules', function($query){
-                                    return $query->where('etd', '<', Carbon::now());
-                                });
-                            });
-                        });
+                        return $query->where('type', PackingListType::SHIPPING_PACKING_LIST);
                     })->get()),
                     'in_transit_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){
                         return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($query) {
diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue
index 7fc433ce..74cf02ae 100644
--- a/resources/assets/vue/components/orders/elements/PackageComponent.vue
+++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue
@@ -54,7 +54,7 @@
                                         </div>
                                         <div class="col-auto" v-if="$store.getters.isAdmin">
                                             <small class="fs-10 all-caps muted">Container</small>
-                                            <p class="no-margin bold">{{item.container.container_reference}}</p>
+                                            <p class="no-margin bold">{{item.container ? item.container.container_reference : '-'}}</p>
                                         </div>
                                     </div>
                                     <div class="row">
@@ -69,7 +69,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row p-t-10 p-b-10">
+                            <div class="row p-t-10 p-b-10" v-if="item.container">
                                 <div class="col-auto p-r-0 p-t-10">
                                     <div class="row" v-for="schedule in item.container.transport.schedule_history" :key="schedule.id">
                                         <div class="col">
diff --git a/resources/assets/vue/components/orders/forms/CreateShippingPackageListFormComponent.vue b/resources/assets/vue/components/orders/forms/CreateShippingPackageListFormComponent.vue
new file mode 100644
index 00000000..0d835fe6
--- /dev/null
+++ b/resources/assets/vue/components/orders/forms/CreateShippingPackageListFormComponent.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col">
+            <div class="row m-b-20 text-info">
+                <div class="col">
+                    <h3 class="text-left">Create Shipping Packing List</h3>
+                </div>
+            </div>
+            <error-message-component class="m-b-20" :error="error"></error-message-component>
+            <div class="row">
+                <div class="col">
+                    <package-form-component :section="section" :packages="parameters.packages"></package-form-component>
+                    <div class="row m-t-15 align-items-center justify-content-center">
+                        <div class="col">
+                            <div class="btn btn-block btn-lg btn-primary b-rad-none no-border" @click="submitForm">Submit</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        props: {
+            id: {
+                type: Number,
+                required: true
+            },
+            section:{
+                type: String,
+                required: true
+            }
+        },
+        data() {
+            return {
+                error: '',
+                parameters: {
+                    order_id: this.id,
+                    packages: []
+                }
+            };
+        },
+        watch: {
+            'id': function () {
+                this.parameters.order_id = this.id;
+            }
+        },
+        methods: {
+            submitForm(){
+                this.submit(this.route('api.order.create.shipping.packing_list'), 'post', this.section, true, true)
+            }
+        },
+        mixins: [componentHandler, modalFormHandler]
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/orders/forms/CreatePackageListFormComponent.vue b/resources/assets/vue/components/orders/forms/CreateWarehousePackageListFormComponent.vue
similarity index 89%
rename from resources/assets/vue/components/orders/forms/CreatePackageListFormComponent.vue
rename to resources/assets/vue/components/orders/forms/CreateWarehousePackageListFormComponent.vue
index 40765f7d..7193c928 100644
--- a/resources/assets/vue/components/orders/forms/CreatePackageListFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/CreateWarehousePackageListFormComponent.vue
@@ -3,7 +3,7 @@
         <div class="col">
             <div class="row m-b-20 text-info">
                 <div class="col">
-                    <h3 class="text-left">Create Package List</h3>
+                    <h3 class="text-left">Create Warehouse Packing List</h3>
                 </div>
             </div>
             <error-message-component class="m-b-20" :error="error"></error-message-component>
@@ -52,11 +52,7 @@
                     tracking: this.tracking,
                     receive_date: this.receive_date,
                     packages: []
-                },
-                options: {
-                  format: 'YYYY/MM/DD',
-                  useCurrent: true,
-                }       
+                }
             };
         },
         watch: {
@@ -66,7 +62,7 @@
         },
         methods: {
             submitForm(){
-                this.submit(this.route('api.packing_list.create'), 'post', this.section, true, true)
+                this.submit(this.route('api.order.create.warehouse.packing_list'), 'post', this.section, true, true)
             }
         },
         mixins: [createPackageListFormValidation, componentHandler, modalFormHandler]
diff --git a/resources/assets/vue/components/orders/forms/PackageFormComponent.vue b/resources/assets/vue/components/orders/forms/PackageFormComponent.vue
index 5f89af2e..7a4e40aa 100644
--- a/resources/assets/vue/components/orders/forms/PackageFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/PackageFormComponent.vue
@@ -75,7 +75,7 @@
                                         </div>
                                         
                                         <div class="col text-center p-r-5 p-l-5">
-                                            <input type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Quantity" v-model.lazy="product.reference"/>
+                                            <input type="text" class="form-control fs-10 b-rad-none text-center" placeholder="Reference" v-model.lazy="product.reference"/>
                                         </div>
                                        
                                         <div class="col-auto">
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index d59cf450..8da23c4d 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -233,9 +233,9 @@
                                                                  style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M8.6,23.65c-2.37676,0 -4.3,1.92324 -4.3,4.3c0,2.37676 1.92324,4.3 4.3,4.3c2.37676,0 4.3,-1.92324 4.3,-4.3c4.77031,0 8.6,3.82969 8.6,8.6v85.10137c0,8.28926 6.76074,15.05 15.05,15.05h0.50391c0.99941,2.98145 3.72051,5.19863 7.02109,5.19863h4.43438c-0.74746,1.26816 -1.20938,2.72949 -1.20938,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20938,-4.3h66.91875c-0.74746,1.26816 -1.20937,2.72949 -1.20937,4.3c0,4.72832 3.87168,8.6 8.6,8.6c4.72832,0 8.6,-3.87168 8.6,-8.6c0,-1.57051 -0.46191,-3.03184 -1.20937,-4.3h4.43437c3.36777,0 6.13926,-2.30117 7.08828,-5.375h0.43672v-2.15c0,-3.90527 -3.04863,-7.12188 -6.87832,-7.45781c0.26035,-0.69707 0.42832,-1.43613 0.42832,-2.21719v-40.85c0,-1.67129 -0.73066,-3.14941 -1.78887,-4.3c1.0582,-1.15059 1.78887,-2.62871 1.78887,-4.3v-43c0,-3.53574 -2.91426,-6.45 -6.45,-6.45h-94.6c-3.53574,0 -6.45,2.91426 -6.45,6.45v43c0,1.67129 0.73066,3.14941 1.78887,4.3c-1.0582,1.15059 -1.78887,2.62871 -1.78887,4.3v40.85c0,0.78105 0.16797,1.52012 0.42832,2.21719c-3.15781,0.27715 -5.75293,2.51953 -6.57598,5.48418h-0.30234c-5.96289,0 -10.75,-4.78711 -10.75,-10.75v-85.10137c0,-7.09668 -5.80332,-12.9 -12.9,-12.9zM49.45,30.1h94.6c1.21777,0 2.15,0.93223 2.15,2.15v43c0,1.21777 -0.93223,2.15 -2.15,2.15c-1.17578,0.0168 -2.11641,0.97422 -2.11641,2.15c0,1.17578 0.94062,2.1332 2.11641,2.15c1.21777,0 2.15,0.93223 2.15,2.15v40.85c0,1.21777 -0.93223,2.15 -2.15,2.15h-94.6c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-40.85c0,-1.21777 0.93223,-2.15 2.15,-2.15c1.17578,-0.0168 2.11641,-0.97422 2.11641,-2.15c0,-1.17578 -0.94063,-2.1332 -2.11641,-2.15c-1.21777,0 -2.15,-0.93223 -2.15,-2.15v-43c0,-1.21777 0.93223,-2.15 2.15,-2.15zM88.15,38.7c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM58.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM66.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM75.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM83.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM92.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM101.05,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM109.65,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM118.25,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM126.85,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM135.45,77.4c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM88.15,90.3c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666h17.2c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666zM44.075,131.15h105.35c1.80566,0 3.225,1.41934 3.225,3.225c0,1.80566 -1.41934,3.225 -3.225,3.225h-105.35c-1.80566,0 -3.225,-1.41934 -3.225,-3.225c0,-1.80566 1.41934,-3.225 3.225,-3.225zM55.9,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3zM137.6,141.9c2.40195,0 4.3,1.89805 4.3,4.3c0,2.40195 -1.89805,4.3 -4.3,4.3c-2.40195,0 -4.3,-1.89805 -4.3,-4.3c0,-2.40195 1.89805,-4.3 4.3,-4.3z"></path></g></g></svg>
                                                         </div>
                                                         <div class="col-auto">
-                                                            <div data-type="createPackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
-                                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createPackageList" size="large">
-                                                                <create-package-list-form-component :id="order.id" :section="section"></create-package-list-form-component>
+                                                            <div data-type="createWarehousePackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
+                                                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createWarehousePackageList" size="large">
+                                                                <create-warehouse-package-list-form-component :id="order.id" :section="section"></create-warehouse-package-list-form-component>
                                                             </modal-component>
                                                         </div>
                                                     </div>
@@ -252,6 +252,16 @@
                                                 <div class="col">
                                                     <div class="row" v-if="order.origin_warehouse_packages.length">
                                                         <div class="col">
+
+                                                            <div class="col-12 mb-2">
+                                                                <div data-type="createShippingPackageList" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">
+                                                                    Add
+                                                                </div>
+                                                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createShippingPackageList" size="large">
+                                                                    <create-shipping-package-list-form-component :id="order.id" :section="section"></create-shipping-package-list-form-component>
+                                                                </modal-component>
+                                                            </div>
+
                                                             <div class="row" v-for="group in Math.ceil(order.origin_warehouse_packages.length / 2)">
                                                                 <div class="col-12 p-r-0" :class="'col-md-'+(12/2)" v-for="item in order.origin_warehouse_packages.slice((group - 1) * 2, group * 2)" v-bind:key="item.id" :data="item">
                                                                     <package-component :data="item" status="Ready To Ship"></package-component>
diff --git a/routes/order.php b/routes/order.php
index 6a0c04d3..47b4b6f8 100644
--- a/routes/order.php
+++ b/routes/order.php
@@ -11,4 +11,12 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f
     Route::put('/restore/{id}', 'RestoreOrderController@restore')->name('restore');
     Route::post('/address/change/request', 'RequestChangeOrderAddressController@request')->name('address.change.request');
     Route::put('/address/{id}/status/{status}', 'ApproveChangeOrderAddressController@approve')->name('address.status.update');
+
+
+    Route::post('/create-warehouse-packing-list', 'CreateWarehousePackingListController@create')->name('create.warehouse.packing_list');
+    Route::post('/create-shipping-packing-list', 'CreateShippingPackingListController@create')->name('create.shipping.packing_list');
+
+    // Route::post('/create', 'CreateOrderController@create')->name('create');
+
+
 });