diff --git a/package.json b/package.json
index 26b57108..534b3459 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
"gulp-uglify": "^3.0.0",
"gulp-uglify-es": "^2.0.0",
"laravel-mix": "^5.0.9",
+ "laravel-vapor": "^0.7.0",
"lodash": "^4.17.19",
"postcss": "^8.1.14",
"resolve-url-loader": "^3.1.2"
diff --git a/resources/assets/sass/modules/_login.scss b/resources/assets/sass/modules/_login.scss
index 9b5361fe..7a0bb2ef 100644
--- a/resources/assets/sass/modules/_login.scss
+++ b/resources/assets/sass/modules/_login.scss
@@ -15,7 +15,8 @@
}
.login-wrapper {
- background: linear-gradient(rgba(0, 0, 0, 0.6), $color-primary), url('../images/iStock-976354264_Malaysia.jpg');
+ /* background: linear-gradient(rgba(0, 0, 0, 0.6), $color-primary), url('../images/iStock-976354264_Malaysia.jpg'); */
+ background: linear-gradient(rgba(0, 0, 0, 0.6), $color-primary), url('{{asset("images/iStock-976354264_Malaysia.jpg")}}');
background-size: cover;
padding: 80px 0 20px 0;
min-height: 100%;
@@ -67,4 +68,4 @@
width: 100%;
}
}
-}
\ No newline at end of file
+}
diff --git a/resources/assets/vue/app.js b/resources/assets/vue/app.js
index b81feb10..085ec3fc 100644
--- a/resources/assets/vue/app.js
+++ b/resources/assets/vue/app.js
@@ -24,6 +24,9 @@ import closable from './general/directives/closable';
import Avatar from 'vue-avatar';
+import Vapor from 'laravel-vapor';
+window.Vapor = Vapor;
+
/** Application Injections */
Vue.use(vuelidate);
Vue.use(VueTheMask);
@@ -37,7 +40,8 @@ Vue.directive('tooltip', function(el, binding){
})
Vue.mixin({
methods: {
- route: route
+ route: route,
+ asset: window.Vapor.asset
},
mixins: [request, crudHandler]
});
diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
index 9f9dc3e0..0c0e7bca 100644
--- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue
@@ -23,7 +23,7 @@
-

+
diff --git a/resources/assets/vue/components/companies/sections/DeliveryCustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/DeliveryCustomerProfileSectionComponent.vue
index efa44347..9784bc77 100644
--- a/resources/assets/vue/components/companies/sections/DeliveryCustomerProfileSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/DeliveryCustomerProfileSectionComponent.vue
@@ -16,7 +16,7 @@
-

+
@@ -103,4 +103,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
index d80174cf..db6b032c 100644
--- a/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
@@ -26,7 +26,7 @@
-

+
@@ -47,7 +47,7 @@
-

+
@@ -68,7 +68,7 @@
-

+
diff --git a/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue b/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
index f4ecee0d..effc2a86 100644
--- a/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
@@ -21,7 +21,7 @@
-

+
@@ -35,7 +35,7 @@
-

+
@@ -108,8 +108,8 @@
seal_reference: this.seal_reference,
container_type: 1,
company_module_id: this.company_module_id,
- etd: this.etd,
- eta: this.eta,
+ etd: this.etd,
+ eta: this.eta,
}
};
},
@@ -121,4 +121,4 @@
mixins: [createContainerFormValidation, componentHandler, modalFormHandler]
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue b/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
index 7e577da0..cc0705c2 100644
--- a/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
+++ b/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
@@ -88,7 +88,7 @@
}
},
errorHandler(error, statusCode){
- this.src = statusCode === 404 ? '/images/3231370.jpg' : '/images/2942005.jpg'
+ this.src = statusCode === 404 ? asset('images/3231370.jpg') : asset('images/2942005.jpg')
this.isLoading = false;
}
},
@@ -98,4 +98,4 @@
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/general/elements/ListComponent.vue b/resources/assets/vue/components/general/elements/ListComponent.vue
index bd1c759c..134b1f53 100644
--- a/resources/assets/vue/components/general/elements/ListComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListComponent.vue
@@ -8,7 +8,7 @@
diff --git a/resources/assets/vue/components/general/elements/ListPollingComponent.vue b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
index e3f8a8c3..786380b4 100644
--- a/resources/assets/vue/components/general/elements/ListPollingComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListPollingComponent.vue
@@ -8,7 +8,7 @@
diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
index e0f6fb1c..4e7845be 100644
--- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
+++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue
@@ -36,7 +36,7 @@
@@ -95,4 +95,4 @@
},
mixins: [ModalFormHandler]
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/general/elements/SearchComponent.vue b/resources/assets/vue/components/general/elements/SearchComponent.vue
index 36bddce1..eca19095 100644
--- a/resources/assets/vue/components/general/elements/SearchComponent.vue
+++ b/resources/assets/vue/components/general/elements/SearchComponent.vue
@@ -5,7 +5,7 @@
-

