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

fix conflict

Browse Source
This commit is contained in:
Jack Goh
2018-07-31 15:06:16 +08:00
parent ebb30f31c5
commit af71283864
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/booking/uploadUserBankSlip.vue
-12
View File
@@ -1,16 +1,5 @@
<template>
<el-main>
<<<<<<< HEAD <progress-track v-model="status" />
<div align="center" v-if="booking.user_bankslip_path">
<h1 class="alert-heading">Your Bank Slip Has Been Rejected</h1>
<p>Reason : {{ booking.reject_reason }}</p>
<p>Please Reupload Your Bank Slip</p>
<hr>
</div>
<div v-else>
<h1>Waiting For Payment</h1>
</div>
=======
<progress-track v-model="status" />
<div align="center" v-if="booking.user_bankslip_path">
<h4 style="margin-top:5%">
@@ -23,7 +12,6 @@
<div v-else align="center">
<h1>Please Upload Bankslip</h1>
</div>
>>>>>>> 12fd1676189e5e62e226b96068bfba6afa4af8e5
<div class="row">
<table class="table table-striped">