 Jack Goh
|
560035be09
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
# package-lock.json
# package.json
# resources/assets/js/pages/settings/admin-supplier.vue
# vendor/composer/autoload_static.php
|
2018-07-05 11:52:38 +08:00 |
|
|
Jack Goh
|
09f2dcf579
|
Merge branch 'too/chinabanksetting' into 'master'
done integrate for cief bank setting page
See merge request CIEFWorldwideSdnBhd/exchange!58
|
2018-07-05 03:05:56 +00:00 |
|
|
Jack Goh
|
340381d0b3
|
half fix registration page
|
2018-07-05 10:09:30 +08:00 |
|
|
Jack Goh
|
41012cf4b9
|
Merge branch 'frontend/making-uploaded-images-responsive' into 'master'
Frontend/making uploaded images responsive
See merge request CIEFWorldwideSdnBhd/exchange!56
|
2018-07-05 01:45:07 +00:00 |
|
 Too
|
45c81597bd
|
git pull origin master
|
2018-07-04 23:30:14 +08:00 |
|
|
Too
|
4959de9dd5
|
done integrate for cief bank setting page
|
2018-07-04 23:28:07 +08:00 |
|
|
Jack Goh
|
cfa20eac16
|
Merge branch 'too/suppliersetting' into 'master'
Too/suppliersetting
See merge request CIEFWorldwideSdnBhd/exchange!57
|
2018-07-04 10:27:26 +00:00 |
|
|
Too
|
9805fd04d0
|
move axios configuration from external file to inline
|
2018-07-04 18:04:55 +08:00 |
|
|
Too
|
ab3cba389d
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting
|
2018-07-04 17:31:21 +08:00 |
|
|
Too
|
42476f9b57
|
move vee-validate to index.js
|
2018-07-04 17:30:06 +08:00 |
|
|
Too
|
aa7c665d9c
|
add validation for supplier form
|
2018-07-04 17:27:44 +08:00 |
|
|
Too
|
bfae59bf1e
|
integrate edit feature
|
2018-07-04 16:30:34 +08:00 |
|
 Mouhamed Lamine
