add filter date and dealer on mutations and opnames
This commit is contained in:
@@ -22,10 +22,38 @@ class OpnamesController extends Controller
|
||||
{
|
||||
public function index(Request $request){
|
||||
$menu = Menu::where('link','opnames.index')->first();
|
||||
$dealers = Dealer::all();
|
||||
if($request->ajax()){
|
||||
$data = Opname::with('user','dealer')
|
||||
->orderBy('created_at', 'desc')
|
||||
->get();
|
||||
$data = Opname::query()
|
||||
->with('user','dealer')
|
||||
->orderBy('created_at', 'desc');
|
||||
|
||||
// Filter berdasarkan dealer yang dipilih
|
||||
if ($request->filled('dealer_filter')) {
|
||||
$data->where('dealer_id', $request->dealer_filter);
|
||||
}
|
||||
|
||||
// Filter berdasarkan tanggal
|
||||
if ($request->filled('date_from')) {
|
||||
try {
|
||||
$dateFrom = \Carbon\Carbon::parse($request->date_from)->format('Y-m-d');
|
||||
$data->whereDate('opname_date', '>=', $dateFrom);
|
||||
} catch (\Exception $e) {
|
||||
// Fallback to original format
|
||||
$data->whereDate('opname_date', '>=', $request->date_from);
|
||||
}
|
||||
}
|
||||
|
||||
if ($request->filled('date_to')) {
|
||||
try {
|
||||
$dateTo = \Carbon\Carbon::parse($request->date_to)->format('Y-m-d');
|
||||
$data->whereDate('opname_date', '<=', $dateTo);
|
||||
} catch (\Exception $e) {
|
||||
// Fallback to original format
|
||||
$data->whereDate('opname_date', '<=', $request->date_to);
|
||||
}
|
||||
}
|
||||
|
||||
return DataTables::of($data)
|
||||
->addColumn('user_name', function ($row){
|
||||
return $row->user ? $row->user->name : '-';
|
||||
@@ -59,7 +87,7 @@ class OpnamesController extends Controller
|
||||
->make(true);
|
||||
}
|
||||
|
||||
return view('warehouse_management.opnames.index');
|
||||
return view('warehouse_management.opnames.index', compact('dealers'));
|
||||
}
|
||||
|
||||
public function create(){
|
||||
|
||||
Reference in New Issue
Block a user