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

fixes for tests

Browse Source
This commit is contained in:
David Bomba 2020-11-25 20:21:26 +11:00
parent 656bf13510
commit b0740b46dd
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Commands/CheckData.php
View File

@ -22,6 +22,7 @@ use App\Models\Credit;
use App\Models\Invitation; use App\Models\Invitation;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\InvoiceInvitation; use App\Models\InvoiceInvitation;
use App\Models\Payment;
use App\Utils\Ninja; use App\Utils\Ninja;
use Carbon; use Carbon;
use DB; use DB;
@ -325,8 +326,11 @@ class CheckData extends Command
$total_invoice_payments = 0; $total_invoice_payments = 0;
foreach ($client->invoices->where('is_deleted', false)->where('status_id', '>', 1) as $invoice) { foreach ($client->invoices->where('is_deleted', false)->where('status_id', '>', 1) as $invoice) {
$total_amount = $invoice->payments->whereNull('deleted_at')->sum('pivot.amount'); // $total_amount = $invoice->payments->whereNull('deleted_at')->sum('pivot.amount');
$total_refund = $invoice->payments->whereNull('deleted_at')->sum('pivot.refunded'); // $total_refund = $invoice->payments->whereNull('deleted_at')->sum('pivot.refunded');
$total_amount = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.amount');
$total_refund = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.refunded');
$total_invoice_payments += ($total_amount - $total_refund); $total_invoice_payments += ($total_amount - $total_refund);
} }
@ -360,8 +364,8 @@ class CheckData extends Command
Client::cursor()->each(function ($client) use ($wrong_balances) { Client::cursor()->each(function ($client) use ($wrong_balances) {
$client->invoices->where('is_deleted', false)->whereIn('status_id', '!=', Invoice::STATUS_DRAFT)->each(function ($invoice) use ($wrong_balances, $client) { $client->invoices->where('is_deleted', false)->whereIn('status_id', '!=', Invoice::STATUS_DRAFT)->each(function ($invoice) use ($wrong_balances, $client) {
$total_amount = $invoice->payments->sum('pivot.amount'); $total_amount = $invoice->payments->whereIn('status_id', [Payment::STATUS_PAID, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.amount');
$total_refund = $invoice->payments->sum('pivot.refunded'); $total_refund = $invoice->payments->whereIn('status_id', [Payment::STATUS_PAID, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED])->sum('pivot.refunded');
$total_credit = $invoice->credits->sum('amount'); $total_credit = $invoice->credits->sum('amount');
$total_paid = $total_amount - $total_refund; $total_paid = $total_amount - $total_refund;

2
app/Models/Invoice.php
View File

@ -186,7 +186,7 @@ class Invoice extends BaseModel
public function payments() public function payments()
{ {
return $this->morphToMany(Payment::class, 'paymentable')->withPivot('amount', 'refunded')->withTimestamps()->withTrashed(); return $this->morphToMany(Payment::class, 'paymentable')->withTrashed()->withPivot('amount', 'refunded')->withTimestamps();
} }
public function company_ledger() public function company_ledger()

10
app/Repositories/PaymentRepository.php
View File

@ -12,6 +12,7 @@
namespace App\Repositories; namespace App\Repositories;
use App\Events\Payment\PaymentWasCreated; use App\Events\Payment\PaymentWasCreated;
use App\Events\Payment\PaymentWasDeleted;
use App\Factory\CreditFactory; use App\Factory\CreditFactory;
use App\Jobs\Credit\ApplyCreditPayment; use App\Jobs\Credit\ApplyCreditPayment;
use App\Libraries\Currency\Conversion\CurrencyApi; use App\Libraries\Currency\Conversion\CurrencyApi;
@ -146,7 +147,7 @@ class PaymentRepository extends BaseRepository
//todo optimize into a single query //todo optimize into a single query
foreach ($data['credits'] as $paid_credit) { foreach ($data['credits'] as $paid_credit) {
$credit = Credit::find($this->decodePrimaryKey($paid_credit['credit_id']))->withTrashed(); $credit = Credit::withTrashed()->find($this->decodePrimaryKey($paid_credit['credit_id']));
if ($credit) { if ($credit) {
ApplyCreditPayment::dispatchNow($credit, $payment, $paid_credit['amount'], $credit->company); ApplyCreditPayment::dispatchNow($credit, $payment, $paid_credit['amount'], $credit->company);
@ -198,9 +199,12 @@ class PaymentRepository extends BaseRepository
return; return;
} }
$payment->service()->deletePayment(); $payment = $payment->service()->deletePayment();
return parent::delete($payment); event(new PaymentWasDeleted($payment, $payment->company, Ninja::eventVars()));
return $payment;
//return parent::delete($payment);
} }
public function restore($payment) public function restore($payment)