65c65ef257
Fix calculation
2018-07-20 21:47:23 +08:00
21c13d3e60
change billingcharge rate and tax rate table to double. Modify Customer calculation table
2018-07-20 21:16:36 +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
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
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +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
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
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
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
6c1cd5500a
added credit limit exceed check
2018-07-03 18:12:40 +08:00
2726d8c71d
git pull origin master
2018-07-02 23:25:49 +08:00
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
b26c6a68da
Merge conflict fix
2018-07-02 14:58:27 +08:00
9d3e08889c
fix booking status on upload invoice
2018-06-30 10:51:05 +08:00
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
eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
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
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
30a210324e
booking confirm error
2018-06-29 18:21:08 +08:00
b212858eba
commit before pull
2018-06-29 18:10:12 +08:00
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
9d0aadb5c3
added reject reason response for getting booking
...
updated bankslip reject screen for user
2018-06-29 15:37:44 +08:00
0544e23ee6
fix timeout for rejected user bankslip
...
fix is_rejected able to accept again
2018-06-29 15:21:27 +08:00
691bd1c91a
updated reject booking status
...
added reject reason on verification page
2018-06-29 11:05:27 +08:00
722dbacd00
updated home frontend to cope with pagination
2018-06-28 16:15:10 +08:00
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
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
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
651f762237
update confirmation and transfer page
...
- update booking controller
2018-06-28 15:40:27 +08:00
6d2c83d912
temporary added default amount value
...
fixed no file detected bug
2018-06-28 15:38:15 +08:00
4e448afc60
added relationship for invoice and booking
...
added confirm invoice feature (after user upload the image)
2018-06-28 15:22:25 +08:00
105b61eab3
fixed retrive po path in booking controller
...
updated chinabankslip error message to be more clear
fixed supplier booking report loading button
updated upload invoice frontend to show user po image
2018-06-28 15:07:41 +08:00
0cf92b9936
added confirmSupplier booking
...
removed droptable due to database contraints issue
fixed rename booking foreight key in po table issue
added supplierstable seeder
updated supplierreport frontend
updated upload po frontend
2018-06-28 14:46:30 +08:00
4ba48abf1a
Merge branch 'master' into 'too/bookingpagination'
...
# Conflicts:
# routes/api.php
2018-06-28 06:17:17 +00:00
7fc0696099
fix conflit
2018-06-28 12:45:02 +08:00
d054703170
fix wrong status for user after book supplier
2018-06-28 12:13:09 +08:00
ee7fe28f74
added new status for user tracking nav bar
...
fixed top nav for admin only
2018-06-28 12:08:12 +08:00
1d740a08ea
added waiting invoice and po frontend
2018-06-28 10:33:00 +08:00
2b4ddadfcb
rename book_id in po table to booking_id to perform ORM relantionship
...
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
24f6273028
added booking pagination. (havent write test)
2018-06-28 00:06:23 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
cc86e2272b
updated get booking status for admin
2018-06-27 17:15:04 +08:00
edc3dbaa35
fixed upload chinabankslip
...
removed unused code in bookingcontroller
updated upload chinabankslip frontend
moved some routes into authenticated route list
2018-06-27 16:01:52 +08:00
b7f258f6a9
refactor BookingsupplierController
...
fix booking supplier model
updated fields for bookg supplier frontend
2018-06-27 10:30:01 +08:00
d362d947a3
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-27 09:56:35 +08:00
c59aac1e4d
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00:00
fdcaa31ffe
Add upload file maxsize checking in booking controller
2018-06-26 21:39:24 +08:00
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
fd03f5b248
updated approvebankslip booking not found
...
updated update status upon userbankslip approved
updated update status upon userbankslip rejected
updated supplier index to display value and label for input select
updated supplierBooking frontend
completed booking accept and reject integration
2018-06-26 17:40:44 +08:00
weiweitoo
Jack Goh
Mouhamed Lamine
Mohd Arief
Nazri Hamzah