Static Analysis Cleanup

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

View File

@ -139,7 +139,10 @@ class PurchaseOrderController extends BaseController
*/ */
public function create(CreatePurchaseOrderRequest $request) 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); return $this->itemResponse($purchase_order);
} }
@ -183,7 +186,10 @@ class PurchaseOrderController extends BaseController
*/ */
public function store(StorePurchaseOrderRequest $request) 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() $purchase_order = $purchase_order->service()
->fillDefaults() ->fillDefaults()
@ -361,7 +367,7 @@ class PurchaseOrderController extends BaseController
$purchase_order = $purchase_order->service() $purchase_order = $purchase_order->service()
->triggeredActions($request) ->triggeredActions($request)
->touchPdf() // ->touchPdf()
->save(); ->save();
event(new PurchaseOrderWasUpdated($purchase_order, $purchase_order->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); event(new PurchaseOrderWasUpdated($purchase_order, $purchase_order->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

View File

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

View File

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

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 = Invoice::query()->whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) { // $invoices->each(function ($invoice) {
$invoice->service()->deletePdf(); // $invoice->service()->deletePdf();
}); // });
$invoices->first()->invitations->each(function ($invitation) use ($nmo) { $invoices->first()->invitations->each(function ($invitation) use ($nmo) {
if ((bool) $invitation->contact->send_email !== false && $invitation->contact->email) { 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 = Invoice::query()->whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
$invoices->each(function ($invoice) { // $invoices->each(function ($invoice) {
$invoice->service()->deletePdf(); // $invoice->service()->deletePdf();
}); // });
$invoices->first()->invitations->each(function ($invitation) use ($nmo) { $invoices->first()->invitations->each(function ($invitation) use ($nmo) {
if (! $invitation->contact->trashed()) { if (! $invitation->contact->trashed()) {

View File

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

View File

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

View File

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

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; return $this->invoice;
} }

View File

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

View File

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

View File

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

View File

@ -35,12 +35,21 @@ class TriggeredActions extends AbstractService
public function run() public function run()
{ {
if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') { 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(); $this->sendEmail();
} }
if ($this->request->has('mark_sent') && $this->request->input('mark_sent') == 'true') { 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') { if ($this->request->has('save_default_footer') && $this->request->input('save_default_footer') == 'true') {

View File

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

View File

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

View File

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