removed closing date and add it into env
This commit is contained in:
@@ -34,8 +34,8 @@ class FormEntertainmentPresentationController extends Controller
|
||||
$role = auth()->user()->getRoleNames()[0];
|
||||
$forms = FormEntertaimentPresentation::whereMonth('tanggal', date('m'))
|
||||
->whereYear('tanggal', date('Y'))
|
||||
->where('tanggal', '<=', date('Y-m-20'))
|
||||
->whereRaw('DAY(CURDATE()) <= 20')
|
||||
->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
|
||||
->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
|
||||
->orderBy('tanggal', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ class FormMeetingSeminarController extends Controller
|
||||
$role = auth()->user()->getRoleNames()[0];
|
||||
$forms = FormMeetingSeminar::whereMonth('created_at', date('m'))
|
||||
->whereYear('created_at', date('Y'))
|
||||
->where('created_at', '<=', date('Y-m-20'))
|
||||
->whereRaw('DAY(CURDATE()) <= 20')
|
||||
->where('created_at', '<=', date('Y-m-' . env('CLOSING_DATE')))
|
||||
->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
|
||||
->orderBy('created_at', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ class FormOtherController extends Controller
|
||||
$role = auth()->user()->getRoleNames()[0];
|
||||
$forms = FormOthers::whereMonth('tanggal', date('m'))
|
||||
->whereYear('tanggal', date('Y'))
|
||||
->where('tanggal', '<=', date('Y-m-20'))
|
||||
->whereRaw('DAY(CURDATE()) <= 20')
|
||||
->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
|
||||
->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
|
||||
->orderBy('tanggal', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ class FormUpCountryController extends Controller
|
||||
$role = auth()->user()->getRoleNames()[0];
|
||||
$forms = FormUpCountry::whereMonth('tanggal', date('m'))
|
||||
->whereYear('tanggal', date('Y'))
|
||||
->where('tanggal', '<=', date('Y-m-20'))
|
||||
->whereRaw('DAY(CURDATE()) <= 20')
|
||||
->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
|
||||
->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
|
||||
->orderBy('tanggal', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ class FormVehicleController extends Controller
|
||||
$role = auth()->user()->getRoleNames()[0];
|
||||
$forms = FormVehicleRunningCost::whereMonth('tanggal', date('m'))
|
||||
->whereYear('tanggal', date('Y'))
|
||||
->where('tanggal', '<=', date('Y-m-20'))
|
||||
->whereRaw('DAY(CURDATE()) <= 20')
|
||||
->where('tanggal', '<=', date('Y-m-' . env('CLOSING_DATE')))
|
||||
->whereRaw('DAY(CURDATE()) <= ' . env('CLOSING_DATE'))
|
||||
->orderBy('tanggal', 'desc')
|
||||
->get();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user