72a4f6645f
Added marking to admin home page
...
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-07-08 10:53:24 +08:00
c964e702a3
fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder.
2018-07-02 22:44:41 +08:00
94b664bb45
show current rate api
2018-06-30 16:13:26 +08:00
24f6273028
added booking pagination. (havent write test)
2018-06-28 00:06:23 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
436b284a3b
Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table
2018-06-26 22:23:10 +08:00
fdcaa31ffe
Add upload file maxsize checking in booking controller
2018-06-26 21:39:24 +08:00
41a265e1a0
Merge branch 'too/ETA' into 'master'
...
Too/eta
See merge request CIEFWorldwideSdnBhd/exchange!31
2018-06-26 06:32:48 +00:00
a498d370cf
remove eta from booking
2018-06-26 12:21:53 +08:00
428660a91d
Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA
2018-06-26 12:19:52 +08:00
0a6bd2c405
Add eta
2018-06-26 12:17:12 +08:00
f31f39caec
Add seeder and test for setting_credit
2018-06-26 11:47:48 +08:00
ec6db69373
Add ETA for booking table
2018-06-26 11:28:53 +08:00
9aea239c52
add handle for exceed credit limit
2018-06-25 16:03:24 +08:00
453852c7ea
rename image_url to image_path in user_bank_slip,invoice,purchase_order
2018-06-21 14:36:33 +08:00
db7e30ea95
add upload invoice and test
2018-06-21 13:15:36 +08:00
93d866f432
Revert back changes during debug. Remove Auto login after register.
2018-06-20 17:30:53 +08:00
e3c104f902
Done checking marking before register user
2018-06-20 16:57:47 +08:00
a2dad37758
Check marking before create user
2018-06-20 15:43:04 +08:00
3f2d9fbfb8
Add controller and table for marking
2018-06-20 00:38:32 +08:00
95f4f25dd3
Add test for settingcredit and rate
2018-06-19 18:56:31 +08:00
1b39ee8bda
Add admin auth middleware
2018-06-19 16:46:32 +08:00
6a025a6bac
Fix conflit of variable name with master branch.
2018-06-19 13:32:09 +08:00
a019ae2616
Fix conflit
2018-06-19 02:52:21 +08:00
e7c63bb4e9
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# routes/api.php
2018-06-18 22:42:16 +08:00
cc881cc5c7
added updatebankslip test
2018-06-18 22:39:15 +08:00
012fef948e
Reject user bank slip with reason. Add migration for userbankslip.
2018-06-18 18:57:27 +08:00
c303fb0c5f
added update transfer amount function
...
changed bankslip_url to file for upload user bankslip
2018-06-18 18:39:30 +08:00
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +08:00
8f431ed090
New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store.
2018-06-16 14:40:39 +08:00
82b2c0104e
Remove unused bookingtest.php
2018-06-15 21:13:11 +08:00
67b966f40f
add file checking in bookingtest. optimize some code.
2018-06-15 18:21:12 +08:00
3060aa1c1f
Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye
2018-06-15 17:13:53 +08:00
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
a3cb5344ee
updated readme
2018-06-12 09:46:42 +08:00
929266a09c
updated only booking belongs to user can update or delete the booking
...
phpfmt booking controller
removed example test
moved booking test to feature
2018-06-07 17:30:54 +08:00
6e54771ca2
upload po test
2018-06-05 10:15:43 +08:00
cc3ea574f8
add logic, test
2018-05-30 16:33:11 +08:00
11ccbd6a91
fix discussion
2018-05-30 12:24:30 +08:00
4210cdc19d
upload purchase order
2018-05-28 17:24:13 +08:00
7e0a0aefa9
booking controller update
2018-05-24 15:14:33 +08:00
f84951f973
booking test
2018-05-23 11:49:32 +08:00
8f3a6d82e5
updated booking to create for current user
...
updated test to pass
2018-05-19 16:11:19 +08:00
3a9b949245
changed ordertest to bookingtest
...
updated databaseseeder to use class
updated booking seeder
2018-05-19 12:59:28 +08:00
315ed64520
added booking seeder
...
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
204af7cf5e
merge master
2018-05-15 12:35:52 +08:00
254077476e
edit the unit test
2018-05-15 11:18:06 +08:00
bc6f948314
added unit testing
2018-05-15 10:59:26 +08:00
a1db64d1c1
integrated frontend
2018-05-07 15:26:23 +08:00
cd217f9db8
init
2018-04-20 14:03:37 +08:00
Jack Goh
Too
Nazri Hamzah
jack
Mohd Arief