+
@@ -78,4 +78,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/general/elements/bearComponent.vue b/resources/assets/vue/components/general/elements/bearComponent.vue
index 4f92caa7..d72be2e8 100644
--- a/resources/assets/vue/components/general/elements/bearComponent.vue
+++ b/resources/assets/vue/components/general/elements/bearComponent.vue
@@ -1,7 +1,7 @@
-
+
![]()
@@ -21,4 +21,4 @@
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
index 3eaf28b8..77e72ecb 100644
--- a/resources/assets/vue/components/general/forms/FileUploadComponent.vue
+++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
@@ -98,10 +98,10 @@
vm.isLoading = true;
if(file.name.split('.').pop() === 'pdf'){
- $(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", "/images/icons/pdf.png");
+ $(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", asset("images/icons/pdf.png"));
}
if(file.name.split('.').pop().indexOf("xls") !== -1){
- $(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", "/images/icons/xlsx.png");
+ $(file.previewElement).closest("img[data-dz-thumbnail]").attr("src", asset("images/icons/xlsx.png"));
}
Promise.all(dropzone.files.map(function(file){
@@ -147,4 +147,4 @@
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/orders/elements/ListOrderComponent.vue b/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
index b7c82ede..a358784d 100644
--- a/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
+++ b/resources/assets/vue/components/orders/elements/ListOrderComponent.vue
@@ -8,7 +8,7 @@
diff --git a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
index 791f53bd..c00bff2c 100644
--- a/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/orders/forms/OrderFormComponent.vue
@@ -16,7 +16,7 @@
-

+
@@ -30,7 +30,7 @@
-

+
@@ -44,7 +44,7 @@
-

+
@@ -144,7 +144,7 @@
-

+
@@ -166,7 +166,7 @@
-

+
diff --git a/resources/assets/vue/components/orders/sections/OrderPackageV2SectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderPackageV2SectionComponent.vue
index 64e2d165..e4c7fe2d 100644
--- a/resources/assets/vue/components/orders/sections/OrderPackageV2SectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderPackageV2SectionComponent.vue
@@ -186,7 +186,7 @@
@@ -219,7 +219,7 @@
@@ -252,7 +252,7 @@
@@ -285,7 +285,7 @@
@@ -342,4 +342,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
index 25417616..cc685d4e 100644
--- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
@@ -334,7 +334,7 @@
@@ -367,7 +367,7 @@
@@ -400,7 +400,7 @@
@@ -433,7 +433,7 @@
diff --git a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
index 23297089..9719e2ec 100644
--- a/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrderSectionComponent.vue
@@ -115,7 +115,7 @@
-

+
@@ -234,4 +234,4 @@
export default {
mixins: [componentHandler]
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
index d7766718..e17500c6 100644
--- a/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
+++ b/resources/assets/vue/components/orders/sections/OrdersTableSectionComponent.vue
@@ -105,7 +105,7 @@
@@ -197,8 +197,8 @@
orderStatusFilterArray: ['Active', 'Complete', 'Pending Verification', 'Cancelled'],
orderStatusFilterDropDownStatus: false,
filters: {
- per_page: 2,
- status_in: [1],
+ per_page: 2,
+ status_in: [1],
with_packing_lists: true,
reference_like: '',
order_by: {
@@ -256,7 +256,7 @@
case 'Pending Verification':
this.filters.status_in = [1];
break;
-
+
case 'Cancelled':
this.filters.status_in = [4, 5, 6];
break;
diff --git a/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue
index 1df26547..5888565b 100644
--- a/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue
@@ -35,7 +35,7 @@
-

+
Online Banking
diff --git a/resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue
index 712269be..71234a08 100644
--- a/resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue
+++ b/resources/assets/vue/components/paymentsBilling/forms/PaymentFormComponent.vue
@@ -35,7 +35,7 @@
-

+
Online Banking
diff --git a/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue b/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue
index cb31b4de..b571228d 100644
--- a/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue
+++ b/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue
@@ -88,7 +88,7 @@
@@ -129,8 +129,8 @@
section: 'basePriceSection',
basePriceData: [],
searchParam:{
- dateFrom: '',
- dateTo: '',
+ dateFrom: '',
+ dateTo: '',
},
filters:{
},
diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
index 5fa3252c..c10b0e9d 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
@@ -67,7 +67,7 @@