diff --git a/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php b/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php
new file mode 100644
index 00000000..ad80e9d0
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasMorphCompanyModule.php
@@ -0,0 +1,23 @@
+whereHasMorph('owner', ['App\Models\CompanyModule'], function ($query) use($value) {
+ $query->where('id',$value);
+ });
+ }
+}
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index e8d432b8..d746ac31 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -8,7 +8,7 @@ use App\Classes\Modules\Addresses\Services\CreatesAddress;
use App\Classes\Modules\Addresses\Services\FetchesDistrict;
use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
use App\Http\Resources\AddressResource;
use ErrorException;
use Illuminate\Http\JsonResponse;
@@ -33,8 +33,8 @@ class CreateAddressLogic extends AbstractControllerLogic
/** @var FetchesDistrict */
private $fetchesDistrict;
- /** @var FetchesCompany */
- private $fetchesCompany;
+ /** @var FetchesCompanyModule */
+ private $fetchesCompanyModule;
/** @var CreatesAddress */
private $createsAddress;
@@ -43,14 +43,14 @@ class CreateAddressLogic extends AbstractControllerLogic
* CreateAddressLogic constructor.
* @param CanCreateAddress $canCreateAddress
* @param FetchesDistrict $fetchesDistrict
- * @param FetchesCompany $fetchesCompany
+ * @param FetchesCompanyModule $fetchesCompanyModule
* @param CreatesAddress $createsAddress
*/
- public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
+ public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompanyModule $fetchesCompanyModule, CreatesAddress $createsAddress)
{
$this->canCreateAddress = $canCreateAddress;
$this->fetchesDistrict = $fetchesDistrict;
- $this->fetchesCompany = $fetchesCompany;
+ $this->fetchesCompanyModule = $fetchesCompanyModule;
$this->createsAddress = $createsAddress;
}
@@ -70,10 +70,10 @@ class CreateAddressLogic extends AbstractControllerLogic
$this->canCreateAddress->passes($object);
- $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+ $query = $this->createsAddress->execute($this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]), $object);
return $this->resourceResponse(new AddressResource($query));
}
-}
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Addresses/Services/CreatesAddress.php b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
index e6a7b8b3..0e650f07 100644
--- a/app/Classes/Modules/Addresses/Services/CreatesAddress.php
+++ b/app/Classes/Modules/Addresses/Services/CreatesAddress.php
@@ -6,7 +6,7 @@ use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
use App\Models\Address;
-use App\Models\Company;
+use App\Models\CompanyModule;
class CreatesAddress extends AbstractUpdateRelationshipRecord
{
@@ -17,7 +17,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
- public function execute(Company $company, AddressObject $object) {
+ public function execute(CompanyModule $companyModule, AddressObject $object) {
$model = new Address();
$model->street_one = $object->getStreetOne();
$model->street_two = $object->getStreetTwo();
@@ -26,7 +26,7 @@ class CreatesAddress extends AbstractUpdateRelationshipRecord
$model->district_id = $object->getDistrictId();
$model->postcode = $object->getPostCode();
- return $this->handler($company->addresses(), $model);
+ return $this->handler($companyModule->addresses(), $model);
}
}
\ No newline at end of file
diff --git a/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php b/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php
new file mode 100644
index 00000000..f04d39cc
--- /dev/null
+++ b/app/Classes/Modules/Companies/Services/FetchesCompanyModule.php
@@ -0,0 +1,34 @@
+repository = $repository;
+ }
+
+
+ /**
+ * @return Builder
+ */
+ public function getRepository(): Builder
+ {
+ return $this->repository->newQuery();
+ }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
new file mode 100644
index 00000000..bf960049
--- /dev/null
+++ b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersLogic.php
@@ -0,0 +1,55 @@
+ 'Retrieved Orders',
+ 'message' => 'You have successfully retrieved a list of Orders'
+ ];
+ }
+
+ /** @var CanListOrders */
+ private $canListOrders;
+
+ /** @var ListsOrders */
+ private $listsOrders;
+
+ /**
+ * ListOrdersLogic constructor.
+ * @param CanListOrders $canListOrders
+ * @param ListsOrders $listsOrders
+ */
+ public function __construct(CanListOrders $canListOrders, ListsOrders $listsOrders)
+ {
+ $this->canListOrders = $canListOrders;
+ $this->listsOrders = $listsOrders;
+ }
+
+ public function logic(Request $request) : JsonResponse
+ {
+ $this->canListOrders->passes();
+
+ $query = $this->listsOrders->execute($this->listsOrders->deserializeFilters($request->input('filters')));
+
+ return $this->collectionResponse(OrderResource::collection($query));
+
+ }
+
+
+
+}
diff --git a/app/Classes/Modules/Orders/Services/ListsOrders.php b/app/Classes/Modules/Orders/Services/ListsOrders.php
new file mode 100644
index 00000000..8b9c835b
--- /dev/null
+++ b/app/Classes/Modules/Orders/Services/ListsOrders.php
@@ -0,0 +1,31 @@
+repository = $repository;
+ }
+
+ /**
+ * @return Builder
+ */
+ public function getRepository(): Builder
+ {
+ return $this->repository->newQuery();
+ }
+}
diff --git a/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php b/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php
new file mode 100644
index 00000000..b7d48485
--- /dev/null
+++ b/app/Classes/Modules/Orders/Standards/Rules/CanListOrders.php
@@ -0,0 +1,40 @@
+execute($request);
+ }
+}
diff --git a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
index de1c6443..e38ac3bf 100644
--- a/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
+++ b/resources/assets/vue/components/accounts/forms/LogOutFormComponent.vue
@@ -53,6 +53,7 @@
},
successHandler(){
this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
+ this.$store.dispatch('updateIfCreateNewOrder','');
},
errorHandler(){
this.$store.dispatch('userAuthentication', {access_token: '', redirect_url: this.route('login')});
diff --git a/resources/assets/vue/components/address/forms/AddressFormComponent.vue b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
new file mode 100644
index 00000000..6bd8840d
--- /dev/null
+++ b/resources/assets/vue/components/address/forms/AddressFormComponent.vue
@@ -0,0 +1,128 @@
+
+
+ Some quick example text to build on the card title and + make up the bulk of the card's content. +
++ Some quick example text to build on the card title and + make up the bulk of the card's content. +
++ Some quick example text to build on the card title and + make up the bulk of the card's content. +
+