Merge pull request #6937 from turbo124/v5-develop

Fixes for payment hash types
This commit is contained in:
David Bomba 2021-11-06 10:31:55 +11:00 committed by GitHub
commit a2e08a4baa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 146 additions and 28 deletions

View File

@ -484,6 +484,9 @@ class CheckData extends Command
}
}
$this->logMessage("{$this->wrong_paid_to_dates} clients with incorrect paid to dates");
}
@ -648,25 +651,19 @@ ORDER BY clients.id;
private function clientBalanceQuery()
{
$results = \DB::select( \DB::raw("
SELECT
SUM(invoices.balance) as invoice_balance,
SUM(credits.balance) as credit_balance,
clients.id as client_id,
clients.balance as client_balance
FROM invoices
INNER JOIN
clients ON
clients.id=invoices.client_id
INNER JOIN
credits ON
credits.client_id = clients.id
WHERE invoices.is_deleted = false
AND invoices.status_id > 1
AND credits.is_deleted = false
AND credits.status_id > 1
GROUP BY clients.id
HAVING invoice_balance != clients.balance
ORDER BY clients.id;
SELECT
SUM(invoices.balance) as invoice_balance,
clients.id as client_id,
clients.balance as client_balance
FROM clients
LEFT JOIN
invoices ON
clients.id=invoices.client_id
WHERE invoices.is_deleted = false
AND invoices.status_id > 1
GROUP BY clients.id
HAVING invoice_balance != clients.balance
ORDER BY clients.id;
") );
return $results;
@ -686,7 +683,12 @@ ORDER BY clients.id;
{
$client = (array)$client;
$invoice_balance = $client['invoice_balance'] - $client['credit_balance'];
// $credit_balance = Credit::withTrashed()->where('is_deleted', 0)
// ->where('client_id', $client['client_id'])
// ->where('status_id', '>', 1)->sum('balance');
// $invoice_balance = $client['invoice_balance'] - $credit_balance;
$invoice_balance = $client['invoice_balance'];
$ledger = CompanyLedger::where('client_id', $client['client_id'])->orderBy('id', 'DESC')->first();
@ -701,8 +703,8 @@ ORDER BY clients.id;
if($this->option('client_balance')){
$this->logMessage("# {$client_object->id} " . $client_object->present()->name.' - '.$client_object->number." Fixing {$client_object->balance} to {$invoice_balance}");
$client->balance = $invoice_balance;
$client->save();
$client_object->balance = $invoice_balance;
$client_object->save();
$ledger->adjustment = $invoice_balance;
$ledger->balance = $invoice_balance;

View File

@ -19,6 +19,7 @@ use App\Factory\UserFactory;
use App\Filters\UserFilters;
use App\Http\Controllers\Traits\VerifiesUserEmail;
use App\Http\Requests\User\AttachCompanyUserRequest;
use App\Http\Requests\User\BulkUserRequest;
use App\Http\Requests\User\CreateUserRequest;
use App\Http\Requests\User\DestroyUserRequest;
use App\Http\Requests\User\DetachCompanyUserRequest;
@ -534,8 +535,9 @@ class UserController extends BaseController
* ),
* )
*/
public function bulk()
public function bulk(BulkUserRequest $request)
{
/* Validate restore() here and check if restoring the user will exceed their user quote (hosted only)*/
$action = request()->input('action');
$ids = request()->input('ids');

View File

@ -0,0 +1,48 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Http\Requests\User;
use App\Http\Requests\Request;
use App\Http\ValidationRules\Ninja\CanRestoreUserRule;
use App\Http\ValidationRules\UniqueUserRule;
use App\Utils\Ninja;
class BulkUserRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize() : bool
{
return auth()->user()->isAdmin();
}
public function rules()
{
$rules = [];
if(Ninja::isHosted() && $this->action && $this->action == 'restore')
$rules['ids'] = new CanRestoreUserRule();
return $rules;
}
protected function prepareForValidation()
{
$input = $this->all();
$this->replace($input);
}
}

View File

@ -11,6 +11,7 @@
namespace App\Http\ValidationRules\Ninja;
use App\Models\CompanyUser;
use Illuminate\Contracts\Validation\Rule;
/**
@ -30,7 +31,16 @@ class CanAddUserRule implements Rule
*/
public function passes($attribute, $value)
{
return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users;
$count = CompanyUser::query()
->with('user')
->where('account_id', auth()->user()->account_id)
->distinct()
->select('user_id')
->count();
return $count < auth()->user()->company()->account->num_users;
//return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users;
}
/**

View File

@ -0,0 +1,56 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://www.elastic.co/licensing/elastic-license
*/
namespace App\Http\ValidationRules\Ninja;
use App\Models\CompanyUser;
use App\Models\User;
use Illuminate\Contracts\Validation\Rule;
/**
* Class CanAddUserRule.
*/
class CanRestoreUserRule implements Rule
{
public function __construct()
{
}
/**
* @param string $attribute
* @param mixed $value
* @return bool
*/
public function passes($attribute, $value)
{
$count = User::query()
->with(['company_user' => function ($query){
return $query->whereNull('company_user.deleted_at');
}])
->where('account_id', 1)
->distinct()
->select('users.id')
->count();
return $count < auth()->user()->company()->account->num_users;
//return auth()->user()->company()->account->users->count() < auth()->user()->company()->account->num_users;
}
/**
* @return string
*/
public function message()
{
return ctrans('texts.limit_users', ['limit' => auth()->user()->company()->account->num_users]);
}
}

View File

@ -116,7 +116,7 @@ class CreateAccount
$spaa9f78->fresh();
if(Ninja::isHosted()){
nlog("welcome");
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($sp035a66->settings));

View File

@ -36,7 +36,7 @@ class PaymentFailedMailer implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, UserNotifies;
public PaymentHash $payment_hash;
public ?PaymentHash $payment_hash;
public string $error;

View File

@ -33,7 +33,7 @@ class PaymentFailureObject
public $amount;
public PaymentHash $payment_hash;
public ?PaymentHash $payment_hash;
// private $invoices;
/**

View File

@ -71,7 +71,7 @@ class BaseDriver extends AbstractPaymentDriver
public $payment_method;
/* PaymentHash */
public PaymentHash $payment_hash;
public ?PaymentHash $payment_hash;
/* Array of payment methods */
public static $methods = [];