diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php index 573620c..8862cf2 100755 --- a/app/Http/Controllers/MenuController.php +++ b/app/Http/Controllers/MenuController.php @@ -61,7 +61,10 @@ class MenuController extends Controller public function view_vehicles(Request $req) { - $data = [ + $listPool = DB::select("SELECT * FROM t_conf_pool WHERE dlt IS NULL ORDER BY pool_code ASC"); + $listDistribution = DB::select("SELECT * FROM t_conf_distribution_category WHERE dlt IS NULL ORDER BY dc_code ASC"); + + $data = [ // 'cats' => Vehicles::listCats(), // default Truck "brands" => Vehicles::listBrands(), "types" => Vehicles::listTypes(), @@ -73,6 +76,8 @@ class MenuController extends Controller "is_idle_yes" => 1, "is_available" => Devices::IS_AVAIL, ]), + "listPool" => $listPool, + "listDistribution" => $listDistribution ]; // dd($data); return view("menu_v1.vehicles", $data); diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index b3ece3e..f1c5924 100755 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -152,6 +152,8 @@ class VehiclesController extends Controller "tax_exp" => $req->tax_exp, // "kir_exp" => $req->kir_exp, // "vendor_id" => $req->vendor_id, + "dc_code" => $req->dc_code, + "pool_code" => $req->pool_code, ]; $rulesInput = [ "front_vehicle_photo" => "required|string", @@ -184,6 +186,8 @@ class VehiclesController extends Controller "tax_exp" => "required|date_format:Y-m-d", // "kir_exp" => "required|date_format:Y-m-d", // "vendor_id" => "nullable|integer|not_in:0", + "dc_code" => "nullable|string", + "pool_code" => "nullable|string", ]; if ($req->auth->role == Users::ROLE_VENDOR) { @@ -249,6 +253,7 @@ class VehiclesController extends Controller "crt_by" => $req->auth->uid, "updt" => $now, "updt_by" => $req->auth->uid, + ]; // dd($insVhc); if ($req->model_id) { @@ -316,6 +321,9 @@ class VehiclesController extends Controller "regis_year" => $req->regis_year, "tax_exp" => $req->tax_exp, "kir_exp" => $req->kir_exp, + "dc_code" => $req->dc_code, + "pool_code" => $req->pool_code, + ]; VehiclesDetail::addDetail($insDetail); @@ -375,6 +383,8 @@ class VehiclesController extends Controller "tax_exp" => $req->tax_exp, // "kir_exp" => $req->kir_exp, // "vendor_id" => $req->vendor_id, + "dc_code" => $req->dc_code, + "pool_code" => $req->pool_code, ]; $rulesInput = [ "vid" => "required|integer|not_in:0", @@ -409,6 +419,8 @@ class VehiclesController extends Controller "tax_exp" => "required|date_format:Y-m-d", // "kir_exp" => "required|date_format:Y-m-d", // "vendor_id" => "nullable|integer|not_in:0", + "dc_code" => "nullable|string", + "pool_code" => "nullable|string", ]; if ($req->auth->role == Users::ROLE_VENDOR) { @@ -563,6 +575,8 @@ class VehiclesController extends Controller "regis_year" => $req->regis_year, "tax_exp" => $req->tax_exp, "kir_exp" => $req->kir_exp, + "dc_code" => $req->dc_code, + "pool_code" => $req->pool_code, ]; if ($req->fvhc_base64) { $updtDetail["fvhc_img"] = $url_fvhc; diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php index 74f078f..2c1931f 100755 --- a/resources/views/menu_v1/vehicles.blade.php +++ b/resources/views/menu_v1/vehicles.blade.php @@ -148,7 +148,31 @@ - +
+
+
+ + +
+
+
+
+ + +
+
+
+ {{-- Job Data --}} @@ -365,6 +389,31 @@ +
+
+
+ + +
+
+
+
+ + +
+
+
+ @@ -1044,6 +1093,9 @@ data.append('vendor_id', safeVal('#add-vendor_id')); + data.append('dc_code', safeVal('#add-dc_code')); + data.append('pool_code', safeVal('#add-pool_code')); + // File input (cek ada file atau tidak) const fvhcFile = $('#add-fvhc-file')[0].files[0]; if (fvhcFile) data.append('fvhc_file', fvhcFile); @@ -1312,8 +1364,11 @@ data.regis_year = $('#edt-stnk-regisyear').val(); data.tax_exp = $('#edt-stnk-taxexp').val().split('-').reverse().join('-'); // data.kir_exp = $('#edt-kirexp').val().split('-').reverse().join('-'); - + data.vendor_id = $('#edt-vendor_id').val(); + + data.dc_code = $('#edt-dc_code').val(); + data.pool_code = $('#edt-pool_code').val(); return data; }, submitData: async function(data) {