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

Browse Source
This commit is contained in:
David Bomba 2022-12-19 12:38:03 +11:00
parent 61ae25b2be
commit 66ba48bb49
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ class SubscriptionService
'invoice' => $this->encodePrimaryKey($payment_hash->fee_invoice_id),
'client' => $recurring_invoice->client->hashed_id,
'subscription' => $this->subscription->hashed_id,
'contact' => auth()->guard('contact')->user() ? auth()->guard('contact')->user()->hashed_id : $recurring_invoice->client->contacts()->first()->hashed_id,
'contact' => auth()->guard('contact')->user() ? auth()->guard('contact')->user()->hashed_id : $recurring_invoice->client->contacts()->whereNotNull('email')->first()->hashed_id,
'account_key' => $recurring_invoice->client->custom_value2,
];

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

@ -209,7 +209,7 @@
@foreach($bundle->toArray() as $item)
<div class="flex justify-between mt-1 mb-1">
<span class="font-light text-sm">{{ substr(str_replace(["\r","\n","<BR>","<BR />","<br>","<br />"]," ", $item['product']), 0, 30) . "..." }} x {{ $item['qty'] }}</span>
<span class="font-light text-sm">{{ $item['qty'] }} x {{ substr(str_replace(["\r","\n","<BR>","<BR />","<br>","<br />"]," ", $item['product']), 0, 30) . "..." }}</span>
<span class="font-bold text-sm">{{ $item['price'] }}</span>
</div>
@endforeach