From caff1ab5d5ce352f765b3a19fa4ac55278892e90 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 12 Oct 2023 18:57:14 +0800 Subject: [PATCH] show error message for bulk download --- .../ControllersLogic/BulkDownloadCustomerInvoicesLogic.php | 4 ++-- .../ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php | 2 +- .../bookings/elements/DownloadSupplierWhiteFormComponent.vue | 2 +- .../companies/elements/BulkDownloadInvoiceComponent.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php index f32e786f..41a64ecf 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php @@ -77,7 +77,7 @@ class BulkDownloadCustomerInvoicesLogic return response()->download($zip_file); } else { return response()->json([ - 'status' => 'Failed', + 'status' => 'Error', 'message' => 'Failed to create the Zip archive.', ]); } @@ -86,7 +86,7 @@ class BulkDownloadCustomerInvoicesLogic Log::error('Error in BulkDownloadCustomerInvoicesLogic: ' . $e->getMessage()); return response()->json([ - 'status' => 'Failed', + 'status' => 'Error', 'message' => 'An error occurred while processing the request.', ]); } diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php index 73f59c58..0cec8515 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php @@ -69,7 +69,7 @@ class BulkDownloadSupplierWhiteFormsLogic Log::error('Error in BulkDownloadSupplierWhiteFormsLogic: ' . $e->getMessage()); return response()->json([ - 'status' => 'Failed', + 'status' => 'Error', 'message' => 'An error occurred while processing the request.', ]); } diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue index 25b29a0b..afa2ebc2 100644 --- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue +++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue @@ -41,7 +41,7 @@
-

{{ returnData.message }}

+

{{ returnData.message }}

diff --git a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue index 91ac1da7..d493fed2 100644 --- a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue +++ b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue @@ -36,7 +36,7 @@
-

{{ returnData.message }}

+

{{ returnData.message }}