StudioPlus Module Update

Fix filter by track and 500 issue on vc downline
This commit is contained in:
Leonard Biano
2024-06-02 20:26:00 +08:00
parent 73c2be72b1
commit 3d5b13bf45
9 changed files with 52 additions and 24 deletions
@@ -155,7 +155,7 @@ class StudioPlusVideoController extends Controller
'channel.user.staff',
'urls',
])
->filter($request)
//->filter($request)
->when($request->filled('category_id'), fn ($query) => $query->where('studio_plus_category_id', $request->category_id))
->when($request->filled('status') && $request->status !== 'All' && $request->status !== 'MVL', fn ($query) => $query->where('status', $status))
->when(isset($request->start_date) && strtotime($request->start_date) && isset($request->end_date) && strtotime($request->end_date), function($query) use($request) {
@@ -163,7 +163,7 @@ class StudioPlusVideoController extends Controller
$endDate = Carbon::createFromFormat('Y-m-d', $request->end_date)->endOfDay();
if($request->filled('tracks')){
$query->whereHas('tracks', function($query) use($startDate,$endDate) {
$query->whereHas('tracks', function($query) use($request,$startDate,$endDate) {
$query->where('name', $request->tracks);
$query->whereBetween('created_at', [$startDate, $endDate]);
});
@@ -563,7 +563,7 @@ class StudioPlusVideoController extends Controller
$endDate = Carbon::createFromFormat('Y-m-d', $request->end_date)->endOfDay();
if($request->filled('tracks')){
$query->whereHas('tracks', function($query) use($startDate,$endDate) {
$query->whereHas('tracks', function($query) use($request,$startDate,$endDate) {
$query->where('name', $request->tracks);
$query->whereBetween('created_at', [$startDate, $endDate]);
});