83 Commits

Author SHA1 Message Date
weiweitoo d9a818c05a Fix notification frontend 2018-07-25 15:02:43 +08:00
weiweitoo 336e5e4ed3 create notification for each step done. Make unread message bold. 2018-07-25 10:05:18 +08:00
weiweitoo 563c0d42d7 Update UI and migration,seeder for notification. 2018-07-24 17:02:45 +08:00
weiweitoo c4962e4655 git pull origin master 2018-07-20 22:12:48 +08:00
weiweitoo 73c36dd8e3 Add setting for taxrate and billingcharge 2018-07-20 18:47:19 +08:00
weiweitoo 34bc7a43c6 Add CRUD for marking setting 2018-07-20 00:58:47 +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
weiweitoo 19ea22141e dynamically show chinabank in supplier report 2018-07-12 22:42:16 +08:00
weiweitoo 1535b54f04 revert back changes during debug 2018-07-12 01:09:49 +08:00
weiweitoo 39d5646155 dynamically show malaysia bank acc for booking step 2018-07-12 00:52:46 +08:00
Mouhamed Lamine d38d801638 Showing Completed Orders Task Done 2018-07-11 16:24:55 +08:00
Mouhamed Lamine a35e4fd3c8 Showing Completed Orders To Admin 2018-07-10 15:32:22 +08:00
weiweitoo 97453bb084 add marking setting page and integrate it 2018-07-09 20:47:55 +08:00
Too bb633916a2 revert back changes during debug 2018-07-08 01:57:19 +08:00
Too bddef7d16f make acc_no unique in malaysiabank and china bank. integrate active bank page. add seeder for beneficiares and active bank. add table setting_active_bank 2018-07-07 01:52:35 +08:00
Too 84fc15adce fix update and delete at settingmalaysiacontroller 2018-07-06 13:22:44 +08:00
Too 36917cbd60 add malaysia bank page and integrate it with backend 2018-07-06 13:12:18 +08:00
Jack Goh 0180694d72 gitignored autoload_classmap
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
Jack Goh c902c8db82 hide rate id from model
fixed DB not found in rate controller
2018-07-03 17:11:30 +08:00
Nazri Hamzah 94b664bb45 show current rate api 2018-06-30 16:13:26 +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 4e448afc60 added relationship for invoice and booking
added confirm invoice feature (after user upload the image)
2018-06-28 15:22:25 +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 06974f039b revert back changes during debug 2018-06-27 23:37:29 +08:00
Too 206a637a88 Add test for setting supplier 2018-06-27 23:34:35 +08:00
Jack Goh a5ea991a8d changed routes name for update china bankslip 2018-06-27 16:54:02 +08:00
Jack Goh addd89ceb8 added relantionship in chinabankslip model
added update chinabankslip feature
2018-06-27 16:37:48 +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 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
Jack Goh 544d414dee remove destroy function for bookingsupplier 2018-06-27 10:30:56 +08:00
Jack Goh 5f053577df removed viewCustomerBookingDetails, it was done in bookingController 2018-06-27 10:12:35 +08:00
Jack Goh 299597ed16 update book supplier routes to admin routes 2018-06-27 09:58:09 +08:00
Nazri Hamzah a17a692549 fix conflict 2018-06-26 18:23:00 +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
Jack Goh bf40262994 added admin booking list controller 2018-06-23 00:40:50 +08:00
Jack Goh aaf0decd97 removed amount from uploadpo
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
Too de45782ae3 fix conflit with master 2018-06-21 13:26:18 +08:00
Too db7e30ea95 add upload invoice and test 2018-06-21 13:15:36 +08:00
Jack Goh 385372e3dd added rate to booking table 2018-06-20 22:54:31 +08:00
Jack Goh a30fd2a0b1 added booking list controller 2018-06-20 22:21:45 +08:00
Jack Goh bc637adcab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
# Conflicts:
#	routes/api.php
2018-06-20 18:41:31 +08:00
Jack Goh 498fafd502 added booking lists controller and routes 2018-06-20 18:39:55 +08:00
Nazri Hamzah a7970e2d72 fix conflict 2018-06-20 17:17:22 +08:00
Too e3c104f902 Done checking marking before register user 2018-06-20 16:57:47 +08:00
Too b1843c0b9b Revert back unnessary changes during debug 2018-06-20 02:04:05 +08:00
Too 3f2d9fbfb8 Add controller and table for marking 2018-06-20 00:38:32 +08:00
Nazri Hamzah a5633b7754 supplier booking 2018-06-19 17:26:37 +08:00