diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index e553add7..b111fcfd 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -732,8 +732,8 @@ class BookingController extends Controller return response()->json(["message"=> "Please upload your invoice"],400); } - $booking->status = 7; // completed - $booking->admin_status = 7; // completed + $booking->status = 6; // completed + $booking->admin_status = 6; // completed if($booking->save()){ return response()->json(['message'=>"Success"],200); diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index 521c953a..53d56e5c 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -269,12 +269,12 @@ rules: { actual_transfer_amount: [{ required: true, - message: 'Please input amount', + message: 'Please input transfer amount', trigger: 'change' }], date: [{ required: true, - message: 'Please input bank name', + message: 'Please input date', trigger: 'change' }], details: [{ diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index 0f6dd21b..445b12dd 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -5,7 +5,7 @@


-
+

Upload Invoice

@@ -181,7 +181,7 @@
- +
@@ -219,8 +219,7 @@
- - +
@@ -246,12 +245,12 @@ status: 6, loading_btn: false, booking_id: this.$route.params.id, - user_po_path: null, booking_details: { id: null, amount: null, bia: null, user_bankslip_path: null, + user_po_path: null, }, supplier: null, supplier_options: null, @@ -315,6 +314,7 @@ axios .get('/api/admin/booking/' + this.$route.params.id) .then((response) => { + loading.close() this.booking_details = response.data }).catch((error) => { console.log(error) @@ -323,22 +323,6 @@ name: 'notfound' }) }) - - axios - .get('/api/booking/'+ this.$route.params.id +'/po') - .then((response) => { - loading.close() - if(response.user_po_path){ - this.user_po_path = response.user_po_path - } - }).catch((error) => { - loading.close() - console.log(error) - this.$router.push({ - name: 'notfound' - }) - }) - }, methods: { confirmInvoice () {