 Jack Goh
|
293dfd6cd2
|
temporary commented out rate and transfer amount from supplier booking
|
2018-07-25 22:33:14 +08:00 |
|
|
Jack Goh
|
4e0f1dbe0a
|
removed vee-validate which causes cief bank details not showing in user upload bank slip
added exception if userbankslip not save show error
added tax rate to supplier booking
added order number and payment for to booking seeder
|
2018-07-25 16:22:53 +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
|
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 |
|
|
lonetrinity
|
fef401d76c
|
fix conflict
|
2018-07-19 12:20:54 +08:00 |
|
|
lonetrinity
|
b2e9d6f0c6
|
removed unstacked files
|
2018-07-19 12:19:56 +08:00 |
|
|
lonetrinity
|
18932c03c5
|
fix conflig
|
2018-07-19 12:18:54 +08:00 |
|
|
lonetrinity
|
bd3f106e05
|
fix/loading for user done
|
2018-07-19 11:48:14 +08:00 |
|
|
Jack Goh
|
0bf30ac312
|
Merge branch 'deployment/staging' into 'master'
Deployment/staging
See merge request CIEFWorldwideSdnBhd/exchange!75
|
2018-07-19 03:31:05 +00:00 |
|
|
Jack Goh
|
6bb754ab9b
|
removed unuse dockerfile
|
2018-07-19 11:28:30 +08:00 |
|