omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
238 Commits 28 Branches 0 Tags
f078be408dbcacc86c55d20d211ef8794cdc552d
Commit Graph

238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh f078be408d fix migration errors 2018-06-27 10:09:06 +08:00
Jack Goh 299597ed16 update book supplier routes to admin routes 2018-06-27 09:58:09 +08:00
Jack Goh d362d947a3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip 
# Conflicts:
#	app/Http/Controllers/BookingController.php
 2018-06-27 09:56:35 +08:00
Jack Goh c59aac1e4d Merge branch 'feature/admin-home-frontend' into 'master' 
Feature/admin home frontend

See merge request CIEFWorldwideSdnBhd/exchange!34
 2018-06-27 01:36:22 +00:00
Jack Goh b802a91e18 Merge branch 'too/validatefilesize' into 'master' 
Too/validatefilesize

See merge request CIEFWorldwideSdnBhd/exchange!33
 2018-06-26 14:32:18 +00:00
Too 819da14684 revert back changes during debug 2018-06-26 22:24:47 +08:00
Too 436b284a3b Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table 2018-06-26 22:23:10 +08:00
Too fdcaa31ffe Add upload file maxsize checking in booking controller 2018-06-26 21:39:24 +08:00
Nazri Hamzah a17a692549 fix conflict 2018-06-26 18:23:00 +08:00
Nazri Hamzah acfd8eeb48 supplier booking (multiple booking removed) 2018-06-26 18:17:38 +08:00
Jack Goh 21338401c4 update supplierbooking frontend 2018-06-26 17:56:51 +08:00
Jack Goh f262830b1b Merge branch 'arief/admin-settings-content' into 'master' 
completed the setting content

See merge request CIEFWorldwideSdnBhd/exchange!32
 2018-06-26 09:42:24 +00:00
Jack Goh fd03f5b248 updated approvebankslip booking not found 
updated update status upon userbankslip approved
updated update status upon userbankslip rejected
updated supplier index to display value and label for input select
updated supplierBooking frontend
completed booking accept and reject integration
 2018-06-26 17:40:44 +08:00
Mohd Arief 045c137dab update dialog name 2018-06-26 17:28:22 +08:00
Jack Goh 2bf0df8b62 Merge branch 'arief/admin-setting-frontend' into 'master' 
Arief/admin setting frontend

See merge request CIEFWorldwideSdnBhd/exchange!29
 2018-06-26 09:08:15 +00:00
Mohd Arief c8ff54f79a completed the setting content 2018-06-26 16:55:31 +08:00
Jack Goh 2023050218 fix conflict 2018-06-26 14:44:48 +08:00
Jack Goh 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue
 2018-06-26 14:43:53 +08:00
Jack Goh ee59dc69d5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 2018-06-26 14:41:45 +08:00
Jack Goh 5366353484 updated loading button param 2018-06-26 14:41:37 +08:00
Jack Goh 41a265e1a0 Merge branch 'too/ETA' into 'master' 
Too/eta

See merge request CIEFWorldwideSdnBhd/exchange!31
 2018-06-26 06:32:48 +00:00
Jack Goh 366f91352b Merge branch 'too/timelimit' into 'master' 
get_time_limit

See merge request CIEFWorldwideSdnBhd/exchange!30
 2018-06-26 06:31:53 +00:00
Too dec9ba9405 fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller 2018-06-26 12:28:17 +08:00
Jack Goh 852c64f35b completed display user bankslip in verification frontend 2018-06-26 12:27:09 +08:00
Too a498d370cf remove eta from booking 2018-06-26 12:21:53 +08:00
Too 428660a91d Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA 2018-06-26 12:19:52 +08:00
Too c6ef6219a3 fix conflit 2018-06-26 12:19:08 +08:00
Too 0a6bd2c405 Add eta 2018-06-26 12:17:12 +08:00
Jack Goh ae85886365 updated user bankslip path in verification frontend 2018-06-26 12:12:02 +08:00
Jack Goh 9fff113250 updated dockerfile to add storage symlink 2018-06-26 12:08:43 +08:00
Jack Goh 20923d8f4a updated upload path 2018-06-26 12:07:27 +08:00
Too f31f39caec Add seeder and test for setting_credit 2018-06-26 11:47:48 +08:00
Too ec6db69373 Add ETA for booking table 2018-06-26 11:28:53 +08:00
Mohd Arief 6f510c93cc solved merge conflict 2018-06-26 10:40:35 +08:00
Mohd Arief 3a7edc8401 update admin setting 2018-06-26 10:30:57 +08:00
Too 3129da5df4 get_time_limit 2018-06-25 18:16:20 +08:00
Jack Goh 89f5e34aa8 update booking status on stage 2 2018-06-25 17:52:41 +08:00
Jack Goh ffe1023bba added credit limit seeder, it causes error when creating booking 2018-06-25 17:48:51 +08:00
Jack Goh 62d0d83cb6 attempt to fetch user bankslip 2018-06-25 17:34:34 +08:00
Jack Goh a3d8eff9e0 Merge branch 'feature/admin-home-frontend' into 'master' 
Feature/admin home frontend

See merge request CIEFWorldwideSdnBhd/exchange!28
 2018-06-25 08:57:41 +00:00
Jack Goh 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
 2018-06-25 16:57:20 +08:00
Mohd Arief 069883deeb complete the admin setting navbar 2018-06-25 16:57:18 +08:00
Jack Goh b715663d47 updated adminshow function 2018-06-25 16:56:36 +08:00
Jack Goh 2c6128c564 changed admin status default to 1 
added show one booking for admin
added booking details for verification page
 2018-06-25 16:41:31 +08:00
Jack Goh 0db893d07b Merge branch 'too/creditlimit' into 'master' 
add handle for exceed credit limit

See merge request CIEFWorldwideSdnBhd/exchange!27
 2018-06-25 08:32:22 +00:00
Too 9aea239c52 add handle for exceed credit limit 2018-06-25 16:03:24 +08:00
Jack Goh 1e7f076335 updated booking status on upload user bankslip 
revert back the correct routes for user
update user path names
 2018-06-25 15:45:02 +08:00
Jack Goh bf40262994 added admin booking list controller 2018-06-23 00:40:50 +08:00
Mohd Arief 620e496f0e update route.js 2018-06-22 16:53:14 +08:00
Mohd Arief 72f9aee7c8 solved conflict 2018-06-22 16:31:56 +08:00