diff --git a/app/Console/Commands/ImportMigrations.php b/app/Console/Commands/ImportMigrations.php index a589634203ab..c09058cda827 100644 --- a/app/Console/Commands/ImportMigrations.php +++ b/app/Console/Commands/ImportMigrations.php @@ -127,7 +127,7 @@ class ImportMigrations extends Command $user = User::factory()->create([ 'account_id' => $account->id, 'email' => Str::random(10) . "@example.com", - 'confirmation_code' => $this->createDbHash(config('database.default')), + 'confirmation_code' => $this->createDbHash($company->db), ]); CompanyToken::unguard(); diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 464849ef70d8..4cb5ce6395d4 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -171,7 +171,7 @@ class SendRecurring implements ShouldQueue $this->recurring_invoice->invitations->each(function ($recurring_invitation) use($invoice){ $ii = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($invoice->company->db); $ii->invoice_id = $invoice->id; $ii->client_contact_id = $recurring_invitation->client_contact_id; $ii->save(); diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index ceb9a08215ec..495f3fecd78b 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -60,7 +60,7 @@ class CreateUser $user->account_id = $this->account->id; $user->password = $this->request['password'] ? bcrypt($this->request['password']) : ''; $user->accepted_terms_version = config('ninja.terms_version'); - $user->confirmation_code = $this->createDbHash(config('database.default')); + $user->confirmation_code = $this->createDbHash($this->company->db); $user->fill($this->request); $user->email = $this->request['email']; //todo need to remove this in production $user->last_login = now(); diff --git a/app/Listeners/Quote/CreateQuoteInvitation.php b/app/Listeners/Quote/CreateQuoteInvitation.php index fa71ba6440a2..9c5f08a25430 100644 --- a/app/Listeners/Quote/CreateQuoteInvitation.php +++ b/app/Listeners/Quote/CreateQuoteInvitation.php @@ -43,7 +43,7 @@ class CreateQuoteInvitation implements ShouldQueue if (! $invitation && $contact->send_credit) { $ii = QuoteInvitationFactory::create($quote->company_id, $quote->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($quote->company->db); $ii->quote_id = $quote->id; $ii->client_contact_id = $contact->id; $ii->save(); diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index cf37b1d3f141..2eada6f2bd11 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -277,7 +277,7 @@ class BaseRepository $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); $new_invitation->{$lcfirst_resource_id} = $model->id; $new_invitation->client_contact_id = $contact->id; - $new_invitation->key = $this->createDbHash(config('database.default')); + $new_invitation->key = $this->createDbHash($model->company->db); $new_invitation->save(); } diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index 85d9105b8b64..6e91d344cca7 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -70,7 +70,7 @@ class UserRepository extends BaseRepository } if (!$user->confirmation_code) { - $user->confirmation_code = $this->createDbHash(config('database.default')); + $user->confirmation_code = $this->createDbHash($company->db); } $user->account_id = $account->id; diff --git a/app/Services/Credit/CreateInvitations.php b/app/Services/Credit/CreateInvitations.php index 498ba051c99d..a4cca1d37b75 100644 --- a/app/Services/Credit/CreateInvitations.php +++ b/app/Services/Credit/CreateInvitations.php @@ -49,7 +49,7 @@ class CreateInvitations extends AbstractService if (! $invitation) { $ii = CreditInvitationFactory::create($this->credit->company_id, $this->credit->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($this->credit->company->db); $ii->credit_id = $this->credit->id; $ii->client_contact_id = $contact->id; $ii->save(); diff --git a/app/Services/Invoice/CreateInvitations.php b/app/Services/Invoice/CreateInvitations.php index 2f659f0d272d..7d7c6d7dad0a 100644 --- a/app/Services/Invoice/CreateInvitations.php +++ b/app/Services/Invoice/CreateInvitations.php @@ -51,7 +51,7 @@ class CreateInvitations extends AbstractService if (! $invitation && $contact->send_email) { $ii = InvoiceInvitationFactory::create($this->invoice->company_id, $this->invoice->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($this->invoice->company->db); $ii->invoice_id = $this->invoice->id; $ii->client_contact_id = $contact->id; $ii->save(); @@ -65,7 +65,7 @@ class CreateInvitations extends AbstractService $contact = $this->createBlankContact(); $ii = InvoiceInvitationFactory::create($this->invoice->company_id, $this->invoice->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($this->invoice->company->db); $ii->invoice_id = $this->invoice->id; $ii->client_contact_id = $contact->id; $ii->save(); diff --git a/app/Services/Quote/ConvertQuote.php b/app/Services/Quote/ConvertQuote.php index 12915ce54f24..77137f5c24a9 100644 --- a/app/Services/Quote/ConvertQuote.php +++ b/app/Services/Quote/ConvertQuote.php @@ -77,7 +77,7 @@ class ConvertQuote foreach($quote->invitations as $quote_invitation){ $ii = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($invoice->company->db); $ii->client_contact_id = $quote_invitation->client_contact_id; $invites[] = $ii; diff --git a/app/Services/Quote/CreateInvitations.php b/app/Services/Quote/CreateInvitations.php index e5da296d758c..2ef9fbb320c4 100644 --- a/app/Services/Quote/CreateInvitations.php +++ b/app/Services/Quote/CreateInvitations.php @@ -50,7 +50,7 @@ class CreateInvitations if (! $invitation && $contact->send_email) { $ii = QuoteInvitationFactory::create($this->quote->company_id, $this->quote->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($this->quote->company->db); $ii->quote_id = $this->quote->id; $ii->client_contact_id = $contact->id; $ii->save(); diff --git a/app/Services/Recurring/CreateRecurringInvitations.php b/app/Services/Recurring/CreateRecurringInvitations.php index ae2692214a6c..657bfa38c581 100644 --- a/app/Services/Recurring/CreateRecurringInvitations.php +++ b/app/Services/Recurring/CreateRecurringInvitations.php @@ -51,7 +51,7 @@ class CreateRecurringInvitations extends AbstractService if (! $invitation && $contact->send_email) { $ii = $this->invitation_factory::create($this->entity->company_id, $this->entity->user_id); - $ii->key = $this->createDbHash(config('database.default')); + $ii->key = $this->createDbHash($this->entity->company->db); $ii->{$this->entity_id_name} = $this->entity->id; $ii->client_contact_id = $contact->id; $ii->save();