cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-28 17:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.7-jenkins-vapor' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-03 23:29:16 +08:00
parent a99d19721c 38cdd37aea
commit d4ba2a2c43
5 changed files with 114 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+5 -4
View File
@@ -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": {
resources/views/pages/download/index.blade.php
+86
View File
@@ -0,0 +1,86 @@
@extends('layouts.base_portal')
@section('inner_content')
<div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
<!-- Group 1: Packaging Related Downloads -->
<div class="col-12">
<h4>Packaging Downloads</h4>
<div class="row">
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>packing-list-on-hold.xls</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('packaging_list.on_hold.export')" :is-url-protected="true">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>aging_report.xls</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('aging-listing.export')">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>arrived-parcel.xlsx</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('packing_list.arrived_parcel.export')">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>parcel-summary.xls</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('packing_list.arrived_parcel.parcel-summary')">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>guangzhou2-to-johor-summary.xls</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('packing_list.arrived_parcel.guangZhou2ToJohor')">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
</div>
</div>
<!-- Group 2: Feedback Related Downloads -->
<div class="col-12">
<h4>Feedback Downloads</h4>
<div class="row">
<div class="col-md-6">
<div class="card mb-3">
<div class="card-body d-flex justify-content-between align-items-center">
<span>Feedback</span>
<open-link-in-new-tab-component custom-class="btn btn-default" :url="route('feedback.export')" :is-url-protected="true">
<i class="fa fa-download"></i> Download
</open-link-in-new-tab-component>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
resources/views/partials/menu.blade.php
+13 -1
View File
@@ -210,6 +210,18 @@
<a href="{{route('admin.feedback')}}"><h6 class="no-margin light fs-18 all-caps">Feedback</h6></a>
</div>
</div>
<div class="row p-t-15 p-b-15 align-items-center justify-content-center d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin">
<div class="col-auto p-r-0">
<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 24 24" fill="none" stroke="#7D7D7D" stroke-width="1" stroke-linecap="round" stroke-linejoin="round">
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/>
<polyline points="7 10 12 15 17 10"/>
<line x1="12" y1="15" x2="12" y2="3"/>
</svg>
</div>
<div class="col">
<a href="{{route('admin.download')}}"><h6 class="no-margin light fs-18 all-caps">Download</h6></a>
</div>
</div>
<div class="row p-t-15 p-b-15 justify-content-center d-md-none">
<div class="col">
<logout-component></logout-component>
@@ -234,7 +246,7 @@
</div>
</div>
</div>
<div class="row no-margin d-none" :class="[{'d-flex': !$store.getters.isAdmin && ![7,8].includes($store.getters.getCompanyModuleType)}]" v-if="!$store.getters.isAdmin && ![7,8].includes($store.getters.getCompanyModuleType)">
<div class="row no-margin d-none" :class="[{'d-flex': !$store.getters.isAdmin && ![7,8].includes($store.getters.getCompanyModuleType)}]" v-if="!$store.getters.isAdmin && ![7,8].includes($store.getters.getCompanyModuleType)">
<new-service-announcement-component></new-service-announcement-component>
</div>
</div>
routes/web.php
+7 -2
View File
@@ -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 '<tr><td><a target="_blank" href="' . route('customer.payment-and-billing', $companyMarking) . '">' . $companyMarking . '</a><br></td></tr>';
}
});
Route::get('/download', function () {
return view('pages.download.index');
})->name('admin.download');
webpack.mix.js
Vendored
+3 -1
View File
@@ -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()