diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php index 5ac90094..4961eead 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php @@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\RoleTypes; use App\Models\Company; +use App\Models\CompanyModule; use App\Models\User; use Illuminate\Http\JsonResponse; @@ -96,23 +97,24 @@ class CreateCustomerLogic extends AbstractControllerLogic * @return JsonResponse * @throws \App\Classes\Exceptions\AccessForbiddenException * @throws \App\Classes\Exceptions\AccessUnauthorisedException - * @throws \App\Classes\Exceptions\InternalServerErrorException * @throws \App\Classes\Exceptions\MalformedRequestException * @throws \App\Classes\Exceptions\RequestValidationException */ public function logic(Request $request): JsonResponse { /** @var User $user */ - $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION); + $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION); /** @var Company $company */ $company = $this->createCompanyProcessor->execute($request, $request->input('type'), ApprovalStatus::PENDING_SUBMISSION); $this->createContactProcessor->execute($request, $company); + /** @var CompanyModule $companyModule */ $companyModule = $this->createCompanyModuleProcessor->execute($company, $request->input('business_type')); $Object = new EmploymentObject($companyModule, $user); + $this->assignEmployeeProcessor->execute($Object); //$this->assignSegmentProcessor->execute($company); diff --git a/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php b/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php index 4d9677d3..127ef55a 100644 --- a/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php +++ b/app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php @@ -55,6 +55,7 @@ class GeneratesAuthenticationToken { /** @var Company $companyModule */ $companyModule = $user->companyModule()->first(); + $order = $companyModule->orders->count(); $claims = [ diff --git a/app/Http/Controllers/Accounts/CreateCustomerController.php b/app/Http/Controllers/Accounts/CreateCustomerController.php index 635ba903..71d1b152 100644 --- a/app/Http/Controllers/Accounts/CreateCustomerController.php +++ b/app/Http/Controllers/Accounts/CreateCustomerController.php @@ -10,7 +10,7 @@ class CreateCustomerController { /** * @param Request $request - * @param CreateCustomerLogic $logic + * @param CreateCustomerLogic $createCustomerLogic * @return JsonResponse */ public function create(Request $request, CreateCustomerLogic $createCustomerLogic): JsonResponse diff --git a/composer.json b/composer.json index 7ff264a6..824d2d3f 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "keywords": ["framework", "laravel"], "license": "MIT", "require": { - "php": "^7.3|^8.0", + "php": "^7.3", "ext-fileinfo": "^7.3", "ext-json": "^1.7", "barryvdh/laravel-dompdf": "^0.9.0", diff --git a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue index e5ee6305..a88815cf 100644 --- a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue @@ -31,7 +31,7 @@
-

New Customer? Create Account

+

New Customer? Create Account

diff --git a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue index be33cc6e..04cae09f 100644 --- a/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue @@ -1,14 +1,9 @@