From e2faeb4bff1bbcf4a94b03ae42abf108777470cb Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Sat, 23 Apr 2022 17:20:07 +0800 Subject: [PATCH] Add reference in supplier (Settings Ui & Pending Order Ui & API) --- .../Processors/CreateCompanyProcessor.php | 3 ++- .../SupplierPendingOrdersSectionComponent.vue | 4 ++-- .../companies/forms/SupplierFormComponent.vue | 14 +++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php index fc84e9cc..0f852dda 100644 --- a/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php +++ b/app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php @@ -46,9 +46,10 @@ class CreateCompanyProcessor public function execute(Request $request, int $businessType = BusinessType::IMPORTER, ?int $companyType = CompanyType::COMPANY_BUSINESS, ?int $status = ApprovalStatus::PENDING_SUBMISSION): Model { $companyName = $companyType === CompanyType::COMPANY_BUSINESS ? $request->input('company_name') : $request->input('name'); + $companyReference = $request->input('company_name') ? $request->input('company_name') : mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(); $company_object = new CompanyObject( $companyName, - mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(), + $companyReference, $businessType, $companyType, $status); $this->canCreateCompany->passes($company_object); diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue index 5e43314b..a08a16c9 100644 --- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue @@ -12,7 +12,7 @@
- {{selectedSupplier.name}} + {{selectedSupplier.name}} - {{selectedSupplier.reference}}
@@ -31,7 +31,7 @@
-
{{supplier.name}}
+
{{supplier.name}} - {{supplier.reference}}
diff --git a/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue index 6c346db6..8b53a970 100644 --- a/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue +++ b/resources/assets/vue/components/companies/forms/SupplierFormComponent.vue @@ -22,6 +22,14 @@
+
+
+ + + + +
+
Cancel
@@ -43,6 +51,7 @@ return { parameters: { company_name: '', + company_reference: '', } } }, @@ -50,7 +59,10 @@ parameters: { company_name: { required: true - } + }, + company_reference: { + required: true + }, } }, mixins: [ModalFormHandler]