diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index bcf98f78..ec23be1c 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -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 } } diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 54da4315..ac1699ab 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -198,7 +198,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac @@ -236,7 +240,11 @@ amount: null, bia: null, user_bankslip_path: null, +<<<<<<< HEAD } +======= + }, +>>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac } }, beforeCreate () {