cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-27 08:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
572 Commits 33 Branches 0 Tags
621fcc09e87b7ffd51f5ec5b5beca349a3b0b375
Commit Graph

291 Commits

Author SHA1 Message Date
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 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 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
weiweitoo a0f80aa41b fix booking confirmation 2018-07-21 14:16:39 +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 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 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
lonetrinity a3717a19e2 complete orders/admin/refreshbutton 2018-07-19 16:16:27 +08:00
lonetrinity a322b8b798 fix unwanted line removal 2018-07-19 12:32:48 +08:00
lonetrinity fef401d76c fix conflict 2018-07-19 12:20:54 +08:00
lonetrinity bd3f106e05 fix/loading for user done 2018-07-19 11:48:14 +08:00
lonetrinity 37fdf32af1 fixed admin refresh button with loading 2018-07-19 10:11:31 +08:00
Jack Goh 1a7dc820a9 fix production frontend issue 2018-07-19 09:51:35 +08:00
Jack Goh 8cf011c59c test with app env check 2018-07-19 09:49:44 +08:00
Jack Goh 67c5b0c97b fix webpackjson not found 2018-07-19 09:47:09 +08:00
weiweitoo 6e849b6145 Show download button for non-preview able file in the complete page. 2018-07-18 23:53:04 +08:00
Jack Goh b0071d1000 updated production frontend error 2018-07-18 22:20:49 +08:00
Mouhamed Lamine 9670454c61 Almost Done 2018-07-18 21:48:34 +08:00
weiweitoo eda6aabecf Fix filter 2018-07-18 17:31:11 +08:00
weiweitoo 812040a433 fix timezone issue. Add refresh rate button. Add success message for all refresh button. Fix typo in user step 4 2018-07-18 15:38:06 +08:00
weiweitoo a35c07a794 Add admin page 1. show error when upload wrong file in upload po and invoice 2018-07-18 14:35:05 +08:00
Jack Goh 888519f546 removed db:seed at docker 
update timezone
fixed production and staging frontend not showing issue
 2018-07-18 11:57:36 +08:00
Jack Goh fb8951265d Merge branch 'frontend/making-uploaded-images-responsive' into 'master' 
Showing Completed Orders Task Done

See merge request CIEFWorldwideSdnBhd/exchange!68
 2018-07-17 08:53:22 +00:00
Mouhamed Lamine 3410008dd4 final commit 2018-07-17 16:52:30 +08:00
Mouhamed Lamine d2337953a6 Halfway through the task 2018-07-17 16:41:09 +08:00
weiweitoo 8c31bcc420 remove date option in supplier report. upload china bankslip detail should be optional. make accept for uploadpurchaseorder - frontend only 2018-07-17 16:31:37 +08:00
Jack Goh 040cc5afc0 temporary remove the notification from navbar 2018-07-16 22:03:35 +08:00