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

Fixes for query grammar

Browse Source
This commit is contained in:
David Bomba 2023-08-21 11:29:31 +10:00
parent 1182184306
commit 805229f4c0
55 changed files with 164 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,7 @@ class CheckData extends Command
GROUP BY clients.id GROUP BY clients.id
HAVING payments_applied != client_paid_to_date HAVING payments_applied != client_paid_to_date
ORDER BY clients.id; ORDER BY clients.id;
")); ")->getValue(DB::connection()->getQueryGrammar()));
return $results; return $results;
} }
@ -583,7 +583,7 @@ class CheckData extends Command
AND paymentables.amount > 0 AND paymentables.amount > 0
AND payments.is_deleted = 0 AND payments.is_deleted = 0
AND payments.client_id = ?; AND payments.client_id = ?;
"), [App\Models\Credit::class, $client->id]); ")->getValue(DB::connection()->getQueryGrammar()), [App\Models\Credit::class, $client->id]);
return $results; return $results;
} }
@ -636,7 +636,7 @@ class CheckData extends Command
->where('clients.updated_at', '>', now()->subDays(2)) ->where('clients.updated_at', '>', now()->subDays(2))
->groupBy('clients.id') ->groupBy('clients.id')
->havingRaw('clients.paid_to_date != sum(coalesce(payments.amount - payments.refunded, 0))') ->havingRaw('clients.paid_to_date != sum(coalesce(payments.amount - payments.refunded, 0))')
->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(coalesce(payments.amount - payments.refunded, 0)) as amount')]); ->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(coalesce(payments.amount - payments.refunded, 0)) as amount')->getValue(DB::connection()->getQueryGrammar())]);
/* Due to accounting differences we need to perform a second loop here to ensure there actually is an issue */ /* Due to accounting differences we need to perform a second loop here to ensure there actually is an issue */
$clients->each(function ($client_record) use ($credit_total_applied) { $clients->each(function ($client_record) use ($credit_total_applied) {
@ -656,7 +656,7 @@ class CheckData extends Command
$p = Payment::where('client_id', $client->id) $p = Payment::where('client_id', $client->id)
->where('is_deleted', 0) ->where('is_deleted', 0)
->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED]) ->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])
->sum(DB::Raw('amount - applied')); ->sum(DB::Raw('amount - applied')->getValue(DB::connection()->getQueryGrammar()));
$total_invoice_payments += $p; $total_invoice_payments += $p;
@ -736,7 +736,7 @@ class CheckData extends Command
GROUP BY clients.id GROUP BY clients.id
HAVING invoice_balance != clients.balance HAVING invoice_balance != clients.balance
ORDER BY clients.id; ORDER BY clients.id;
")); ")->getValue(DB::connection()->getQueryGrammar()));
return $results; return $results;
} }
@ -827,7 +827,7 @@ class CheckData extends Command
GROUP BY clients.id GROUP BY clients.id
HAVING(invoices_balance != clients.balance) HAVING(invoices_balance != clients.balance)
ORDER BY clients.id; ORDER BY clients.id;
")); ")->getValue(DB::connection()->getQueryGrammar()));
return $results; return $results;
} }
@ -961,7 +961,7 @@ class CheckData extends Command
} }
$records = DB::table($table) $records = DB::table($table)
->join($tableName, "{$tableName}.id", '=', "{$table}.{$field}_id") ->join($tableName, "{$tableName}.id", '=', "{$table}.{$field}_id")
->where("{$table}.{$company_id}", '!=', DB::raw("{$tableName}.company_id")) ->where("{$table}.{$company_id}", '!=', DB::raw("{$tableName}.company_id")->getValue(DB::connection()->getQueryGrammar()))
->get(["{$table}.id"]); ->get(["{$table}.id"]);
if ($records->count()) { if ($records->count()) {

2
app/Import/Providers/BaseImport.php
View File

@ -734,7 +734,7 @@ class BaseImport
{ {
$user = User::where('account_id', $this->company->account->id) $user = User::where('account_id', $this->company->account->id)
->where( ->where(
\DB::raw('CONCAT_WS(" ", first_name, last_name)'), \DB::raw('CONCAT_WS(" ", first_name, last_name)')->getValue(DB::connection()->getQueryGrammar()),
'like', 'like',
'%'.$user_hash.'%' '%'.$user_hash.'%'
) )

15
app/Jobs/Ninja/CheckCompanyData.php
View File

@ -158,17 +158,6 @@ class CheckCompanyData implements ShouldQueue
$total_invoice_payments += ($total_amount - $total_refund); $total_invoice_payments += ($total_amount - $total_refund);
} }
//10/02/21
// foreach ($client->payments as $payment) {
// $credit_total_applied += $payment->paymentables->where('paymentable_type', App\Models\Credit::class)->sum(DB::raw('amount'));
// }
// if ($credit_total_applied < 0) {
// $total_invoice_payments += $credit_total_applied;
// } //todo this is contentious
// nlog("total invoice payments = {$total_invoice_payments} with client paid to date of of {$client->paid_to_date}");
if (round($total_invoice_payments, 2) != round($client->paid_to_date, 2)) { if (round($total_invoice_payments, 2) != round($client->paid_to_date, 2)) {
$wrong_paid_to_dates++; $wrong_paid_to_dates++;
@ -287,7 +276,7 @@ class CheckCompanyData implements ShouldQueue
// $clients->where('clients.id', '=', $this->option('client_id')); // $clients->where('clients.id', '=', $this->option('client_id'));
// } // }
$clients = $clients->get(['clients.id', DB::raw('count(client_contacts.id)')]); $clients = $clients->get(['clients.id', DB::raw('count(client_contacts.id)')->getValue(DB::connection()->getQueryGrammar())]);
$this->company_data[] = $clients->count().' clients without a single primary contact'; $this->company_data[] = $clients->count().' clients without a single primary contact';
if ($clients->count() > 0) { if ($clients->count() > 0) {
@ -326,7 +315,7 @@ class CheckCompanyData implements ShouldQueue
} }
$records = DB::table($table) $records = DB::table($table)
->join($tableName, "{$tableName}.id", '=', "{$table}.{$field}_id") ->join($tableName, "{$tableName}.id", '=', "{$table}.{$field}_id")
->where("{$table}.{$company_id}", '!=', DB::raw("{$tableName}.company_id")) ->where("{$table}.{$company_id}", '!=', DB::raw("{$tableName}.company_id")->getValue(DB::connection()->getQueryGrammar()))
->get(["{$table}.id"]); ->get(["{$table}.id"]);
if ($records->count()) { if ($records->count()) {

2
app/Jobs/Util/Import.php
View File

@ -302,7 +302,7 @@ class Import implements ShouldQueue
// 10/02/21 // 10/02/21
foreach ($client->payments as $payment) { foreach ($client->payments as $payment) {
$credit_total_applied += $payment->paymentables()->where('paymentable_type', \App\Models\Credit::class)->get()->sum(\DB::raw('amount')); $credit_total_applied += $payment->paymentables()->where('paymentable_type', \App\Models\Credit::class)->get()->sum(\DB::raw('amount')->getValue(DB::connection()->getQueryGrammar()));
} }
if ($credit_total_applied < 0) { if ($credit_total_applied < 0) {

20
app/Services/Chart/ChartQueries.php
View File

@ -34,7 +34,7 @@ trait ChartQueries
AND (expenses.date BETWEEN :start_date AND :end_date) AND (expenses.date BETWEEN :start_date AND :end_date)
{$user_filter} {$user_filter}
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getExpenseChartQuery($start_date, $end_date, $currency_id) public function getExpenseChartQuery($start_date, $end_date, $currency_id)
@ -54,7 +54,7 @@ trait ChartQueries
{$user_filter} {$user_filter}
GROUP BY expenses.date GROUP BY expenses.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
@ -80,7 +80,7 @@ trait ChartQueries
AND payments.company_id = :company_id AND payments.company_id = :company_id
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
@ -106,7 +106,7 @@ trait ChartQueries
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY payments.date GROUP BY payments.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
@ -139,7 +139,7 @@ trait ChartQueries
AND invoices.balance > 0 AND invoices.balance > 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getRevenueQueryX($start_date, $end_date) public function getRevenueQueryX($start_date, $end_date)
@ -161,7 +161,7 @@ trait ChartQueries
AND invoices.status_id IN (3,4) AND invoices.status_id IN (3,4)
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getRevenueQuery($start_date, $end_date) public function getRevenueQuery($start_date, $end_date)
@ -179,7 +179,7 @@ trait ChartQueries
AND payments.status_id IN (1,4,5,6) AND payments.status_id IN (1,4,5,6)
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY payments.currency_id GROUP BY payments.currency_id
"), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getInvoicesQuery($start_date, $end_date) public function getInvoicesQuery($start_date, $end_date)
@ -201,7 +201,7 @@ trait ChartQueries
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getOutstandingChartQuery($start_date, $end_date, $currency_id) public function getOutstandingChartQuery($start_date, $end_date, $currency_id)
@ -224,7 +224,7 @@ trait ChartQueries
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.date GROUP BY invoices.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => (int) $this->company->settings->currency_id, 'company_currency' => (int) $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
@ -254,7 +254,7 @@ trait ChartQueries
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.date GROUP BY invoices.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => (int) $this->company->settings->currency_id, 'company_currency' => (int) $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,

13
app/Services/Chart/ChartQueriesLegacy.php
View File

@ -23,6 +23,7 @@ trait ChartQueriesLegacy
*/ */
public function getExpenseQuery($start_date, $end_date) public function getExpenseQuery($start_date, $end_date)
{ {
return DB::select(DB::raw(' return DB::select(DB::raw('
SELECT sum(expenses.amount) as amount, SELECT sum(expenses.amount) as amount,
IFNULL(expenses.currency_id, :company_currency) as currency_id IFNULL(expenses.currency_id, :company_currency) as currency_id
@ -31,7 +32,7 @@ trait ChartQueriesLegacy
AND expenses.company_id = :company_id AND expenses.company_id = :company_id
AND (expenses.date BETWEEN :start_date AND :end_date) AND (expenses.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
'), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ')->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getExpenseChartQuery($start_date, $end_date, $currency_id) public function getExpenseChartQuery($start_date, $end_date, $currency_id)
@ -47,7 +48,7 @@ trait ChartQueriesLegacy
AND expenses.is_deleted = 0 AND expenses.is_deleted = 0
GROUP BY expenses.date GROUP BY expenses.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
'), [ ')->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
@ -69,7 +70,7 @@ trait ChartQueriesLegacy
AND payments.company_id = :company_id AND payments.company_id = :company_id
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
'), [ ')->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
@ -91,7 +92,7 @@ trait ChartQueriesLegacy
AND payments.is_deleted = 0 AND payments.is_deleted = 0
GROUP BY payments.date GROUP BY payments.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
'), [ ')->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
@ -119,7 +120,7 @@ trait ChartQueriesLegacy
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
public function getRevenueQuery($start_date, $end_date) public function getRevenueQuery($start_date, $end_date)
@ -158,7 +159,7 @@ trait ChartQueriesLegacy
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
GROUP BY invoices.date GROUP BY invoices.date
HAVING currency_id = :currency_id HAVING currency_id = :currency_id
"), [ ")->getValue(DB::connection()->getQueryGrammar()), [
'company_currency' => (int) $this->company->settings->currency_id, 'company_currency' => (int) $this->company->settings->currency_id,
'currency_id' => $currency_id, 'currency_id' => $currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,

6
app/Services/Invoice/HandleRestore.php
View File

@ -96,17 +96,17 @@ class HandleRestore extends AbstractService
$this->adjustment_amount += $payment->paymentables $this->adjustment_amount += $payment->paymentables
->where('paymentable_type', '=', 'invoices') ->where('paymentable_type', '=', 'invoices')
->where('paymentable_id', $this->invoice->id) ->where('paymentable_id', $this->invoice->id)
->sum(DB::raw('amount')); ->sum(DB::raw('amount')->getValue(DB::connection()->getQueryGrammar()));
$this->adjustment_amount += $payment->paymentables $this->adjustment_amount += $payment->paymentables
->where('paymentable_type', '=', 'invoices') ->where('paymentable_type', '=', 'invoices')
->where('paymentable_id', $this->invoice->id) ->where('paymentable_id', $this->invoice->id)
->sum(DB::raw('refunded')); ->sum(DB::raw('refunded')->getValue(DB::connection()->getQueryGrammar()));
//14/07/2023 - do not include credits in the payment amount //14/07/2023 - do not include credits in the payment amount
$this->adjustment_amount -= $payment->paymentables $this->adjustment_amount -= $payment->paymentables
->where('paymentable_type', '=', 'App\Models\Credit') ->where('paymentable_type', '=', 'App\Models\Credit')
->sum(DB::raw('amount')); ->sum(DB::raw('amount')->getValue(DB::connection()->getQueryGrammar()));
} }

6
app/Services/Invoice/MarkInvoiceDeleted.php
View File

@ -88,17 +88,17 @@ class MarkInvoiceDeleted extends AbstractService
$payment_adjustment = $payment->paymentables $payment_adjustment = $payment->paymentables
->where('paymentable_type', '=', 'invoices') ->where('paymentable_type', '=', 'invoices')
->where('paymentable_id', $this->invoice->id) ->where('paymentable_id', $this->invoice->id)
->sum(DB::raw('amount')); ->sum(DB::raw('amount')->getValue(DB::connection()->getQueryGrammar()));
$payment_adjustment -= $payment->paymentables $payment_adjustment -= $payment->paymentables
->where('paymentable_type', '=', 'invoices') ->where('paymentable_type', '=', 'invoices')
->where('paymentable_id', $this->invoice->id) ->where('paymentable_id', $this->invoice->id)
->sum(DB::raw('refunded')); ->sum(DB::raw('refunded')->getValue(DB::connection()->getQueryGrammar()));
//14-07-2023 - Do not include credits in the payment adjustment. //14-07-2023 - Do not include credits in the payment adjustment.
$payment_adjustment -= $payment->paymentables $payment_adjustment -= $payment->paymentables
->where('paymentable_type', '=', 'App\Models\Credit') ->where('paymentable_type', '=', 'App\Models\Credit')
->sum(DB::raw('amount')); ->sum(DB::raw('amount')->getValue(DB::connection()->getQueryGrammar()));
$payment->amount -= $payment_adjustment; $payment->amount -= $payment_adjustment;
$payment->applied -= $payment_adjustment; $payment->applied -= $payment_adjustment;

8
app/Services/Report/ProfitLoss.php
View File

@ -250,7 +250,7 @@ class ProfitLoss
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
} }
/** /**
@ -421,7 +421,7 @@ class ProfitLoss
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
"), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]); ")->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
} }
/** /**
@ -447,7 +447,7 @@ class ProfitLoss
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
ORDER BY currency_id; ORDER BY currency_id;
'), ['company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]); ')->getValue(DB::connection()->getQueryGrammar()), ['company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
} }
private function expenseData() private function expenseData()
@ -553,7 +553,7 @@ class ProfitLoss
AND expenses.company_id = :company_id AND expenses.company_id = :company_id
AND (expenses.date BETWEEN :start_date AND :end_date) AND (expenses.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
'), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]); ')->getValue(DB::connection()->getQueryGrammar()), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
} }
private function setBillingReportType() private function setBillingReportType()

4
app/Transformers/AccountTransformer.php
View File

@ -28,7 +28,7 @@ class AccountTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
//'default_company', //'default_company',
//'user', //'user',
//'company_users' //'company_users'
@ -37,7 +37,7 @@ class AccountTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'default_company', 'default_company',
'company_users', 'company_users',
'companies', 'companies',

4
app/Transformers/ActivityTransformer.php
View File

@ -34,12 +34,12 @@ class ActivityTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = []; protected array $defaultIncludes = [];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'history', 'history',
'user', 'user',
'client', 'client',

4
app/Transformers/ArraySerializer.php
View File

@ -24,7 +24,7 @@ class ArraySerializer extends FractalArraySerializer
* *
* @return array * @return array
*/ */
public function collection($resourceKey, array $data) public function collection(?string $resourceKey, array $data): array
{ {
return $data; return $data;
} }
@ -35,7 +35,7 @@ class ArraySerializer extends FractalArraySerializer
* *
* @return array * @return array
*/ */
public function item($resourceKey, array $data) public function item(?string $resourceKey, array $data): array
{ {
return $data; return $data;
} }

4
app/Transformers/BankIntegrationTransformer.php
View File

@ -28,7 +28,7 @@ class BankIntegrationTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
//'default_company', //'default_company',
//'user', //'user',
//'company_users' //'company_users'
@ -37,7 +37,7 @@ class BankIntegrationTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'company', 'company',
'account', 'account',
'bank_transactions', 'bank_transactions',

4
app/Transformers/BankTransactionRuleTransformer.php
View File

@ -29,13 +29,13 @@ class BankTransactionRuleTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'company', 'company',
'vendor', 'vendor',
'client', 'client',

4
app/Transformers/BankTransactionTransformer.php
View File

@ -28,13 +28,13 @@ class BankTransactionTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'company', 'company',
// 'expense', // 'expense',
'payment', 'payment',

4
app/Transformers/ClientTransformer.php
View File

@ -29,7 +29,7 @@ class ClientTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'contacts', 'contacts',
'documents', 'documents',
'gateway_tokens', 'gateway_tokens',
@ -38,7 +38,7 @@ class ClientTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'activities', 'activities',
'ledger', 'ledger',
'system_logs', 'system_logs',

4
app/Transformers/CompanyGatewayTransformer.php
View File

@ -29,13 +29,13 @@ class CompanyGatewayTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'system_logs', 'system_logs',
'gateway', 'gateway',
]; ];

4
app/Transformers/CompanyTokenHashedTransformer.php
View File

@ -24,13 +24,13 @@ class CompanyTokenHashedTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/CompanyTokenTransformer.php
View File

@ -24,13 +24,13 @@ class CompanyTokenTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/CompanyTransformer.php
View File

@ -59,14 +59,14 @@ class CompanyTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'documents', 'documents',
'users', 'users',
'designs', 'designs',

4
app/Transformers/CompanyUserTransformer.php
View File

@ -22,14 +22,14 @@ class CompanyUserTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
// 'user', // 'user',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'user', 'user',
'company', 'company',
'token', 'token',

4
app/Transformers/Contact/InvoiceTransformer.php
View File

@ -19,11 +19,11 @@ class InvoiceTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
// 'invoice_items', // 'invoice_items',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
public function transform(Invoice $invoice) public function transform(Invoice $invoice)

4
app/Transformers/CreditTransformer.php
View File

@ -24,12 +24,12 @@ class CreditTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'activities', 'activities',
'client', 'client',
]; ];

4
app/Transformers/DesignTransformer.php
View File

@ -26,13 +26,13 @@ class DesignTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/DocumentTransformer.php
View File

@ -20,9 +20,9 @@ class DocumentTransformer extends EntityTransformer
protected $serializer; protected $serializer;
protected $defaultIncludes = []; protected array $defaultIncludes = [];
protected $availableIncludes = []; protected array $availableIncludes = [];
public function __construct($serializer = null) public function __construct($serializer = null)
{ {

2
app/Transformers/EntityTransformer.php
View File

@ -44,7 +44,7 @@ class EntityTransformer extends TransformerAbstract
return $this->item($data, $transformer, $entityType); return $this->item($data, $transformer, $entityType);
} }
public function getDefaultIncludes() public function getDefaultIncludes(): array
{ {
return $this->defaultIncludes; return $this->defaultIncludes;
} }

4
app/Transformers/ExpenseCategoryTransformer.php
View File

@ -23,13 +23,13 @@ class ExpenseCategoryTransformer extends EntityTransformer
use MakesHash; use MakesHash;
use SoftDeletes; use SoftDeletes;
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/ExpenseTransformer.php
View File

@ -30,14 +30,14 @@ class ExpenseTransformer extends EntityTransformer
use MakesHash; use MakesHash;
use SoftDeletes; use SoftDeletes;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'client', 'client',
'vendor', 'vendor',
'category', 'category',

4
app/Transformers/GatewayTransformer.php
View File

@ -21,13 +21,13 @@ class GatewayTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/GroupSettingTransformer.php
View File

@ -23,14 +23,14 @@ class GroupSettingTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/InvoiceHistoryTransformer.php
View File

@ -19,11 +19,11 @@ class InvoiceHistoryTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
// 'activity', // 'activity',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'activity', 'activity',
]; ];

