diff --git a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php index 8dc461b6..17a5a34f 100644 --- a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php +++ b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php @@ -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){ diff --git a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue index fe175436..cabd9f8b 100644 --- a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue +++ b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue @@ -31,14 +31,19 @@
-
+
+ + Import + +
+
Import
- +
diff --git a/resources/assets/vue/components/bookings/elements/UploadComponent.vue b/resources/assets/vue/components/bookings/elements/UploadComponent.vue index bfc7573c..3803d89f 100644 --- a/resources/assets/vue/components/bookings/elements/UploadComponent.vue +++ b/resources/assets/vue/components/bookings/elements/UploadComponent.vue @@ -6,7 +6,7 @@
-
Document Upload
+
Upload: {{ reportType }}
@@ -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);