d38d801638
Showing Completed Orders Task Done
2018-07-11 16:24:55 +08:00
a35e4fd3c8
Showing Completed Orders To Admin
2018-07-10 15:32:22 +08:00
b48f3c8b1d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
...
# Conflicts:
# package-lock.json
# vendor/composer/autoload_static.php
2018-07-05 14:07:37 +08:00
33ca8471c0
fix inline update rate dialog
2018-07-05 13:39:28 +08:00
d5c7597307
added back name field to user table
...
fixed unable to login issue
2018-07-05 13:27:38 +08:00
560035be09
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
...
# Conflicts:
# package-lock.json
# package.json
# resources/assets/js/pages/settings/admin-supplier.vue
# vendor/composer/autoload_static.php
2018-07-05 11:52:38 +08:00
1793a2ac8d
changed client to axios in supplier setting
2018-07-05 11:43:42 +08:00
080851675c
integrate index in suplier page
2018-07-04 13:31:10 +08:00
678197d40a
fix conflit
2018-07-04 11:19:33 +08:00
7a0d11247d
integrate add setting supplier
2018-07-04 11:17:29 +08:00
d18deb2866
git pull origin master
2018-07-03 23:19:42 +08:00
fca8b7fccf
reset from master
2018-07-03 23:17:29 +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
884b8b4099
Error handling done for the whole process
2018-07-03 15:20:30 +08:00
699827184d
Resolved merge conflict
2018-07-03 11:25:42 +08:00
48f9a56230
Commit before pull
2018-07-03 10:43:29 +08:00
4da5cfd7be
added relationship between marking and user
...
added billing_amount and salestax_amount to supplierbooking table
2018-07-03 09:58:06 +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
bd55d385f7
successfully integrated canvas to vuejs
2018-07-02 18:26:02 +08:00
09181b22ee
completed the pagination function for user booking list
2018-07-02 15:27:47 +08:00
5237f4d94c
git pull origin master
2018-07-01 01:00:11 +08:00
5151f9163f
Register page, add marking input. Register page, change text to icon. Register page, add password visibility toggle function.
2018-07-01 00:56:21 +08:00
71e6c3358f
added reject reason dialog
2018-06-29 10:59:41 +08:00
fe07b7cd64
first commit
2018-06-28 22:26:06 +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
ee7fe28f74
added new status for user tracking nav bar
...
fixed top nav for admin only
2018-06-28 12:08:12 +08:00
534ad41fd3
fix conflict
2018-06-27 17:25:11 +08:00
d1ce576109
changed model from bookingsupplier to supplier booking
...
fix supplier booking controller
make payment method nullable for supplier booking
2018-06-27 12:01:49 +08:00
f078be408d
fix migration errors
2018-06-27 10:09:06 +08:00
acfd8eeb48
supplier booking (multiple booking removed)
2018-06-26 18:17:38 +08:00
6a025a6bac
Fix conflit of variable name with master branch.
2018-06-19 13:32:09 +08:00
4a4e147072
fix running routes:cache error
...
fix UserBankSlip class not found
fix undefined book_id
added loading when confirm booking
added confirm booking success redirect with correct page
added error handling for upload user bankslip
completed upload user bankslip flow
2018-06-18 22:37:33 +08:00
3d7016281b
fix loading button after get calculation
2018-06-18 10:26:29 +08:00
3060aa1c1f
Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye
2018-06-15 17:13:53 +08:00
0ca14574d4
fix conflit
2018-06-14 23:49:27 +08:00
fb944428a5
fix conflit
2018-06-14 23:46:39 +08:00
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
83dfca2ae1
fix conflit
2018-06-14 16:02:33 +08:00
5ce817cd33
remove duplicate getting banksli_url. add user bank slip into database in uploadbankslip. save image_url in uploadpurchaseorder
2018-06-14 15:08:00 +08:00
87442520a9
Fix test
...
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
# Conflicts:
# app/Http/Controllers/BookingController.php
# vendor/composer/autoload_classmap.php
# vendor/composer/autoload_static.php
2018-06-13 15:57:08 +08:00
84019bace1
ignore some vendorfiles
2018-06-13 14:44:41 +08:00
90fcbcda73
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
...
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# vendor/composer/autoload_classmap.php
# vendor/composer/autoload_static.php
2018-06-13 14:43:30 +08:00
ec4d72c316
solve merge conflict
2018-06-12 12:05:07 +08:00
65225369ca
Forgot Password
2018-06-08 18:13:36 +08:00
f405f461dd
fix view welcome not found
...
added env example
remove ignored files
2018-06-07 17:05:28 +08:00
4210cdc19d
upload purchase order
2018-05-28 17:24:13 +08:00
5c1a4d28c4
customer booking bank slip
2018-05-28 10:58:40 +08:00
1b64a3d744
user-dashboard completed
2018-05-24 16:23:06 +08:00
Mouhamed Lamine
Jack Goh
Nazri Hamzah
Too
Mohd Arief