cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-23 14:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Lingges/Fix_orderNo/RefNo' into 'master'

Browse Source 
Lingges/Fix_no_refNo

See merge request CIEFWorldwideSdnBhd/exchange!90
This commit is contained in:
Jack Goh
2018-07-27 09:39:17 +00:00
parent 390c6064a5 78fbe3151c
commit b239f13344
18 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/admin/booking/bookingDetail.vue
+1 -1
View File
@@ -28,7 +28,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/completed.vue
+2 -2
View File
@@ -37,7 +37,7 @@
</div>
<el-row :gutter="12" type="flex">
<el-col :span="12" align="center">
<div v-for="cn_bankslip in booking_details.china_bankslip_path">
<div v-for="cn_bankslip in booking_details.china_bankslip_path" :key='cn_bankslip'>
<a target="_blank" :href="getURL(cn_bankslip)">
<img v-if="isImage(cn_bankslip)" v-bind:src="cn_bankslip" class="image">
<p v-else>Download</p>
@@ -101,7 +101,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/supplierBooking.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/supplierReport.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+1 -1
View File
@@ -29,7 +29,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/uploadInvoice.vue
+1 -1
View File
@@ -36,7 +36,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/booking/verification.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<tbody>
<tr class="el-table__row">
<td class="el-table_2_column_9 is-right ">
<div class="cell">Order Number :</div>
<div class="cell">Ref No :</div>
</td>
<td class="el-table_2_column_10 is-left ">
<div class="cell">{{ booking_details.id }}</div>
resources/assets/js/pages/admin/complete-orders.vue
+1 -1
View File
@@ -6,7 +6,7 @@
</div>
<h1 align="center" style="margin-bottom:50px;">Completed Orders</h1>
<el-table :data="tableData" stripe height="500" style="width: 100%">
<el-table-column label="No." prop="id" sortable></el-table-column>
<el-table-column label="Ref No." prop="id" sortable></el-table-column>
<el-table-column label="Order Date" prop="created_at" width="180" sortable></el-table-column>
<el-table-column label="Marking" width="120" prop="marking"></el-table-column>
<el-table-column label="Rate" prop="rate" width="74"></el-table-column>
resources/assets/js/pages/admin/home.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<el-row :gutter="20">
<div>
<el-table :data="bookingTable">
<el-table-column label="No." width="100">
<el-table-column label="Ref No." width="100">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
<el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> {{ scope.row.id }}</el-button>
</el-table-column>
resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<el-button type="primary" icon="el-icon-plus" @click="AddNewDialogVisible = true">Add New</el-button>
</div><br>
<el-table :data="tableData" stripe style="width: 100%">
<el-table-column label="Order No" sortable></el-table-column>
<el-table-column label="Ref No" sortable></el-table-column>
<el-table-column label="Amount (RMB)" sortable></el-table-column>
<el-table-column label="Date" sortable></el-table-column>
<el-table-column label="Bank Slip File"></el-table-column>
resources/assets/js/pages/booking/completed.vue
+2 -2
View File
@@ -24,7 +24,7 @@
<div class="card">
<div class="card-header">China Bank Slip</div>
<div class="row">
<div v-for="cn_bankslip in booking_details.china_bankslip_path">
<div v-for="cn_bankslip in booking_details.china_bankslip_path" :key='cn_bankslip'>
<a target="_blank" :href="getURL(cn_bankslip)">
<img v-if="isImage(cn_bankslip)" v-bind:src="cn_bankslip" class="image">
<p v-else>Download</p>
@@ -57,7 +57,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No :</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/booking/confirmation.vue
+1 -1
View File
@@ -13,7 +13,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No :</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/booking/po.vue
+1 -1
View File
@@ -53,7 +53,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No :</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/booking/poComplete.vue
+1 -1
View File
@@ -69,7 +69,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No :</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/booking/transfer.vue
+1 -1
View File
@@ -15,7 +15,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No:</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/booking/uploadPo.vue
+1 -1
View File
@@ -56,7 +56,7 @@
<table class="table table-striped">
<tbody>
<tr>
<td>Order Number :</td>
<td>Ref No :</td>
<td>{{ booking_details.id }}</td>
</tr>
<tr>
resources/assets/js/pages/home.vue
+1 -1
View File
@@ -287,7 +287,7 @@
<el-row :gutter="20">
<div>
<el-table :data="bookingTable">
<el-table-column label="No." width="100">
<el-table-column label="Ref No." width="100">
<el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
<el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> {{ scope.row.id }}</el-button>
</el-table-column>
resources/assets/js/pages/settings/admin-malaysia-bank.vue
+1 -6
View File
@@ -187,12 +187,7 @@
.then((response) => {
this.loading_btn = false;
this.tableData = response.data;
this.$message({
showClose: true,
message: 'Data Updated Successfully',
type: 'success',
duration: 5000
});
})
.catch((error) => {