d9dfe84c2e
rename beneficiaries tobeneficiary
2018-07-13 09:58:32 +08:00
39d5646155
dynamically show malaysia bank acc for booking step
2018-07-12 00:52:46 +08:00
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
538adc7366
added marking to bookings api
...
changed hard coded marking in booking details to dynamic for frontend
2018-07-07 16:15:32 +08:00
71e11fa034
added marking to admin booking index
...
hide roles in user model
hide user from booking model
2018-07-07 12:12:27 +08:00
59fc234ea0
updated user has many booking to bookings
...
added index booking with user marking
added turncate marking when seeding
added turncate settingmalaysiabank when seeding
added marking to user seeder
2018-07-07 12:06:21 +08:00
2a8f5c0b3c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
2018-07-07 10:32:43 +08:00
77a2168832
fix update bug at activebankcontroller when empty record
2018-07-07 01:57:30 +08:00
bddef7d16f
make acc_no unique in malaysiabank and china bank. integrate active bank page. add seeder for beneficiares and active bank. add table setting_active_bank
2018-07-07 01:52:35 +08:00
84fc15adce
fix update and delete at settingmalaysiacontroller
2018-07-06 13:22:44 +08:00
36917cbd60
add malaysia bank page and integrate it with backend
2018-07-06 13:12:18 +08:00
38515c055b
Add setting malaysia bank table and controller
2018-07-05 19:10:17 +08:00
503e3aec5b
added marking to user table
...
added marking on registration
2018-07-05 17:56:49 +08:00
0180694d72
gitignored autoload_classmap
...
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
d5c7597307
added back name field to user table
...
fixed unable to login issue
2018-07-05 13:27:38 +08:00
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
340381d0b3
half fix registration page
2018-07-05 10:09:30 +08:00
232baf76cd
fix validation error
2018-07-04 12:01:32 +08:00
54f6722472
fix npm issue
...
added name validation to register controller
fixed register frontend validator issue
2018-07-04 11:54:28 +08:00
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
35dfa58a14
Merge branch 'fix/bug' into 'master'
...
Fix/bug
See merge request CIEFWorldwideSdnBhd/exchange!55
2018-07-04 03:13:33 +00:00
29576dcc60
comment name column in oauthctroller
2018-07-03 23:08:34 +08:00
dae26ccb83
add validation of registeration form
2018-07-03 22:27:26 +08:00
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
6c1cd5500a
added credit limit exceed check
2018-07-03 18:12:40 +08:00
c902c8db82
hide rate id from model
...
fixed DB not found in rate controller
2018-07-03 17:11:30 +08:00
07950c8252
fix register duplicate user error response message
2018-07-03 17:03:26 +08:00
b731226f18
Merge conflict saved
2018-07-03 16:53:34 +08:00
457f0de312
changed booking supplier date format
2018-07-03 11:32:39 +08:00
699827184d
Resolved merge conflict
2018-07-03 11:25:42 +08:00
48f9a56230
Commit before pull
2018-07-03 10:43:29 +08:00
4da5cfd7be
added relationship between marking and user
...
added billing_amount and salestax_amount to supplierbooking table
2018-07-03 09:58:06 +08:00
2726d8c71d
git pull origin master
2018-07-02 23:25:49 +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
647c42a30e
renamed booking supplier book_id to booking_id
...
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
2018-07-02 21:26:12 +08:00
b26c6a68da
Merge conflict fix
2018-07-02 14:58:27 +08:00
2c2c3928e9
remove username from controller and migration
2018-07-02 10:31:42 +08:00
7a10f39e70
fix conflict
2018-06-30 16:16:08 +08:00
94b664bb45
show current rate api
2018-06-30 16:13:26 +08:00
9d3e08889c
fix booking status on upload invoice
2018-06-30 10:51:05 +08:00
43809bc478
fix wrong update status on upload po
...
fix validation message for upload china bankslip
removed get po api on upload invoice
2018-06-30 10:47:35 +08:00
eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
ca74cfae23
updated admin booking show function with user, china, po, invoice slip
...
removed one step from admin tracking
integrated admin booking complete
changed admin complete order component name
2018-06-29 19:18:54 +08:00
d80f048f5a
added po and invoice into show booking return
...
integrated complete page frontend
integrated po page frontend
integrated po complete page frontend
removed ETA for transfer page frontend
2018-06-29 19:01:15 +08:00
30a210324e
booking confirm error
2018-06-29 18:21:08 +08:00
b212858eba
commit before pull
2018-06-29 18:10:12 +08:00
3d05dbb755
added chinabankslip return on show booking query
...
updated upload po page with booking info, china bankslip and user bankslip
2018-06-29 17:40:28 +08:00
7aba4e2b05
fix edit supplier booking
...
fix done supplier booking report button loading
2018-06-29 15:48:26 +08:00
9d0aadb5c3
added reject reason response for getting booking
...
updated bankslip reject screen for user
2018-06-29 15:37:44 +08:00
0544e23ee6
fix timeout for rejected user bankslip
...
fix is_rejected able to accept again
2018-06-29 15:21:27 +08:00
weiweitoo
Jack Goh
Mouhamed Lamine
Nazri Hamzah