 Jack Goh
|
35cfdfeaa9
|
Merge branch 'fix/slice-error' into 'master'
fix booking not found bug
See merge request CIEFWorldwideSdnBhd/exchange!114
|
2018-08-13 07:10:26 +00:00 |
|
|
Jack Goh
|
a68095f203
|
fix booking not found bug
|
2018-08-13 15:04:36 +08:00 |
|
|
Jack Goh
|
a938aab8fe
|
Merge branch 'fix/frontend-marking' into 'master'
fix marking bug - when typing chinese
See merge request CIEFWorldwideSdnBhd/exchange!112
|
2018-08-13 06:09:28 +00:00 |
|
|
Jack Goh
|
92fe8d99f7
|
fix bankslip aprrove bug
|
2018-08-13 12:22:26 +08:00 |
|
|
Jack Goh
|
2910a9037a
|
fix upload user bankslip error
|
2018-08-13 12:18:44 +08:00 |
|
|
Jack Goh
|
796e8bf6df
|
fix marking bug - when typing chinese
|
2018-08-13 12:07:15 +08:00 |
|
|
Jack Goh
|
91c0bec289
|
added bank name and bank branch to booking calcualation
|
2018-08-13 11:36:26 +08:00 |
|
 lonetrinity
|
326ef7dd5f
|
fix/mergeConflicts
|
2018-08-11 10:30:16 +08:00 |
|
|
lonetrinity
|
98db669a64
|
fix/discussionResolved
|
2018-08-11 10:23:15 +08:00 |
|
|
lonetrinity
|
3f38fef845
|
fixPaginationAdmin_and_user
|
2018-08-10 17:45:01 +08:00 |
|
|
Jack Goh
|
de0c9fabc4
|
update send reset link success message
|
2018-08-09 16:16:45 +08:00 |
|
|
Jack Goh
|
9b78b8c669
|
temporary fix bank_branch not null
|
2018-08-09 15:04:03 +08:00 |
|
|
Jack Goh
|
114aab975b
|
fix forgot-password
|
2018-08-09 14:37:47 +08:00 |
|
|
Jack Goh
|
594c6a74fe
|
fix admin x2 status track
|
2018-08-08 17:11:08 +08:00 |
|
|
Jack Goh
|
06bacfcaf9
|
fixed x2 status for user side
|
2018-08-08 16:31:35 +08:00 |
|
|
lonetrinity
|
97f7041459
|
fix/adminBookingTableComplete
|
2018-08-08 11:55:14 +08:00 |
|
|
lonetrinity
|
63f8584455
|
fix/adminbookingcompletetable
|
2018-08-08 11:48:03 +08:00 |
|
|
Jack Goh
|
f5809e8c8b
|
fix billing charge for x2 to 0
|
2018-08-08 10:19:21 +08:00 |
|
|
lonetrinity
|
80d90d680b
|
fix display booking complete table
|
2018-08-07 19:14:25 +08:00 |
|
|
Jack Goh
|
b0557c220c
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci
# Conflicts:
# public/mix-manifest.json
|
2018-08-07 12:44:13 +08:00 |
|
|
lonetrinity
|
8ad9966695
|
display completed table
|
2018-08-03 18:15:37 +08:00 |
|
|
lonetrinity
|
93cc423091
|
categorise multitable/lingges
|
2018-08-02 18:02:05 +08:00 |
|
|
Jack Goh
|
0a672eda6e
|
change test db connection to mysql
|
2018-08-02 12:22:02 +08:00 |
|
|
Jack Goh
|
beb0cb8cd4
|
fix middleware not found
|
2018-08-01 16:25:28 +08:00 |
|
|
Jack Goh
|
f789127c57
|
added bank branch to supplier booking report
|
2018-07-31 17:01:40 +08:00 |
|
|
Jack Goh
|
3f37b50c5c
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci
# Conflicts:
# app/Http/Controllers/BookingController.php
# app/Http/Kernel.php
# composer.lock
|
2018-07-31 16:30:26 +08:00 |
|
|
Jack Goh
|
cc2539d44c
|
update max upload file size to 10mb
|
2018-07-30 14:48:48 +08:00 |
|
|
Jack Goh
|
1d3b8c2af7
|
temporary fix register page
|
2018-07-30 13:49:35 +08:00 |
|
|
Jack Goh
|
727374abb8
|
added back rate in supplierbooking
changed back to 9000 in caddy server
|
2018-07-27 11:02:06 +08:00 |
|
|
Jack Goh
|
438d9fa602
|
temporary added po format link in upload po page
added back costing rate in supplier booking page
|
2018-07-27 10:53:20 +08:00 |
|
|
Jack Goh
|
f6cfd9a188
|
updat the login session to be 12 hours
fix status description not showing
update user booking confirmation china beneficiary acc into one row
|
2018-07-27 10:41:57 +08:00 |
|
 weiweitoo
|
91c37778dc
|
add load more pagination of notificaiton
|
2018-07-26 22:58:22 +08:00 |
|
|
Jack Goh
|
fcfecb83d3
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
# Conflicts:
# app/Http/Controllers/BookingController.php
# resources/assets/js/pages/home.vue
|
2018-07-26 15:50:49 +08:00 |
|
|
Jack Goh
|
fa049bfa7e
|
fixed incorrect calculation when storing booking
|
2018-07-26 15:15:18 +08:00 |
|
|
Jack Goh
|
665a4faa91
|
fix beneficiary name and acc number display on booking confirmation
|
2018-07-26 14:47:48 +08:00 |
|
|
Jack Goh
|
a06f57712d
|
fix user booking calculation
|
2018-07-26 12:26:34 +08:00 |
|
|
Jack Goh
|
4ae97df8c5
|
fixed term1 fixed charge bug
|
2018-07-26 11:42:17 +08:00 |
|
|
Jack Goh
|
8f7a4ee6b6
|
changed get active bank from backend instead of frontend
|
2018-07-26 11:22:03 +08:00 |
|
|
weiweitoo
|
2f63c27e67
|
Uodate store calculation
|
2018-07-26 11:06:28 +08:00 |
|
|
weiweitoo
|
74b84acf36
|
add time_interval feature in notification
|
2018-07-26 10:58:56 +08:00 |
|
|
Jack Goh
|
45e8ce8620
|
updated supplier calculation with latest format
|
2018-07-26 10:56:28 +08:00 |
|
|
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 |
|
|
weiweitoo
|
d9a818c05a
|
Fix notification frontend
|
2018-07-25 15:02:43 +08:00 |
|
|
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 |
|
|
lonetrinity
|
74e602836b
|
fix pagination for admin booking table
|
2018-07-24 14:10:31 +08:00 |
|
|
Jack Goh
|
017f70391e
|
fix admin completed order function not found error
|
2018-07-22 18:30:23 +08:00 |
|
|
Jack Goh
|
46b349b189
|
added order_no and payment_for in booking controller store function
|
2018-07-22 18:09:28 +08:00 |
|