diff --git a/.gitignore b/.gitignore index 414589fc..9035d84d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.vscode /.vagrant /data +vendor/composer Homestead.json Homestead.yaml npm-debug.log diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index b52098b7..0ae1355e 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -18,7 +18,7 @@ class BookingController extends Controller { public function index(){ - $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'amount', 'bia', 'verification_status') + $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id',Auth::user()->id) ->get(); @@ -39,23 +39,29 @@ class BookingController extends Controller $booking->transfer_amount = $booking->bia; $booking->track_status = "(". $booking->status ."/6)"; - switch ($booking->status) { case 1: - $booking->status_desc = "Order in progress"; + $status_desc = "Order in progress"; + break; case 2: - $booking->status_desc = "Waiting for payment"; + $status_desc = "Waiting for payment"; + break; case 3: - $booking->status_desc = "Waiting verification"; + $status_desc = "Waiting verification"; + break; case 4: - $booking->status_desc = "Processing transfer"; + $status_desc = "Processing transfer"; + break; case 5: - $booking->status_desc = "Transfer Complete, please upload your PO"; + $status_desc = "Transfer Complete, please upload your PO"; + break; case 6: - $booking->status_desc = "Processing invoice"; + $status_desc = "Processing invoice"; + break; default: - $booking->status_desc = ""; + $biastatus_desc = ""; } + $booking->status_desc = $status_desc; } return $bookings; diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index f1af9485..cc394a7e 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -32,7 +32,7 @@
- + @@ -140,6 +140,19 @@ this.booking.timeout = response.data.timeout * 1000 this.start = true; loading.close() + + if(this.booking.timeout < 0 ){ + this.$message({ + showClose: true, + message: 'Booking timeout, please make another booking.', + type: 'error', + duration: 30000, + }); + this.$router.push({ + name: 'home' + }) + } + }).catch((error) => { console.log(error) loading.close() @@ -150,6 +163,17 @@ }, methods: { + handleCoutdownend(){ + this.$message({ + showClose: true, + message: 'Booking timeout, please make another booking.', + type: 'error', + duration: 30000, + }); + this.$router.push({ + name: 'home' + }) + }, handleRemove(file, fileList) { console.log(file, fileList) }, diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 06308f43..da7696fa 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -239,17 +239,17 @@
- + Update {{scope.row.id}} - + prop="transfer_amount" width="170" /> @@ -265,13 +265,14 @@ - + -