cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
764 Commits 33 Branches 0 Tags
fix/register-error-message
Commit Graph

764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
weiweitoo 336e5e4ed3 create notification for each step done. Make unread message bold. 2018-07-25 10:05:18 +08:00
weiweitoo ad5a9970ea git pull origin master 2018-07-24 17:05:38 +08:00
weiweitoo 563c0d42d7 Update UI and migration,seeder for notification. 2018-07-24 17:02:45 +08:00
Jack Goh c8af387546 Merge branch 'PaginationAdminBTable' into 'master' 
Pagination admin b table

See merge request CIEFWorldwideSdnBhd/exchange!81
 2018-07-24 06:18:28 +00:00
lonetrinity 978df88b0a fixTWo pagination for admin booking table 2018-07-24 14:15:01 +08:00
lonetrinity 74e602836b fix pagination for admin booking table 2018-07-24 14:10:31 +08:00
lonetrinity ae7bf422de pagination for admin booking table 2018-07-24 12:30:03 +08:00
Jack Goh 017f70391e fix admin completed order function not found error 2018-07-22 18:30:23 +08:00
Jack Goh 01fa0d07c3 fix active bank error 2018-07-22 18:28:45 +08:00
Jack Goh 621fcc09e8 update seed for malaysia bank 2018-07-22 18:25:06 +08:00
Jack Goh 46b349b189 added order_no and payment_for in booking controller store function 2018-07-22 18:09:28 +08:00
Jack Goh c3d50a776b fix user booking form 2018-07-22 15:54:18 +08:00
Jack Goh 1d23e913d5 added order_no and patment_for to calculation controller function 2018-07-22 15:42:48 +08:00
Jack Goh 7229d71109 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug 
# Conflicts:
#	resources/assets/js/components/LocaleDropdown.vue
#	resources/assets/js/pages/home.vue
 2018-07-22 15:39:35 +08:00
Jack Goh 5772a3c540 changed bookingtable data to null 2018-07-22 14:53:15 +08:00
Jack Goh 51e4072a00 Merge branch 'too/fix-bug' into 'master' 
Too/fix bug

See merge request CIEFWorldwideSdnBhd/exchange!79
 2018-07-22 06:22:41 +00:00
Jack Goh 7aa22bf804 fixed internal error on booking confirmation 2018-07-22 14:21:40 +08:00
Jack Goh df8ae0a931 Merge branch 'too/fix-bug' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug 2018-07-22 14:08:20 +08:00
Jack Goh 6799db199e no message 2018-07-21 16:50:48 +08:00
weiweitoo a0f80aa41b fix booking confirmation 2018-07-21 14:16:39 +08:00
weiweitoo 81bf3ac585 add migration for notification. update booking confirmation 2018-07-21 14:15:42 +08:00
weiweitoo 1b874d0800 Fix conflit 2018-07-21 01:43:10 +08:00
weiweitoo 3e60ec8e86 fix conflit 2018-07-21 00:15:43 +08:00
weiweitoo c4962e4655 git pull origin master 2018-07-20 22:12:48 +08:00
weiweitoo 65c65ef257 Fix calculation 2018-07-20 21:47:23 +08:00
weiweitoo 21c13d3e60 change billingcharge rate and tax rate table to double. Modify Customer calculation table 2018-07-20 21:16:36 +08:00
weiweitoo 73c36dd8e3 Add setting for taxrate and billingcharge 2018-07-20 18:47:19 +08:00
Jack Goh 026ac66257 added default field for select field 2018-07-20 18:08:39 +08:00
Jack Goh 32278095bf beautified user home page 
added order number and payment for field in user booking
 2018-07-20 18:04:30 +08:00
Jack Goh 14a1090263 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug 2018-07-20 17:45:47 +08:00
Jack Goh 1497c50da5 changed payment voucher in supplier booking report to Ref No. 
added dynamic marking to supplier booking
 2018-07-20 17:45:39 +08:00
Jack Goh d3a995c6b5 Merge branch 'frontend/making-every-user-page-responsive' into 'master' 
Frontend/making every user page responsive

See merge request CIEFWorldwideSdnBhd/exchange!74
 2018-07-20 09:44:31 +00:00
Mouhamed Lamine 1cccefdb8a Discussion Fixed 2018-07-20 17:42:27 +08:00
weiweitoo 4bb40e3643 display china beneficiary information in all order detail 2018-07-20 17:20:02 +08:00
Jack Goh 20cc501f0e make beneficiary nullable 2018-07-20 15:08:48 +08:00
Jack Goh b971fc79ce added a option to let admin choose to use customer's beneficiary in supplier report 2018-07-20 14:54:52 +08:00
Jack Goh 5814c999d6 updated update rate input to be wider 2018-07-20 11:18:05 +08:00
Jack Goh e2cf3fecdd fix term1 no service charge 
fix navbar extra </li>
 2018-07-20 11:12:20 +08:00
Jack Goh aea6323a66 fix other loading button not working 2018-07-20 10:59:32 +08:00
Jack Goh f6c0d6aab3 Added navigation notice in user home page 
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

# Conflicts:
#	resources/assets/js/pages/home.vue
 2018-07-20 10:55:55 +08:00
Jack Goh a18f00c29f added production env sample 2018-07-20 10:26:18 +08:00
weiweitoo 34bc7a43c6 Add CRUD for marking setting 2018-07-20 00:58:47 +08:00
weiweitoo d97d7f4cb4 Fix user page pagination 2018-07-19 18:08:04 +08:00
weiweitoo d01f14d9f7 Remove some unnessary console.log 2018-07-19 18:01:16 +08:00
weiweitoo ef200257b3 revert back changes during debug 2018-07-19 17:49:02 +08:00
weiweitoo 16205404e1 Fix upload issue. allow po to upload multiple and display multiple. Display download link when the uploaded file is not image 2018-07-19 17:45:25 +08:00
Jack Goh c63c4e6811 Merge branch 'fix/loadingButton' into 'master' 
complete orders/admin/refreshbutton

See merge request CIEFWorldwideSdnBhd/exchange!77
 2018-07-19 08:18:08 +00:00
lonetrinity a3717a19e2 complete orders/admin/refreshbutton 2018-07-19 16:16:27 +08:00
Jack Goh d87c45938d Merge branch 'fix/loadingButton' into 'master' 
Fix/loading button

See merge request CIEFWorldwideSdnBhd/exchange!76
 2018-07-19 08:01:05 +00:00
lonetrinity a322b8b798 fix unwanted line removal 2018-07-19 12:32:48 +08:00