diff --git a/config/app.php b/config/app.php index 9d2e4b07..03944677 100644 --- a/config/app.php +++ b/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Asia/Singapore', /* |-------------------------------------------------------------------------- diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index 822dfcb4..6faefff5 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -34,20 +34,20 @@ - + - X1:    Cash : - Cheque : - BA : + X1:    Cash : + Cheque : + BA :
- X2:    Cash : - Cheque : - BA : + X2:    Cash : + Cheque : + BA :
Cancel - Save + Save
@@ -74,21 +74,13 @@ export default { UpdateRateDialogVisible: false, DoneUpdateRateDialogVisible: false, rate: { - x1_ba: null, - x1_cheque: null, - x1_cash: null, - x2_ba: null, - x2_cash: null, - x2_cheque: null, + x1_ba: null, + x1_cheque: null, + x1_cash: null, + x2_ba: null, + x2_cash: null, + x2_cheque: null, }, - rateForm: { - x1_cash: '', - x1_cheque: '', - x1_ba: '', - x1_cash: '', - x1_cheque: '', - x1_ba: '', - }, rules: { x1_cash: [ { required: true, message: 'Please input rate for X1 Cash', trigger: 'change'}, @@ -123,11 +115,9 @@ export default { user: 'auth/user', role: 'auth/role' }), - - mounted () { - this.getRate() + mounted () { + this.getRate(); }, - methods: { setLocale (locale) { if (this.$i18n.locale !== locale) { @@ -140,10 +130,9 @@ export default { let $this = this axios.get('/api/rate').then(response => { this.rate = response.data - console.log(this.rate) + console.log(this.rate); }) }, - createRate: function () { this.loading = true, this.dialogFormVisible1 = true @@ -179,12 +168,12 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { let newRate = { - x1_cash: this.rateForm.x1_cash, - x1_cheque: this.rateForm.x1_cheque, - x1_ba: this.rateForm.x1_ba, - x2_cash: this.rateForm.x2_cash, - x2_cheque: this.rateForm.x2_cheque, - x2_ba: this.rateForm.x2_ba, + x1_cash: this.rate.x1_cash, + x1_cheque: this.rate.x1_cheque, + x1_ba: this.rate.x1_ba, + x2_cash: this.rate.x2_cash, + x2_cheque: this.rate.x2_cheque, + x2_ba: this.rate.x2_ba, } axios.post('/api/update-rate', newRate) diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 9f20635c..6cff23ee 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -5,7 +5,7 @@


-
Supplier Report
+
Supplier Report

diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index 7d0481ad..158489c3 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -206,6 +206,7 @@ Click to upload
jpg/png files with a size less than 3 MB
@@ -371,7 +372,6 @@ duration: 10000 }) }) - } else { this.loading_btn = false this.$message({ diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index cfc0652f..c48aa193 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -193,6 +193,7 @@ diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 80b66878..5e4f2ab8 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -62,14 +62,25 @@ export default { } }, mounted () { - this.RefreshBooking() + this.getBooking() }, methods: { + getBooking() { + let $this = this + axios.get(this.url).then(response => { + this.bookingTable = response.data + }) + }, RefreshBooking() { let $this = this axios.get(this.url).then(response => { this.bookingTable = response.data - console.log(this.bookingTable); + this.$message({ + showClose: true, + message: 'Booking is updated', + type: 'success', + duration: 5000 + }) }) }, filterTag (value, row) { diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue index 5fac361e..94fce616 100644 --- a/resources/assets/js/pages/booking/transfer.vue +++ b/resources/assets/js/pages/booking/transfer.vue @@ -3,7 +3,7 @@
-

Bankin Slip Aprroved

Transfer In Progress

+

Bankin Slip Approved

Transfer In Progress


Go Back
diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index 5036dd1c..b8abc5f2 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -57,6 +57,7 @@ diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index c045ed52..48e105c6 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -23,6 +23,10 @@ + +
+ Refresh Rate
+

@@ -388,16 +392,15 @@ export default { } }, mounted () { - this.getBooking() - this.RefreshBooking() - this.getRate() + this.getBooking(); + this.initBooking(); + this.getRate(); }, methods: { getRate(){ let $this = this axios.get(this.url).then(response => { this.bookingTable = response.data.data - $this.makePagination(response.data) }) }, @@ -405,13 +408,36 @@ export default { let $this = this axios.get('api/rate').then(response => { this.rate = response.data - console.log(this.rate) + }) + }, + refreshRate() { + let $this = this + axios.get('api/rate').then(response => { + this.rate = response.data + this.$message({ + showClose: true, + message: 'Rate is updated', + type: 'success', + duration: 5000 + }) + }) + }, + initBooking() { + let $this = this + axios.get(this.url).then(response => { + this.bookingTable = response.data.data }) }, RefreshBooking() { let $this = this axios.get(this.url).then(response => { this.bookingTable = response.data.data + this.$message({ + showClose: true, + message: 'Booking is updated', + type: 'success', + duration: 5000 + }) }) }, makePagination(data){