omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 04:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing totals to include service charge for x2 payments

Browse Source
This commit is contained in:
Omair Saleh
2019-04-19 14:56:57 +08:00
parent 927daf304d
commit 03cbcc3542
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/admin/home.vue
+14 -12
View File
@@ -317,52 +317,54 @@ export default {
// TODO : Get booking status from server
this.status = status
switch (this.status) {
case '1':
case 1:
this.$router.push({
name: 'booking.admin.booking.detail',
params: {id: booking_id }
})
break
case '2':
case 2:
this.$router.push({
name: 'booking.admin.verification',
params: {id: booking_id }
})
break
case '3':
case 3:
this.$router.push({
name: 'booking.admin.supplier',
params: {id: booking_id }
})
break
case '4':
case 4:
this.$router.push({
name: 'booking.admin.supplier.report',
params: {id: booking_id }
})
break
case '5':
case 5:
this.$router.push({
name: 'booking.admin.cnslip',
params: {id: booking_id }
})
break
case '6':
case 6:
if(term == 'x2_cash' || term == 'x2_cheque' || term == 'x2_ba'){
this.$router.push({
name: 'booking.admin.x2complete',
params: {id: booking_id }
})
break
} else {
this.$router.push({
name: 'booking.admin.invoice',
params: {id: booking_id }
})
break
}
this.$router.push({
name: 'booking.admin.invoice',
params: {id: booking_id }
})
break
case '7':
case 7:
this.$router.push({
name: 'booking.admin.complete',
params: {id: booking_id }
resources/assets/js/pages/home.vue
+7 -7
View File
@@ -785,32 +785,32 @@ export default {
// TODO : Get booking status from server
// this.status = status;
switch (status) {
case '1':
case 1:
this.$router.push({
name: 'booking.user.upload',
params: {id: booking_id }
});
break;
case '2':
case 2:
this.$router.push({
name: 'booking.user.upload',
params: {id: booking_id }
});
break;
case '3':
case 3:
this.$router.push({
name: 'booking.user.confirmation',
params: {id: booking_id }
});
break;
case '4':
case 4:
this.$router.push({
name: 'booking.user.transfer',
params: {id: booking_id }
});
break;
case '5':
case 5:
if(term === 'x2_cash' || term === 'x2_cheque' || term === 'x2_ba'){
this.$router.push({
name: 'booking.user.x2complete',
@@ -827,14 +827,14 @@ export default {
case '6':
case 6:
this.$router.push({
name: 'booking.user.po',
params: {id: booking_id }
});
break;
case '7':
case 7:
this.$router.push({
name: 'booking.user.complete',
params: {id: booking_id }