remove announcement from login page, update dashboard announcement, and remove booking form

This commit is contained in:
omair saleh
2021-06-17 07:18:03 +08:00
parent f4ea235eef
commit 94a3935b9f
2 changed files with 281 additions and 280 deletions
-7
View File
@@ -2,13 +2,6 @@
<div class="container">
<div class="row">
<div class="col-lg-8 m-auto">
<div class="alert alert-danger" role="alert">
Dear EXCHANGE users,<br>
Please note that we will be experiencing server downtime on the 17<sup>th</sup> June 2021, from 7:00 am until 9:00 am due to routine maintenance.<br>We apologise in advance for any inconvenience that may be caused<br><br>
尊贵的EXCHANGE用户<br>
EXCHANGE 系统将在 2021 6 17 早上 7 9 开始进行维修<br>
如有不便 敬请原谅
</div>
<card :title="$t('login')">
<form @submit.prevent="login" @keydown="form.onKeydown($event)">
<!-- Email -->
+281 -273
View File
@@ -2,290 +2,298 @@
<el-main>
<div class="alert alert-danger" role="alert">
Dear EXCHANGE users,<br>
Please note that we will be experiencing server downtime on the 17<sup>th</sup> June 2021, from 7:00 am until 9:00 am due to routine maintenance.<br>We apologise in advance for any inconvenience that may be caused<br><br>
We have officially launched EXCHANGE 2.0, your current account is closed for any further transactions by 7am, 17<sup>th</sup> June 2021.<br>
To create new bookings, you will need to click the below link and login using the same email and password in the new system.<br>
<a href="https://stagging.exchange.cief-malaysia.com">
<button class="btn btn-success">Go to new site</button>
</a><br><br>
尊贵的EXCHANGE用户<br>
EXCHANGE 系统将在 2021 6 17 早上 7 9 开始进行维修<br>
如有不便 敬请原谅
EXCHANGE 2.0 已正式推出 当前户口最后下订单和汇款的截止时间为 617早上7点<br>
您可以点击以下网址 使用同样的电子邮件和密码登录及下订单<br>
<a href="https://stagging.exchange.cief-malaysia.com">
<button class="btn btn-success">转到新站点</button>
</a>
</div>
<!-- Input-Amount -->
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col :span="20">
<div class="grid-content bg-purple" align="center">
I need :
<el-select v-model="value" placeholder="RMB">
<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-col>
</el-row>
<br>
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col :xs="18" :sm="18" :md="8" :lg="8" :xl="8">
<div class="grid-content bg-purple" align="left">
<el-input v-model="booking.amount" placeholder="Amount" />
</div>
</el-col>
</el-row>
<!-- Input-Amount-end -->
<!--&lt;!&ndash; Input-Amount &ndash;&gt;-->
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col :span="20">-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--I need :-->
<!--<el-select v-model="value" placeholder="RMB">-->
<!--<el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />-->
<!--</el-select>-->
<!--</div>-->
<!--</el-col>-->
<!--</el-row>-->
<!--<br>-->
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col :xs="18" :sm="18" :md="8" :lg="8" :xl="8">-->
<!--<div class="grid-content bg-purple" align="left">-->
<!--<el-input v-model="booking.amount" placeholder="Amount" />-->
<!--</div>-->
<!--</el-col>-->
<!--</el-row>-->
<!--&lt;!&ndash; Input-Amount-end &ndash;&gt;-->
<div align="right">
<el-button type="primary" :loading="loading_btn" size="mini" @click="refreshRate()">Refresh Rate</el-button></div>
<!--<div align="right">-->
<!--<el-button type="primary" :loading="loading_btn" size="mini" @click="refreshRate()">Refresh Rate</el-button></div>-->
<hr>
<!-- Rate-Display -->
<br>
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col>
<div class="grid-content bg-purple" align="right" />
</el-col>
<el-col>
<div class="grid-content bg-purple" align="right" />
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">Cash/Bank Transfer</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">Cheque</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">BA</div>
</el-col>
</el-row>
<!--<hr>-->
<!--&lt;!&ndash; Rate-Display &ndash;&gt;-->
<!--<br>-->
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="right" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="right" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">Cash/Bank Transfer</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">Cheque</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">BA</div>-->
<!--</el-col>-->
<!--</el-row>-->
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col>
<el-tooltip class="item" effect="dark" content="With Invoice" placement="right">
<div class="grid-content bg-purple" align="right">
<i type="button" class="el-icon-question" circle/>
</div>
</el-tooltip>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="right">X1 :</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x1_cash }}</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x1_cheque }}</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x1_ba }}</div>
</el-col>
</el-row>
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col>-->
<!--<el-tooltip class="item" effect="dark" content="With Invoice" placement="right">-->
<!--<div class="grid-content bg-purple" align="right">-->
<!--<i type="button" class="el-icon-question" circle/>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="right">X1 :</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x1_cash }}</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x1_cheque }}</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x1_ba }}</div>-->
<!--</el-col>-->
<!--</el-row>-->
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col>
<div class="grid-content bg-purple" />
</el-col>
<el-col>
<div class="grid-content bg-purple" />
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x1_cash')">Book</el-button>
</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x1_cheque')">Book</el-button>
</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x1_ba')">Book</el-button>
</div>
</el-col>
</el-row>
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x1_cash')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x1_cheque')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x1_ba')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--</el-row>-->
<br>
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col>
<el-tooltip class="item" effect="dark" content="Without Invoice" placement="right">
<div class="grid-content bg-purple" align="right">
<i type="button" class="el-icon-question" circle/>
</div>
</el-tooltip>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="right">X2 :</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x2_cash }}</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x2_cheque }}</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">{{ rate.x2_ba }}</div>
</el-col>
</el-row>
<!--<br>-->
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col>-->
<!--<el-tooltip class="item" effect="dark" content="Without Invoice" placement="right">-->
<!--<div class="grid-content bg-purple" align="right">-->
<!--<i type="button" class="el-icon-question" circle/>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="right">X2 :</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x2_cash }}</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x2_cheque }}</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">{{ rate.x2_ba }}</div>-->
<!--</el-col>-->
<!--</el-row>-->
<el-row :gutter="20" type="flex" justify="center" align="middle">
<el-col>
<div class="grid-content bg-purple" />
</el-col>
<el-col>
<div class="grid-content bg-purple" />
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x2_cash')">Book</el-button>
</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x2_cheque')">Book</el-button>
</div>
</el-col>
<el-col>
<div class="grid-content bg-purple" align="center">
<el-button type="text" @click="acceptTerm('x2_ba')">Book</el-button>
</div>
</el-col>
</el-row>
<!-- Rate-Display-end -->
<!--<el-row :gutter="20" type="flex" justify="center" align="middle">-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" />-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x2_cash')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x2_cheque')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--<el-col>-->
<!--<div class="grid-content bg-purple" align="center">-->
<!--<el-button type="text" @click="acceptTerm('x2_ba')">Book</el-button>-->
<!--</div>-->
<!--</el-col>-->
<!--</el-row>-->
<!--&lt;!&ndash; Rate-Display-end &ndash;&gt;-->
<!-- Form_popup -->
<el-dialog :visible.sync="dialogFormVisible" :fullscreen="true" title="Booking" center>
<el-form ref="bookingForm" :model="bookingForm" :rules="rules">
<div align="center">
<el-form-item prop="payment_for"> <!-- TODO : this should be payment for order number -->
<el-select v-model="bookingForm.payment_for" placeholder="Payment For" style="width: 80%" required="true">
<el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item prop="order_no">
<el-input v-model="bookingForm.order_no" placeholder="Order No. (Optional)" style="width: 80%" required="true" />
</el-form-item>
<br>
<div align=center>
<h6>China's Supplier Details</h6>
</div>
<br>
<el-form-item prop="account_name">
<el-input v-model="bookingForm.account_name" placeholder="Account Name" style="width: 80%" required="true" />
</el-form-item>
<el-form-item prop="account_num">
<el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number" style="width: 80%"/>
</el-form-item>
<el-form-item prop="bank_name">
<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>
<!-- <el-button @click="dialogFormVisible = false">Cancel</el-button> -->
<!--&lt;!&ndash; Form_popup &ndash;&gt;-->
<!--<el-dialog :visible.sync="dialogFormVisible" :fullscreen="true" title="Booking" center>-->
<!--<el-form ref="bookingForm" :model="bookingForm" :rules="rules">-->
<!--<div align="center"> -->
<!--<el-form-item prop="payment_for"> &lt;!&ndash; TODO : this should be payment for order number &ndash;&gt;-->
<!--<el-select v-model="bookingForm.payment_for" placeholder="Payment For" style="width: 80%" required="true">-->
<!--<el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value" />-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--<el-form-item prop="order_no">-->
<!--<el-input v-model="bookingForm.order_no" placeholder="Order No. (Optional)" style="width: 80%" required="true" />-->
<!--</el-form-item> -->
<!--<br>-->
<!--<div align=center>-->
<!--<h6>China's Supplier Details</h6>-->
<!--</div>-->
<!--<br>-->
<!--<el-form-item prop="account_name">-->
<!--<el-input v-model="bookingForm.account_name" placeholder="Account Name" style="width: 80%" required="true" />-->
<!--</el-form-item>-->
<!--<el-form-item prop="account_num">-->
<!--<el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number" style="width: 80%"/>-->
<!--</el-form-item>-->
<!--<el-form-item prop="bank_name">-->
<!--<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>-->
<!--&lt;!&ndash; <el-button @click="dialogFormVisible = false">Cancel</el-button> &ndash;&gt;-->
<el-button :loading="loading" type="primary" @click="getCalculationValue('bookingForm')">Book Now</el-button>
</el-form-item>
</div>
</el-form>
</el-dialog>
<!-- Form_popup-end -->
<!--<el-button :loading="loading" type="primary" @click="getCalculationValue('bookingForm')">Book Now</el-button>-->
<!--</el-form-item>-->
<!--</div>-->
<!--</el-form>-->
<!--</el-dialog>-->
<!---->
<!--&lt;!&ndash; Form_popup-end &ndash;&gt;-->
<!-- Booking_confirmation_popup -->
<el-dialog :visible.sync="dialogFormVisible1" :fullscreen="true" title="Booking Confirmation" center>
<table class="table table-striped">
<tbody>
<tr>
<td>Date : </td>
<td> {{ bookingConfirmTable.date }}</td>
</tr>
<tr>
<td>Customer Marking : </td>
<td> {{ bookingConfirmTable.marking }}</td>
</tr>
<tr v-if="bookingConfirmTable.order_no != null">
<td>Payment for (Order No.) : </td>
<td> {{ bookingConfirmTable.order_no }}</td>
</tr>
<tr>
<td>Payment for : </td>
<td> {{ bookingConfirmTable.payment_for }}</td>
</tr>
<tr>
<td>Payment Method : </td>
<td> {{ bookingConfirmTable.payment_method }}</td>
</tr>
<tr>
<td>Remarks : </td>
<td> {{ bookingConfirmTable.remark }}</td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
<tr>
<td>CNY/RMB :</td>
<td>
<b> CNY {{ bookingConfirmTable.amount }}</b>
</td>
</tr>
<tr>
<td>+ Service Charges :</td>
<td>
CNY {{ bookingConfirmTable.service_charge }}
</td>
</tr>
<tr>
<td>/ Rate :</td>
<td>
{{ bookingConfirmTable.rate }}
</td>
</tr>
<tr>
<td></td>
<td>
MYR {{ bookingConfirmTable.subtotal }}
</td>
</tr>
<tr>
<td>+ Tax :</td>
<td>
MYR {{ bookingConfirmTable.taxAmount }}
</td>
</tr>
<tr>
<td>+ Billing Charge :</td>
<td>
MYR {{ bookingConfirmTable.billingChargeAmount }}
</td>
</tr>
<tr>
<td>Bank In Amount :</td>
<td>
<b> MYR {{ bookingConfirmTable.bankin_amount }}</b>
</td>
</tr>
<tr>
<td>China Beneficiary Acc : <br>
Name : {{ bookingConfirmTable.acc_name }} <br>
Account No. : {{ bookingConfirmTable.acc_no }} <br>
Bank : {{ bookingConfirmTable.bank_name }}<br>
Branch. : {{ bookingConfirmTable.bank_branch }}
</td>
<td></td>
</tr>
<tr>
<td>Bank In Amount :</td>
<td><b>RM {{ bookingConfirmTable.bankin_amount }}</b></td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="dialogFormVisible = false">Cancel</el-button> -->
<el-button :loading="loading" type="primary" @click="createBooking">Confirm</el-button>
</span>
</el-dialog>
<!-- Booking_confirmation_popup -->
<!--&lt;!&ndash; Booking_confirmation_popup &ndash;&gt;-->
<!--<el-dialog :visible.sync="dialogFormVisible1" :fullscreen="true" title="Booking Confirmation" center>-->
<!--<table class="table table-striped">-->
<!--<tbody>-->
<!--<tr>-->
<!--<td>Date : </td>-->
<!--<td> {{ bookingConfirmTable.date }}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Customer Marking : </td>-->
<!--<td> {{ bookingConfirmTable.marking }}</td>-->
<!--</tr>-->
<!--<tr v-if="bookingConfirmTable.order_no != null">-->
<!--<td>Payment for (Order No.) : </td>-->
<!--<td> {{ bookingConfirmTable.order_no }}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Payment for : </td>-->
<!--<td> {{ bookingConfirmTable.payment_for }}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Payment Method : </td>-->
<!--<td> {{ bookingConfirmTable.payment_method }}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Remarks : </td>-->
<!--<td> {{ bookingConfirmTable.remark }}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td></td>-->
<!--<td></td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>CNY/RMB :</td>-->
<!--<td>-->
<!--<b> CNY {{ bookingConfirmTable.amount }}</b>-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>+ Service Charges :</td>-->
<!--<td>-->
<!--CNY {{ bookingConfirmTable.service_charge }}-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>/ Rate :</td>-->
<!--<td>-->
<!--{{ bookingConfirmTable.rate }}-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td></td>-->
<!--<td>-->
<!--MYR {{ bookingConfirmTable.subtotal }}-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>+ Tax :</td>-->
<!--<td>-->
<!--MYR {{ bookingConfirmTable.taxAmount }}-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>+ Billing Charge :</td>-->
<!--<td>-->
<!--MYR {{ bookingConfirmTable.billingChargeAmount }}-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Bank In Amount :</td>-->
<!--<td>-->
<!--<b> MYR {{ bookingConfirmTable.bankin_amount }}</b>-->
<!--</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>China Beneficiary Acc : <br>-->
<!--Name : {{ bookingConfirmTable.acc_name }} <br>-->
<!--Account No. : {{ bookingConfirmTable.acc_no }} <br>-->
<!--Bank : {{ bookingConfirmTable.bank_name }}<br>-->
<!--Branch. : {{ bookingConfirmTable.bank_branch }}-->
<!--</td>-->
<!--<td></td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>Bank In Amount :</td>-->
<!--<td><b>RM {{ bookingConfirmTable.bankin_amount }}</b></td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td></td>-->
<!--<td></td>-->
<!--</tr>-->
<!--</tbody>-->
<!--</table>-->
<!--<span slot="footer" class="dialog-footer">-->
<!--&lt;!&ndash; <el-button @click="dialogFormVisible = false">Cancel</el-button> &ndash;&gt;-->
<!--<el-button :loading="loading" type="primary" @click="createBooking">Confirm</el-button>-->
<!--</span>-->
<!--</el-dialog>-->
<!--&lt;!&ndash; Booking_confirmation_popup &ndash;&gt;-->
<br>
<br>