This commit is contained in:
meusinfirmary
2025-05-29 13:21:59 +07:00
parent 3b9d94620a
commit 77bc5f10a6
29 changed files with 2206 additions and 2247 deletions

View File

@ -226,16 +226,16 @@ class MenuController extends Controller
)
->get();
foreach ($rawData as $_data) {
$ehck = DB::table("t_orders_drivers_uploads")
->select(
"id", //
"checklist_name",
"checklist_desc",
"img",
"updt"
)
->where("ord_pck_drop_id", $_data->id)
->get();
// $ehck = DB::table("t_orders_drivers_uploads")
// ->select(
// "id", //
// "checklist_name",
// "checklist_desc",
// "img",
// "updt"
// )
// ->where("ord_pck_drop_id", $_data->id)
// ->get();
$data[] = [
"id" => $_data->id,
"pck_date" => $_data->pck_date,
@ -244,11 +244,9 @@ class MenuController extends Controller
"pck_addr" => $_data->pck_addr,
"drop_name" => $_data->drop_name,
"drop_addr" => $_data->drop_addr,
"checklist_array" => $ehck,
"checklist_array" => [],
];
}
// dd($data[0]["checklist_array"]);
// dd($data);
$data = [
"data" => $data,
"orders" => $orders,
@ -317,11 +315,12 @@ class MenuController extends Controller
$rate = OrdersRates::getById($order[0]->ord_rate_id);
$data = [
"order" => $order[0],
"vendors" => OrdersVendors::searchVendorsByRate([
"active_rates" => $rate[0],
"prefer_truck_type" => $order[0]->prefer_truck_type,
]),
// "vendors" => OrdersVendors::searchVendorsByRate([
// "active_rates" => $rate[0],
// "prefer_truck_type" => $order[0]->prefer_truck_type,
// ]),
];
// dd($data["order"]);
return view("menu_v1._confirmTransactions", $data);
}
@ -340,16 +339,22 @@ class MenuController extends Controller
public function view_transactions_add(Request $req)
{
// dd(Users::ROLE_ADMIN);
$uclients = Users::listUsers([
"role" => Users::ROLE_ADMIN,
"status" => Users::STATUS_ACTIVE,
]);
// dd($uclients);
$data = [
"uclients" => Users::listUsers([
"role" => Users::ROLE_CLIENT_ADMIN,
"status" => Users::STATUS_ACTIVE,
]),
"uclients" => [collect($uclients)->firstWhere("id", 1)],
"truck_types" => ConfTruckTypes::listTruckTypesRates(
ConfTruckTypes::IS_ACTIVE,
ConfRates::LANE_EARTH
),
"vehicle" => Vehicles::listVehicles([]),
"driver" => Drivers::getDrivers([]),
];
// dd($data["vehicle"]);
return view("menu_v2.Clients._addTransactions", $data);
}