mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git
synced 2026-08-25 07:14:22 +00:00
fix wrong update status on upload po
fix validation message for upload china bankslip removed get po api on upload invoice
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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: [{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div align="center">
|
||||
<h4 style="margin-top:5%;"></h4>
|
||||
<br>
|
||||
<div v-if="user_po_path !== null">
|
||||
<div v-if="booking_details.user_po_path !== null">
|
||||
<h4>Upload Invoice</h4>
|
||||
</div>
|
||||
<div v-else>
|
||||
@@ -181,7 +181,7 @@
|
||||
</el-row>
|
||||
<br>
|
||||
|
||||
<el-row v-if="user_po_path !== null" :gutter="12" justify="center" align="center">
|
||||
<el-row v-if="booking_details.user_po_path !== null" :gutter="12" justify="center" align="center">
|
||||
<el-col :span="12">
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
@@ -219,8 +219,7 @@
|
||||
</div>
|
||||
<el-row :gutter="12" type="flex">
|
||||
<el-col :span="12">
|
||||
<img v-bind:src="user_po_path" width="100%" height="100%">
|
||||
<img v-bind:src="booking_details.user_bankslip_path" class="image">
|
||||
<img v-bind:src="booking_details.user_po_path" class="image">
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
@@ -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 () {
|
||||
|
||||
Reference in New Issue
Block a user