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

Merge conflicts fixed

Browse Source
This commit is contained in:
Mouhamed Lamine
2018-07-28 12:09:05 +08:00
parent 353d830985 1571dd3da4
commit 1eb0060f31
13 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -3,7 +3,7 @@
/public/storage
/public/js
/public/css
public/mix-manifest.json
/public/mix-manifest.json
/storage/*.key
/vendor/**
/.idea
resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+4 -6
View File
@@ -84,7 +84,7 @@
</el-upload>
<br>
<el-form-item prop="actual_transfer_amount">
<el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
<el-input v-model.number="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
</el-form-item>
<el-form-item prop="details">
<el-input v-model="chinaSlipForm.details" type="text" placeholder="Details" style="width: 80%" />
@@ -149,11 +149,9 @@
details: null,
},
rules: {
actual_transfer_amount: [{
required: true,
message: 'Please input transfer amount',
trigger: 'change'
}],
actual_transfer_amount: [
{ required: true, message: 'Please input amount',trigger: 'change'},
{ type: 'number', message: 'Amount must be a number',trigger: 'change'}],
// date: [{
// required: true,
// message: 'Please input date',
resources/assets/js/pages/admin/complete-orders.vue
+1 -1
View File
@@ -5,7 +5,7 @@
</div>
<h1>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
+7 -1
View File
@@ -44,7 +44,13 @@
<!-- Booking Table-end -->
</div>
</template>
<style type="text/css">
.el-table__column-filter-trigger i {
font-size: 18px;
font-weight: 900;
vertical-align: sub;
}
</style>
<script>
import axios from 'axios'
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
+9 -9
View File
@@ -152,16 +152,16 @@
<el-input v-model="bookingForm.order_no" placeholder="Order No." style="width: 80%" required="true" />
</el-form-item>
<el-form-item prop="account_name">
<el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Account" style="width: 80%" required="true" />
<el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Name" style="width: 80%" required="true" />
</el-form-item>
<el-form-item prop="bank_name">
<el-input v-model="bookingForm.bank_name" type="text" placeholder="Bank Name / AliPay / WechatPay" style="width: 80%" />
<el-input v-model="bookingForm.bank_name" type="text" placeholder="Bank Name" style="width: 80%" />
</el-form-item>
<el-form-item prop="bank_branch">
<el-input v-model="bookingForm.bank_branch" type="text" placeholder="Branch / 分行/支行" style="width: 80%" />
</el-form-item>
<el-form-item prop="account_num">
<el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number / AliPay_ID / WechatPay_ID" style="width: 80%"
<el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number" style="width: 80%"
/>
</el-form-item>
<el-form-item>
@@ -260,7 +260,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>
@@ -353,11 +353,11 @@ export default {
account_num: ''
},
rules: {
order_no: [{
required: true,
message: 'Please input order number',
trigger: 'change'
}],
// order_no: [{
// required: true,
// message: 'Please input order number',
// trigger: 'change'
// }],
payment_for: [{
required: true,
message: 'Please input payment for',
resources/assets/js/pages/settings/admin-malaysia-bank.vue
+1 -6
View File
@@ -224,12 +224,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) => {