diff --git a/app/Http/Controllers/DriversController.php b/app/Http/Controllers/DriversController.php index f762968..42c5371 100755 --- a/app/Http/Controllers/DriversController.php +++ b/app/Http/Controllers/DriversController.php @@ -99,60 +99,35 @@ class DriversController extends Controller "ktp_photo" => $req->ktp_base64, "nik" => $req->nik, "fullname" => $req->fullname, - "fullname2" => $req->fullname2, "phone" => $req->phone, - "phone2" => $req->phone2, "email" => $req->email, "date_of_birth" => $req->dob, "age" => $req->age, "blood" => $req->blood, "home_address" => $req->fulladdress, - "npwp_photo" => $req->npwp_base64, - "npwp_number" => $req->npwp_string, - "npwp_number_hidden" => $req->npwp_number, "license_photo" => $req->license_base64, "license_number" => $req->license_number, "license_exp" => $req->license_exp, "emergency_fullname" => $req->em_fullname, "emergency_relationship" => $req->em_relationship, "emergency_phone" => $req->em_phone, - "bank_id" => $req->bank_id, - "bank_code" => $req->bank_code, - "bank_short" => $req->bank_short, - "bank_name" => $req->bank_name, - "bank_kcp" => $req->bank_branch_name, - "bank_acc_number" => $req->bank_acc_number, - "bank_acc_name" => $req->bank_acc_name, "vendor_id" => Auth::user()->id, ]; $rulesInput = [ "ktp_photo" => "nullable|string", // required "nik" => "nullable|integer", // required "fullname" => "required|string|min:3|max:125", - "fullname2" => "nullable|string", "phone" => "required|integer|not_in:0", - "phone2" => "nullable|integer|not_in:0", "email" => "nullable|email", // required "date_of_birth" => "nullable|date_format:Y-m-d", // required "age" => "nullable|integer", // required "blood" => "nullable|string|max:4", // required - "home_address" => "nullable|string|min:25", // required - "npwp_photo" => "nullable|string", // required - "npwp_number" => "nullable|string", // required - "npwp_number_hidden" => "nullable|numeric", // required "license_photo" => "nullable|string", // required "license_number" => "nullable|numeric", // required "license_exp" => "nullable|date_format:Y-m-d", // required "emergency_fullname" => "nullable|string|min:3", // required "emergency_relationship" => "nullable|string", // required "emergency_phone" => "nullable|integer|not_in:0", // required - "bank_id" => "required|integer|not_in:0", - "bank_code" => "required|numeric", - "bank_short" => "required|string", - "bank_name" => "required|string", - "bank_kcp" => "nullable|string", - "bank_acc_number" => "nullable|numeric", // required - "bank_acc_name" => "nullable|string|max:255", // required "vendor_id" => "required|integer|not_in:0", ]; @@ -162,19 +137,11 @@ class DriversController extends Controller $apiResp = Responses::bad_input($isValidInput->messages()->first()); return new Response($apiResp, $apiResp["meta"]["code"]); } - if ($req->nik && strlen($req->nik) != 16) { - $apiResp = Responses::bad_input("nik must be 16 digit"); - return new Response($apiResp, $apiResp["meta"]["code"]); - } - if ($req->license_number && strlen($req->license_number) < 12) { - $apiResp = Responses::bad_input("license number must be at least 12 digit"); - return new Response($apiResp, $apiResp["meta"]["code"]); - } if ($req->nik) { $uniqNik = Drivers::getDriverByNik($req->nik); if (count($uniqNik) > 0) { - $apiResp = Responses::bad_request("nik has been used"); + $apiResp = Responses::bad_request("ID Number has been used"); return new Response($apiResp, $apiResp["meta"]["code"]); } } @@ -229,15 +196,6 @@ class DriversController extends Controller return new Response($apiResp, $apiResp["meta"]["code"]); } } - if ($req->npwp_base64) { - $url_npwp = "drivers/$did/npwp_$now.jpeg"; - if (!Storage::disk("public")->put($url_npwp, base64_decode($req->npwp_base64))) { - Storage::disk("public")->delete($url_ktp); - DB::rollBack(); - $apiResp = Responses::bad_request("fail upload npwp photo"); - return new Response($apiResp, $apiResp["meta"]["code"]); - } - } if ($req->license_base64) { $url_license = "drivers/$did/license_$now.jpeg"; if (!Storage::disk("public")->put($url_license, base64_decode($req->license_base64))) { @@ -261,7 +219,7 @@ class DriversController extends Controller "em_fullname" => $req->em_fullname, "em_phone" => $req->em_phone, "em_relationship" => $req->em_relationship, - "bank_id" => $req->bank_id, + "bank_id" => 1, "bank_code" => $req->bank_code, "bank_short_name" => $req->bank_short, "bank_name" => $req->bank_name, @@ -318,30 +276,18 @@ class DriversController extends Controller "ktp_photo" => $req->ktp_base64, "nik" => $req->nik, "fullname" => $req->fullname, - "fullname2" => $req->fullname2, "phone" => $req->phone, - "phone2" => $req->phone2, "email" => $req->email, "date_of_birth" => $req->dob, "age" => $req->age, "blood" => $req->blood, "home_address" => $req->fulladdress, - "npwp_photo" => $req->npwp_base64, - "npwp_number" => $req->npwp_string, - "npwp_number_hidden" => $req->npwp_number, "license_photo" => $req->license_base64, "license_number" => $req->license_number, "license_exp" => $req->license_exp, "emergency_fullname" => $req->em_fullname, "emergency_relationship" => $req->em_relationship, "emergency_phone" => $req->em_phone, - "bank_id" => $req->bank_id, - "bank_code" => $req->bank_code, - "bank_short" => $req->bank_short, - "bank_name" => $req->bank_name, - "bank_kcp" => $req->bank_branch_name, - "bank_acc_number" => $req->bank_acc_number, - "bank_acc_name" => $req->bank_acc_name, "vendor_id" => Auth::user()->id, ]; $rulesInput = [ @@ -349,30 +295,18 @@ class DriversController extends Controller "ktp_photo" => "nullable|string", "nik" => "required|integer", "fullname" => "nullable|string|min:3|max:125", // required - "fullname2" => "nullable|string", "phone" => "required|integer|not_in:0", - "phone2" => "nullable|integer|not_in:0", "email" => "nullable|email", // required "date_of_birth" => "nullable|date_format:Y-m-d", // required "age" => "nullable|integer", // required "blood" => "nullable|string|max:4", // required "home_address" => "nullable|string|min:25", // required - "npwp_photo" => "nullable|string", - "npwp_number" => "nullable|string", // required - "npwp_number_hidden" => "nullable|numeric", // required "license_photo" => "nullable|string", "license_number" => "nullable|numeric", // required "license_exp" => "nullable|date_format:Y-m-d", // required "emergency_fullname" => "nullable|string|min:3", // required "emergency_relationship" => "nullable|string", // required "emergency_phone" => "nullable|integer|not_in:0", // required - "bank_id" => "required|integer|not_in:0", // required - "bank_code" => "required|numeric", - "bank_short" => "required|string", - "bank_name" => "required|string", - "bank_kcp" => "nullable|string", - "bank_acc_number" => "required|numeric", - "bank_acc_name" => "required|string|max:255", "vendor_id" => "required|integer|not_in:0", ]; @@ -382,14 +316,6 @@ class DriversController extends Controller $apiResp = Responses::bad_input($isValidInput->messages()->first()); return new Response($apiResp, $apiResp["meta"]["code"]); } - if ($req->nik && strlen($req->nik) != 16) { - $apiResp = Responses::bad_input("nik must be 16 digit"); - return new Response($apiResp, $apiResp["meta"]["code"]); - } - if ($req->license_number && strlen($req->license_number) < 12) { - $apiResp = Responses::bad_input("license number must be at least 12 digit"); - return new Response($apiResp, $apiResp["meta"]["code"]); - } $driver = Drivers::showDriverById($did); if (count($driver) < 1) { @@ -449,11 +375,8 @@ class DriversController extends Controller "nik" => $req->nik ? $req->nik : 0, "fullname" => $req->fullname, "email" => $req->email, - "fullname2" => $req->fullname2, "phone" => $req->phone, "phone_code" => Drivers::DEFAULT_PHONE_CODE, - "phone2" => $req->phone2 ?? 0, - "phone2_code" => Drivers::DEFAULT_PHONE_CODE, "dob" => $req->dob, "age" => $req->age ? $req->age : 0, "blood" => $req->blood, @@ -507,7 +430,7 @@ class DriversController extends Controller "em_fullname" => $req->em_fullname, "em_phone" => $req->em_phone, "em_relationship" => $req->em_relationship, - "bank_id" => $req->bank_id, + "bank_id" => 1, "bank_code" => $req->bank_code, "bank_short_name" => $req->bank_short, "bank_name" => $req->bank_name, diff --git a/resources/views/menu_v1/_viewTransactions.blade.php b/resources/views/menu_v1/_viewTransactions.blade.php index 47d245e..fb11924 100755 --- a/resources/views/menu_v1/_viewTransactions.blade.php +++ b/resources/views/menu_v1/_viewTransactions.blade.php @@ -11,7 +11,7 @@
-

Detail Pesanan +

Job Detail @foreach ($orders as $iOrd => $order) #{{ $order->code }} @if (count($orders) !== ((int) $iOrd) + 1) @@ -21,7 +21,7 @@

- +
@@ -39,13 +39,74 @@
-

Penjemputan dan Pengantaran ({{ $iOrd + 1 }})

+ {{--

Penjemputan dan Pengantaran ({{ $iOrd + 1 }})

--}}
+
+ +
+
+ {{--

B 1192 XY

--}} + @if ($order->vhc_nopol1) +

+ {{ $order->vhc_nopol1 . ' ' . $order->vhc_nopol2 . ' ' . $order->vhc_nopol3 }} +

+ @else +

not yet assigned

+ @endif +
+
+
+
+ +
+
+ {{--

Archibald Borislav Aldric

--}} + @if ($order->drv_name) +

+ {{ $order->drv_name }} +

+

+ +   + {{ implode(' ', str_split('0' . $order->drv_phone_val, 4)) }} + +

+

+ {{ implode(' ', str_split('0' . $order->drv_phone_val, 4)) }} +

+ @else +

not yet assigned

+ @endif +
+
+ @if ($order->drv_name2) + +
+
+ @if ($order->drv_name2) +

{{ $order->drv_name2 }}

+

+ +   + {{ implode(' ', str_split('0' . $order->drv_phone2_val, 4)) }} + +

+

+ + {{ implode(' ', str_split('0' . $order->drv_phone2_val, 4)) }} +

+ @else +

belum ditugaskan

+ @endif +
+
+ @endif +
- +

{{ $_order['pck_date'] }}

@@ -54,7 +115,7 @@
- +

{{ $_order['pck_time'] }}

@@ -66,7 +127,7 @@
- +

{{ $_order['pck_name'] }}

@@ -79,7 +140,7 @@
- +

{{ $_order['drop_name'] }}

@@ -118,7 +179,7 @@
-
+
@@ -141,67 +202,6 @@
-
- -
-
- {{--

B 1192 XY

--}} - @if ($order->vhc_nopol1) -

- {{ $order->vhc_nopol1 . ' ' . $order->vhc_nopol2 . ' ' . $order->vhc_nopol3 }} -

- @else -

not yet assigned

- @endif -
-
-
-
- -
-
- {{--

Archibald Borislav Aldric

--}} - @if ($order->drv_name) -

- {{ $order->drv_name }} -

-

- -   - {{ implode(' ', str_split('0' . $order->drv_phone_val, 4)) }} - -

-

- {{ implode(' ', str_split('0' . $order->drv_phone_val, 4)) }} -

- @else -

not yet assigned

- @endif -
-
- @if ($order->drv_name2) - -
-
- @if ($order->drv_name2) -

{{ $order->drv_name2 }}

-

- -   - {{ implode(' ', str_split('0' . $order->drv_phone2_val, 4)) }} - -

-

- - {{ implode(' ', str_split('0' . $order->drv_phone2_val, 4)) }} -

- @else -

belum ditugaskan

- @endif -
-
- @endif -
diff --git a/resources/views/menu_v1/clients.blade.php b/resources/views/menu_v1/clients.blade.php index 75655b7..a83b86a 100755 --- a/resources/views/menu_v1/clients.blade.php +++ b/resources/views/menu_v1/clients.blade.php @@ -11,8 +11,8 @@ } /* .select2-container { - z-index: 99999; - } */ + z-index: 99999; + } */ @endsection @@ -25,15 +25,7 @@
-

Client (0)

-
-
- {{-- Add New Client --}} - {{-- Tambah Client --}} -
-
- {{-- --}} - {{-- --}} +

Company

@@ -43,16 +35,16 @@ # - Tindakan - Nama Client - Alamat Perusahaan - Telepon Client - Alamat Email - Tanggal Bergabung - Total Transaksi - Nama PIC - Telepon PIC - Alamat Email PIC + Action + Company Name + Company Address + Phone Number + Email Addres + {{-- Tanggal Bergabung --}} + Total Job + PIC Name + PIC Phone NUmber + PIC Email Address Status @@ -64,7 +56,7 @@ Kramat jati, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13630 021 83782235 mail.us@jne.co.id - Jan 22, 2022 14:02 + {{-- Jan 22, 2022 14:02 --}} 13 Jerrard Izaak +62 812 8920 6762 @@ -310,7 +302,7 @@