cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-23 22:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
796 Commits 33 Branches 0 Tags
fix/slice-error
Commit Graph

122 Commits

Author SHA1 Message Date
Jack Goh b5c8688a56 fix unknow column when testing 2018-08-13 12:40:08 +08:00
Jack Goh 356b1e5267 remove complete order nav from admin 
updated name of the tab
 2018-08-13 12:27:55 +08:00
lonetrinity 326ef7dd5f fix/mergeConflicts 2018-08-11 10:30:16 +08:00
lonetrinity 385cd33211 resolved discussion 2018-08-10 18:15:55 +08:00
lonetrinity 3f38fef845 fixPaginationAdmin_and_user 2018-08-10 17:45:01 +08:00
Jack Goh a9b30e2bb9 added supplier booking report to complete page at admin side 2018-08-09 12:08:03 +08:00
Jack Goh 5eb1771ae1 added supplier booking report to upload china bankslip at admin side 2018-08-09 11:30:31 +08:00
Jack Goh 45391317ef added supplier booking report to upload invoice at admin side 2018-08-09 11:24:15 +08:00
Jack Goh 5d3ab327ca fix progress track bug for admin side 2018-08-09 10:50:59 +08:00
Jack Goh 2f3b9baf9b added x2 progress track 2018-08-09 10:44:21 +08:00
Jack Goh 594c6a74fe fix admin x2 status track 2018-08-08 17:11:08 +08:00
lonetrinity 63f8584455 fix/adminbookingcompletetable 2018-08-08 11:48:03 +08:00
Jack Goh f789127c57 added bank branch to supplier booking report 2018-07-31 17:01:40 +08:00
Jack Goh ec7964face fix credit setting error 2018-07-31 16:54:03 +08:00
Jack Goh 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
weiweitoo a707977ab2 fix bug 2018-07-27 17:44:32 +08:00
lonetrinity 78fbe3151c Fix_orderNo/RefNoPArt2 2018-07-27 17:35:10 +08:00
lonetrinity f1d49ef82c Fix-OrderNo/RefNo 2018-07-27 17:24:37 +08:00
lonetrinity 05757911b1 Lingges/Fix_no_refNo 2018-07-27 11:30:19 +08:00
Jack Goh ba45091cf7 removed logo in supplier report 2018-07-27 11:19:10 +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
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 8f7a4ee6b6 changed get active bank from backend instead of frontend 2018-07-26 11:22:03 +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 336e5e4ed3 create notification for each step done. Make unread message bold. 2018-07-25 10:05:18 +08: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 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
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
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
weiweitoo 4bb40e3643 display china beneficiary information in all order detail 2018-07-20 17:20:02 +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 37fdf32af1 fixed admin refresh button with loading 2018-07-19 10:11:31 +08:00
weiweitoo 6e849b6145 Show download button for non-preview able file in the complete page. 2018-07-18 23:53:04 +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
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
Mouhamed Lamine fb102df36c Fixed Merge Conflicts 2018-07-16 19:32:56 +08:00
Mouhamed Lamine d29d3c49eb Adding Completed Orders Link on Admin Nav Bar 2018-07-16 19:15:01 +08:00