omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 04:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add reference in supplier (Settings Ui & Pending Order Ui & API)

Browse Source
This commit is contained in:
ahmedsophyudden
2022-04-23 17:20:07 +08:00
parent 63ad9abc3c
commit e2faeb4bff
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/Processors/CreateCompanyProcessor.php
+2 -1
View File
@@ -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 { 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'); $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( $company_object = new CompanyObject(
$companyName, $companyName,
mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(), $companyReference,
$businessType, $companyType, $status); $businessType, $companyType, $status);
$this->canCreateCompany->passes($company_object); $this->canCreateCompany->passes($company_object);
resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+2 -2
View File
@@ -12,7 +12,7 @@
<div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status"> <div class="btn btn-xs btn-outline-primary btn-block text-left b-rad-none p-t-0 p-b-0 p-l-15 p-r-15" @click="selectedSupplier.status = !selectedSupplier.status">
<div class="row"> <div class="row">
<div class="col p-t-5 p-b-5 fs-9"> <div class="col p-t-5 p-b-5 fs-9">
{{selectedSupplier.name}} {{selectedSupplier.name}} - {{selectedSupplier.reference}}
</div> </div>
<div class="col-auto b-l b-success"> <div class="col-auto b-l b-success">
<div class="row h-100 align-items-center"> <div class="row h-100 align-items-center">
@@ -31,7 +31,7 @@
<div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)"> <div class="col b-b b-grey p-t-10 p-b-10 pointer hover-t-10 p-b-10" :class="[{'bg-primary-light': selectedSupplier.id === supplier.id}, {'text-white': selectedSupplier.id === supplier.id}, {'hover-primary': selectedSupplier.id !== supplier.id}, {'pointer': selectedSupplier.id !== supplier.id}]" @click="updateSupplier(supplier)">
<div class="row align-items-center justify-content-center"> <div class="row align-items-center justify-content-center">
<div class="col"> <div class="col">
<div class="font-heading fs-10">{{supplier.name}}</div> <div class="font-heading fs-10">{{supplier.name}} - {{supplier.reference}}</div>
</div> </div>
</div> </div>
</div> </div>
resources/assets/vue/components/companies/forms/SupplierFormComponent.vue
+13 -1
View File
@@ -22,6 +22,14 @@
</validation-wrapper-component> </validation-wrapper-component>
</div> </div>
</div> </div>
<div class="row m-b-10">
<div class="col">
<validation-wrapper-component :validator="$v.parameters.company_reference">
<label>Reference</label>
<input type="text" class="form-control" v-model="parameters.company_reference">
</validation-wrapper-component>
</div>
</div>
<div class="row"> <div class="row">
<div class="col p-r-5"> <div class="col p-r-5">
<div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div> <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
@@ -43,6 +51,7 @@
return { return {
parameters: { parameters: {
company_name: '', company_name: '',
company_reference: '',
} }
} }
}, },
@@ -50,7 +59,10 @@
parameters: { parameters: {
company_name: { company_name: {
required: true required: true
} },
company_reference: {
required: true
},
} }
}, },
mixins: [ModalFormHandler] mixins: [ModalFormHandler]