From a18377df9f4ae649f53f8b96c684a66c9ca9951a Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 12:24:01 +0800 Subject: [PATCH 1/8] Laravel Vapor - Fix a problem with deployment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 534b3459..b3695454 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "gulp-streamify": "^1.0.2", "gulp-uglify": "^3.0.0", "gulp-uglify-es": "^2.0.0", - "laravel-mix": "^5.0.9", + "laravel-mix": "^6.0.49", "laravel-vapor": "^0.7.0", "lodash": "^4.17.19", "postcss": "^8.1.14", From 2c24c469f5d0dec54b431f55cc8ab007aa4edb86 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 12:54:20 +0800 Subject: [PATCH 2/8] Laravel Vapor - Fix a problem with deployment --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3695454..5797044d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "scripts": { "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", From c01d5c993cefe27f1aac37032e0d6a759ae5f955 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 13:01:17 +0800 Subject: [PATCH 3/8] Laravel Vapor - Fix a problem with deployment --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5797044d..534b3459 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "scripts": { "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", @@ -58,7 +58,7 @@ "gulp-streamify": "^1.0.2", "gulp-uglify": "^3.0.0", "gulp-uglify-es": "^2.0.0", - "laravel-mix": "^6.0.49", + "laravel-mix": "^5.0.9", "laravel-vapor": "^0.7.0", "lodash": "^4.17.19", "postcss": "^8.1.14", From 5753c632480c2e596804dd982d3726dcf5040bb2 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 13:09:51 +0800 Subject: [PATCH 4/8] Laravel Vapor - Fix a problem with deployment --- webpack.mix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 01dcbd11..47d9b5cf 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,4 +11,4 @@ const mix = require('laravel-mix'); | */ -mix.js('./resources/assets/vue/app.js', 'public/vue').version(); +//mix.js('./resources/assets/vue/app.js', 'public/vue').version(); From cd05d1bed3bd155a901f3131036285d4e22d9823 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 13:43:05 +0800 Subject: [PATCH 5/8] Laravel Vapor - Fix a problem with deployment --- webpack.mix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.mix.js b/webpack.mix.js index 47d9b5cf..01dcbd11 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,4 +11,4 @@ const mix = require('laravel-mix'); | */ -//mix.js('./resources/assets/vue/app.js', 'public/vue').version(); +mix.js('./resources/assets/vue/app.js', 'public/vue').version(); From 5799da5ae1f4172aea9901975519b27855a7f9b9 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 16:37:08 +0800 Subject: [PATCH 6/8] Laravel Vapor - Fix a problem with deployment --- package.json | 9 +++++---- webpack.mix.js | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 534b3459..76130b18 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "scripts": { "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", @@ -31,7 +31,6 @@ "vue": "^2.6.10", "vue-avatar": "^2.1.8", "vue-debounce": "^2.6.0", - "vue-template-compiler": "^2.6.10", "vue-the-mask": "^0.11.1", "vuelidate": "^0.7.4", "vuex": "^3.1.1" @@ -58,11 +57,13 @@ "gulp-streamify": "^1.0.2", "gulp-uglify": "^3.0.0", "gulp-uglify-es": "^2.0.0", - "laravel-mix": "^5.0.9", + "laravel-mix": "^6.0.49", "laravel-vapor": "^0.7.0", "lodash": "^4.17.19", "postcss": "^8.1.14", - "resolve-url-loader": "^3.1.2" + "resolve-url-loader": "^3.1.2", + "vue-loader": "^15.11.1 ", + "vue-template-compiler": "^2.7.16" }, "paths": { "build": { diff --git a/webpack.mix.js b/webpack.mix.js index 01dcbd11..c93cfbe4 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,4 +11,6 @@ const mix = require('laravel-mix'); | */ -mix.js('./resources/assets/vue/app.js', 'public/vue').version(); +mix.js('./resources/assets/vue/app.js', 'public/vue') + .vue() + .version() From 5f6670ad9192064ae81244c1135ebc5e61f5fa7f Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 16:55:32 +0800 Subject: [PATCH 7/8] Laravel Vapor - Fix a problem with deployment --- webpack.mix.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.mix.js b/webpack.mix.js index c93cfbe4..c8fa95d4 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -12,5 +12,5 @@ const mix = require('laravel-mix'); */ mix.js('./resources/assets/vue/app.js', 'public/vue') - .vue() - .version() + .vue() + .version() From 38cdd37aea49b8acc9ca2d61b09d264d0811cb2f Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Thu, 3 Oct 2024 22:41:35 +0800 Subject: [PATCH 8/8] Laravel Vapor - New UI for admin to download reports --- .../views/pages/download/index.blade.php | 86 +++++++++++++++++++ resources/views/partials/menu.blade.php | 14 ++- routes/web.php | 9 +- 3 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 resources/views/pages/download/index.blade.php diff --git a/resources/views/pages/download/index.blade.php b/resources/views/pages/download/index.blade.php new file mode 100644 index 00000000..ebc8e317 --- /dev/null +++ b/resources/views/pages/download/index.blade.php @@ -0,0 +1,86 @@ +@extends('layouts.base_portal') +@section('inner_content') +
+ + +
+

Packaging Downloads

+
+
+
+
+ packing-list-on-hold.xls + + Download + +
+
+
+
+
+
+ aging_report.xls + + Download + +
+
+
+
+ +
+
+
+
+ arrived-parcel.xlsx + + Download + +
+
+
+
+
+
+ parcel-summary.xls + + Download + +
+
+
+
+ +
+
+
+
+ guangzhou2-to-johor-summary.xls + + Download + +
+
+
+
+
+ + +
+

Feedback Downloads

+
+
+
+
+ Feedback + + Download + +
+
+
+
+
+ +
+@endsection diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 6e1e8619..e068f8b2 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -210,6 +210,18 @@
Feedback
 +
+
+ + + + + +
+
+
Download
 +
+
@@ -234,7 +246,7 @@
-
+
diff --git a/routes/web.php b/routes/web.php index 9c2ce434..0637a62b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -435,11 +435,11 @@ Route::get('/export/packing-list/{id}', 'Exports\ExportContainerPackingListContr Route::get('/export/pending-arrangement-delivery-list', 'Exports\ExportPendingArrangementPackingListV2Controller@export')->name('packaging_list.pending_arrangement.export'); // Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPackingListV2Controller@onHold')->name('packaging_list.on_hold.export'); Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export'); -Route::get('/export/parcel-summary', 'Exports\ExportArrivedParcelController@summary'); +Route::get('/export/parcel-summary', 'Exports\ExportArrivedParcelController@summary')->name('packing_list.arrived_parcel.parcel-summary'); Route::get('/export/aging-list', 'Exports\ExportArrivedParcelController@aging')->name('aging-listing.export'); Route::get('/export/parcel-postcode', 'Exports\ExportParcelPostcodesController@export'); Route::get('/export/{year}/customer-total-order', 'Exports\ExportCustomersToExcelController@totalOrders'); -Route::get('/export/packing-list-warehouse/guangzhou2-to-johor', 'Exports\ExportArrivedParcelController@guangZhou2ToJohor'); +Route::get('/export/packing-list-warehouse/guangzhou2-to-johor', 'Exports\ExportArrivedParcelController@guangZhou2ToJohor')->name('packing_list.arrived_parcel.guangZhou2ToJohor'); //Convert to protected route (20240925) Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPackingListController@onHold')->middleware(['api'])->middleware(['valid.token'])->name('packaging_list.on_hold.export'); @@ -1361,3 +1361,8 @@ Route::get('/group-transaction-with-completed-payments', function () { echo '' . $companyMarking . '
'; } }); + + +Route::get('/download', function () { + return view('pages.download.index'); +})->name('admin.download');