|
0f9a9581fd
|
Removing gitignore mess
|
2018-07-04 15:14:55 +08:00 |
|
|
Mouhamed Lamine
|
43306d8c36
|
Uploaded Images made responsive
|
2018-07-04 15:06:44 +08:00 |
|
|
Too
|
55455b89d7
|
integrate delete supplier
|
2018-07-04 14:35:42 +08:00 |
|
|
Too
|
080851675c
|
integrate index in suplier page
|
2018-07-04 13:31:10 +08:00 |
|
|
Jack Goh
|
232baf76cd
|
fix validation error
|
2018-07-04 12:01:32 +08:00 |
|
|
Jack Goh
|
54f6722472
|
fix npm issue
added name validation to register controller
fixed register frontend validator issue
|
2018-07-04 11:54:28 +08:00 |
|
|
Too
|
678197d40a
|
fix conflit
|
2018-07-04 11:19:33 +08:00 |
|
|
Jack Goh
|
8798c83b97
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
# package-lock.json
# package.json
# vendor/composer/autoload_static.php
# yarn.lock
|
2018-07-04 11:17:44 +08:00 |
|
|
Too
|
7a0d11247d
|
integrate add setting supplier
|
2018-07-04 11:17:29 +08:00 |
|
|
Jack Goh
|
35dfa58a14
|
Merge branch 'fix/bug' into 'master'
Fix/bug
See merge request CIEFWorldwideSdnBhd/exchange!55
|
2018-07-04 03:13:33 +00:00 |
|
|
Jack Goh
|
9ae80ed013
|
fix migration down database integrity contraints
|
2018-07-04 10:56:43 +08:00 |
|
|
Too
|
d18deb2866
|
git pull origin master
|
2018-07-03 23:19:42 +08:00 |
|
|
Too
|
fca8b7fccf
|
reset from master
|
2018-07-03 23:17:29 +08:00 |
|
|
Too
|
29576dcc60
|
comment name column in oauthctroller
|
2018-07-03 23:08:34 +08:00 |
|
|
Too
|
dae26ccb83
|
add validation of registeration form
|
2018-07-03 22:27:26 +08:00 |
|
|
Jack Goh
|
9badd33d81
|
commented out some undone feature navigation bar
|
2018-07-03 18:23:26 +08:00 |
|
|
Jack Goh
|
b8fd5d08c4
|
Merge branch 'frontend/error-handling-for-axios-in-admin-booking-vues' into 'master'
Frontend/error handling for axios in booking vues
See merge request CIEFWorldwideSdnBhd/exchange!52
|
2018-07-03 10:17:58 +00:00 |
|
|
Mouhamed Lamine
|
3d9e7054d7
|
Final changes
|
2018-07-03 18:14:45 +08:00 |
|
|
Jack Goh
|
6c1cd5500a
|
added credit limit exceed check
|
2018-07-03 18:12:40 +08:00 |
|
|
Jack Goh
|
2bc7542e10
|
Merge branch 'feature/rate-integration' into 'master'
Feature/rate integration
See merge request CIEFWorldwideSdnBhd/exchange!54
|
2018-07-03 09:36:59 +00:00 |
|
|
Jack Goh
|
bac71e1980
|
fix typo for x2 rate
|
2018-07-03 17:13:14 +08:00 |
|
|
Jack Goh
|
6402d2cf28
|
updated dynamic rate for x2
|
2018-07-03 17:12:08 +08:00 |
|
|
Jack Goh
|
c902c8db82
|
hide rate id from model
fixed DB not found in rate controller
|
2018-07-03 17:11:30 +08:00 |
|
|
Too
|
07950c8252
|
fix register duplicate user error response message
|
2018-07-03 17:03:26 +08:00 |
|
|
Mouhamed Lamine
|
b731226f18
|
Merge conflict saved
|
2018-07-03 16:53:34 +08:00 |
|
|
Mouhamed Lamine
|
27c5c14373
|
GitIgnored my package-lock.json
|
2018-07-03 16:43:17 +08:00 |
|
|
Mouhamed Lamine
|
e073bfdba8
|
GitIgnored my package-lock.json
|
2018-07-03 16:36:55 +08:00 |
|
|
Jack Goh
|
3aab1506c4
|
Merge branch 'feature/booking-refresh-button' into 'master'
added the refresh button
See merge request CIEFWorldwideSdnBhd/exchange!53
|
2018-07-03 08:17:02 +00:00 |
|
 Mohd Arief
|
63e26622bd
|
added the refresh button
|
2018-07-03 16:11:50 +08:00 |
|
|
Mouhamed Lamine
|
d082918d37
|
GitIgnored my package-lock.json
|
2018-07-03 15:56:29 +08:00 |
|
|
Mouhamed Lamine
|
884b8b4099
|
Error handling done for the whole process
|
2018-07-03 15:20:30 +08:00 |
|
|
Jack Goh
|
c3d7aa800f
|
Merge branch 'feature/supplier-report' into 'master'
Feature/supplier report
See merge request CIEFWorldwideSdnBhd/exchange!51
|
2018-07-03 06:33:40 +00:00 |
|
|
Jack Goh
|
4b3957704f
|
fix upload invoice page, user_po_path exist issue
|
2018-07-03 12:57:29 +08:00 |
|
|
Jack Goh
|
e32e908b8f
|
updated banklogo at supplier report
|
2018-07-03 12:39:15 +08:00 |
|
|
Jack Goh
|
457f0de312
|
changed booking supplier date format
|
2018-07-03 11:32:39 +08:00 |
|
|
Mouhamed Lamine
|
4152b58ef4
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into frontend/error-handling-for-axios-in-admin-booking-vues
|
2018-07-03 11:25:57 +08:00 |
|
|
Mouhamed Lamine
|
699827184d
|
Resolved merge conflict
|
2018-07-03 11:25:42 +08:00 |
|
|
Jack Goh
|
d46de18d00
|
Merge branch 'feature/booking-pagination' into 'master'
add the bank account details
See merge request CIEFWorldwideSdnBhd/exchange!50
|
2018-07-03 02:54:09 +00:00 |
|