From 9e84f6c10fc88ceeacae1f2339cea826888fea26 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 22 Dec 2022 16:53:48 +1100 Subject: [PATCH] Reduce object sizes in Livewire --- app/Http/Livewire/BillingPortalPurchase.php | 12 ++++-------- app/Http/Livewire/BillingPortalPurchasev2.php | 8 +++++++- resources/views/billing-portal/purchase.blade.php | 2 +- resources/views/billing-portal/purchasev2.blade.php | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php index 08fa88b36141..404194f58531 100644 --- a/app/Http/Livewire/BillingPortalPurchase.php +++ b/app/Http/Livewire/BillingPortalPurchase.php @@ -188,6 +188,7 @@ class BillingPortalPurchase extends Component MultiDB::setDb($this->db); $this->subscription = Subscription::with('company')->find($this->subscription); + $this->company = $this->subscription->company; $this->quantity = 1; @@ -230,10 +231,10 @@ class BillingPortalPurchase extends Component $this->steps['existing_user'] = false; - $contact = $this->createBlankClient(); + $this->contact = $this->createBlankClient(); - if ($contact && $contact instanceof ClientContact) { - $this->getPaymentMethods($contact); + if ($this->contact && $this->contact instanceof ClientContact) { + $this->getPaymentMethods($this->contact); } } @@ -270,9 +271,6 @@ class BillingPortalPurchase extends Component } } -// nlog($this->subscription->group_settings->settings); -// nlog($this->subscription->group_settings->settings->currency_id); - if(array_key_exists('currency_id', $this->request_data)) { $currency = Cache::get('currencies')->filter(function ($item){ @@ -335,8 +333,6 @@ class BillingPortalPurchase extends Component else $this->steps['fetched_payment_methods'] = true; -nlog("payment methods price = {$this->price}"); - $this->methods = $contact->client->service()->getPaymentMethods($this->price); $this->heading_text = ctrans('texts.payment_methods'); diff --git a/app/Http/Livewire/BillingPortalPurchasev2.php b/app/Http/Livewire/BillingPortalPurchasev2.php index b6426c95db19..fae6115ec79a 100644 --- a/app/Http/Livewire/BillingPortalPurchasev2.php +++ b/app/Http/Livewire/BillingPortalPurchasev2.php @@ -130,6 +130,8 @@ class BillingPortalPurchasev2 extends Component */ public $company; + public $db; + /** * Campaign reference. * @@ -157,7 +159,11 @@ class BillingPortalPurchasev2 extends Component public function mount() { - MultiDB::setDb($this->company->db); + MultiDB::setDb($this->db); + + $this->subscription = Subscription::with('company')->find($this->subscription); + + $this->company = $this->subscription->company; if(auth()->guard('contact')->check()){ $this->email = auth()->guard('contact')->user()->email; diff --git a/resources/views/billing-portal/purchase.blade.php b/resources/views/billing-portal/purchase.blade.php index f6227ad0b8cf..5ad20943cc96 100644 --- a/resources/views/billing-portal/purchase.blade.php +++ b/resources/views/billing-portal/purchase.blade.php @@ -2,7 +2,7 @@ @section('meta_title', ctrans('texts.purchase')) @section('body') - @livewire('billing-portal-purchase', ['subscription' => $subscription->id, 'db' => $subscription->company->db, 'contact' => auth()->guard('contact')->user(), 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null]) + @livewire('billing-portal-purchase', ['subscription' => $subscription->id, 'db' => $subscription->company->db, 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null]) @stop @push('footer') diff --git a/resources/views/billing-portal/purchasev2.blade.php b/resources/views/billing-portal/purchasev2.blade.php index 91c557dc222b..239d2a271f99 100644 --- a/resources/views/billing-portal/purchasev2.blade.php +++ b/resources/views/billing-portal/purchasev2.blade.php @@ -2,7 +2,7 @@ @section('meta_title', ctrans('texts.purchase')) @section('body') - @livewire('billing-portal-purchasev2', ['subscription' => $subscription, 'company' => $subscription->company, 'contact' => auth()->guard('contact')->user(), 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null]) + @livewire('billing-portal-purchasev2', ['subscription' => $subscription->id, 'db' => $subscription->company->db, 'hash' => $hash, 'request_data' => $request_data, 'campaign' => request()->query('campaign') ?? null]) @stop @push('footer')