Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for subscriptions v2

Browse Source
This commit is contained in:
David Bomba 2023-03-01 19:14:04 +11:00
parent b18e7773c2
commit 212f5920e0
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/BillingPortalPurchasev2.php
View File

@ -173,6 +173,9 @@ class BillingPortalPurchasev2 extends Component
$this->authenticated = true; $this->authenticated = true;
$this->payment_started = true; $this->payment_started = true;
} }
else {
$this->bundle = collect();
}
$this->discount = 0; $this->discount = 0;
$this->sub_total = 0; $this->sub_total = 0;

25
resources/views/portal/ninja2020/components/livewire/billing-portal-purchasev2.blade.php
View File

@ -268,27 +268,28 @@
@endif @endif
<div class="border-gray-200 border-opacity-50 mt-4"> <div class="border-gray-200 border-opacity-50 mt-4">
@if($discount)
<div class="flex font-semibold justify-between py-1 text-sm uppercase"> <div class="flex font-semibold justify-between py-1 text-sm uppercase">
<span>{{ ctrans('texts.one_time_purchases') }}</span>
<span>{{ $non_recurring_total }}</span>
</div>
<div class="flex font-semibold justify-between py-1 text-sm uppercase">
<span>{{ ctrans('texts.recurring_purchases') }}</span>
<span>{{ $recurring_total }}</span>
</div>
@if($discount)
<!-- <div class="flex font-semibold justify-between py-1 text-sm uppercase">
<span>{{ ctrans('texts.subtotal') }}</span> <span>{{ ctrans('texts.subtotal') }}</span>
<span>{{ $sub_total }}</span> <span>{{ $sub_total }}</span>
</div> </div> -->
<div class="flex font-semibold justify-between py-1 text-sm uppercase"> <div class="flex font-semibold justify-between py-1 text-sm uppercase">
<span>{{ ctrans('texts.discount') }}</span> <span>{{ ctrans('texts.discount') }}</span>
<span>{{ $discount }}</span> <span>{{ $discount }}</span>
</div> </div>
@endif @endif
<div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
<span>{{ ctrans('texts.one_time_purchases') }}</span>
<span>{{ $non_recurring_total }}</span>
</div>
<div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
<span>{{ ctrans('texts.recurring_purchases') }}</span>
<span>{{ $recurring_total }}</span>
</div>
<div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2"> <div class="flex font-semibold justify-between py-1 text-sm uppercase border-t-2">
<span>{{ ctrans('texts.total') }}</span> <span>{{ ctrans('texts.total') }}</span>
<span>{{ $total }}</span> <span>{{ $total }}</span>