Re-add changes to avoid compilation errors
This commit is contained in:
@@ -48,8 +48,9 @@ public function summaryAll()
|
|||||||
|
|
||||||
public function summaryThisYear()
|
public function summaryThisYear()
|
||||||
{
|
{
|
||||||
|
$dt = new DateTime('first day of january this year');
|
||||||
$invoices = Invoice::select()
|
$invoices = Invoice::select()
|
||||||
->where('invoice_date', '>=', (new DateTime('first day of january this year')->format('Y-m-d')))
|
->where('invoice_date', '>=', $dt->format('Y-m-d'))
|
||||||
->orderBy('invoice_date', 'asc')
|
->orderBy('invoice_date', 'asc')
|
||||||
->orderByRaw("CAST(SUBSTRING(nr, 4) AS UNSIGNED) ASC")
|
->orderByRaw("CAST(SUBSTRING(nr, 4) AS UNSIGNED) ASC")
|
||||||
->get();
|
->get();
|
||||||
@@ -61,8 +62,9 @@ public function summaryThisYear()
|
|||||||
|
|
||||||
public function summaryBeforeThisYear()
|
public function summaryBeforeThisYear()
|
||||||
{
|
{
|
||||||
|
$dt = new DateTime('first day of january this year');
|
||||||
$invoices = Invoice::select()
|
$invoices = Invoice::select()
|
||||||
->where('invoice_date', '<', (new DateTime('first day of january this year')->format('Y-m-d')))
|
->where('invoice_date', '<', $dt->format('Y-m-d'))
|
||||||
->orderBy('invoice_date', 'asc')
|
->orderBy('invoice_date', 'asc')
|
||||||
->orderByRaw("CAST(SUBSTRING(nr, 4) AS UNSIGNED) ASC")
|
->orderByRaw("CAST(SUBSTRING(nr, 4) AS UNSIGNED) ASC")
|
||||||
->get();
|
->get();
|
||||||
|
|||||||
Reference in New Issue
Block a user