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

remove first name last name required (#3756)

Browse Source 
* remove first name last name required

* Working on check update script
This commit is contained in:
David Bomba 2020-05-26 22:37:15 +10:00 committed by GitHub
parent 0a4464fc23
commit a80e3ba454
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,9 @@ namespace App\Console\Commands;
use App; use App;
use App\Libraries\CurlUtils; use App\Libraries\CurlUtils;
use App\Models\Account; use App\Models\Account;
use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\CompanyLedger;
use App\Models\Contact; use App\Models\Contact;
use App\Models\Invitation; use App\Models\Invitation;
use App\Models\Invoice; use App\Models\Invoice;
@ -287,56 +289,59 @@ class CheckData extends Command
private function checkInvoiceBalances() private function checkInvoiceBalances()
{ {
// $invoices = DB::table('invoices')
// ->leftJoin('payments', function($join) {
// $join->on('payments.invoice_id', '=', 'invoices.id')
// ->where('payments.payment_status_id', '!=', 2)
// ->where('payments.payment_status_id', '!=', 3)
// ->where('payments.is_deleted', '=', 0);
// })
// ->where('invoices.updated_at', '>', '2017-10-01')
// ->groupBy('invoices.id')
// ->havingRaw('(invoices.amount - invoices.balance) != coalesce(sum(payments.amount - payments.refunded), 0)')
// ->get(['invoices.id', 'invoices.amount', 'invoices.balance', DB::raw('coalesce(sum(payments.amount - payments.refunded), 0)')]);
// $this->logMessage($invoices->count() . ' invoices with incorrect balances'); $wrong_balances = 0;
$wrong_paid_to_dates = 0;
foreach(Client::cursor() as $client)
{
$invoice_balance = $client->invoices->where('is_deleted', false)->sum('balance');
$ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
if($ledger && $invoice_balance != $client->balance)
{
$wrong_balances++;
$this->logMessage($client->present()->name . " - " . $client->id . " - balances do not match {$invoice_balance} - {$client->balance} - {$ledger->balance}");
$this->isValid = false;
}
}
$this->logMessage("{$wrong_balances} clients with incorrect balances");
// if ($invoices->count() > 0) {
// $this->isValid = false;
// }
} }
private function checkClientBalances() private function checkClientBalances()
{ {
// find all clients where the balance doesn't equal the sum of the outstanding invoices
// $clients = DB::table('clients')
// ->join('invoices', 'invoices.client_id', '=', 'clients.id')
// ->join('accounts', 'accounts.id', '=', 'clients.company_id')
// ->where('accounts.id', '!=', 20432)
// ->where('clients.is_deleted', '=', 0)
// ->where('invoices.is_deleted', '=', 0)
// ->where('invoices.is_public', '=', 1)
// ->where('invoices.invoice_type_id', '=', INVOICE_TYPE_STANDARD)
// ->where('invoices.is_recurring', '=', 0)
// ->havingRaw('abs(clients.balance - sum(invoices.balance)) > .01 and clients.balance != 999999999.9999');
// if ($this->option('client_id')) { $wrong_balances = 0;
// $clients->where('clients.id', '=', $this->option('client_id')); $wrong_paid_to_dates = 0;
// }
// $clients = $clients->groupBy('clients.id', 'clients.balance') foreach(Client::cursor() as $client)
// ->orderBy('accounts.company_id', 'DESC') {
// ->get(['accounts.company_id', 'clients.company_id', 'clients.id', 'clients.balance', 'clients.paid_to_date', DB::raw('sum(invoices.balance) actual_balance')]); $invoice_balance = $client->invoices->where('is_deleted', false)->sum('balance');
// $this->logMessage($clients->count() . ' clients with incorrect balance/activities'); $invoice_amounts = $client->invoices->where('is_deleted', false)->sum('amount') - $invoice_balance;
// if ($clients->count() > 0) { $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
// $this->isValid = false;
// }
// foreach ($clients as $client) { if($ledger && (string)$invoice_amounts != rtrim($client->paid_to_date, "0"))
// $this->logMessage("=== Company: {$client->company_id} Account:{$client->company_id} Client:{$client->id} Balance:{$client->balance} Actual Balance:{$client->actual_balance} ==="); {
$wrong_paid_to_dates++;
$this->logMessage($client->present()->name . " - " . $client->id . " - client paid to dates do not match {$invoice_amounts} - " .rtrim($client->paid_to_date, "0"));
$this->isValid = false;
}
}
$this->logMessage("{$wrong_paid_to_dates} clients with incorrect paid_to_dates");
//}
} }
private function checkLogoFiles() private function checkLogoFiles()

4
app/Http/Requests/Account/CreateAccountRequest.php
View File

@ -36,8 +36,8 @@ class CreateAccountRequest extends Request
{ {
return [ return [
//'email' => 'required|string|email|max:100', //'email' => 'required|string|email|max:100',
'first_name' => 'required|string|max:100', 'first_name' => 'string|max:100',
'last_name' => 'required|string:max:100', 'last_name' => 'string:max:100',
'password' => 'required|string|min:6', 'password' => 'required|string|min:6',
'email' => 'bail|required|email', 'email' => 'bail|required|email',
'email' => new NewUniqueUserRule(), 'email' => new NewUniqueUserRule(),

5
app/Models/Client.php
View File

@ -182,6 +182,11 @@ class Client extends BaseModel implements HasLocalePreference
return $this->belongsTo(Country::class); return $this->belongsTo(Country::class);
} }
public function invoices()
{
return $this->hasMany(Invoice::class);
}
public function shipping_country() public function shipping_country()
{ {
return $this->belongsTo(Country::class, 'shipping_country_id', 'id'); return $this->belongsTo(Country::class, 'shipping_country_id', 'id');