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

Static Analysis Cleanup

Browse Source
This commit is contained in:
David Bomba 2023-09-05 11:54:05 +10:00
parent 9cc464d0d7
commit 1e2f7259a3
15 changed files with 60 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PurchaseOrderController.php
View File

@ -139,7 +139,10 @@ class PurchaseOrderController extends BaseController
*/
public function create(CreatePurchaseOrderRequest $request)
{
$purchase_order = PurchaseOrderFactory::create(auth()->user()->company()->id, auth()->user()->id);
/** @var \App\Models\User $user */
$user = auth()->user();
$purchase_order = PurchaseOrderFactory::create($user->company()->id, $user->id);
return $this->itemResponse($purchase_order);
}
@ -183,7 +186,10 @@ class PurchaseOrderController extends BaseController
*/
public function store(StorePurchaseOrderRequest $request)
{
$purchase_order = $this->purchase_order_repository->save($request->all(), PurchaseOrderFactory::create(auth()->user()->company()->id, auth()->user()->id));
/** @var \App\Models\User $user */
$user = auth()->user();
$purchase_order = $this->purchase_order_repository->save($request->all(), PurchaseOrderFactory::create($user->company()->id, $user->id));
$purchase_order = $purchase_order->service()
->fillDefaults()
@ -361,7 +367,7 @@ class PurchaseOrderController extends BaseController
$purchase_order = $purchase_order->service()
->triggeredActions($request)
->touchPdf()
// ->touchPdf()
->save();
event(new PurchaseOrderWasUpdated($purchase_order, $purchase_order->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

4
app/Http/Controllers/QuoteController.php
View File

@ -395,8 +395,8 @@ class QuoteController extends BaseController
$quote = $this->quote_repo->save($request->all(), $quote);
$quote->service()
->triggeredActions($request)
->deletePdf();
->triggeredActions($request);
// ->deletePdf();
event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

21
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -153,7 +153,10 @@ class RecurringInvoiceController extends BaseController
*/
public function create(CreateRecurringInvoiceRequest $request)
{
$recurring_invoice = RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id);
/** @var \App\Models\User $user */
$user = auth()->user();
$recurring_invoice = RecurringInvoiceFactory::create($user->company()->id, $user->id);
return $this->itemResponse($recurring_invoice);
}
@ -199,7 +202,10 @@ class RecurringInvoiceController extends BaseController
*/
public function store(StoreRecurringInvoiceRequest $request)
{
$recurring_invoice = $this->recurring_invoice_repo->save($request->all(), RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
/** @var \App\Models\User $user */
$user = auth()->user();
$recurring_invoice = $this->recurring_invoice_repo->save($request->all(), RecurringInvoiceFactory::create($user->company()->id, $user->id));
$recurring_invoice->service()
->triggeredActions($request)
@ -380,7 +386,7 @@ class RecurringInvoiceController extends BaseController
$recurring_invoice->service()
->triggeredActions($request)
->deletePdf()
// ->deletePdf()
->save();
event(new RecurringInvoiceWasUpdated($recurring_invoice, $recurring_invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
@ -405,18 +411,21 @@ class RecurringInvoiceController extends BaseController
*/
public function bulk(BulkRecurringInvoiceRequest $request)
{
/** @var \App\Models\User $user */
$user = auth()->user();
$percentage_increase = request()->has('percentage_increase') ? request()->input('percentage_increase') : 0;
if (in_array($request->action, ['increase_prices', 'update_prices'])) {
UpdateRecurring::dispatch($request->ids, auth()->user()->company(), auth()->user(), $request->action, $percentage_increase);
UpdateRecurring::dispatch($request->ids, $user->company(), $user, $request->action, $percentage_increase);
return response()->json(['message' => 'Update in progress.'], 200);
}
$recurring_invoices = RecurringInvoice::withTrashed()->find($request->ids);
$recurring_invoices->each(function ($recurring_invoice, $key) use ($request) {
if (auth()->user()->can('edit', $recurring_invoice)) {
$recurring_invoices->each(function ($recurring_invoice, $key) use ($request, $user) {
if ($user->can('edit', $recurring_invoice)) {
$this->performAction($recurring_invoice, $request->action, true);
}
});

12
app/PaymentDrivers/BaseDriver.php
View File

@ -530,9 +530,9 @@ class BaseDriver extends AbstractPaymentDriver
$invoices = Invoice::query()->whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) {
$invoice->service()->deletePdf();
});
// $invoices->each(function ($invoice) {
// $invoice->service()->deletePdf();
// });
$invoices->first()->invitations->each(function ($invitation) use ($nmo) {
if ((bool) $invitation->contact->send_email !== false && $invitation->contact->email) {
@ -575,9 +575,9 @@ class BaseDriver extends AbstractPaymentDriver
$invoices = Invoice::query()->whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) {
$invoice->service()->deletePdf();
});
// $invoices->each(function ($invoice) {
// $invoice->service()->deletePdf();
// });
$invoices->first()->invitations->each(function ($invitation) use ($nmo) {
if (! $invitation->contact->trashed()) {

4
app/Services/Credit/ApplyPayment.php
View File

@ -137,7 +137,7 @@ class ApplyPayment
->updateBalance($this->amount_applied * -1)
->updatePaidToDate($this->amount_applied)
->updateStatus()
->deletePdf()
// ->deletePdf()
->save();
$this->credit
@ -147,7 +147,7 @@ class ApplyPayment
event(new InvoiceWasUpdated($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
if ((int) $this->invoice->balance == 0) {
$this->invoice->service()->deletePdf();
// $this->invoice->service()->deletePdf();
$this->invoice = $this->invoice->fresh();
event(new InvoiceWasPaid($this->invoice, $this->payment, $this->payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
}

2
app/Services/Credit/CreditService.php
View File

@ -154,7 +154,7 @@ class CreditService
{
$this->credit = (new ApplyPayment($this->credit, $invoice, $amount, $payment))->run();
$this->deletePdf();
// $this->deletePdf();
return $this;
}

2
app/Services/Credit/MarkSent.php
View File

@ -42,7 +42,7 @@ class MarkSent
->setStatus(Credit::STATUS_SENT)
->applyNumber()
->adjustBalance($this->credit->amount)
->deletePdf()
// ->deletePdf()
->save();
$this->client

7
app/Services/Invoice/ApplyPayment.php
View File

@ -92,7 +92,12 @@ class ApplyPayment extends AbstractService
}
});
$this->invoice->service()->applyNumber()->workFlow()->deletePdf()->save();
$this->invoice
->service()
->applyNumber()
->workFlow()
// ->deletePdf()
->save();
return $this->invoice;
}

4
app/Services/Invoice/InvoiceService.php
View File

@ -346,7 +346,7 @@ class InvoiceService
return $item;
})->toArray();
$this->deletePdf();
// $this->deletePdf();
$this->deleteEInvoice();
return $this;
@ -414,7 +414,7 @@ class InvoiceService
})->toArray();
$this->invoice = $this->invoice->calc()->getInvoice();
$this->deletePdf();
// $this->deletePdf();
$this->deleteEInvoice();
/* 24-03-2022 */

2
app/Services/Invoice/MarkPaid.php
View File

@ -102,7 +102,7 @@ class MarkPaid extends AbstractService
$this->invoice
->service()
->applyNumber()
->deletePdf()
// ->deletePdf()
->save();
$payment->ledger()

2
app/Services/Payment/UpdateInvoicePayment.php
View File

@ -79,7 +79,7 @@ class UpdateInvoicePayment
$invoice = $invoice->service()
->clearPartial()
->updateStatus()
->deletePdf()
// ->deletePdf()
->workFlow()
->save();

13
app/Services/PurchaseOrder/TriggeredActions.php
View File

@ -35,12 +35,21 @@ class TriggeredActions extends AbstractService
public function run()
{
if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
$this->purchase_order->service()->markSent()->touchPdf()->save();
$this->purchase_order
->service()
->markSent()
// ->touchPdf()
->save();
$this->sendEmail();
}
if ($this->request->has('mark_sent') && $this->request->input('mark_sent') == 'true') {
$this->purchase_order = $this->purchase_order->service()->markSent()->touchPdf()->save();
$this->purchase_order = $this->purchase_order
->service()
->markSent()
// ->touchPdf()
->save();
}
if ($this->request->has('save_default_footer') && $this->request->input('save_default_footer') == 'true') {

2
app/Services/Quote/MarkSent.php
View File

@ -42,7 +42,7 @@ class MarkSent
->service()
->setStatus(Quote::STATUS_SENT)
->applyNumber()
->deletePdf()
// ->deletePdf()
->save();
event(new QuoteWasMarkedSent($this->quote, $this->quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

2
app/Services/Quote/QuoteService.php
View File

@ -116,7 +116,7 @@ class QuoteService
$this->invoice
->service()
->markSent()
->deletePdf()
// ->deletePdf()
->save();
}

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

@ -188,7 +188,7 @@ class SubscriptionService
//update the invoice and attach to the recurring invoice!!!!!
$invoice->recurring_id = $recurring_invoice->id;
$invoice->is_proforma = false;
$invoice->service()->deletePdf();
// $invoice->service()->deletePdf();
$invoice->save();
$contact = $invoice->client->contacts()->whereNotNull('email')->first();