TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 12:11:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix dashbord & using FROM_MAIL_ADDRESS issues

Browse Source
This commit is contained in:
raishvaria
2020-01-27 13:43:48 +05:30
parent 22e7e96dfa
commit ca170f5a87
7 changed files with 38 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/DashboardController.php
View File

@ -36,7 +36,8 @@ class DashboardController extends Controller
$start = Carbon::now();
$end = Carbon::now();
$terms = explode('-', $fiscalYear);
if ($terms[0] < $start->month) {
if ($terms[0] <= $start->month) {
$startDate->month($terms[0])->startOfMonth();
$start->month($terms[0])->startOfMonth();
$end->month($terms[0])->endOfMonth();
@ -93,6 +94,7 @@ class DashboardController extends Controller
}
$start->subMonth()->endOfMonth();
$salesTotal = Invoice::whereCompany($request->header('company'))
->whereBetween(
'invoice_date',