Commit Graph

52 Commits

Author SHA1 Message Date
edmondlang 05b1aedda5 Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
#	app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
#	app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
#	app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
#	app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
#	app/Classes/Modules/Segments/Services/CreatesSegment.php
#	app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
#	app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
#	app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
#	app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
#	app/Http/Controllers/Announcements/ListAnnouncementsController.php
#	app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
#	app/Http/Controllers/Announcements/UpdateAnnouncementController.php
#	app/Http/Controllers/Segments/CreateSegmentController.php
#	app/Http/Controllers/Segments/DeleteSegmentController.php
#	routes/announcement.php
#	routes/api.php
#	routes/segment.php
#	routes/web.php
2022-02-09 21:09:17 +08:00
omair saleh 799936fd8b debug loaded container job 2021-12-07 11:55:05 +08:00
omair saleh da52ddd3ac Merge branch 'cross-login' into 'master'
Cross login

See merge request CIEFWorldwideSdnBhd/shipping-portal!75
2021-10-25 05:54:01 +00:00
Fairuz 63aae14b28 Shipping Cost Calculations 2021-10-18 10:04:33 +08:00
glovetleong 05cb3dd35e cross login 2021-10-13 14:10:32 +08:00
glovetleong ee77fd236a cross login 2021-09-29 14:23:50 +08:00
glovetleong 31105cfcef Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into cross-login 2021-09-28 22:09:05 +08:00
glovetleong 5d34201579 pull 2021-09-28 22:07:19 +08:00
glovetleong f385407804 debug 2021-09-28 12:07:05 +08:00
omair saleh 65493e6c90 invitation link registration 2021-09-22 14:14:47 +08:00
omair saleh 2be9a3dcfe remove logger from logout logic 2021-09-15 18:26:54 +08:00
glovetleong 0554cc895f checkout 2021-09-05 12:55:11 +08:00
omair saleh 5083ee83ad disable email verification temp 2021-09-01 15:55:15 +08:00
omair saleh 8363b8ca10 debug registration 2021-09-01 15:54:30 +08:00
omair saleh 0a89451889 debug registration 2021-09-01 15:33:34 +08:00
omair saleh 59730e21d2 debug registration 2021-09-01 15:32:35 +08:00
omair saleh 3887512721 debug registration 2021-09-01 15:29:35 +08:00
omair saleh e11cc64f89 debug registration 2021-09-01 15:27:47 +08:00
omair saleh 5ca3a927c1 debug registration 2021-09-01 15:26:07 +08:00
omair saleh 4246795e14 debug registration 2021-09-01 15:24:29 +08:00
omair saleh d0a9f1aa9f debug registration 2021-09-01 15:23:54 +08:00
omair saleh e8a7812583 debug registration 2021-09-01 15:23:19 +08:00
omair saleh c651b6ca09 debug registration 2021-09-01 15:22:28 +08:00
omair saleh 14cbcfd6f5 large commit 2021-08-18 06:02:14 +08:00
omair saleh d8c767c670 Large commit 2021-08-16 08:59:43 +08:00
omair saleh 8c4bac81e6 General fixes to table design, added state and district seeder for china, made changes to create order process, and ui and vue js components changes for registration, dashboard and registration 2021-08-14 09:28:36 +08:00
omair saleh dfbfd04d31 registration ui fixes, and clean up header menu and footer 2021-08-02 12:08:30 +08:00
omair saleh ea9955c269 Merge remote-tracking branch 'origin/master' 2021-07-30 21:23:59 +08:00
omair saleh 41d59d9a80 fix migration files and add admin user seeder 2021-07-30 21:23:43 +08:00
weichien00 3e8265fe3a update: return company_module_id after login success. 2021-07-30 14:45:45 +08:00
weichien00 0dc68cea5a update: return number of order when login. 2021-07-30 14:26:11 +08:00
weichien00 40af7bb690 fix: add missing class. 2021-07-26 15:04:51 +08:00
weichien00 d254b56629 fix: include business_type for company_module process in create_customer logic. 2021-07-13 22:23:56 +08:00
weichien00 14e35e2110 update: changes on Account Module based on changes #6 2021-07-08 01:59:09 +08:00
weichien00 56c42fe8f9 update: createCustomerLogic - add upload identity document processor. related #5 2021-07-03 00:59:25 +08:00
weichien00 42b58ce68c new:[user apis]add classes required for update user API #3 2021-06-27 01:13:23 +08:00
weichien00 d1065f0f39 new:[user apis]add classes required to delete a user API #3 2021-06-27 00:49:30 +08:00
weichien00 8697fb7a18 new:[user apis]add classes required to create admin user API #3 2021-06-27 00:41:06 +08:00
weichien00 eaa0b2d382 new:[user apis]add classes required to fetch a user API #3 2021-06-27 00:08:02 +08:00
weichien00 570fd257bf new:[User apis]add classes required for user listing API #3 2021-06-27 00:05:09 +08:00
weichien00 7beead2300 new:[authentication apis]add classes required for resend verification email API #2 2021-06-26 18:45:58 +08:00
weichien00 ce4b45708d new:[authentication apis]add classes required for email verification API #2 2021-06-26 18:30:35 +08:00
weichien00 116248b346 new:[authentication apis]add classes required for password reset API #2 2021-06-26 18:19:54 +08:00
weichien00 9248592417 new:[authentication apis]add classes required for request password reset API #2 2021-06-26 18:04:30 +08:00
weichien00 38cccef2fd new:[authentication apis]add classes required for refresh token API #2 2021-06-26 17:16:01 +08:00
weichien00 3426d6b157 new:[authentication apis]add classes required for logout API #2 2021-06-26 03:45:00 +08:00
weichien00 287e72e714 new: [authentication apis]add classes required for login API #2 2021-06-26 02:46:08 +08:00
weichien00 9821c0e306 new: [authentication apis]add classes required for check email API #2 2021-06-26 02:39:41 +08:00
weichien00 dda0879db2 new: add class required to authenticate user after registration success. #1 2021-06-26 00:55:01 +08:00
weichien00 0e1ea69515 new :add classes required to send verification email after user registered. #1 2021-06-26 00:36:37 +08:00