From fbfe68c1c27ef1183f65f6002a7ef9bcf595e9f9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 21 Sep 2021 02:19:41 +0800 Subject: [PATCH 1/8] exchange user table seeder --- app/Models/Exchange/Company.php | 36 ++++++++++ app/Models/Exchange/Employee.php | 37 ++++++++++ app/Models/Exchange/User.php | 19 +++++ config/database.php | 20 +++++- .../seeders/CompanyEmployeesTableSeeder.php | 72 +++++++++++++++++++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 app/Models/Exchange/Company.php create mode 100644 app/Models/Exchange/Employee.php create mode 100644 app/Models/Exchange/User.php create mode 100644 database/seeders/CompanyEmployeesTableSeeder.php diff --git a/app/Models/Exchange/Company.php b/app/Models/Exchange/Company.php new file mode 100644 index 00000000..fc85080c --- /dev/null +++ b/app/Models/Exchange/Company.php @@ -0,0 +1,36 @@ +belongsToMany(User::class, (new Employee())->getTable(), 'company_id','user_id'); + } + +} + + + diff --git a/app/Models/Exchange/Employee.php b/app/Models/Exchange/Employee.php new file mode 100644 index 00000000..b310f078 --- /dev/null +++ b/app/Models/Exchange/Employee.php @@ -0,0 +1,37 @@ +HasMany(Company::class, 'company_id', 'id'); + } + + /** + * @return \Illuminate\Database\Eloquent\Relations\HasOne + **/ + public function user(): HasOne + { + return $this->hasOne(User::class, 'user_id', 'id'); + } +} diff --git a/app/Models/Exchange/User.php b/app/Models/Exchange/User.php new file mode 100644 index 00000000..cc102ba2 --- /dev/null +++ b/app/Models/Exchange/User.php @@ -0,0 +1,19 @@ +belongsToMany(Company::class, (new Employee())->getTable(), 'user_id', 'company_id'); + } +} diff --git a/config/database.php b/config/database.php index 4e8bc250..8b5c199f 100644 --- a/config/database.php +++ b/config/database.php @@ -82,7 +82,25 @@ return [ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], - + 'exchange_db' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE_EXCHANGE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET_IZYIM', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], 'pgsql' => [ 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php new file mode 100644 index 00000000..d0ce9739 --- /dev/null +++ b/database/seeders/CompanyEmployeesTableSeeder.php @@ -0,0 +1,72 @@ +assignEmployeeProcessor = $assignEmployeeProcessor; + } + + + /** + * Run the database seeds. + * + * @return void + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function run() + { + DB::beginTransaction(); + foreach(ExchangeCompany::all() as $company) { + + if($connection = CompanyConnection::where('invitee_reference', $company->reference)->first()){ + + $companyModule = $connection->invitee; + + if($companyModule->employees()->exists()) { + continue; + } + + $exchangeUser = $company->employees()->first(); + + $user = new User(); + $user->name = $exchangeUser->name; + $user->email = $exchangeUser->email; + $user->password = $exchangeUser->password; + $user->type = $exchangeUser->type; + $user->status = $exchangeUser->status; + + $user->save(); + + $Object = new EmploymentObject($companyModule, $user); + + $this->assignEmployeeProcessor->execute($Object); + } + + } + DB::commit(); + + + } + +} From c7b4b759821cf60d3439da4863e25b0c7f86ec8d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 21 Sep 2021 02:31:04 +0800 Subject: [PATCH 2/8] exchange user table seeder --- database/seeders/CompanyEmployeesTableSeeder.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php index d0ce9739..95c4a367 100644 --- a/database/seeders/CompanyEmployeesTableSeeder.php +++ b/database/seeders/CompanyEmployeesTableSeeder.php @@ -49,6 +49,10 @@ class CompanyEmployeesTableSeeder extends Seeder $exchangeUser = $company->employees()->first(); + if(User::where('email', '=', $exchangeUser->email)->get()){ + continue; + } + $user = new User(); $user->name = $exchangeUser->name; $user->email = $exchangeUser->email; From 1c5d8147908a09988aa3dbe6e951cd8d2c796ed5 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 21 Sep 2021 02:39:58 +0800 Subject: [PATCH 3/8] show claimed accounts in company profile --- .../companies/elements/CustomerProfileComponent.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index 59d0dd1e..6f1095fa 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -107,6 +107,13 @@ +
+
+
+ Claimed +
+
+
From 5b105caf0b113381799a79561fe79bbdf6f34d57 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 21 Sep 2021 02:50:48 +0800 Subject: [PATCH 4/8] show claimed accounts in company profile --- database/seeders/CompanyEmployeesTableSeeder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php index 95c4a367..89af1cf2 100644 --- a/database/seeders/CompanyEmployeesTableSeeder.php +++ b/database/seeders/CompanyEmployeesTableSeeder.php @@ -49,7 +49,8 @@ class CompanyEmployeesTableSeeder extends Seeder $exchangeUser = $company->employees()->first(); - if(User::where('email', '=', $exchangeUser->email)->get()){ + dd(User::where('email', '=', $exchangeUser->email)->count()); + if(User::where('email', '=', $exchangeUser->email)->count()){ continue; } From fd8d9bd0dbef804e0c5203d1b5627b50ac096db9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 21 Sep 2021 02:51:50 +0800 Subject: [PATCH 5/8] show claimed accounts in company profile --- database/seeders/CompanyEmployeesTableSeeder.php | 1 - 1 file changed, 1 deletion(-) diff --git a/database/seeders/CompanyEmployeesTableSeeder.php b/database/seeders/CompanyEmployeesTableSeeder.php index 89af1cf2..40473ed1 100644 --- a/database/seeders/CompanyEmployeesTableSeeder.php +++ b/database/seeders/CompanyEmployeesTableSeeder.php @@ -49,7 +49,6 @@ class CompanyEmployeesTableSeeder extends Seeder $exchangeUser = $company->employees()->first(); - dd(User::where('email', '=', $exchangeUser->email)->count()); if(User::where('email', '=', $exchangeUser->email)->count()){ continue; } From 65493e6c901ac62bfdf3dde5f93df02b6ac903d9 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 22 Sep 2021 14:14:47 +0800 Subject: [PATCH 6/8] invitation link registration --- .../CreateInvitedCustomerLogic.php | 105 ++++++++++++++++++ .../CreateInvitedCustomerController.php | 20 ++++ app/Http/Resources/CompanyResource.php | 2 + .../forms/InviteRegistrationFormComponent.vue | 101 +++++++++++++++++ .../RegistrationCheckEmailFormComponent.vue | 1 - .../forms/RegistrationFormComponent.vue | 1 - .../elements/CustomerProfileComponent.vue | 10 ++ .../inviteRegistrationFormValidation.js | 27 +++++ resources/assets/vue/general/mixins/guards.js | 5 +- .../assets/vue/general/mixins/stepNavi.js | 22 ---- .../pages/accounts/claim_business.blade.php | 23 ++++ routes/account.php | 1 + routes/web.php | 13 ++- 13 files changed, 300 insertions(+), 31 deletions(-) create mode 100644 app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php create mode 100644 app/Http/Controllers/Accounts/CreateInvitedCustomerController.php create mode 100644 resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue create mode 100644 resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js delete mode 100644 resources/assets/vue/general/mixins/stepNavi.js create mode 100644 resources/views/pages/accounts/claim_business.blade.php diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php new file mode 100644 index 00000000..ebd4587e --- /dev/null +++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateInvitedCustomerLogic.php @@ -0,0 +1,105 @@ + 'Created User', + 'message' => 'You have successfully created a new User' + ]; + } + + /** @var CreateUserProcessor */ + private $createUserProcessor; + + /** @var CreateContactProcessor */ + private $createContactProcessor; + + /** @var FetchesCompany */ + private $fetchesCompany; + + /** @var AssignEmployeeProcessor */ + private $assignEmployeeProcessor; + + /** @var AuthenticationProcessor */ + private $authenticationProcessor; + + + /** + * CreateInvitedCustomerLogic constructor. + * @param CreateUserProcessor $createUserProcessor + * @param CreateContactProcessor $createContactProcessor + * @param FetchesCompany $fetchesCompany + * @param AssignEmployeeProcessor $assignEmployeeProcessor + * @param AuthenticationProcessor $authenticationProcessor + */ + public function __construct(CreateUserProcessor $createUserProcessor, CreateContactProcessor $createContactProcessor, FetchesCompany $fetchesCompany, AssignEmployeeProcessor $assignEmployeeProcessor, AuthenticationProcessor $authenticationProcessor) + { + $this->createUserProcessor = $createUserProcessor; + $this->createContactProcessor = $createContactProcessor; + $this->fetchesCompany = $fetchesCompany; + $this->assignEmployeeProcessor = $assignEmployeeProcessor; + $this->authenticationProcessor = $authenticationProcessor; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\AccessUnauthorisedException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request): JsonResponse + { + /** @var Company $company */ + $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]); + + /** @var CompanyModule $companyModule */ + $companyModule = $company->companyModules()->first(); + + if($companyModule->employees()->exists()){ + throw new AccessForbiddenException('This company\'s account has been claimed by another user already!'); + } + + /** @var User $user */ + $user = $this->createUserProcessor->execute($request, RoleTypes::USER, !App::environment(['production']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION); + + $contactObject = new ContactObject($request->input('name'), $request->input('phone'), $request->input('contact_email'), $request->input('wechat_id')); + + $this->createContactProcessor->execute($contactObject, $company); + + $Object = new EmploymentObject($companyModule, $user); + + $this->assignEmployeeProcessor->execute($Object); + + return $this->response($this->authenticationProcessor->execute($request)); + } +} diff --git a/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php b/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php new file mode 100644 index 00000000..dce70e1e --- /dev/null +++ b/app/Http/Controllers/Accounts/CreateInvitedCustomerController.php @@ -0,0 +1,20 @@ +execute($request); + } +} \ No newline at end of file diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index 702319aa..cae286b9 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -11,6 +11,7 @@ use App\Models\CompanyModule; use App\Models\Currency; use App\Models\SegmentConstant; use Illuminate\Http\Resources\Json\JsonResource; +use Illuminate\Support\Facades\Crypt; class CompanyResource extends JsonResource { @@ -25,6 +26,7 @@ class CompanyResource extends JsonResource $companyModule = $this->companyModules()->where('type', '=', BusinessType::IMPORTER)->first(); return [ 'id' => $this->id, + 'hash_id' => Crypt::encryptString($this->id), 'name' => $this->name, 'reference' => $this->reference, 'type' => (int) $this->type, diff --git a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue new file mode 100644 index 00000000..9b8af5ea --- /dev/null +++ b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue @@ -0,0 +1,101 @@ + + diff --git a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue index e96c3f46..04a74241 100644 --- a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue @@ -38,7 +38,6 @@ \ No newline at end of file diff --git a/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js b/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js new file mode 100644 index 00000000..7879ff6d --- /dev/null +++ b/resources/assets/vue/general/mixins/accounts/validation/inviteRegistrationFormValidation.js @@ -0,0 +1,27 @@ +import { required, email, numeric, sameAs, requiredUnless, requiredIf } from "vuelidate/lib/validators"; +import authenticationHandler from '../authenticationHandler' +export default { + validations: { + parameters: { + name: { + required: required + }, + email: { + required: required, + email + }, + phone: { + required: required, + numeric + }, + password: { + required: required, + }, + password_confirmation: { + required: required, + sameAs: sameAs('password') + } + } + }, + mixins: [authenticationHandler] +} \ No newline at end of file diff --git a/resources/assets/vue/general/mixins/guards.js b/resources/assets/vue/general/mixins/guards.js index 18681e5d..ffa96e7d 100644 --- a/resources/assets/vue/general/mixins/guards.js +++ b/resources/assets/vue/general/mixins/guards.js @@ -5,7 +5,10 @@ export default { (this.$store.getters.isAuthenticated && !this.isProtectedRoute()&& this.isWithTokenRoute()) ? window.location.href = this.route('dashboard') : ''; }, isProtectedRoute(){ - const unprotectedRoutes = [this.route('login'), this.route('account.email.verification')]; + const unprotectedRoutes = [this.route('login'), this.route('account.email.verification'), this.route('company.claim')]; + if(window.location.href.indexOf(this.route('company.claim')) === 0) { + return false; + } return !unprotectedRoutes.includes(window.location.href); }, isWithTokenRoute(){ diff --git a/resources/assets/vue/general/mixins/stepNavi.js b/resources/assets/vue/general/mixins/stepNavi.js deleted file mode 100644 index a3c05a0d..00000000 --- a/resources/assets/vue/general/mixins/stepNavi.js +++ /dev/null @@ -1,22 +0,0 @@ -export default { - methods: { - changeStep(direction) { - this.status.direction = direction; - - if (direction === 'next') { - - if (this.validate()) { - //this.step += 1; - this.status.email = this.parameters.email; - this.$emit('updateStatus', this.status); - } - return; - } - this.$emit('updateStatus', this.status); - this.$v.$reset(); - }, - }, - beforeDestroy: function (event) { - }, - -} \ No newline at end of file diff --git a/resources/views/pages/accounts/claim_business.blade.php b/resources/views/pages/accounts/claim_business.blade.php new file mode 100644 index 00000000..645b8e5f --- /dev/null +++ b/resources/views/pages/accounts/claim_business.blade.php @@ -0,0 +1,23 @@ +@extends('layouts.base_login') + +@section('inner_content') +
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
+@endsection \ No newline at end of file diff --git a/routes/account.php b/routes/account.php index 7a9e08df..ff6a9960 100644 --- a/routes/account.php +++ b/routes/account.php @@ -5,6 +5,7 @@ use Illuminate\Support\Facades\Route; Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account.'], function () { Route::post('/registration', 'CreateCustomerController@create')->name('registration.register'); + Route::post('/invite/registration', 'CreateInvitedCustomerController@create')->name('registration.invite.register'); Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () { Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () { diff --git a/routes/web.php b/routes/web.php index 2eb2bcbb..0e1b6593 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6,6 +6,7 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob; use App\Classes\Jobs\FetchPackingListFromVTPortalJob; use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob; use App\Models\CompanyConnection; +use Illuminate\Support\Facades\Crypt; use Illuminate\Support\Facades\Route; /* @@ -21,9 +22,9 @@ use Illuminate\Support\Facades\Route; require __DIR__ . '/template.php'; -Route::get('/', function () { - return view('welcome'); -}); +Route::get('', function () { + return view('pages.accounts.login'); +})->name('login'); Route::group(['prefix' => 'swagger'], function () { Route::get('/', function () { @@ -34,9 +35,9 @@ Route::group(['prefix' => 'swagger'], function () { }); }); -Route::get('', function () { - return view('pages.accounts.login');//temporary showing welcome page. -})->name('login'); +Route::get('/business/claim/{hash}', function ($hash) { + return view('pages.accounts.claim_business', ['id' => Crypt::decryptString($hash)]); +})->name('company.claim'); Route::get('/account/email/verification/{token}', function ($token) { return view('pages.accounts.email_verified', ['token' => $token]); From a8e26c4dd6bd2f81ce29b63c5f7368d1c4a53100 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 22 Sep 2021 14:20:50 +0800 Subject: [PATCH 7/8] invitation link registration --- .../components/companies/elements/CustomerProfileComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index b0e28553..b68875d3 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -41,7 +41,7 @@
-
Account Owner
+
Email Address
{{item.employee.email}}
From 8039446db56715f6686b29b352081d5784801e6d Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 22 Sep 2021 14:57:29 +0800 Subject: [PATCH 8/8] tooltip for copying invitation link --- .../companies/elements/CustomerProfileComponent.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index b68875d3..af3e0e7c 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -112,7 +112,7 @@
Claimed
-
+
Invitation Link
@@ -126,9 +126,16 @@ import componentHandler from '../../../general/mixins/componentHandler'; export default { methods: { - copyUrl() { + copyUrl(event) { this.$refs.invitationLink.select(); document.execCommand('copy'); + + $(this.$refs.copyButton).tooltip({ + title: 'Url Copied To Clipboard!', + placement: 'left', + delay: 1000 + }); + $(this.$refs.copyButton).tooltip('show'); } }, mixins: [componentHandler]