4
app/Transformers/InvoiceTransformer.php
View File

@ -24,12 +24,12 @@ class InvoiceTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'payments', 'payments',
'client', 'client',
'activities', 'activities',

4
app/Transformers/PaymentTransformer.php
View File

@ -24,12 +24,12 @@ class PaymentTransformer extends EntityTransformer
protected $serializer; protected $serializer;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'paymentables', 'paymentables',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'client', 'client',
'invoices', 'invoices',
]; ];

4
app/Transformers/PaymentableTransformer.php
View File

@ -21,9 +21,9 @@ class PaymentableTransformer extends EntityTransformer
protected $serializer; protected $serializer;
protected $defaultIncludes = []; protected array $defaultIncludes = [];
protected $availableIncludes = []; protected array $availableIncludes = [];
public function __construct($serializer = null) public function __construct($serializer = null)
{ {

4
app/Transformers/ProductTransformer.php
View File

@ -22,14 +22,14 @@ class ProductTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'company', 'company',
'user', 'user',
]; ];

4
app/Transformers/ProjectTransformer.php
View File

@ -25,14 +25,14 @@ class ProjectTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'client', 'client',
'tasks', 'tasks',
]; ];

4
app/Transformers/PurchaseOrderTransformer.php
View File

@ -22,12 +22,12 @@ class PurchaseOrderTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents' 'documents'
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'expense', 'expense',
'vendor', 'vendor',
]; ];

