omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
796 Commits 28 Branches 0 Tags
fix/slice-error
Commit Graph

146 Commits

Author SHA1 Message Date
Too 3752de2347 Add setting malaysia bank seeder 2018-07-06 14:07:07 +08:00
Too 36917cbd60 add malaysia bank page and integrate it with backend 2018-07-06 13:12:18 +08:00
Too 38515c055b Add setting malaysia bank table and controller 2018-07-05 19:10:17 +08:00
Jack Goh 503e3aec5b added marking to user table 
added marking on registration
 2018-07-05 17:56:49 +08:00
Jack Goh 07c4f9ed92 fixed register issue 2018-07-05 13:37:00 +08:00
Jack Goh d5c7597307 added back name field to user table 
fixed unable to login issue
 2018-07-05 13:27:38 +08:00
Jack Goh 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
Mouhamed Lamine 0f9a9581fd Removing gitignore mess 2018-07-04 15:14:55 +08:00
Mouhamed Lamine 43306d8c36 Uploaded Images made responsive 2018-07-04 15:06:44 +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 35dfa58a14 Merge branch 'fix/bug' into 'master' 
Fix/bug

See merge request CIEFWorldwideSdnBhd/exchange!55
 2018-07-04 03:13:33 +00:00
Jack Goh 9ae80ed013 fix migration down database integrity contraints 2018-07-04 10:56:43 +08:00
Mouhamed Lamine 3d9e7054d7 Final changes 2018-07-03 18:14:45 +08:00
Jack Goh 4da5cfd7be added relationship between marking and user 
added billing_amount and salestax_amount to supplierbooking table
 2018-07-03 09:58:06 +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
Jack Goh 647c42a30e renamed booking supplier book_id to booking_id 
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
 2018-07-02 21:26:12 +08:00
Too 2c2c3928e9 remove username from controller and migration 2018-07-02 10:31:42 +08:00
Jack Goh eec356f22d fix wrong timeout 
fix seeder info to newer info
 2018-06-30 10:29:03 +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
Mohd Arief 651f762237 update confirmation and transfer page 
- update booking controller
 2018-06-28 15:40:27 +08:00
Jack Goh 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
Too 7fc0696099 fix conflit 2018-06-28 12:45:02 +08:00
Jack Goh 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
Too 206a637a88 Add test for setting supplier 2018-06-27 23:34:35 +08:00
Jack Goh cea2857d0f added booking foreign key to china bankslip 
updated upload china bankslip routes
 2018-06-27 16:16:48 +08:00
Jack Goh 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
Jack Goh f078be408d fix migration errors 2018-06-27 10:09:06 +08:00
Jack Goh 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
Jack Goh 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
Too 436b284a3b Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table 2018-06-26 22:23:10 +08:00
Too fdcaa31ffe Add upload file maxsize checking in booking controller 2018-06-26 21:39:24 +08:00
Nazri Hamzah a17a692549 fix conflict 2018-06-26 18:23:00 +08:00
Nazri Hamzah acfd8eeb48 supplier booking (multiple booking removed) 2018-06-26 18:17:38 +08:00
Jack Goh 2023050218 fix conflict 2018-06-26 14:44:48 +08:00
Jack Goh 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue
 2018-06-26 14:43:53 +08:00
Jack Goh 41a265e1a0 Merge branch 'too/ETA' into 'master' 
Too/eta

See merge request CIEFWorldwideSdnBhd/exchange!31
 2018-06-26 06:32:48 +00:00
Too dec9ba9405 fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller 2018-06-26 12:28:17 +08:00
Too a498d370cf remove eta from booking 2018-06-26 12:21:53 +08:00
Too 428660a91d Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA 2018-06-26 12:19:52 +08:00
Too c6ef6219a3 fix conflit 2018-06-26 12:19:08 +08:00
Too 0a6bd2c405 Add eta 2018-06-26 12:17:12 +08:00
Too f31f39caec Add seeder and test for setting_credit 2018-06-26 11:47:48 +08:00
Too ec6db69373 Add ETA for booking table 2018-06-26 11:28:53 +08:00
Too 3129da5df4 get_time_limit 2018-06-25 18:16:20 +08:00
Jack Goh ffe1023bba added credit limit seeder, it causes error when creating booking 2018-06-25 17:48:51 +08:00
Jack Goh 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
 2018-06-25 16:57:20 +08:00
Jack Goh 2c6128c564 changed admin status default to 1 
added show one booking for admin
added booking details for verification page
 2018-06-25 16:41:31 +08:00
Too 9aea239c52 add handle for exceed credit limit 2018-06-25 16:03:24 +08:00
Jack Goh bc49e39df7 added admin status to booking table 
updated admin progress track steps
added dummy template in admin booking
 2018-06-22 12:31:51 +08:00