cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

E-Invoice - Fix minor problems discovered from Shipping Portal

Browse Source
This commit is contained in:
Dillon Ngo
2025-06-20 11:08:37 +08:00
parent 13df313cea
commit fdfcf714e5
3 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyEInvoiceInfoLogic.php
-3
View File
@@ -109,9 +109,6 @@ class UpdateCompanyEInvoiceInfoLogic extends AbstractControllerLogic
//Update tin, msic code
$this->updatesCompanyEInvoiceInfo->execute($company, $dto->tin, $dto->msicCode);
$query->tin = $dto->tin;
$query->msic_code = $dto->msicCode;
return $this->response([]);
}
}
app/Classes/Modules/Companies/Services/UpdatesCompanyEInvoiceRequest.php
+1 -1
View File
@@ -17,7 +17,7 @@ class UpdatesCompanyEInvoiceRequest extends AbstractUpdateRecord
*/
public function execute(Company $model, bool $eInvoice)
{
if (is_null($model->e_invoice) && is_null($model->e_invoice_requested_at)) {
if (is_null($model->e_invoice_requested_at)) {
if($eInvoice){
$model->e_invoice_requested_at = now();
}
resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
+40 -38
View File
@@ -22,7 +22,7 @@
</validation-wrapper-component>
</div>
</div>
<div class="row m-b-5" v-if="data.e_invoice !== null">
<div class="row m-b-5" v-if="data.e_invoice !== 0 && data.e_invoice !== null">
<div class="col">
E-Invoice Info
<div class="row m-b-15">
@@ -135,40 +135,43 @@
// },
validations() {
const companyType = this.data.type
const isEInvoiceEnabled = this.data.e_invoice !== 0 && this.data.e_invoice !== null;
return {
parameters: {
name: {
required,
},
debtor: {},
tin: {
...(companyType === 0
? {
required,
alphaNum,
minLength: minLength(11),
maxLength: maxLength(13)
}
: {}),
...(companyType === 1
? {
required,
alphaNum,
minLength: minLength(10),
maxLength: maxLength(12)
}
: {})
},
msic_code: {
tin: isEInvoiceEnabled
? {
...(companyType === 0
? {
required,
alphaNum,
minLength: minLength(11),
maxLength: maxLength(13)
}
: {}),
...(companyType === 1
? {
required,
alphaNum,
minLength: minLength(10),
maxLength: maxLength(12)
}
: {})
}
: {},
msic_code: isEInvoiceEnabled ? {
notZero, fiveDigits
},
}: {},
address_id: {},
street_one: { required },
street_one: isEInvoiceEnabled ? { required } : {},
street_two: {},
district_id: { required },
state_id: { required },
post_code: { required, notZero},
district_id: isEInvoiceEnabled ? { required } : {},
state_id: isEInvoiceEnabled ? { required } : {},
post_code: isEInvoiceEnabled ? { required, notZero } : {},
}
}
@@ -185,22 +188,21 @@
}
}
},
watch: {
'data': function(newData) { //cief todo: 90
if (newData && newData.address_einvoice) {
this.parameters.address_id = newData.address_einvoice.id;
this.parameters.street_one = newData.address_einvoice.street_one;
this.parameters.street_two = newData.address_einvoice.street_two;
this.parameters.district_id = newData.address_einvoice.district.id;
this.parameters.state_id = newData.address_einvoice.state.id;
this.parameters.post_code = newData.address_einvoice.post_code;
}
}
},
// watch: {
// 'data': function(newData) { //cief todo: 90
// if (newData && newData.address_einvoice) {
// this.parameters.address_id = newData.address_einvoice.id;
// this.parameters.street_one = newData.address_einvoice.street_one;
// this.parameters.street_two = newData.address_einvoice.street_two;
// this.parameters.district_id = newData.address_einvoice.district.id;
// this.parameters.state_id = newData.address_einvoice.state.id;
// this.parameters.post_code = newData.address_einvoice.post_code;
// }
// }
// },
methods: {
successHandler(response) {
// window.location.replace(this.route('customers', response.payload.data.reference));
this.$emit('e-invoice-info', this.parameters);
this.closeModal();
},
submitForm() {