From 8a985c69548d1ae0db63f684431e8eb86ed0e096 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 7 Jun 2021 11:06:31 +1000 Subject: [PATCH] Make all livewire components MultiDB aware --- app/Http/Livewire/CreditsTable.php | 8 ++++++++ app/Http/Livewire/DocumentsTable.php | 6 ++++++ app/Http/Livewire/InvoicesTable.php | 5 +++++ app/Http/Livewire/PayNowDropdown.php | 5 +++++ app/Http/Livewire/PaymentMethodsTable.php | 7 +++++++ app/Http/Livewire/PaymentsTable.php | 7 +++++++ app/Http/Livewire/QuotesTable.php | 10 ++++++++++ .../Livewire/RecurringInvoiceCancellation.php | 18 ++++++++++++++---- app/Http/Livewire/RequiredClientInfo.php | 8 +++++++- app/Http/Livewire/SubscriptionPlanSwitch.php | 5 +++++ .../SubscriptionRecurringInvoicesTable.php | 8 ++++++++ app/Http/Livewire/TasksTable.php | 8 ++++++++ .../portal/ninja2020/credits/index.blade.php | 2 +- .../portal/ninja2020/documents/index.blade.php | 2 +- .../portal/ninja2020/invoices/index.blade.php | 2 +- .../ninja2020/invoices/payment.blade.php | 2 +- .../portal/ninja2020/invoices/show.blade.php | 2 +- .../portal/ninja2020/layout/payments.blade.php | 2 +- .../ninja2020/payment_methods/index.blade.php | 2 +- .../portal/ninja2020/payments/index.blade.php | 2 +- .../portal/ninja2020/quotes/index.blade.php | 2 +- .../includes/modals/cancellation.blade.php | 2 +- .../recurring_invoices/index.blade.php | 2 +- .../ninja2020/subscriptions/index.blade.php | 2 +- .../ninja2020/subscriptions/switch.blade.php | 2 +- .../portal/ninja2020/tasks/index.blade.php | 2 +- 26 files changed, 104 insertions(+), 19 deletions(-) diff --git a/app/Http/Livewire/CreditsTable.php b/app/Http/Livewire/CreditsTable.php index 4ea703c2db..3d8713e0b7 100644 --- a/app/Http/Livewire/CreditsTable.php +++ b/app/Http/Livewire/CreditsTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Credit; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -24,6 +25,13 @@ class CreditsTable extends Component public $per_page = 10; + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + } + public function render() { $query = Credit::query() diff --git a/app/Http/Livewire/DocumentsTable.php b/app/Http/Livewire/DocumentsTable.php index 465effc984..f71cf116a4 100644 --- a/app/Http/Livewire/DocumentsTable.php +++ b/app/Http/Livewire/DocumentsTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Client; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -25,8 +26,13 @@ class DocumentsTable extends Component public $per_page = 10; + public $company; + public function mount($client) { + + MultiDB::setDb($this->company->db); + $this->client = $client; } diff --git a/app/Http/Livewire/InvoicesTable.php b/app/Http/Livewire/InvoicesTable.php index 783c832df5..2659f1fdd0 100644 --- a/app/Http/Livewire/InvoicesTable.php +++ b/app/Http/Livewire/InvoicesTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Invoice; use App\Utils\Traits\WithSorting; use Carbon\Carbon; @@ -26,8 +27,12 @@ class InvoicesTable extends Component public $status = []; + public $company; + public function mount() { + MultiDB::setDb($this->company->db); + $this->sort_asc = false; $this->sort_field = 'date'; diff --git a/app/Http/Livewire/PayNowDropdown.php b/app/Http/Livewire/PayNowDropdown.php index 440872077f..8ca1dfc77d 100644 --- a/app/Http/Livewire/PayNowDropdown.php +++ b/app/Http/Livewire/PayNowDropdown.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use Livewire\Component; class PayNowDropdown extends Component @@ -20,8 +21,12 @@ class PayNowDropdown extends Component public $methods; + public $company; + public function mount(int $total) { + MultiDB::setDb($this->company->db); + $this->total = $total; $this->methods = auth()->user()->client->service()->getPaymentMethods($total); diff --git a/app/Http/Livewire/PaymentMethodsTable.php b/app/Http/Livewire/PaymentMethodsTable.php index 3a6d9d14a7..8a37e71537 100644 --- a/app/Http/Livewire/PaymentMethodsTable.php +++ b/app/Http/Livewire/PaymentMethodsTable.php @@ -5,6 +5,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\ClientGatewayToken; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -16,10 +17,16 @@ class PaymentMethodsTable extends Component use WithSorting; public $per_page = 10; + public $client; + public $company; + public function mount($client) { + + MultiDB::setDb($this->company->db); + $this->client = $client; } diff --git a/app/Http/Livewire/PaymentsTable.php b/app/Http/Livewire/PaymentsTable.php index 0a41f98d4d..f9bd5991bd 100644 --- a/app/Http/Livewire/PaymentsTable.php +++ b/app/Http/Livewire/PaymentsTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Payment; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -23,11 +24,17 @@ class PaymentsTable extends Component use WithPagination; public $per_page = 10; + public $user; + public $company; + public function mount() { + MultiDB::setDb($this->company->db); + $this->user = auth()->user(); + } public function render() diff --git a/app/Http/Livewire/QuotesTable.php b/app/Http/Livewire/QuotesTable.php index c14847eccd..f697c965bf 100644 --- a/app/Http/Livewire/QuotesTable.php +++ b/app/Http/Livewire/QuotesTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Quote; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -23,8 +24,17 @@ class QuotesTable extends Component use WithPagination; public $per_page = 10; + public $status = []; + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + + } + public function render() { $query = Quote::query() diff --git a/app/Http/Livewire/RecurringInvoiceCancellation.php b/app/Http/Livewire/RecurringInvoiceCancellation.php index d3904c8743..06ade750d9 100644 --- a/app/Http/Livewire/RecurringInvoiceCancellation.php +++ b/app/Http/Livewire/RecurringInvoiceCancellation.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\RecurringInvoice; use Livewire\Component; @@ -22,6 +23,18 @@ class RecurringInvoiceCancellation extends Component */ public $invoice; + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + } + + public function render() + { + return render('components.livewire.recurring-invoice-cancellation'); + } + public function processCancellation() { if ($this->invoice->subscription) { @@ -31,8 +44,5 @@ class RecurringInvoiceCancellation extends Component return redirect()->route('client.recurring_invoices.request_cancellation', ['recurring_invoice' => $this->invoice->hashed_id]); } - public function render() - { - return render('components.livewire.recurring-invoice-cancellation'); - } + } diff --git a/app/Http/Livewire/RequiredClientInfo.php b/app/Http/Livewire/RequiredClientInfo.php index 2b51cacbb8..6c00e8d3ea 100644 --- a/app/Http/Livewire/RequiredClientInfo.php +++ b/app/Http/Livewire/RequiredClientInfo.php @@ -13,6 +13,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\ClientContact; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; @@ -65,7 +66,12 @@ class RequiredClientInfo extends Component public $show_form = false; - public function mount() {} + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + } public function handleSubmit(array $data): bool { diff --git a/app/Http/Livewire/SubscriptionPlanSwitch.php b/app/Http/Livewire/SubscriptionPlanSwitch.php index 9ad9f35dc6..3454e38330 100644 --- a/app/Http/Livewire/SubscriptionPlanSwitch.php +++ b/app/Http/Livewire/SubscriptionPlanSwitch.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\ClientContact; use App\Models\Subscription; use Illuminate\Support\Facades\Cache; @@ -71,8 +72,12 @@ class SubscriptionPlanSwitch extends Component */ public $hash; + public $company; + public function mount() { + MultiDB::setDb($this->company->db); + $this->total = $this->amount; $this->methods = $this->contact->client->service()->getPaymentMethods($this->amount); diff --git a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php index f5c0947593..59ef4d0280 100644 --- a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php +++ b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\RecurringInvoice; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -24,6 +25,13 @@ class SubscriptionRecurringInvoicesTable extends Component public $per_page = 10; + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + } + public function render() { $query = RecurringInvoice::query() diff --git a/app/Http/Livewire/TasksTable.php b/app/Http/Livewire/TasksTable.php index 9a741ed49d..9881ba3772 100644 --- a/app/Http/Livewire/TasksTable.php +++ b/app/Http/Livewire/TasksTable.php @@ -12,6 +12,7 @@ namespace App\Http\Livewire; +use App\Libraries\MultiDB; use App\Models\Task; use App\Utils\Traits\WithSorting; use Livewire\Component; @@ -24,6 +25,13 @@ class TasksTable extends Component public $per_page = 10; + public $company; + + public function mount() + { + MultiDB::setDb($this->company->db); + } + public function render() { $query = Task::query() diff --git a/resources/views/portal/ninja2020/credits/index.blade.php b/resources/views/portal/ninja2020/credits/index.blade.php index d75caf6ab9..b485339c7a 100644 --- a/resources/views/portal/ninja2020/credits/index.blade.php +++ b/resources/views/portal/ninja2020/credits/index.blade.php @@ -13,6 +13,6 @@ @section('body')
- @livewire('credits-table') + @livewire('credits-table', ['company' => $company])
@endsection \ No newline at end of file diff --git a/resources/views/portal/ninja2020/documents/index.blade.php b/resources/views/portal/ninja2020/documents/index.blade.php index 46435884c2..61fc9a6498 100644 --- a/resources/views/portal/ninja2020/documents/index.blade.php +++ b/resources/views/portal/ninja2020/documents/index.blade.php @@ -14,5 +14,5 @@ @csrf - @livewire('documents-table', ['client' => $client]) + @livewire('documents-table', ['client' => $client, 'company' => $company]) @endsection diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php index c7f685ce26..944886d785 100644 --- a/resources/views/portal/ninja2020/invoices/index.blade.php +++ b/resources/views/portal/ninja2020/invoices/index.blade.php @@ -20,6 +20,6 @@
- @livewire('invoices-table') + @livewire('invoices-table', ['company' => $company])
@endsection diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php index de057c8cce..2673b298d1 100644 --- a/resources/views/portal/ninja2020/invoices/payment.blade.php +++ b/resources/views/portal/ninja2020/invoices/payment.blade.php @@ -19,7 +19,7 @@
- @livewire('pay-now-dropdown', ['total' => $total]) + @livewire('pay-now-dropdown', ['total' => $total, 'company' => $company])
diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php index 047c23d990..ced84accce 100644 --- a/resources/views/portal/ninja2020/invoices/show.blade.php +++ b/resources/views/portal/ninja2020/invoices/show.blade.php @@ -47,7 +47,7 @@ @if($settings->client_portal_allow_under_payment || $settings->client_portal_allow_over_payment) @else - @livewire('pay-now-dropdown', ['total' => $invoice->partial > 0 ? $invoice->partial : $invoice->balance]) + @livewire('pay-now-dropdown', ['total' => $invoice->partial > 0 ? $invoice->partial : $invoice->balance, 'company' => $company]) @endif
diff --git a/resources/views/portal/ninja2020/layout/payments.blade.php b/resources/views/portal/ninja2020/layout/payments.blade.php index f72f97a85c..d986f9f8ef 100644 --- a/resources/views/portal/ninja2020/layout/payments.blade.php +++ b/resources/views/portal/ninja2020/layout/payments.blade.php @@ -11,7 +11,7 @@ @endpush @section('body') - @livewire('required-client-info', ['fields' => method_exists($gateway, 'getClientRequiredFields') ? $gateway->getClientRequiredFields() : [], 'contact' => auth('contact')->user(), 'countries' => $countries]) + @livewire('required-client-info', ['fields' => method_exists($gateway, 'getClientRequiredFields') ? $gateway->getClientRequiredFields() : [], 'contact' => auth('contact')->user(), 'countries' => $countries, 'company' => $company])
diff --git a/resources/views/portal/ninja2020/payment_methods/index.blade.php b/resources/views/portal/ninja2020/payment_methods/index.blade.php index b265cbdcd0..60d7200608 100644 --- a/resources/views/portal/ninja2020/payment_methods/index.blade.php +++ b/resources/views/portal/ninja2020/payment_methods/index.blade.php @@ -3,6 +3,6 @@ @section('body')
- @livewire('payment-methods-table', ['client' => $client]) + @livewire('payment-methods-table', ['client' => $client, 'company' => $company])
@endsection diff --git a/resources/views/portal/ninja2020/payments/index.blade.php b/resources/views/portal/ninja2020/payments/index.blade.php index 3f54a73769..22bc5cccf6 100644 --- a/resources/views/portal/ninja2020/payments/index.blade.php +++ b/resources/views/portal/ninja2020/payments/index.blade.php @@ -3,6 +3,6 @@ @section('body')
- @livewire('payments-table') + @livewire('payments-table', ['company' => $company])
@endsection \ No newline at end of file diff --git a/resources/views/portal/ninja2020/quotes/index.blade.php b/resources/views/portal/ninja2020/quotes/index.blade.php index 5ce9880a52..845485d798 100644 --- a/resources/views/portal/ninja2020/quotes/index.blade.php +++ b/resources/views/portal/ninja2020/quotes/index.blade.php @@ -22,6 +22,6 @@
- @livewire('quotes-table') + @livewire('quotes-table', ['company' => $company])
@endsection \ No newline at end of file diff --git a/resources/views/portal/ninja2020/recurring_invoices/includes/modals/cancellation.blade.php b/resources/views/portal/ninja2020/recurring_invoices/includes/modals/cancellation.blade.php index c75064b298..59401a923f 100644 --- a/resources/views/portal/ninja2020/recurring_invoices/includes/modals/cancellation.blade.php +++ b/resources/views/portal/ninja2020/recurring_invoices/includes/modals/cancellation.blade.php @@ -34,7 +34,7 @@
- @livewire('recurring-invoice-cancellation', ['invoice' => $invoice]) + @livewire('recurring-invoice-cancellation', ['invoice' => $invoice, 'company' => $company])
- @livewire('subscription-plan-switch', compact('recurring_invoice', 'subscription', 'target', 'contact', 'amount')) + @livewire('subscription-plan-switch', compact('recurring_invoice', 'subscription', 'target', 'contact', 'amount', 'company'))
@endsection diff --git a/resources/views/portal/ninja2020/tasks/index.blade.php b/resources/views/portal/ninja2020/tasks/index.blade.php index 783e325a25..c60fd34cd8 100644 --- a/resources/views/portal/ninja2020/tasks/index.blade.php +++ b/resources/views/portal/ninja2020/tasks/index.blade.php @@ -3,6 +3,6 @@ @section('body')
- @livewire('tasks-table') + @livewire('tasks-table', ['company' => $company])
@endsection