Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 22:34:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor for switch plans

Browse Source
This commit is contained in:
David Bomba 2022-09-02 10:38:27 +10:00
parent 59ac21662d
commit a43f30adbc
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Livewire/SubscriptionPlanSwitch.php
View File

@ -56,6 +56,7 @@ class SubscriptionPlanSwitch extends Component
*/ */
public $total; public $total;
public $hide_button = false;
/** /**
* @var array * @var array
*/ */
@ -139,12 +140,20 @@ class SubscriptionPlanSwitch extends Component
public function handlePaymentNotRequired() public function handlePaymentNotRequired()
{ {
return $this->target->service()->createChangePlanCredit([ $this->hide_button = true;
$response = $this->target->service()->createChangePlanCredit([
'recurring_invoice' => $this->recurring_invoice, 'recurring_invoice' => $this->recurring_invoice,
'subscription' => $this->subscription, 'subscription' => $this->subscription,
'target' => $this->target, 'target' => $this->target,
'hash' => $this->hash, 'hash' => $this->hash,
]); ]);
$this->hide_button = true;
$this->dispatchBrowserEvent('redirectRoute', ['route' => $response]);
// return redirect($response);
} }
public function render() public function render()

12
app/Services/Subscription/SubscriptionService.php
View File

@ -477,10 +477,14 @@ class SubscriptionService
nlog($response); nlog($response);
if($credit) if($credit){
return $this->handleRedirect('/client/credits/'.$credit->hashed_id); // return $this->handleRedirect('/client/credits/'.$credit->hashed_id);
else return '/client/credits/'.$credit->hashed_id;
return $this->handleRedirect('/client/credits'); }
else{
// return $this->handleRedirect('/client/credits');
return '/client/credits';
}
} }

16
resources/views/portal/ninja2020/components/livewire/subscription-plan-switch.blade.php
View File

@ -1,3 +1,4 @@
<div>
<div class="grid grid-cols-12 gap-8 mt-8"> <div class="grid grid-cols-12 gap-8 mt-8">
<div class="col-span-12 md:col-span-5 md:col-start-4 px-4 py-5"> <div class="col-span-12 md:col-span-5 md:col-start-4 px-4 py-5">
<!-- Total price --> <!-- Total price -->
@ -62,6 +63,7 @@
</div> </div>
</div> </div>
@elseif($amount <= 0) @elseif($amount <= 0)
<div class="relative flex justify-center text-sm leading-5"> <div class="relative flex justify-center text-sm leading-5">
<h1 class="text-2xl font-bold tracking-wide bg-gray-100 px-6 py-0"> <h1 class="text-2xl font-bold tracking-wide bg-gray-100 px-6 py-0">
{{ ctrans('texts.total') }}: {{ \App\Utils\Number::formatMoney($amount, $subscription->company) }} {{ ctrans('texts.total') }}: {{ \App\Utils\Number::formatMoney($amount, $subscription->company) }}
@ -69,12 +71,20 @@
</div> </div>
<div class="relative flex justify-center text-sm leading-5 mt-10"> <div class="relative flex justify-center text-sm leading-5 mt-10">
<button wire:click="handlePaymentNotRequired" class="px-3 py-2 border rounded mr-4 hover:border-blue-600"> <button wire:click="handlePaymentNotRequired" class="px-3 py-2 border rounded mr-4 hover:border-blue-600" wire:loading.attr="disabled" @if($hide_button) disabled @endif>
{{ ctrans('texts.click_to_continue') }} @if($hide_button) {{ ctrans('texts.loading') }} @else {{ ctrans('texts.click_to_continue') }} @endif
</button> </button>
</div> </div>
@endif @endif
</div> </div>
</div> </div>
<script defer>
window.addEventListener('redirectRoute', event => {
window.location.href = event.detail.route;
})
</script>
</div>