WIP - Order steps & remaining APIs

app/Classes/Modules/Packages/ControllersLogic/CreatePackageLogic.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\Packages\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\CreatesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesDistrict;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Packages\Services\CreatesPackage;
+use App\Classes\Modules\Packages\Services\FetchesDistrict;
+use App\Classes\Modules\Packages\Standards\Rules\CanCreatePackage;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Http\Resources\RemarkResource;
+use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateRemarkLogic extends AbstractControllerLogic
+class CreatePackageLogic extends AbstractControllerLogic
 {
 
     /**
@@ -22,13 +22,13 @@ class CreateRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Created Remark',
-            'message' => 'You have successfully created a new Remark'
+            'title' => 'Created Package',
+            'message' => 'You have successfully created a new Package'
         ];
     }
 
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
+    /** @var CanCreatePackage */
+    private $canCreatePackage;
 
     /** @var FetchesDistrict */
     private $fetchesDistrict;
@@ -36,22 +36,22 @@ class CreateRemarkLogic extends AbstractControllerLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
-    /** @var CreatesRemark */
-    private $createsRemark;
+    /** @var CreatesPackage */
+    private $createsPackage;
 
     /**
-     * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
+     * CreatePackageLogic constructor.
+     * @param CanCreatePackage $canCreatePackage
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompany $fetchesCompany
-     * @param CreatesRemark $createsRemark
+     * @param CreatesPackage $createsPackage
      */
-    public function __construct(CanCreateRemark $canCreateRemark, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesRemark $createsRemark)
+    public function __construct(CanCreatePackage $canCreatePackage, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesPackage $createsPackage)
     {
-        $this->canCreateRemark = $canCreateRemark;
+        $this->canCreatePackage = $canCreatePackage;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompany = $fetchesCompany;
-        $this->createsRemark = $createsRemark;
+        $this->createsPackage = $createsPackage;
     }
 
     /**
@@ -66,13 +66,13 @@ class CreateRemarkLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+        $object = new PackageObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
 
-        $this->canCreateRemark->passes($object);
+        $this->canCreatePackage->passes($object);
 
-        $query = $this->createsRemark->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+        $query = $this->createsPackage->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
 
-        return $this->resourceResponse(new RemarkResource($query));
+        return $this->resourceResponse(new PackageResource($query));
 
     }
 

app/Classes/Modules/Packages/ControllersLogic/DeletePackageLogic.php

@@ -1,49 +1,49 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\Packages\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\DeletesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanDeleteRemark;
+use App\Classes\Modules\Packages\Services\DeletesPackage;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
+use App\Classes\Modules\Packages\Standards\Rules\CanDeletePackage;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteRemarkLogic extends AbstractControllerLogic
+class DeletePackageLogic extends AbstractControllerLogic
 {
     /**
      * @return array
      */
     protected function notification():array {
         return [
-            'title' => 'Deleted Remark',
-            'message' => 'You have successfully deleted a Remark'
+            'title' => 'Deleted Package',
+            'message' => 'You have successfully deleted a Package'
         ];
     }
 
 
-    /** @var CanDeleteRemark */
-    private $canDeleteRemark;
+    /** @var CanDeletePackage */
+    private $canDeletePackage;
 
-    /** @var DeletesRemark */
-    private $deletesRemark;
+    /** @var DeletesPackage */
+    private $deletesPackage;
 
-    /** @var FetchesRemark */
-        private $fetchesRemark;
+    /** @var FetchesPackage */
+        private $fetchesPackage;
 
     /**
-     * DeleteRemarkControllersLogic constructor.
-     * @param CanDeleteRemark $canDeleteRemark
-     * @param DeletesRemark $deletesRemark
-     * @param FetchesRemark $fetchesRemark
+     * DeletePackageControllersLogic constructor.
+     * @param CanDeletePackage $canDeletePackage
+     * @param DeletesPackage $deletesPackage
+     * @param FetchesPackage $fetchesPackage
      */
-    public function __construct(CanDeleteRemark $canDeleteRemark, DeletesRemark $deletesRemark, FetchesRemark $fetchesRemark)
+    public function __construct(CanDeletePackage $canDeletePackage, DeletesPackage $deletesPackage, FetchesPackage $fetchesPackage)
     {
-        $this->canDeleteRemark = $canDeleteRemark;
-        $this->deletesRemark = $deletesRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canDeletePackage = $canDeletePackage;
+        $this->deletesPackage = $deletesPackage;
+        $this->fetchesPackage = $fetchesPackage;
     }
 
 
@@ -56,11 +56,11 @@ class DeleteRemarkLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canDeleteRemark->passes();
+            $this->canDeletePackage->passes();
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
-            $this->deletesRemark->execute($query);
+            $this->deletesPackage->execute($query);
 
             return $this->response([]);
 

app/Classes/Modules/Packages/ControllersLogic/FetchPackageLogic.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\Packages\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanFetchRemark;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
+use App\Classes\Modules\Packages\Standards\Rules\CanFetchPackage;
+use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchRemarkLogic extends AbstractControllerLogic
+class FetchPackageLogic extends AbstractControllerLogic
 {
 
     /**
@@ -19,26 +19,26 @@ class FetchRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Retrieved Remark',
-            'message' => 'You have successfully retrieved a Remark'
+            'title' => 'Retrieved Package',
+            'message' => 'You have successfully retrieved a Package'
         ];
     }
 
-    /** @var CanFetchRemark */
-    private $canFetchRemark;
+    /** @var CanFetchPackage */
+    private $canFetchPackage;
 
-    /** @var FetchesRemark */
-    private $fetchesRemark;
+    /** @var FetchesPackage */
+    private $fetchesPackage;
 
     /**
-     * FetchRemarkControllersLogic constructor.
-     * @param CanFetchRemark $canFetchRemark
-     * @param FetchesRemark $fetchesRemark
+     * FetchPackageControllersLogic constructor.
+     * @param CanFetchPackage $canFetchPackage
+     * @param FetchesPackage $fetchesPackage
      */
-    public function __construct(CanFetchRemark $canFetchRemark, FetchesRemark $fetchesRemark)
+    public function __construct(CanFetchPackage $canFetchPackage, FetchesPackage $fetchesPackage)
     {
-        $this->canFetchRemark = $canFetchRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canFetchPackage = $canFetchPackage;
+        $this->fetchesPackage = $fetchesPackage;
     }
 
 
@@ -51,11 +51,11 @@ class FetchRemarkLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canFetchRemark->passes();
+            $this->canFetchPackage->passes();
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
-            return $this->resourceResponse(new RemarkResource($query));
+            return $this->resourceResponse(new PackageResource($query));
 
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());

app/Classes/Modules/Packages/ControllersLogic/ListPackagesLogic.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\Packages\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\ListsRemarks;
-use App\Classes\Modules\Remarks\Standards\Rules\CanListRemarks;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\Packages\Services\ListsPackages;
+use App\Classes\Modules\Packages\Standards\Rules\CanListPackages;
+use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListRemarksLogic extends AbstractControllerLogic
+class ListPackagesLogic extends AbstractControllerLogic
 {
 
     /**
@@ -19,26 +19,26 @@ class ListRemarksLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Retrieved Remarks',
-            'message' => 'You have successfully retrieved a list of Remarks'
+            'title' => 'Retrieved Packages',
+            'message' => 'You have successfully retrieved a list of Packages'
         ];
     }
 
-    /** @var CanListRemarks */
-    private $canListRemarks;
+    /** @var CanListPackages */
+    private $canListPackages;
 
-    /** @var ListsRemarks */
-    private $listsRemarks;
+    /** @var ListsPackages */
+    private $listsPackages;
 
     /**
-     * ListRemarksLogic constructor.
-     * @param CanListRemarks $canListRemarks
-     * @param ListsRemarks $listsRemarks
+     * ListPackagesLogic constructor.
+     * @param CanListPackages $canListPackages
+     * @param ListsPackages $listsPackages
      */
-    public function __construct(CanListRemarks $canListRemarks, ListsRemarks $listsRemarks)
+    public function __construct(CanListPackages $canListPackages, ListsPackages $listsPackages)
     {
-        $this->canListRemarks = $canListRemarks;
-        $this->listsRemarks = $listsRemarks;
+        $this->canListPackages = $canListPackages;
+        $this->listsPackages = $listsPackages;
     }
 
 
@@ -51,11 +51,11 @@ class ListRemarksLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canListRemarks->passes();
+            $this->canListPackages->passes();
 
-            $query = $this->listsRemarks->execute($this->listsRemarks->deserializeFilters($request->input('filters')));
+            $query = $this->listsPackages->execute($this->listsPackages->deserializeFilters($request->input('filters')));
 
-            return $this->collectionResponse(RemarkResource::collection($query));
+            return $this->collectionResponse(PackageResource::collection($query));
 
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());

app/Classes/Modules/Packages/ControllersLogic/UpdatePackageLogic.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\Packages\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\UpdatesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesDistrict;
-use App\Classes\Modules\Remarks\Standards\Rules\CanUpdateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\Packages\Services\UpdatesPackage;
+use App\Classes\Modules\Packages\Services\FetchesPackage;
+use App\Classes\Modules\Packages\Services\FetchesDistrict;
+use App\Classes\Modules\Packages\Standards\Rules\CanUpdatePackage;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Http\Resources\PackageResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateRemarkLogic extends AbstractControllerLogic
+class UpdatePackageLogic extends AbstractControllerLogic
 {
 
     /**
@@ -22,35 +22,35 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Updated Remark',
-            'message' => 'You have successfully updated the Remark'
+            'title' => 'Updated Package',
+            'message' => 'You have successfully updated the Package'
         ];
     }
 
-    /** @var CanUpdateRemark */
-    private $canUpdateRemark;
+    /** @var CanUpdatePackage */
+    private $canUpdatePackage;
 
-    /** @var UpdatesRemark */
-    private $updatesRemark;
+    /** @var UpdatesPackage */
+    private $updatesPackage;
 
-    /** @var FetchesRemark */
-    private $fetchesRemark;
+    /** @var FetchesPackage */
+    private $fetchesPackage;
 
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
     /**
-     * UpdateRemarkLogic constructor.
-     * @param CanUpdateRemark $canUpdateRemark
-     * @param UpdatesRemark $updatesRemark
-     * @param FetchesRemark $fetchesRemark
+     * UpdatePackageLogic constructor.
+     * @param CanUpdatePackage $canUpdatePackage
+     * @param UpdatesPackage $updatesPackage
+     * @param FetchesPackage $fetchesPackage
      * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdatePackage $canUpdatePackage, UpdatesPackage $updatesPackage, FetchesPackage $fetchesPackage, FetchesDistrict $fetchesDistrict)
     {
-        $this->canUpdateRemark = $canUpdateRemark;
-        $this->updatesRemark = $updatesRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canUpdatePackage = $canUpdatePackage;
+        $this->updatesPackage = $updatesPackage;
+        $this->fetchesPackage = $fetchesPackage;
         $this->fetchesDistrict = $fetchesDistrict;
     }
 
@@ -65,16 +65,16 @@ class UpdateRemarkLogic extends AbstractControllerLogic
         try {
 
             $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new RemarkObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+            $object = new PackageObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new PackageObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
 
-            $this->canUpdateRemark->passes($object);
+            $this->canUpdatePackage->passes($object);
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackage->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesRemark->execute($query, $object);
+            $query = $this->updatesPackage->execute($query, $object);
 
-            return $this->resourceResponse(new RemarkResource($query));
+            return $this->resourceResponse(new PackageResource($query));
 
 
         } catch (\Exception $exception){

app/Classes/Modules/Packages/DataTransferObjects/PackageObject.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\DataTransferObjects;
+namespace App\Classes\Modules\Packages\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
 
-class RemarkObject implements DataTransferObject
+class PackageObject implements DataTransferObject
 {
 
     /** @var string */
@@ -26,7 +26,7 @@ class RemarkObject implements DataTransferObject
     private $postCode;
 
     /**
-     * RemarkObject constructor.
+     * PackageObject constructor.
      * @param string $streetOne
      * @param null|string $streetTwo
      * @param int $countryId

app/Classes/Modules/Packages/Services/CreatesPackage.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\Packages\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Models\Package;
 use App\Models\Company;
 
-class CreatesRemark extends AbstractUpdateRelationshipRecord
+class CreatesPackage extends AbstractUpdateRelationshipRecord
 {
 
     /**
      * @param Company $company
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $company, RemarkObject $object) {
-        $model = new Remark();
+    public function execute(Company $company, PackageObject $object) {
+        $model = new Package();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
         $model->country_id = $object->getCountryId();
@@ -26,7 +26,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
 
-        return $this->handler($company->Remarks(), $model);
+        return $this->handler($company->Packages(), $model);
 
     }
 }

app/Classes/Modules/Packages/Services/DeletesPackage.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\Packages\Services;
 
 use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\Remark;
+use App\Models\Package;
 
-class DeletesRemark extends AbstractDeleteRecord
+class DeletesPackage extends AbstractDeleteRecord
 {
 
     /**
-     * @param Remark $model
+     * @param Package $model
      * @return mixed
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Remark $model) {
+    public function execute(Package $model) {
         return $this->handler($model);
     }
 }

app/Classes/Modules/Packages/Services/FetchesPackage.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\Packages\Services;
 
 
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\Remark;
+use App\Models\Package;
 
-class FetchesRemark extends AbstractFetchRecord
+class FetchesPackage extends AbstractFetchRecord
 {
 
-    /** @var Remark */
+    /** @var Package */
     private $repository;
 
     /**
-     * FetchesRemark constructor.
-     * @param Remark $repository
+     * FetchesPackage constructor.
+     * @param Package $repository
      */
-    public function __construct(Remark $repository)
+    public function __construct(Package $repository)
     {
         $this->repository = $repository;
     }

app/Classes/Modules/Packages/Services/ListsPackages.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\Packages\Services;
 
 
 use App\Classes\General\Eloquent\AbstractListRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\Remark;
+use App\Models\Package;
 
-class ListsRemarks extends AbstractListRecord
+class ListsPackages extends AbstractListRecord
 {
 
-    /** @var Remark */
+    /** @var Package */
     private $repository;
 
     /**
-     * ListsRemarks constructor.
-     * @param Remark $repository
+     * ListsPackages constructor.
+     * @param Package $repository
      */
-    public function __construct(Remark $repository)
+    public function __construct(Package $repository)
     {
         $this->repository = $repository;
     }

app/Classes/Modules/Packages/Services/UpdatesPackage.php

@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\Packages\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Models\Package;
 
-class UpdatesRemark extends AbstractUpdateRecord
+class UpdatesPackage extends AbstractUpdateRecord
 {
 
     /**
-     * @param Remark $model
-     * @param RemarkObject $object
+     * @param Package $model
+     * @param PackageObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Remark $model, RemarkObject $object) {
+    public function execute(Package $model, PackageObject $object) {
 
         //$model->company_id = $object->getCompanyId();
         $model->street_one = $object->getStreetOne();

app/Classes/Modules/Packages/Standards/Rules/CanCreatePackage.php

@@ -1,25 +1,25 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\Packages\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Classes\Modules\Packages\Standards\Validators\PackageValidation;
 
-class CanCreateRemark extends AbstractRule
+class CanCreatePackage extends AbstractRule
 {
 
-    /** @var RemarkValidation */
-    private $RemarkValidation;
+    /** @var PackageValidation */
+    private $PackageValidation;
 
     /**
-     * CanCreateRemark constructor.
-     * @param RemarkValidation $RemarkValidation
+     * CanCreatePackage constructor.
+     * @param PackageValidation $PackageValidation
      */
-    public function __construct(RemarkValidation $RemarkValidation)
+    public function __construct(PackageValidation $PackageValidation)
     {
-        $this->RemarkValidation = $RemarkValidation;
+        $this->PackageValidation = $PackageValidation;
     }
 
 
@@ -34,19 +34,19 @@ class CanCreateRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function validators($object): bool
     {
-        return $this->RemarkValidation->validate($object);
+        return $this->PackageValidation->validate($object);
 
     }
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/Packages/Standards/Rules/CanDeletePackage.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\Packages\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 
-class CanDeleteRemark extends AbstractRule
+class CanDeletePackage extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanDeleteRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanDeleteRemark extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/Packages/Standards/Rules/CanFetchPackage.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\Packages\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 
-class CanFetchRemark extends AbstractRule
+class CanFetchPackage extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanFetchRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanFetchRemark extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/Packages/Standards/Rules/CanListPackages.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\Packages\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 
-class CanListRemarks extends AbstractRule
+class CanListPackages extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanListRemarks extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanListRemarks extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/Packages/Standards/Rules/CanUpdatePackage.php

@@ -1,25 +1,25 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\Packages\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
+use App\Classes\Modules\Packages\Standards\Validators\PackageValidation;
 
-class CanUpdateRemark extends AbstractRule
+class CanUpdatePackage extends AbstractRule
 {
 
-    /** @var RemarkValidation */
-    private $RemarkValidation;
+    /** @var PackageValidation */
+    private $PackageValidation;
 
     /**
-     * CanUpdateRemark constructor.
-     * @param RemarkValidation $RemarkValidation
+     * CanUpdatePackage constructor.
+     * @param PackageValidation $PackageValidation
      */
-    public function __construct(RemarkValidation $RemarkValidation)
+    public function __construct(PackageValidation $PackageValidation)
     {
-        $this->RemarkValidation = $RemarkValidation;
+        $this->PackageValidation = $PackageValidation;
     }
 
 
@@ -34,19 +34,19 @@ class CanUpdateRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function validators($object): bool
     {
-        return $this->RemarkValidation->validate($object);
+        return $this->PackageValidation->validate($object);
 
     }
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/Packages/Standards/Validators/PackageValidation.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Validators;
+namespace App\Classes\Modules\Packages\Standards\Validators;
 
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\Packages\DataTransferObjects\PackageObject;
 
-class RemarkValidation extends AbstractValidation
+class PackageValidation extends AbstractValidation
 {
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackageObject $object
      * @return array
      */
     protected function data($object): array {

app/Classes/Modules/PackingLists/ControllersLogic/CreatePackingListLogic.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\CreatesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesDistrict;
-use App\Classes\Modules\Remarks\Standards\Rules\CanCreateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\Services\CreatesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesDistrict;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanCreatePackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Http\Resources\RemarkResource;
+use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class CreateRemarkLogic extends AbstractControllerLogic
+class CreatePackingListLogic extends AbstractControllerLogic
 {
 
     /**
@@ -22,13 +22,13 @@ class CreateRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Created Remark',
-            'message' => 'You have successfully created a new Remark'
+            'title' => 'Created PackingList',
+            'message' => 'You have successfully created a new PackingList'
         ];
     }
 
-    /** @var CanCreateRemark */
-    private $canCreateRemark;
+    /** @var CanCreatePackingList */
+    private $canCreatePackingList;
 
     /** @var FetchesDistrict */
     private $fetchesDistrict;
@@ -36,22 +36,22 @@ class CreateRemarkLogic extends AbstractControllerLogic
     /** @var FetchesCompany */
     private $fetchesCompany;
 
-    /** @var CreatesRemark */
-    private $createsRemark;
+    /** @var CreatesPackingList */
+    private $createsPackingList;
 
     /**
-     * CreateRemarkLogic constructor.
-     * @param CanCreateRemark $canCreateRemark
+     * CreatePackingListLogic constructor.
+     * @param CanCreatePackingList $canCreatePackingList
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompany $fetchesCompany
-     * @param CreatesRemark $createsRemark
+     * @param CreatesPackingList $createsPackingList
      */
-    public function __construct(CanCreateRemark $canCreateRemark, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesRemark $createsRemark)
+    public function __construct(CanCreatePackingList $canCreatePackingList, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesPackingList $createsPackingList)
     {
-        $this->canCreateRemark = $canCreateRemark;
+        $this->canCreatePackingList = $canCreatePackingList;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompany = $fetchesCompany;
-        $this->createsRemark = $createsRemark;
+        $this->createsPackingList = $createsPackingList;
     }
 
     /**
@@ -66,13 +66,13 @@ class CreateRemarkLogic extends AbstractControllerLogic
 
         $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
 
-        $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+        $object = new PackingListObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
 
-        $this->canCreateRemark->passes($object);
+        $this->canCreatePackingList->passes($object);
 
-        $query = $this->createsRemark->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+        $query = $this->createsPackingList->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
 
-        return $this->resourceResponse(new RemarkResource($query));
+        return $this->resourceResponse(new PackingListResource($query));
 
     }
 

app/Classes/Modules/PackingLists/ControllersLogic/DeletePackingListLogic.php

@@ -1,49 +1,49 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\DeletesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanDeleteRemark;
+use App\Classes\Modules\PackingLists\Services\DeletesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanDeletePackingList;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class DeleteRemarkLogic extends AbstractControllerLogic
+class DeletePackingListLogic extends AbstractControllerLogic
 {
     /**
      * @return array
      */
     protected function notification():array {
         return [
-            'title' => 'Deleted Remark',
-            'message' => 'You have successfully deleted a Remark'
+            'title' => 'Deleted PackingList',
+            'message' => 'You have successfully deleted a PackingList'
         ];
     }
 
 
-    /** @var CanDeleteRemark */
-    private $canDeleteRemark;
+    /** @var CanDeletePackingList */
+    private $canDeletePackingList;
 
-    /** @var DeletesRemark */
-    private $deletesRemark;
+    /** @var DeletesPackingList */
+    private $deletesPackingList;
 
-    /** @var FetchesRemark */
-        private $fetchesRemark;
+    /** @var FetchesPackingList */
+        private $fetchesPackingList;
 
     /**
-     * DeleteRemarkControllersLogic constructor.
-     * @param CanDeleteRemark $canDeleteRemark
-     * @param DeletesRemark $deletesRemark
-     * @param FetchesRemark $fetchesRemark
+     * DeletePackingListControllersLogic constructor.
+     * @param CanDeletePackingList $canDeletePackingList
+     * @param DeletesPackingList $deletesPackingList
+     * @param FetchesPackingList $fetchesPackingList
      */
-    public function __construct(CanDeleteRemark $canDeleteRemark, DeletesRemark $deletesRemark, FetchesRemark $fetchesRemark)
+    public function __construct(CanDeletePackingList $canDeletePackingList, DeletesPackingList $deletesPackingList, FetchesPackingList $fetchesPackingList)
     {
-        $this->canDeleteRemark = $canDeleteRemark;
-        $this->deletesRemark = $deletesRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canDeletePackingList = $canDeletePackingList;
+        $this->deletesPackingList = $deletesPackingList;
+        $this->fetchesPackingList = $fetchesPackingList;
     }
 
 
@@ -56,11 +56,11 @@ class DeleteRemarkLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canDeleteRemark->passes();
+            $this->canDeletePackingList->passes();
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $this->deletesRemark->execute($query);
+            $this->deletesPackingList->execute($query);
 
             return $this->response([]);
 

app/Classes/Modules/PackingLists/ControllersLogic/FetchPackingListLogic.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Standards\Rules\CanFetchRemark;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanFetchPackingList;
+use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class FetchRemarkLogic extends AbstractControllerLogic
+class FetchPackingListLogic extends AbstractControllerLogic
 {
 
     /**
@@ -19,26 +19,26 @@ class FetchRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Retrieved Remark',
-            'message' => 'You have successfully retrieved a Remark'
+            'title' => 'Retrieved PackingList',
+            'message' => 'You have successfully retrieved a PackingList'
         ];
     }
 
-    /** @var CanFetchRemark */
-    private $canFetchRemark;
+    /** @var CanFetchPackingList */
+    private $canFetchPackingList;
 
-    /** @var FetchesRemark */
-    private $fetchesRemark;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
 
     /**
-     * FetchRemarkControllersLogic constructor.
-     * @param CanFetchRemark $canFetchRemark
-     * @param FetchesRemark $fetchesRemark
+     * FetchPackingListControllersLogic constructor.
+     * @param CanFetchPackingList $canFetchPackingList
+     * @param FetchesPackingList $fetchesPackingList
      */
-    public function __construct(CanFetchRemark $canFetchRemark, FetchesRemark $fetchesRemark)
+    public function __construct(CanFetchPackingList $canFetchPackingList, FetchesPackingList $fetchesPackingList)
     {
-        $this->canFetchRemark = $canFetchRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canFetchPackingList = $canFetchPackingList;
+        $this->fetchesPackingList = $fetchesPackingList;
     }
 
 
@@ -51,11 +51,11 @@ class FetchRemarkLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canFetchRemark->passes();
+            $this->canFetchPackingList->passes();
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            return $this->resourceResponse(new RemarkResource($query));
+            return $this->resourceResponse(new PackingListResource($query));
 
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());

app/Classes/Modules/PackingLists/ControllersLogic/ListPackingListsLogic.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\ListsRemarks;
-use App\Classes\Modules\Remarks\Standards\Rules\CanListRemarks;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanListPackingLists;
+use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class ListRemarksLogic extends AbstractControllerLogic
+class ListPackingListsLogic extends AbstractControllerLogic
 {
 
     /**
@@ -19,26 +19,26 @@ class ListRemarksLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Retrieved Remarks',
-            'message' => 'You have successfully retrieved a list of Remarks'
+            'title' => 'Retrieved PackingLists',
+            'message' => 'You have successfully retrieved a list of PackingLists'
         ];
     }
 
-    /** @var CanListRemarks */
-    private $canListRemarks;
+    /** @var CanListPackingLists */
+    private $canListPackingLists;
 
-    /** @var ListsRemarks */
-    private $listsRemarks;
+    /** @var ListsPackingLists */
+    private $listsPackingLists;
 
     /**
-     * ListRemarksLogic constructor.
-     * @param CanListRemarks $canListRemarks
-     * @param ListsRemarks $listsRemarks
+     * ListPackingListsLogic constructor.
+     * @param CanListPackingLists $canListPackingLists
+     * @param ListsPackingLists $listsPackingLists
      */
-    public function __construct(CanListRemarks $canListRemarks, ListsRemarks $listsRemarks)
+    public function __construct(CanListPackingLists $canListPackingLists, ListsPackingLists $listsPackingLists)
     {
-        $this->canListRemarks = $canListRemarks;
-        $this->listsRemarks = $listsRemarks;
+        $this->canListPackingLists = $canListPackingLists;
+        $this->listsPackingLists = $listsPackingLists;
     }
 
 
@@ -51,11 +51,11 @@ class ListRemarksLogic extends AbstractControllerLogic
     {
         try {
 
-            $this->canListRemarks->passes();
+            $this->canListPackingLists->passes();
 
-            $query = $this->listsRemarks->execute($this->listsRemarks->deserializeFilters($request->input('filters')));
+            $query = $this->listsPackingLists->execute($this->listsPackingLists->deserializeFilters($request->input('filters')));
 
-            return $this->collectionResponse(RemarkResource::collection($query));
+            return $this->collectionResponse(PackingListResource::collection($query));
 
         } catch (\Exception $exception){
             throw new ErrorException($exception->getMessage(), $exception->getCode());

app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListLogic.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\ControllersLogic;
+namespace App\Classes\Modules\PackingLists\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Remarks\Services\UpdatesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesRemark;
-use App\Classes\Modules\Remarks\Services\FetchesDistrict;
-use App\Classes\Modules\Remarks\Standards\Rules\CanUpdateRemark;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Http\Resources\RemarkResource;
+use App\Classes\Modules\PackingLists\Services\UpdatesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesPackingList;
+use App\Classes\Modules\PackingLists\Services\FetchesDistrict;
+use App\Classes\Modules\PackingLists\Standards\Rules\CanUpdatePackingList;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Http\Resources\PackingListResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class UpdateRemarkLogic extends AbstractControllerLogic
+class UpdatePackingListLogic extends AbstractControllerLogic
 {
 
     /**
@@ -22,35 +22,35 @@ class UpdateRemarkLogic extends AbstractControllerLogic
      */
     protected function notification():array {
         return [
-            'title' => 'Updated Remark',
-            'message' => 'You have successfully updated the Remark'
+            'title' => 'Updated PackingList',
+            'message' => 'You have successfully updated the PackingList'
         ];
     }
 
-    /** @var CanUpdateRemark */
-    private $canUpdateRemark;
+    /** @var CanUpdatePackingList */
+    private $canUpdatePackingList;
 
-    /** @var UpdatesRemark */
-    private $updatesRemark;
+    /** @var UpdatesPackingList */
+    private $updatesPackingList;
 
-    /** @var FetchesRemark */
-    private $fetchesRemark;
+    /** @var FetchesPackingList */
+    private $fetchesPackingList;
 
     /** @var FetchesDistrict */
     private $fetchesDistrict;
 
     /**
-     * UpdateRemarkLogic constructor.
-     * @param CanUpdateRemark $canUpdateRemark
-     * @param UpdatesRemark $updatesRemark
-     * @param FetchesRemark $fetchesRemark
+     * UpdatePackingListLogic constructor.
+     * @param CanUpdatePackingList $canUpdatePackingList
+     * @param UpdatesPackingList $updatesPackingList
+     * @param FetchesPackingList $fetchesPackingList
      * @param FetchesDistrict $fetchesDistrict
      */
-    public function __construct(CanUpdateRemark $canUpdateRemark, UpdatesRemark $updatesRemark, FetchesRemark $fetchesRemark, FetchesDistrict $fetchesDistrict)
+    public function __construct(CanUpdatePackingList $canUpdatePackingList, UpdatesPackingList $updatesPackingList, FetchesPackingList $fetchesPackingList, FetchesDistrict $fetchesDistrict)
     {
-        $this->canUpdateRemark = $canUpdateRemark;
-        $this->updatesRemark = $updatesRemark;
-        $this->fetchesRemark = $fetchesRemark;
+        $this->canUpdatePackingList = $canUpdatePackingList;
+        $this->updatesPackingList = $updatesPackingList;
+        $this->fetchesPackingList = $fetchesPackingList;
         $this->fetchesDistrict = $fetchesDistrict;
     }
 
@@ -65,16 +65,16 @@ class UpdateRemarkLogic extends AbstractControllerLogic
         try {
 
             $district = $this->fetchesDistrict->execute(['id' => $request->input('district_id')]);
-            $object = new RemarkObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
-            //$object = new RemarkObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
+            $object = new PackingListObject($request->input('street_one'), $request->input('street_two'), $district->country_id, $district->state_id, $district->id, $request->input('post_code'));
+            //$object = new PackingListObject($request->input('company_id'), $request->input('street_one'), $request->input('street_two'), $request->input('city'), $request->input('state'), $request->input('post_code'), $request->input('country'), $request->input('default'), $request->input('billing'));
 
-            $this->canUpdateRemark->passes($object);
+            $this->canUpdatePackingList->passes($object);
 
-            $query = $this->fetchesRemark->execute(['id' => $request->route('id')]);
+            $query = $this->fetchesPackingList->execute(['id' => $request->route('id')]);
 
-            $query = $this->updatesRemark->execute($query, $object);
+            $query = $this->updatesPackingList->execute($query, $object);
 
-            return $this->resourceResponse(new RemarkResource($query));
+            return $this->resourceResponse(new PackingListResource($query));
 
 
         } catch (\Exception $exception){

app/Classes/Modules/PackingLists/DataTransferObjects/PackingListObject.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\DataTransferObjects;
+namespace App\Classes\Modules\PackingLists\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
 
-class RemarkObject implements DataTransferObject
+class PackingListObject implements DataTransferObject
 {
 
     /** @var string */
@@ -26,7 +26,7 @@ class RemarkObject implements DataTransferObject
     private $postCode;
 
     /**
-     * RemarkObject constructor.
+     * PackingListObject constructor.
      * @param string $streetOne
      * @param null|string $streetTwo
      * @param int $countryId

app/Classes/Modules/PackingLists/Services/CreatesPackingList.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\PackingLists\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Models\PackingList;
 use App\Models\Company;
 
-class CreatesRemark extends AbstractUpdateRelationshipRecord
+class CreatesPackingList extends AbstractUpdateRelationshipRecord
 {
 
     /**
      * @param Company $company
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Company $company, RemarkObject $object) {
-        $model = new Remark();
+    public function execute(Company $company, PackingListObject $object) {
+        $model = new PackingList();
         $model->street_one = $object->getStreetOne();
         $model->street_two = $object->getStreetTwo();
         $model->country_id = $object->getCountryId();
@@ -26,7 +26,7 @@ class CreatesRemark extends AbstractUpdateRelationshipRecord
         $model->district_id = $object->getDistrictId();
         $model->postcode = $object->getPostCode();
 
-        return $this->handler($company->Remarks(), $model);
+        return $this->handler($company->PackingLists(), $model);
 
     }
 }

app/Classes/Modules/PackingLists/Services/DeletesPackingList.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\PackingLists\Services;
 
 use App\Classes\General\Eloquent\AbstractDeleteRecord;
-use App\Models\Remark;
+use App\Models\PackingList;
 
-class DeletesRemark extends AbstractDeleteRecord
+class DeletesPackingList extends AbstractDeleteRecord
 {
 
     /**
-     * @param Remark $model
+     * @param PackingList $model
      * @return mixed
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Remark $model) {
+    public function execute(PackingList $model) {
         return $this->handler($model);
     }
 }

app/Classes/Modules/PackingLists/Services/FetchesPackingList.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\PackingLists\Services;
 
 
 use App\Classes\General\Eloquent\AbstractFetchRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\Remark;
+use App\Models\PackingList;
 
-class FetchesRemark extends AbstractFetchRecord
+class FetchesPackingList extends AbstractFetchRecord
 {
 
-    /** @var Remark */
+    /** @var PackingList */
     private $repository;
 
     /**
-     * FetchesRemark constructor.
-     * @param Remark $repository
+     * FetchesPackingList constructor.
+     * @param PackingList $repository
      */
-    public function __construct(Remark $repository)
+    public function __construct(PackingList $repository)
     {
         $this->repository = $repository;
     }

app/Classes/Modules/PackingLists/Services/ListsPackingLists.php

@@ -1,23 +1,23 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\PackingLists\Services;
 
 
 use App\Classes\General\Eloquent\AbstractListRecord;
 use Illuminate\Database\Eloquent\Builder;
-use App\Models\Remark;
+use App\Models\PackingList;
 
-class ListsRemarks extends AbstractListRecord
+class ListsPackingLists extends AbstractListRecord
 {
 
-    /** @var Remark */
+    /** @var PackingList */
     private $repository;
 
     /**
-     * ListsRemarks constructor.
-     * @param Remark $repository
+     * ListsPackingLists constructor.
+     * @param PackingList $repository
      */
-    public function __construct(Remark $repository)
+    public function __construct(PackingList $repository)
     {
         $this->repository = $repository;
     }

app/Classes/Modules/PackingLists/Services/UpdatesPackingList.php

@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Services;
+namespace App\Classes\Modules\PackingLists\Services;
 
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Models\Remark;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Models\PackingList;
 
-class UpdatesRemark extends AbstractUpdateRecord
+class UpdatesPackingList extends AbstractUpdateRecord
 {
 
     /**
-     * @param Remark $model
-     * @param RemarkObject $object
+     * @param PackingList $model
+     * @param PackingListObject $object
      * @return \Illuminate\Database\Eloquent\Model
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Remark $model, RemarkObject $object) {
+    public function execute(PackingList $model, PackingListObject $object) {
 
         //$model->company_id = $object->getCompanyId();
         $model->street_one = $object->getStreetOne();

app/Classes/Modules/PackingLists/Standards/Rules/CanCreatePackingList.php

@@ -1,25 +1,25 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Standards\Validators\PackingListValidation;
 
-class CanCreateRemark extends AbstractRule
+class CanCreatePackingList extends AbstractRule
 {
 
-    /** @var RemarkValidation */
-    private $RemarkValidation;
+    /** @var PackingListValidation */
+    private $PackingListValidation;
 
     /**
-     * CanCreateRemark constructor.
-     * @param RemarkValidation $RemarkValidation
+     * CanCreatePackingList constructor.
+     * @param PackingListValidation $PackingListValidation
      */
-    public function __construct(RemarkValidation $RemarkValidation)
+    public function __construct(PackingListValidation $PackingListValidation)
     {
-        $this->RemarkValidation = $RemarkValidation;
+        $this->PackingListValidation = $PackingListValidation;
     }
 
 
@@ -34,19 +34,19 @@ class CanCreateRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function validators($object): bool
     {
-        return $this->RemarkValidation->validate($object);
+        return $this->PackingListValidation->validate($object);
 
     }
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/PackingLists/Standards/Rules/CanDeletePackingList.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 
-class CanDeleteRemark extends AbstractRule
+class CanDeletePackingList extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanDeleteRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanDeleteRemark extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/PackingLists/Standards/Rules/CanFetchPackingList.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 
-class CanFetchRemark extends AbstractRule
+class CanFetchPackingList extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanFetchRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanFetchRemark extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/PackingLists/Standards/Rules/CanListPackingLists.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 
-class CanListRemarks extends AbstractRule
+class CanListPackingLists extends AbstractRule
 {
 
 
@@ -21,7 +21,7 @@ class CanListRemarks extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function validators($object): bool
@@ -32,7 +32,7 @@ class CanListRemarks extends AbstractRule
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/PackingLists/Standards/Rules/CanUpdatePackingList.php

@@ -1,25 +1,25 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Rules;
+namespace App\Classes\Modules\PackingLists\Standards\Rules;
 
 
 use App\Classes\General\Abstracts\AbstractRule;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
-use App\Classes\Modules\Remarks\Standards\Validators\RemarkValidation;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Standards\Validators\PackingListValidation;
 
-class CanUpdateRemark extends AbstractRule
+class CanUpdatePackingList extends AbstractRule
 {
 
-    /** @var RemarkValidation */
-    private $RemarkValidation;
+    /** @var PackingListValidation */
+    private $PackingListValidation;
 
     /**
-     * CanUpdateRemark constructor.
-     * @param RemarkValidation $RemarkValidation
+     * CanUpdatePackingList constructor.
+     * @param PackingListValidation $PackingListValidation
      */
-    public function __construct(RemarkValidation $RemarkValidation)
+    public function __construct(PackingListValidation $PackingListValidation)
     {
-        $this->RemarkValidation = $RemarkValidation;
+        $this->PackingListValidation = $PackingListValidation;
     }
 
 
@@ -34,19 +34,19 @@ class CanUpdateRemark extends AbstractRule
     }
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
     protected function validators($object): bool
     {
-        return $this->RemarkValidation->validate($object);
+        return $this->PackingListValidation->validate($object);
 
     }
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/Modules/PackingLists/Standards/Validators/PackingListValidation.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Classes\Modules\Remarks\Standards\Validators;
+namespace App\Classes\Modules\PackingLists\Standards\Validators;
 
 
 use App\Classes\General\Abstracts\AbstractValidation;
-use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
 
-class RemarkValidation extends AbstractValidation
+class PackingListValidation extends AbstractValidation
 {
 
 
     /**
-     * @param RemarkObject $object
+     * @param PackingListObject $object
      * @return array
      */
     protected function data($object): array {