 Too
|
30b72fe2cb
|
uncomment failed test
|
2018-06-22 22:18:06 +08:00 |
|
|
Too
|
0a0d8e1046
|
revert changes on docker
|
2018-06-22 22:06:09 +08:00 |
|
|
sengweitoo
|
4d46288fff
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into too/gitlabci
|
2018-06-22 21:26:09 +08:00 |
|
|
sengweitoo
|
87778241eb
|
fix .env.testing
|
2018-06-22 21:14:31 +08:00 |
|
|
sengweitoo
|
c0e722bca8
|
add .env.testing
|
2018-06-22 17:35:26 +08:00 |
|
|
sengweitoo
|
b5862e4c4a
|
add db_port
|
2018-06-22 16:50:02 +08:00 |
|
|
sengweitoo
|
3281aeb43c
|
add dbhost
|
2018-06-22 16:35:18 +08:00 |
|
|
sengweitoo
|
a72485b6db
|
remove php artisan optimize
|
2018-06-22 16:20:34 +08:00 |
|
|
sengweitoo
|
496ce622dd
|
rename .env.testing to .env-example
|
2018-06-22 16:14:30 +08:00 |
|
|
sengweitoo
|
4acc51a9c9
|
remove mcrypt since deprecated in 7.1 and removed in 7.2
|
2018-06-22 16:07:55 +08:00 |
|
|
sengweitoo
|
e2b3d133f6
|
change php version in gitlab-ci.yml
|
2018-06-22 16:02:17 +08:00 |
|
|
sengweitoo
|
cc95347a40
|
install php7.2
|
2018-06-22 15:57:22 +08:00 |
|
|
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 |
|
 Jack Goh
|
efb5f21567
|
Merge branch 'feature/user-uploadpo-frontend' into 'master'
removed amount from uploadpo
See merge request CIEFWorldwideSdnBhd/exchange!26
|
2018-06-21 07:49:10 +00:00 |
|
|
Jack Goh
|
aaf0decd97
|
removed amount from uploadpo
added confirmpo after user upload their po
completed uploadpo integration
|
2018-06-21 15:48:24 +08:00 |
|
|
Jack Goh
|
c4e85d0e6d
|
Merge branch 'bug/bookinglist-timeout-countdown' into 'master'
Bug/bookinglist timeout countdown
See merge request CIEFWorldwideSdnBhd/exchange!25
|
2018-06-21 07:05:48 +00:00 |
|
|
Jack Goh
|
1e6d38646e
|
update ignore file
|
2018-06-21 15:05:16 +08:00 |
|
|
Jack Goh
|
de7161369c
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown
|
2018-06-21 14:48:48 +08:00 |
|
|
Jack Goh
|
46873c7107
|
added handlecountdowned function
|
2018-06-21 14:48:17 +08:00 |
|
|
Jack Goh
|
b405f05369
|
Merge branch 'too/uploadinvoice' into 'master'
Too/uploadinvoice
See merge request CIEFWorldwideSdnBhd/exchange!24
|
2018-06-21 06:40:54 +00:00 |
|
|
Too
|
453852c7ea
|
rename image_url to image_path in user_bank_slip,invoice,purchase_order
|
2018-06-21 14:36:33 +08:00 |
|
|
Jack Goh
|
3c263b56ea
|
fix 404 not found for upload user bankslip
added display term on booking table
|
2018-06-21 14:31:53 +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
|
23b024c2fb
|
fixed status description not found
removed timeout on home page
added timeout handling in upload user bankslip
|
2018-06-21 12:45:05 +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 |
|