cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 20:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
879 Commits 33 Branches 0 Tags
5cecb731f600c9cd8db5e596b3f31bf62691d823
Commit Graph

197 Commits

Author SHA1 Message Date
weiweitoo 2f63c27e67 Uodate store calculation 2018-07-26 11:06:28 +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 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
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
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
Jack Goh e2cf3fecdd fix term1 no service charge 
fix navbar extra </li>
 2018-07-20 11:12:20 +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
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 e868c99440 Added the track status thing 2018-07-16 19:26:09 +08:00
Mouhamed Lamine d29d3c49eb Adding Completed Orders Link on Admin Nav Bar 2018-07-16 19:15:01 +08:00
weiweitoo b21eaf4522 add new branch for booking flow for x2_chequeand x2_ba 2018-07-14 17:31:21 +08:00
Mouhamed Lamine d38d801638 Showing Completed Orders Task Done 2018-07-11 16:24:55 +08:00
Mouhamed Lamine 28a6f43b0a Showing Completed Orders To Admin Done Except Making Table Sortable 2018-07-10 18:08:59 +08:00
Mouhamed Lamine a35e4fd3c8 Showing Completed Orders To Admin 2018-07-10 15:32:22 +08:00
Jack Goh 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
Jack Goh 71e11fa034 added marking to admin booking index 
hide roles in user model
hide user from booking model
 2018-07-07 12:12:27 +08:00
Jack Goh 59fc234ea0 updated user has many booking to bookings 
added index booking with user marking
added turncate marking when seeding
added turncate settingmalaysiabank when seeding
added marking to user seeder
 2018-07-07 12:06:21 +08:00
Jack Goh 8798c83b97 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage 
# Conflicts:
#	package-lock.json
#	package.json
#	vendor/composer/autoload_static.php
#	yarn.lock
 2018-07-04 11:17:44 +08:00
Jack Goh 6c1cd5500a added credit limit exceed check 2018-07-03 18:12:40 +08:00
Too 2726d8c71d git pull origin master 2018-07-02 23:25:49 +08:00
Too c964e702a3 fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder. 2018-07-02 22:44:41 +08:00
Mouhamed Lamine b26c6a68da Merge conflict fix 2018-07-02 14:58:27 +08:00
Jack Goh 9d3e08889c fix booking status on upload invoice 2018-06-30 10:51:05 +08:00
Jack Goh 43809bc478 fix wrong update status on upload po 
fix validation message for upload china bankslip
removed get po api on upload invoice
 2018-06-30 10:47:35 +08:00
Jack Goh eec356f22d fix wrong timeout 
fix seeder info to newer info
 2018-06-30 10:29:03 +08:00
Jack Goh ca74cfae23 updated admin booking show function with user, china, po, invoice slip 
removed one step from admin tracking
integrated admin booking complete
changed admin complete order component name
 2018-06-29 19:18:54 +08:00
Jack Goh d80f048f5a added po and invoice into show booking return 
integrated complete page frontend
integrated po page frontend
integrated po complete page frontend
removed ETA for transfer page frontend
 2018-06-29 19:01:15 +08:00
Mouhamed Lamine 30a210324e booking confirm error 2018-06-29 18:21:08 +08:00
Mouhamed Lamine b212858eba commit before pull 2018-06-29 18:10:12 +08:00
Jack Goh 3d05dbb755 added chinabankslip return on show booking query 
updated upload po page with booking info, china bankslip and user bankslip
 2018-06-29 17:40:28 +08:00
Jack Goh 9d0aadb5c3 added reject reason response for getting booking 
updated bankslip reject screen for user
 2018-06-29 15:37:44 +08:00
Jack Goh 0544e23ee6 fix timeout for rejected user bankslip 
fix is_rejected able to accept again
 2018-06-29 15:21:27 +08:00
Jack Goh 691bd1c91a updated reject booking status 
added reject reason on verification page
 2018-06-29 11:05:27 +08:00
Jack Goh 722dbacd00 updated home frontend to cope with pagination 2018-06-28 16:15:10 +08:00
Jack Goh 536c67bbc6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice 
# Conflicts:
#	database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
#	database/seeds/DatabaseSeeder.php
 2018-06-28 15:55:58 +08:00
Jack Goh 265887f0d7 Merge branch 'integration/confirmation-n-transfer' into 'master' 
update confirmation and transfer page

See merge request CIEFWorldwideSdnBhd/exchange!42
 2018-06-28 07:51:03 +00:00
Jack Goh 385623f6a2 update status upon user upload purchase order 
fix admin complete page not found
fixed admin completed page tracking
 2018-06-28 15:49:46 +08:00
Mohd Arief 651f762237 update confirmation and transfer page 
- update booking controller
 2018-06-28 15:40:27 +08:00
Jack Goh 6d2c83d912 temporary added default amount value 
fixed no file detected bug
 2018-06-28 15:38:15 +08:00
Jack Goh 4e448afc60 added relationship for invoice and booking 
added confirm invoice feature (after user upload the image)
 2018-06-28 15:22:25 +08:00