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

Merge branch 'dillon/90-e-invoice-f' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2025-07-23 22:31:38 +08:00
parent 6773770feb 8e3d0bf30f
commit afdc9dc7f9
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php
+1 -1
View File
@@ -33,7 +33,7 @@ class ImportExcelLogic extends AbstractControllerLogic
*/
public function logic(Request $request) : JsonResponse
{
$files = $request->file('files');
$reportType = $request->input('report_type');
$object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
foreach ($object->getFiles() as $file){
resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue
+7 -2
View File
@@ -31,14 +31,19 @@
</div>
</div>
<div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
<div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center requestModal pointer" data-type="uploadDocumentModel">
<div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center requestModal pointer" v-if=" parameters.reportType !== ''" data-type="uploadDocumentModel">
<span>
Import
</span>
</div>
<div class="btn btn-lg btn-secondary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" :style="'pointer-events: none; opacity: 0.65;'" v-else>
<span>
Import
</span>
</div>
</div>
<modal-component type="uploadDocumentModel">
<upload-component :section="section"></upload-component>
<upload-component :section="section" :report-type="parameters.reportType"></upload-component>
</modal-component>
</div>
</div>
resources/assets/vue/components/bookings/elements/UploadComponent.vue
+6 -8
View File
@@ -6,7 +6,7 @@
<div class="col">
<div class="row m-b-10">
<div class="col">
<div class="font-heading fs-16 all-caps bold m-b-15">Document Upload</div>
<div class="font-heading fs-16 all-caps bold m-b-15">Upload: {{ reportType }}</div>
</div>
</div>
@@ -54,10 +54,10 @@
import { required } from "vuelidate/lib/validators";
export default {
props: {
// id: {
// required: true,
// type: Number
// }
reportType: {
type: String,
required: true
},
},
data(){
return {
@@ -74,9 +74,7 @@
submitForm(){
this.parameters = {
files: this.files,
// booking_id: this.id,
// company_id: this.data.booking.company.id,
// payment_id: this.data.id,
report_type: this.reportType
};
this.submit(this.route('api.import.sales-invoices'), 'post', this.section, true, true);