Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:17:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for check data script

Browse Source
This commit is contained in:
David Bomba 2020-10-21 17:15:03 +11:00
parent d881e7cea1
commit 1338a5e558
3 changed files with 276 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,8 @@ class CheckData extends Command
$credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(\DB::raw('amount')); $credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(\DB::raw('amount'));
} }
//$total_invoice_payments += $credit_total_applied; //todo this is contentious if($credit_total_applied < 0)
$total_invoice_payments += $credit_total_applied; //todo this is contentious
info("total invoice payments = {$total_invoice_payments} with client paid to date of of {$client->paid_to_date}"); info("total invoice payments = {$total_invoice_payments} with client paid to date of of {$client->paid_to_date}");

8
composer.json
View File

@ -27,12 +27,11 @@
"php": ">=7.3", "php": ">=7.3",
"ext-json": "*", "ext-json": "*",
"asgrim/ofxparser": "^1.2", "asgrim/ofxparser": "^1.2",
"checkout/checkout-sdk-php": "^1.0",
"authorizenet/authorizenet": "^2.0", "authorizenet/authorizenet": "^2.0",
"checkout/checkout-sdk-php": "^1.0",
"cleverit/ubl_invoice": "^1.3", "cleverit/ubl_invoice": "^1.3",
"composer/composer": "^1.10", "composer/composer": "^1.10",
"czproject/git-php": "^3.17", "czproject/git-php": "^3.17",
"turbo124/laravel-gmail": "^5.0",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.10",
"fedeisas/laravel-mail-css-inliner": "^3", "fedeisas/laravel-mail-css-inliner": "^3",
"fideloper/proxy": "^4.2", "fideloper/proxy": "^4.2",
@ -46,6 +45,7 @@
"laravel/slack-notification-channel": "^2.2", "laravel/slack-notification-channel": "^2.2",
"laravel/socialite": "^5", "laravel/socialite": "^5",
"laravel/tinker": "^2.0", "laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "^1.1", "league/flysystem-cached-adapter": "^1.1",
"league/fractal": "^0.17.0", "league/fractal": "^0.17.0",
@ -60,8 +60,8 @@
"staudenmeir/eloquent-has-many-deep": "^1.11", "staudenmeir/eloquent-has-many-deep": "^1.11",
"stripe/stripe-php": "^7.50", "stripe/stripe-php": "^7.50",
"turbo124/beacon": "^1", "turbo124/beacon": "^1",
"webpatser/laravel-countries": "dev-master#75992ad", "turbo124/laravel-gmail": "^5.0",
"laravel/ui": "^3.0" "webpatser/laravel-countries": "dev-master#75992ad"
}, },
"require-dev": { "require-dev": {
"anahkiasen/former": "^4.2", "anahkiasen/former": "^4.2",

461
composer.lock generated
View File

File diff suppressed because it is too large Load Diff