diff --git a/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php b/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php index b8d8f1fe395c..e5007a607d98 100644 --- a/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php +++ b/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php @@ -23,6 +23,8 @@ class SubscriptionPurchaseController extends Controller { public function index(Subscription $subscription, Request $request) { + App::setLocale($subscription->company->locale()); + /* Make sure the contact is logged into the correct company for this subscription */ if (auth()->guard('contact')->user() && auth()->guard('contact')->user()->company_id != $subscription->company_id) { auth()->guard('contact')->logout(); @@ -42,6 +44,9 @@ class SubscriptionPurchaseController extends Controller public function upgrade(Subscription $subscription, Request $request) { + + App::setLocale($subscription->company->locale()); + /* Make sure the contact is logged into the correct company for this subscription */ if (auth()->guard('contact')->user() && auth()->guard('contact')->user()->company_id != $subscription->company_id) { auth()->guard('contact')->logout(); diff --git a/app/Http/Livewire/SubscriptionsTable.php b/app/Http/Livewire/SubscriptionsTable.php index dc4744b250ab..f05c07f4b7df 100644 --- a/app/Http/Livewire/SubscriptionsTable.php +++ b/app/Http/Livewire/SubscriptionsTable.php @@ -39,9 +39,9 @@ class SubscriptionsTable extends Component ->where('company_id', $this->company->id) ->whereNotNull('subscription_id') ->where('is_deleted', false) - ->where('status_id', RecurringInvoice::STATUS_ACTIVE) - ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc') + ->whereIn('status_id', [RecurringInvoice::STATUS_ACTIVE, RecurringInvoice::STATUS_PAUSED]) ->withTrashed() + ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc') ->paginate($this->per_page); return render('components.livewire.subscriptions-table', [ diff --git a/resources/views/portal/ninja2020/components/livewire/subscriptions-table.blade.php b/resources/views/portal/ninja2020/components/livewire/subscriptions-table.blade.php index 4602b8c102c8..58a52b03798f 100644 --- a/resources/views/portal/ninja2020/components/livewire/subscriptions-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/subscriptions-table.blade.php @@ -15,6 +15,11 @@ + @forelse($recurring_invoices as $recurring_invoice) +
+

+ {{ ctrans('texts.status') }} +

+

{{ ctrans('texts.subscription') }} @@ -47,6 +52,9 @@

+ {!! $recurring_invoice->badgeForStatus($recurring_invoice->status_id) !!} + {{ $recurring_invoice->subscription->name }}