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 branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend

Browse Source 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue
This commit is contained in:
Jack Goh
2018-06-26 14:43:53 +08:00
parent ee59dc69d5 89f5e34aa8
commit 66b0c14f5e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database/seeds/DatabaseSeeder.php
+4
View File
@@ -16,6 +16,10 @@ class DatabaseSeeder extends Seeder
$this->call(UserRoleSeeder::class);
$this->call(RateTableSeeder::class);
$this->call(BookTableSeeder::class);
<<<<<<< HEAD
$this->call(SettingCreditSeeder::class);
=======
$this->call(CreditTableSeeder::class);
>>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
}
}
resources/assets/js/pages/admin/booking/verification.vue
+8
View File
@@ -198,7 +198,11 @@
</div>
<el-row :gutter="12">
<el-col :span="22" style="text-align:center">
<<<<<<< HEAD
<img v-bind:src="booking_details.user_bankslip_path" class="image">
=======
<img v-bind:src="'public/storage/user_bankslip/' + booking_details.user_bankslip_path" class="image">
>>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
</el-col>
</el-row>
</el-card>
@@ -236,7 +240,11 @@
amount: null,
bia: null,
user_bankslip_path: null,
<<<<<<< HEAD
}
=======
},
>>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
}
},
beforeCreate () {