4
app/Transformers/QuoteTransformer.php
View File

@ -24,12 +24,12 @@ class QuoteTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'activities', 'activities',
'client', 'client',
]; ];

4
app/Transformers/RecurringExpenseTransformer.php
View File

@ -27,14 +27,14 @@ class RecurringExpenseTransformer extends EntityTransformer
use MakesHash; use MakesHash;
use SoftDeletes; use SoftDeletes;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'documents', 'documents',
'client', 'client',
'vendor', 'vendor',

4
app/Transformers/RecurringInvoiceTransformer.php
View File

@ -23,12 +23,12 @@ class RecurringInvoiceTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'activities', 'activities',
'client', 'client',
]; ];

4
app/Transformers/RecurringQuoteTransformer.php
View File

@ -22,12 +22,12 @@ class RecurringQuoteTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'invitations', 'invitations',
'documents', 'documents',
]; ];
protected $availableIncludes = [ protected array $availableIncludes = [
'invitations', 'invitations',
'documents', 'documents',
'activities', 'activities',

4
app/Transformers/Shop/CompanyShopProfileTransformer.php
View File

@ -26,13 +26,13 @@ class CompanyShopProfileTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
/** /**

4
app/Transformers/SubscriptionTransformer.php
View File

@ -22,13 +22,13 @@ class SubscriptionTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
]; ];
public function transform(Subscription $subscription): array public function transform(Subscription $subscription): array

4
app/Transformers/SystemLogTransformer.php
View File

@ -9,12 +9,12 @@ class SystemLogTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = []; protected array $defaultIncludes = [];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = []; protected array $availableIncludes = [];
/** /**
* @param SystemLog $system_log * @param SystemLog $system_log

4
app/Transformers/TaskTransformer.php
View File

@ -28,7 +28,7 @@ class TaskTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'documents', 'documents',
'project', 'project',
]; ];
@ -36,7 +36,7 @@ class TaskTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'client', 'client',
'status', 'status',
'project', 'project',

4
app/Transformers/UserTransformer.php
View File

@ -25,14 +25,14 @@ class UserTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $defaultIncludes = [ protected array $defaultIncludes = [
//'company_user' //'company_user'
]; ];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'companies', 'companies',
'company_users', 'company_users',
'company_user', 'company_user',

4
app/Transformers/VendorTransformer.php
View File

@ -25,7 +25,7 @@ class VendorTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = [ protected array $defaultIncludes = [
'contacts', 'contacts',
'documents', 'documents',
]; ];
@ -33,7 +33,7 @@ class VendorTransformer extends EntityTransformer
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = [ protected array $availableIncludes = [
'activities', 'activities',
]; ];

4
app/Transformers/WebhookTransformer.php
View File

@ -9,12 +9,12 @@ class WebhookTransformer extends EntityTransformer
{ {
use MakesHash; use MakesHash;
protected $defaultIncludes = []; protected array $defaultIncludes = [];
/** /**
* @var array * @var array
*/ */
protected $availableIncludes = []; protected array $availableIncludes = [];
/** /**
* @param Webhook $webhook * @param Webhook $webhook

2
app/Utils/Ninja.php
View File

@ -43,7 +43,7 @@ class Ninja
public static function getDebugInfo() public static function getDebugInfo()
{ {
$mysql_version = DB::select(DB::raw('select version() as version'))[0]->version; $mysql_version = DB::select(DB::raw('select version() as version')->getValue(DB::connection()->getQueryGrammar()))[0]->version;
$version = request()->input('version', 'No Version Supplied.'); $version = request()->input('version', 'No Version Supplied.');

1
phpunit.xml
View File

@ -23,6 +23,7 @@
<env name="MAIL_MAILER" value="array"/> <env name="MAIL_MAILER" value="array"/>
<env name="DB_CONNECTION" value="sqlite"/> <env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/> <env name="DB_DATABASE" value=":memory:"/>
<env name="DB_STRICT" value="FALSE"/>
</php> </php>
<logging/> <logging/>
</phpunit> </phpunit>

11
tests/Feature/Export/ReportApiTest.php
View File

@ -11,10 +11,12 @@
namespace Tests\Feature\Export; namespace Tests\Feature\Export;
use App\Utils\Traits\MakesHash;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Tests\MockAccountData;
use Tests\TestCase; use Tests\TestCase;
use Tests\MockAccountData;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\Event;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Foundation\Testing\Concerns\InteractsWithExceptionHandling;
/** /**
* @test * @test
@ -36,8 +38,7 @@ class ReportApiTest extends TestCase
ThrottleRequests::class ThrottleRequests::class
); );
$this->withoutExceptionHandling(); // $this->withoutExceptionHandling();
$this->makeTestData(); $this->makeTestData();
} }

43
tests/Feature/Export/UserSalesReportTest.php
View File

@ -11,18 +11,21 @@
namespace Tests\Feature\Export; namespace Tests\Feature\Export;
use App\DataMapper\CompanySettings; use Tests\TestCase;
use App\Export\CSV\ProductSalesExport; use App\Models\User;
use App\Factory\InvoiceItemFactory;
use App\Models\Account;
use App\Models\Client; use App\Models\Client;
use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\User; use App\Utils\Traits\AppSetup;
use App\Services\Report\UserSalesReport;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\DataMapper\CompanySettings;
use App\Factory\InvoiceItemFactory;
use Illuminate\Support\Facades\Cache;
use App\Export\CSV\ProductSalesExport;
use Illuminate\Support\Facades\Schema;
use App\Services\Report\UserSalesReport;
use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Routing\Middleware\ThrottleRequests;
use Tests\TestCase;
/** /**
* @test * @test
@ -44,6 +47,32 @@ class UserSalesReportTest extends TestCase
); );
$this->withoutExceptionHandling(); $this->withoutExceptionHandling();
/* Warm up the cache !*/
$cached_tables = config('ninja.cached_tables');
$this->artisan('db:seed --force');
foreach ($cached_tables as $name => $class) {
// check that the table exists in case the migration is pending
if (! Schema::hasTable((new $class())->getTable())) {
continue;
}
if ($name == 'payment_terms') {
$orderBy = 'num_days';
} elseif ($name == 'fonts') {
$orderBy = 'sort_order';
} elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) {
$orderBy = 'name';
} else {
$orderBy = 'id';
}
$tableData = $class::orderBy($orderBy)->get();
if ($tableData->count()) {
Cache::forever($name, $tableData);
}
}
} }
public $company; public $company;

2
tests/MockAccountData.php
View File

@ -57,7 +57,6 @@ use App\Models\VendorContact;
use App\Utils\Traits\GeneratesCounter; use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\TruthSource; use App\Utils\TruthSource;
use Illuminate\Foundation\Testing\WithoutEvents;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
@ -71,7 +70,6 @@ trait MockAccountData
{ {
use MakesHash; use MakesHash;
use GeneratesCounter; use GeneratesCounter;
use WithoutEvents;
/** /**
* @var * @var

1
tests/TestCase.php
View File

@ -2,6 +2,7 @@
namespace Tests; namespace Tests;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
abstract class TestCase extends BaseTestCase abstract class TestCase extends BaseTestCase

3
tests/Unit/WithTypeHelpersTest.php
View File

@ -15,10 +15,13 @@ namespace Tests\Unit;
use App\Models\Account; use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Models\Document; use App\Models\Document;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Tests\TestCase; use Tests\TestCase;
class WithTypeHelpersTest extends TestCase class WithTypeHelpersTest extends TestCase
{ {
use DatabaseMigrations;
public function testIsImageHelper(): void public function testIsImageHelper(): void
{ {
$account = Account::factory()->create(); $account = Account::factory()->create();