 Too
|
0447481f33
|
install php7.2-cli
|
2018-06-22 15:32:11 +08:00 |
|
|
Too
|
b5e0059874
|
manually install php7.2
|
2018-06-22 15:23:08 +08:00 |
|
|
Too
|
fad9bcf115
|
Use jack's version setting
|
2018-06-22 15:14:11 +08:00 |
|
|
Too
|
518647ed08
|
create dummy user at before_Script
|
2018-06-22 15:07:36 +08:00 |
|
|
Too
|
0fa439c185
|
change rootpassword in gitlab-ci.yml
|
2018-06-22 15:02:58 +08:00 |
|
|
Too
|
2543b963f0
|
change db in gitlab-ci.yml
|
2018-06-22 14:58:20 +08:00 |
|
|
Too
|
d998d49171
|
modify db variable
|
2018-06-22 14:47:55 +08:00 |
|
|
Too
|
a1becfab70
|
edit gitlab-ci.sh and gitlab-ci.yml
|
2018-06-22 14:41:47 +08:00 |
|
|
Too
|
8eb6a46bce
|
modify gitlab-ci
|
2018-06-22 14:27:57 +08:00 |
|
|
Too
|
2949800833
|
change tag
|
2018-06-22 14:24:38 +08:00 |
|
|
Too
|
5cecd7e9da
|
modify gitlab-ci.yml
|
2018-06-22 14:23:54 +08:00 |
|
|
Too
|
beda8e28bd
|
add dockerfile
|
2018-06-22 14:20:43 +08:00 |
|
|
Too
|
48f6760153
|
add .gitlab-ci.sh
|
2018-06-21 17:04:22 +08:00 |
|
|
Too
|
f05dc41d45
|
temporary uncomment bookingcontroller@store to pass test
|
2018-06-21 16:24:18 +08:00 |
|
|
Too
|
0cf6cb2051
|
Add .gitlab-ci.yml
|
2018-06-21 16:14:55 +08:00 |
|
|
Too
|
453852c7ea
|
rename image_url to image_path in user_bank_slip,invoice,purchase_order
|
2018-06-21 14:36:33 +08:00 |
|
|
Too
|
de45782ae3
|
fix conflit with master
|
2018-06-21 13:26:18 +08:00 |
|
|
Too
|
db7e30ea95
|
add upload invoice and test
|
2018-06-21 13:15:36 +08:00 |
|
 Jack Goh
|
5a4c4b14ee
|
updated create booking status to 2
|
2018-06-21 10:58:47 +08:00 |
|
|
Jack Goh
|
6bbf271a36
|
added status tracking in booking
|
2018-06-21 10:58:16 +08:00 |
|
|
Jack Goh
|
d06b8ac359
|
added status column to booking table
|
2018-06-21 10:49:45 +08:00 |
|
|
Jack Goh
|
a650879977
|
completed list booking
TBD implement status feature
|
2018-06-21 10:43:52 +08:00 |
|
|
Jack Goh
|
7eb8c7bafc
|
create booking with rate
|
2018-06-20 22:55:29 +08:00 |
|
|
Jack Goh
|
385372e3dd
|
added rate to booking table
|
2018-06-20 22:54:31 +08:00 |
|
|
Jack Goh
|
a30fd2a0b1
|
added booking list controller
|
2018-06-20 22:21:45 +08:00 |
|
|
Jack Goh
|
bc637adcab
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
# Conflicts:
# routes/api.php
|
2018-06-20 18:41:31 +08:00 |
|
|
Jack Goh
|
498fafd502
|
added booking lists controller and routes
|
2018-06-20 18:39:55 +08:00 |
|
|
Jack Goh
|
c3558eb39b
|
Merge branch 'too/registerwithmarking' into 'master'
Too/registerwithmarking
See merge request CIEFWorldwideSdnBhd/exchange!23
|
2018-06-20 09:37:21 +00:00 |
|
|
Too
|
93d866f432
|
Revert back changes during debug. Remove Auto login after register.
|
2018-06-20 17:30:53 +08:00 |
|
|
Too
|
e6d58004bc
|
fix error response code
|
2018-06-20 17:04:50 +08:00 |
|
|
Too
|
e3c104f902
|
Done checking marking before register user
|
2018-06-20 16:57:47 +08:00 |
|
|
Too
|
3959c8c8b2
|
pull from master
|
2018-06-20 15:56:08 +08:00 |
|
|
Too
|
6e51b18058
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerwithmarking
|
2018-06-20 15:54:36 +08:00 |
|
|
Too
|
a2dad37758
|
Check marking before create user
|
2018-06-20 15:43:04 +08:00 |
|
|
Jack Goh
|
40d6eb7ead
|
Merge branch 'too/marking' into 'master'
Too/marking
See merge request CIEFWorldwideSdnBhd/exchange!22
|
2018-06-20 00:50:07 +00:00 |
|
|
Jack Goh
|
01f6c78619
|
Merge branch 'too/adminmiddleware' into 'master'
Add admin auth middleware
See merge request CIEFWorldwideSdnBhd/exchange!20
|
2018-06-20 00:48:46 +00:00 |
|
|
Too
|
b1843c0b9b
|
Revert back unnessary changes during debug
|
2018-06-20 02:04:05 +08:00 |
|
|
Too
|
3f2d9fbfb8
|
Add controller and table for marking
|
2018-06-20 00:38:32 +08:00 |
|
|
Too
|
95f4f25dd3
|
Add test for settingcredit and rate
|
2018-06-19 18:56:31 +08:00 |
|
|
Jack Goh
|
118ce0f819
|
fix tracking status number
|
2018-06-19 17:36:39 +08:00 |
|
|
Jack Goh
|
f9e94cc148
|
added loading for upload user bankinslip
|
2018-06-19 17:33:17 +08:00 |
|
|
Jack Goh
|
77f861472a
|
updated dynamic switch pages on dummny table data
|
2018-06-19 17:10:34 +08:00 |
|
|
Too
|
1b39ee8bda
|
Add admin auth middleware
|
2018-06-19 16:46:32 +08:00 |
|
|
Jack Goh
|
5cb3d6a33d
|
Merge branch 'too/rejectuserbankslip' into 'master'
Reject user bank slip with reason. Add migration for userbankslip.
See merge request CIEFWorldwideSdnBhd/exchange!18
|
2018-06-19 06:21:38 +00:00 |
|
|
Too
|
6a025a6bac
|
Fix conflit of variable name with master branch.
|
2018-06-19 13:32:09 +08:00 |
|
|
Too
|
a019ae2616
|
Fix conflit
|
2018-06-19 02:52:21 +08:00 |
|
|
Too
|
64d8ffed7c
|
Fix variable name
|
2018-06-19 00:15:28 +08:00 |
|
|
Jack Goh
|
7398ce73d6
|
updated timeout from 60 seconds to 10 minutes
|
2018-06-18 22:51:33 +08:00 |
|
|
Jack Goh
|
44563624ee
|
Merge branch 'fix/booking-integration' into 'master'
Fix/booking integration
See merge request CIEFWorldwideSdnBhd/exchange!19
|
2018-06-18 14:49:29 +00:00 |
|
|
Jack Goh
|
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 |
|