cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change-company-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal

Browse Source
This commit is contained in:
edmondlang
2023-02-06 23:10:00 +08:00
parent 2300d237d3 990508501d
commit 18d1841a30
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php
+3 -1
View File
@@ -78,7 +78,9 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic
$query = $this->updatesCompany->execute($query, $object);
$this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
if ($request->input('debtor') || $query->first()->debtor !== null) {
$this->updatesCompanyDebtor->execute($query, $request->input('debtor'));
}
return $this->resourceResponse(new CompanyResource($query));
}
app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php
+1 -1
View File
@@ -15,7 +15,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Company $model, string $debtor)
public function execute(Company $model, ?string $debtor)
{
$model->debtor = $debtor;
resources/assets/vue/components/orders/forms/ChangeCustomerNameFormComponent.vue
+4 -1
View File
@@ -27,7 +27,7 @@
<div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.company.update.nameAndDebtor', data.id), 'put', section, true, true)">Confirm</div>
<div class="btn btn-primary w-100 btn-lg" @click="submitForm">Confirm</div>
</div>
</div>
</div>
@@ -62,6 +62,9 @@
methods: {
successHandler(response) {
window.location.replace(this.route('customers', response.payload.data.reference));
},
submitForm() {
this.submit(this.route('api.company.update.nameAndDebtor', this.data.id), 'put', this.section, true, true)
}
},
mixins: [modalFormHandler]