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

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2024-02-21 09:13:40 +11:00
parent 21c920ad71
commit 14a93eda0b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Http/Controllers/ClientPortal/PrePaymentController.php
View File

@ -12,16 +12,17 @@
namespace App\Http\Controllers\ClientPortal; namespace App\Http\Controllers\ClientPortal;
use App\Utils\Number;
use App\Utils\HtmlEngine;
use Illuminate\View\View;
use App\DataMapper\InvoiceItem; use App\DataMapper\InvoiceItem;
use App\Factory\InvoiceFactory; use App\Factory\InvoiceFactory;
use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest;
use App\Repositories\InvoiceRepository;
use App\Utils\Number;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesDates;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Illuminate\View\View; use App\Repositories\InvoiceRepository;
use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest;
/** /**
* Class PrePaymentController. * Class PrePaymentController.
@ -102,6 +103,13 @@ class PrePaymentController extends Controller
return $invoice; return $invoice;
}); });
$variables = false;
if(($invitation = $invoices->first()->invitations()->first() ?? false) && $invoice->client->getSetting('show_accept_invoice_terms')) {
$variables = (new HtmlEngine($invitation))->generateLabelsAndValues();
}
$data = [ $data = [
'settings' => auth()->guard('contact')->user()->client->getMergedSettings(), 'settings' => auth()->guard('contact')->user()->client->getMergedSettings(),
'invoices' => $invoices, 'invoices' => $invoices,
@ -113,6 +121,7 @@ class PrePaymentController extends Controller
'frequency_id' => $request->frequency_id, 'frequency_id' => $request->frequency_id,
'remaining_cycles' => $request->remaining_cycles, 'remaining_cycles' => $request->remaining_cycles,
'is_recurring' => $request->is_recurring == 'on' ? true : false, 'is_recurring' => $request->is_recurring == 'on' ? true : false,
'variables' => $variables,
]; ];
return $this->render('invoices.payment', $data); return $this->render('invoices.payment', $data);

2
app/Repositories/SubscriptionRepository.php
View File

@ -126,7 +126,7 @@ class SubscriptionRepository extends BaseRepository
$line_items = []; $line_items = [];
$line_items = collect($bundle)->filter(function ($item) { $line_items = collect($bundle)->filter(function ($item) {
return $item->is_recurring; return $item->is_recurring ?? false;
})->map(function ($item) { })->map(function ($item) {
$line_item = new InvoiceItem(); $line_item = new InvoiceItem();
$line_item->product_key = $item->product_key; $line_item->product_key = $item->product_key;