diff --git a/app/Http/Controllers/VehiclesController.php b/app/Http/Controllers/VehiclesController.php index 069d974..afb742a 100755 --- a/app/Http/Controllers/VehiclesController.php +++ b/app/Http/Controllers/VehiclesController.php @@ -119,8 +119,8 @@ class VehiclesController extends Controller "stnk_photo" => $req->stnk_base64, "stnk_exp" => $req->stnk_exp, "nopol1" => $req->nopol1, - "nopol2" => $req->nopol2, - "nopol3" => $req->nopol3, + // "nopol2" => $req->nopol2, + // "nopol3" => $req->nopol3, "manufacture_year" => $req->stnk_vyear, "cylinder_capacity" => $req->cc, "vehicle_identity_number" => $req->vin, @@ -130,7 +130,7 @@ class VehiclesController extends Controller "license_plat_color" => $req->tnkb_color, "regis_year" => $req->regis_year, "tax_exp" => $req->tax_exp, - "kir_exp" => $req->kir_exp, + // "kir_exp" => $req->kir_exp, // "vendor_id" => $req->vendor_id, ]; $rulesInput = [ @@ -150,9 +150,9 @@ class VehiclesController extends Controller "assign_driver" => "nullable|integer", "stnk_photo" => "required|string", "stnk_exp" => "required|date_format:Y-m-d", - "nopol1" => "required|string|max:2", - "nopol2" => "required|string|max:4", - "nopol3" => "required|string|max:3", + "nopol1" => "required|string", + // "nopol2" => "required|string|max:4", + // "nopol3" => "required|string|max:3", "manufacture_year" => "required|digits:4", "cylinder_capacity" => "required|integer", "vehicle_identity_number" => "required|string|min:17|max:45", @@ -162,7 +162,7 @@ class VehiclesController extends Controller "license_plat_color" => "required|string|min:3|max:25", "regis_year" => "required|digits:4", "tax_exp" => "required|date_format:Y-m-d", - "kir_exp" => "required|date_format:Y-m-d", + // "kir_exp" => "required|date_format:Y-m-d", // "vendor_id" => "nullable|integer|not_in:0", ]; @@ -213,8 +213,8 @@ class VehiclesController extends Controller "brand_id" => $req->brand_id, "type_id" => $req->type_id, "nopol1" => strtoupper($req->nopol1), - "nopol2" => strtoupper($req->nopol2), - "nopol3" => strtoupper($req->nopol3), + // "nopol2" => strtoupper($req->nopol2), + // "nopol3" => strtoupper($req->nopol3), "c_did" => $req->d_current ?? 0, "a_did" => $req->d_assign ?? 0, "is_track_holiday" => Vehicles::DEFAULT_TRACK_HOLIDAY, @@ -336,8 +336,8 @@ class VehiclesController extends Controller "stnk_photo" => $req->stnk_base64, "stnk_exp" => $req->stnk_exp, "nopol1" => $req->nopol1, - "nopol2" => $req->nopol2, - "nopol3" => $req->nopol3, + // "nopol2" => $req->nopol2, + // "nopol3" => $req->nopol3, "manufacture_year" => $req->stnk_vyear, "cylinder_capacity" => $req->cc, "vehicle_identity_number" => $req->vin, @@ -347,7 +347,7 @@ class VehiclesController extends Controller "license_plat_color" => $req->tnkb_color, "regis_year" => $req->regis_year, "tax_exp" => $req->tax_exp, - "kir_exp" => $req->kir_exp, + // "kir_exp" => $req->kir_exp, // "vendor_id" => $req->vendor_id, ]; $rulesInput = [ @@ -368,9 +368,9 @@ class VehiclesController extends Controller "assign_driver" => "nullable|integer", "stnk_photo" => "nullable|string", "stnk_exp" => "required|date_format:Y-m-d", - "nopol1" => "required|string|max:2", - "nopol2" => "required|string|max:4", - "nopol3" => "required|string|max:3", + "nopol1" => "required|string", + // "nopol2" => "required|string|max:4", + // "nopol3" => "required|string|max:3", "manufacture_year" => "required|digits:4", "cylinder_capacity" => "required|integer", "vehicle_identity_number" => "required|string|min:17|max:45", @@ -380,7 +380,7 @@ class VehiclesController extends Controller "license_plat_color" => "required|string|min:3|max:25", "regis_year" => "required|digits:4", "tax_exp" => "required|date_format:Y-m-d", - "kir_exp" => "required|date_format:Y-m-d", + // "kir_exp" => "required|date_format:Y-m-d", // "vendor_id" => "nullable|integer|not_in:0", ]; diff --git a/resources/views/menu_v1/vehicles.blade.php b/resources/views/menu_v1/vehicles.blade.php index 77653f6..aecddfb 100755 --- a/resources/views/menu_v1/vehicles.blade.php +++ b/resources/views/menu_v1/vehicles.blade.php @@ -11,18 +11,18 @@ @section('customcss') @endsection @@ -57,37 +57,15 @@ Action Vehicle Tax Exp - Kir Exp + {{-- Kir Exp --}} Service Start @if ($user_role != \App\Models\Users::ROLE_VENDOR) Device ID @endif - {{-- Current Driver --}} - {{-- Assign Driver --}} Type Manufacture Year - {{-- Cylinder Capacity --}} - {{-- Vehicle Identity Number --}} - {{-- Engine Number --}} - {{-- Vehicle Color --}} - {{-- Type Fuel --}} - {{-- License Plat Color --}} - {{-- Registration Year --}} - {{-- Tax Exp --}} - {{-- Speed Limit (kph) --}} - {{-- Fuel Capacity (L) --}} - {{-- Fuel Drop Treshold (L) - --}} - {{-- Maximum Presure (Bar) --}} - {{-- Alert Zones --}} - {{-- Track On Holidays --}} - {{-- Tracking Schedule --}} Mileage (km) - {{-- Cameras --}} Company - {{-- Group --}} @@ -115,10 +93,10 @@
Vehicle Data
-
+

