27dce5b114
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug2
...
# Conflicts:
# public/mix-manifest.json
2018-07-28 09:54:39 +08:00
a707977ab2
fix bug
2018-07-27 17:44:32 +08:00
78fbe3151c
Fix_orderNo/RefNoPArt2
2018-07-27 17:35:10 +08:00
f1d49ef82c
Fix-OrderNo/RefNo
2018-07-27 17:24:37 +08:00
05757911b1
Lingges/Fix_no_refNo
2018-07-27 11:30:19 +08:00
ba45091cf7
removed logo in supplier report
2018-07-27 11:19:10 +08:00
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
91c37778dc
add load more pagination of notificaiton
2018-07-26 22:58:22 +08:00
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
8f7a4ee6b6
changed get active bank from backend instead of frontend
2018-07-26 11:22:03 +08:00
45e8ce8620
updated supplier calculation with latest format
2018-07-26 10:56:28 +08:00
293dfd6cd2
temporary commented out rate and transfer amount from supplier booking
2018-07-25 22:33:14 +08:00
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
336e5e4ed3
create notification for each step done. Make unread message bold.
2018-07-25 10:05:18 +08:00
978df88b0a
fixTWo pagination for admin booking table
2018-07-24 14:15:01 +08:00
74e602836b
fix pagination for admin booking table
2018-07-24 14:10:31 +08:00
ae7bf422de
pagination for admin booking table
2018-07-24 12:30:03 +08:00
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
1b874d0800
Fix conflit
2018-07-21 01:43:10 +08:00
3e60ec8e86
fix conflit
2018-07-21 00:15:43 +08:00
c4962e4655
git pull origin master
2018-07-20 22:12:48 +08:00
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
4bb40e3643
display china beneficiary information in all order detail
2018-07-20 17:20:02 +08:00
ef200257b3
revert back changes during debug
2018-07-19 17:49:02 +08:00
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
a3717a19e2
complete orders/admin/refreshbutton
2018-07-19 16:16:27 +08:00
a322b8b798
fix unwanted line removal
2018-07-19 12:32:48 +08:00
fef401d76c
fix conflict
2018-07-19 12:20:54 +08:00
37fdf32af1
fixed admin refresh button with loading
2018-07-19 10:11:31 +08:00
6e849b6145
Show download button for non-preview able file in the complete page.
2018-07-18 23:53:04 +08:00
eda6aabecf
Fix filter
2018-07-18 17:31:11 +08:00
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
a35c07a794
Add admin page 1. show error when upload wrong file in upload po and invoice
2018-07-18 14:35:05 +08:00
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
fb102df36c
Fixed Merge Conflicts
2018-07-16 19:32:56 +08:00
d29d3c49eb
Adding Completed Orders Link on Admin Nav Bar
2018-07-16 19:15:01 +08:00
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
62e8a9b9b6
close loading only when all resource load finish
2018-07-12 22:59:16 +08:00
19ea22141e
dynamically show chinabank in supplier report
2018-07-12 22:42:16 +08:00
d38d801638
Showing Completed Orders Task Done
2018-07-11 16:24:55 +08:00
28a6f43b0a
Showing Completed Orders To Admin Done Except Making Table Sortable
2018-07-10 18:08:59 +08:00
a35e4fd3c8
Showing Completed Orders To Admin
2018-07-10 15:32:22 +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
0f9a9581fd
Removing gitignore mess
2018-07-04 15:14:55 +08:00
43306d8c36
Uploaded Images made responsive
2018-07-04 15:06:44 +08:00
3d9e7054d7
Final changes
2018-07-03 18:14:45 +08:00
b731226f18
Merge conflict saved
2018-07-03 16:53:34 +08:00
3aab1506c4
Merge branch 'feature/booking-refresh-button' into 'master'
...
added the refresh button
See merge request CIEFWorldwideSdnBhd/exchange!53
2018-07-03 08:17:02 +00:00
63e26622bd
added the refresh button
2018-07-03 16:11:50 +08:00
Jack Goh
weiweitoo
lonetrinity
Mouhamed Lamine
Mohd Arief