- add-fvhc-img + add-fvhc-img
-
+
{{--
--}} -
+
-
-
-
- {{--
-
- - -
-
--}} -
-
+
-
-
-
+
+
+ + +
-
- - -
- {{--
- - -
-
- - -
-
- - -
--}}
{{-- Job Data --}} @@ -233,11 +185,11 @@ {{-- STNK Data --}}
-
STNK Data
+
Certificate of Vehicle (CoV)
-
- +
+
add-stnk-img
@@ -256,91 +208,66 @@
-
-
- +
+
+
- - + +
-
- +
+ +
+
+ +
+
+ +
+
+ +
+
-
- +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- {{--
- - -
--}} -
- - -
-
- - -
-
- {{-- Other Data --}} - {{-- @if ($user_role != \App\Models\Users::ROLE_VENDOR) -
-
-
Other Data
-
-
-
- - -
-
-
- @endif --}}
@@ -371,10 +298,10 @@
Vehicle Data
-
+

- edt-fvhc-img + edt-fvhc-img
-
+
-
+
-
-
-
- {{--
-
- - -
-
--}} -
-
+
-
-
-
+
+
+ + +
-
- - -
- {{--
- - -
-
- - -
-
- - -
--}}
{{-- Job Data --}} @@ -490,10 +390,10 @@ {{-- STNK Data --}}
-
STNK Data
+
Certificate of Vehicle (CoV)
-
+

edt-stnk-img @@ -513,69 +413,65 @@
-
-
- +
+
+
- - + +
-
- +
+ +
+
+ +
+
+ +
+
+ +
+
-
- +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- {{--
- - -
--}} -
- - -
-
- - -
-
{{-- Other Data --}} {{-- @if ($user_role != \App\Models\Users::ROLE_VENDOR) @@ -807,16 +703,16 @@ return (`${moment(data).format('DD MMM YYYY') || '-'}`); }, }, - { - data: 'kir_exp', - className: 'text-end text-nowrap', - visible: true, - orderable: true, - searchable: true, - render: function(data, type, row, meta) { - return (`${moment(data).format('DD MMM YYYY') || '-'}`); - }, - }, + // { + // data: 'kir_exp', + // className: 'text-end text-nowrap', + // visible: true, + // orderable: true, + // searchable: true, + // render: function(data, type, row, meta) { + // return (`${moment(data).format('DD MMM YYYY') || '-'}`); + // }, + // }, { data: 'crt', className: 'text-end text-nowrap', @@ -1077,11 +973,11 @@ startDate: moment().add(1, 'days').toDate(), endDate: moment().add(6, 'month').toDate(), }); - $('#add-kirexp').datepicker({ - format: 'dd-mm-yyyy', - startDate: moment().add(1, 'days').toDate(), - endDate: moment().add(1, 'year').toDate(), - }); + // $('#add-kirexp').datepicker({ + // format: 'dd-mm-yyyy', + // startDate: moment().add(1, 'days').toDate(), + // endDate: moment().add(1, 'year').toDate(), + // }); // file $('#add-fvhc-file').on('click', function() { $('#add-fvhc-file').val(''); @@ -1115,8 +1011,8 @@ data.stnk_base64 = $('#add-stnk-base64').val().replace(/^data:image\/(png|jpg|jpeg);base64,/, ''); data.stnk_exp = $('#add-stnk-exp').val().split('-').reverse().join('-'); data.nopol1 = $('#add-nopol1').val(); - data.nopol2 = $('#add-nopol2').val(); - data.nopol3 = $('#add-nopol3').val(); + // data.nopol2 = $('#add-nopol2').val(); + // data.nopol3 = $('#add-nopol3').val(); data.stnk_vyear = $('#add-stnk-vyear').val(); data.cc = $('#add-stnk-cc').val(); @@ -1127,7 +1023,7 @@ data.tnkb_color = $('#add-stnk-tnkbcolor').val(); data.regis_year = $('#add-stnk-regisyear').val(); data.tax_exp = $('#add-stnk-taxexp').val().split('-').reverse().join('-'); - data.kir_exp = $('#add-kirexp').val().split('-').reverse().join('-'); + // data.kir_exp = $('#add-kirexp').val().split('-').reverse().join('-'); data.vendor_id = $('#add-vendor_id').val(); return data; @@ -1377,7 +1273,7 @@ data.tnkb_color = $('#edt-stnk-tnkbcolor').val(); 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.kir_exp = $('#edt-kirexp').val().split('-').reverse().join('-'); data.vendor_id = $('#edt-vendor_id').val(); return data;