diff --git a/app/Http/Controllers/ZoneController.php b/app/Http/Controllers/ZoneController.php index b69cb1a..1c30915 100755 --- a/app/Http/Controllers/ZoneController.php +++ b/app/Http/Controllers/ZoneController.php @@ -258,11 +258,11 @@ class ZoneController extends Controller "zone_client" => $req->zone_client, "zone_type" => $req->zone_type, "workflow_zone_type" => $req->workflow_zone_type, - "shiptocode" => $req->shiptocode, - "prid" => $req->prid, - "ktid" => $req->ktid, - "kcid" => $req->kcid, - "klid" => $req->klid, + // "shiptocode" => $req->shiptocode, + // "prid" => $req->prid, + // "ktid" => $req->ktid, + // "kcid" => $req->kcid, + // "klid" => $req->klid, "fulladdress" => $req->fulladdress, "status" => $req->status, "boundary_hex_color" => $req->boundary_hex_color, @@ -279,11 +279,11 @@ class ZoneController extends Controller "zone_client" => "nullable|integer|not_in:0", "zone_type" => "required|integer|not_in:0", "workflow_zone_type" => "required|integer|not_in:0", - "shiptocode" => "required|string|min:5|max:6", - "prid" => "required|numeric", - "ktid" => "required|numeric", - "kcid" => "required|numeric", - "klid" => "required|numeric", + // "shiptocode" => "string|min:5|max:6", + // "prid" => "required|numeric", + // "ktid" => "required|numeric", + // "kcid" => "required|numeric", + // "klid" => "required|numeric", "fulladdress" => "required|string|min:55", "status" => "required|integer|not_in:0", "boundary_hex_color" => "required|string|min:7|max:7", @@ -319,11 +319,11 @@ class ZoneController extends Controller "name" => $req->zone_name, "type" => $req->zone_type, "workflow_type" => $req->workflow_zone_type, - "shiptocode" => $req->shiptocode, - "prid" => $req->prid, - "ktid" => $req->ktid, - "kcid" => $req->kcid, - "klid" => $req->klid, + "shiptocode" => "123456", + "prid" => "123456", + "ktid" => "123456", + "kcid" => "123456", + "klid" => "123456", "fulladdress" => $req->fulladdress, "boundary_type" => $req->boundary_type, "boundary_hex_color" => strtoupper($req->boundary_hex_color), @@ -374,11 +374,11 @@ class ZoneController extends Controller "zone_client" => $req->zone_client, "zone_type" => $req->zone_type, "workflow_zone_type" => $req->workflow_zone_type, - "shiptocode" => $req->shiptocode, - "prid" => $req->prid, - "ktid" => $req->ktid, - "kcid" => $req->kcid, - "klid" => $req->klid, + // "shiptocode" => $req->shiptocode, + // "prid" => $req->prid, + // "ktid" => $req->ktid, + // "kcid" => $req->kcid, + // "klid" => $req->klid, "fulladdress" => $req->fulladdress, "status" => $req->status, "boundary_hex_color" => $req->boundary_hex_color, @@ -395,11 +395,11 @@ class ZoneController extends Controller "zone_client" => "nullable|integer|not_in:0", "zone_type" => "required|integer|not_in:0", "workflow_zone_type" => "required|integer|not_in:0", - "shiptocode" => "required|string|min:5|max:6", - "prid" => "required|numeric", - "ktid" => "required|numeric", - "kcid" => "required|numeric", - "klid" => "required|numeric", + // "shiptocode" => "required|string|min:5|max:6", + // "prid" => "required|numeric", + // "ktid" => "required|numeric", + // "kcid" => "required|numeric", + // "klid" => "required|numeric", "fulladdress" => "required|string|min:55", "status" => "required|integer|not_in:0", "boundary_hex_color" => "required|string|min:7|max:7", @@ -449,11 +449,11 @@ class ZoneController extends Controller "name" => $req->zone_name, "type" => $req->zone_type, "workflow_type" => $req->workflow_zone_type, - "shiptocode" => $req->shiptocode, - "prid" => $req->prid, - "ktid" => $req->ktid, - "kcid" => $req->kcid, - "klid" => $req->klid, + "shiptocode" => "123456", + "prid" => "123456", + "ktid" => "123456", + "kcid" => "123456", + "klid" => "123456", "fulladdress" => $req->fulladdress, "boundary_type" => $req->boundary_type, "boundary_hex_color" => strtoupper($req->boundary_hex_color), diff --git a/public/mails/v0/index.html b/public/mails/v0/index.html index 2d1a7b5..d012759 100755 --- a/public/mails/v0/index.html +++ b/public/mails/v0/index.html @@ -43,7 +43,7 @@
-

Halo Rekan usaha Bonceng,

+

Hello Rekan usaha Bonceng,

Selamat Akun Anda telah terverifikasi!

Terima kasih sudah bergabung dengan diff --git a/public/mails/v0/output/1. Verifikasi email.html b/public/mails/v0/output/1. Verifikasi email.html index c214a49..93ddfe6 100755 --- a/public/mails/v0/output/1. Verifikasi email.html +++ b/public/mails/v0/output/1. Verifikasi email.html @@ -61,7 +61,7 @@ style="padding: 1.5rem 1rem;text-align: left;background-color: #fff;margin: 0 1.5rem;border: 1px solid #e4e4e4;border-top: 4px solid #f26e6f;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: rgba(0, 0, 0, .3);">

- Halo Rekan Usaha Bonceng,

+ Hello Rekan Usaha Bonceng,

Untuk memverifikasi bahwa alamat email ini adalah milik Anda. Kode diff --git a/public/mails/v0/output/2. Aktivasi akun.html b/public/mails/v0/output/2. Aktivasi akun.html index 6b96d5d..384be94 100755 --- a/public/mails/v0/output/2. Aktivasi akun.html +++ b/public/mails/v0/output/2. Aktivasi akun.html @@ -61,7 +61,7 @@ style="padding: 1.5rem 1rem;text-align: left;background-color: #fff;margin: 0 1.5rem;border: 1px solid #e4e4e4;border-top: 4px solid #f26e6f;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: rgba(0, 0, 0, .3);">

- Halo [nama_resto],

+ Hello [nama_resto],

Selamat Anda telah menjadi Rekan Usaha Bonceng! Untuk aktivasi akun, Anda diff --git a/public/mails/v0/output/3. Settlement.html b/public/mails/v0/output/3. Settlement.html index 9bbd963..6dee00e 100755 --- a/public/mails/v0/output/3. Settlement.html +++ b/public/mails/v0/output/3. Settlement.html @@ -61,7 +61,7 @@ style="padding: 1.5rem 1rem;text-align: left;background-color: #fff;margin: 0 1.5rem;border: 1px solid #e4e4e4;border-top: 4px solid #f26e6f;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;color: rgba(0, 0, 0, .3);">

- Halo Rekan Usaha Bonceng,

+ Hello Rekan Usaha Bonceng,

Berikut adalah laporan {settelment_type} dari resto {nama_resto}, tanggal diff --git a/public/mails/v0/output/zoning_mail.html b/public/mails/v0/output/zoning_mail.html index b6e72d2..c8e09e3 100755 --- a/public/mails/v0/output/zoning_mail.html +++ b/public/mails/v0/output/zoning_mail.html @@ -358,7 +358,7 @@
-

Halo <%= pic_name %>,

+

Hello <%= pic_name %>,

Vehicle <%= v_nopol %> with driver <%= da_name %> (<%= da_phone %>) has entering zone:

diff --git a/resources/views/app/app.blade.php b/resources/views/app/app.blade.php index fa5a3a3..23123c1 100755 --- a/resources/views/app/app.blade.php +++ b/resources/views/app/app.blade.php @@ -49,7 +49,9 @@ @yield('customcss') - +{{-- --}} + + @include('template/navbar') @yield('content') {{-- Toast --}} @@ -86,18 +88,16 @@ current_company: 0, // cptid } - function startTime() { - var today = new Date(); - var h = today.getHours(); - var m = today.getMinutes(); - var s = today.getSeconds(); - m = checkTime(m); - // s = checkTime(s); - document.getElementById('time').innerHTML = - h + ":" + m + ":" + s; - // h + ":" + m; - var t = setTimeout(startTime, 1000); - } + // function startTime() { + // var today = new Date(); + // var h = today.getHours(); + // var m = today.getMinutes(); + // var s = today.getSeconds(); + // m = checkTime(m); + // document.getElementById('time').innerHTML = + // h + ":" + m + ":" + s; + // var t = setTimeout(startTime, 1000); + // } function checkTime(i) { if (i < 10) { @@ -122,10 +122,10 @@ return new bootstrap.Tooltip(tooltipTriggerEl) }) - // if ({{ Auth::user()->role }} != {{ \App\Models\Users::ROLE_ADMIN }}) { - // $('#subNav').remove(); - // $('#map, .panel-left, .panel-right').css('height', 'calc(100vh - 97.52px)') - // } + if ({{ Auth::user()->role }} == {{ \App\Models\Users::ROLE_ADMIN }}) { + $('#subNav').remove(); + $('#map, .panel-left, .panel-right').css('height', 'calc(100vh - 87.52px)') + } const downloadPackingList = function(fileName, sheetName, data = []) { const listDownload = [] diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 96dd90d..262a16c 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -32,10 +32,10 @@ {{--
--}} -

Halo Admin,

+

Hello Admin,

-

Selamat datang di Movana Fleet Management System

+

Welcome to Movana Fleet Management System

@csrf diff --git a/resources/views/auth/loginAdmin.blade.php b/resources/views/auth/loginAdmin.blade.php index 8482ef8..2642fa9 100755 --- a/resources/views/auth/loginAdmin.blade.php +++ b/resources/views/auth/loginAdmin.blade.php @@ -33,10 +33,10 @@ {{--
--}} -

Halo Admin,

+

Hello Admin,

-

Selamat datang di Movana Fleet Management System

+

Welcome to Movana Fleet Management System

@csrf diff --git a/resources/views/auth/loginChecker.blade.php b/resources/views/auth/loginChecker.blade.php index 622b68d..23d1db6 100755 --- a/resources/views/auth/loginChecker.blade.php +++ b/resources/views/auth/loginChecker.blade.php @@ -35,7 +35,7 @@
--}}

Halo,

-

Selamat datang di Movana Fleet Management System

+

Welcome to Movana Fleet Management System

@csrf diff --git a/resources/views/auth/loginClient.blade.php b/resources/views/auth/loginClient.blade.php index 7686ee7..6c29786 100755 --- a/resources/views/auth/loginClient.blade.php +++ b/resources/views/auth/loginClient.blade.php @@ -33,10 +33,10 @@ {{--
--}} -

Halo Client,

+

Hello Client,

-

Selamat datang di Movana Fleet Management System

+

Welcome to Movana Fleet Management System

@csrf diff --git a/resources/views/auth/loginVendor.blade.php b/resources/views/auth/loginVendor.blade.php index 6773af7..6912c15 100755 --- a/resources/views/auth/loginVendor.blade.php +++ b/resources/views/auth/loginVendor.blade.php @@ -33,10 +33,10 @@ {{--
--}} -

Halo Partner,

+

Hello Partner,

-

Selamat datang di Movana Fleet Management System

+

Welcome to Movana Fleet Management System

@csrf diff --git a/resources/views/menu_v1/_addZone.blade.php b/resources/views/menu_v1/_addZone.blade.php index f5d5942..5b44227 100755 --- a/resources/views/menu_v1/_addZone.blade.php +++ b/resources/views/menu_v1/_addZone.blade.php @@ -3,11 +3,8 @@ Add Zone @endsection @section('customcss') - - + + @endsection @section('content')
@@ -16,31 +13,29 @@
-

Tambah Zona

+

Add New Zone

-
Infomasi Zona
+
Zone Information
- - + +
@if ($is_su)
- - @foreach ($clients as $client) - + @endforeach
@endif
- + +
-
+ {{--
- +
@@ -91,50 +84,45 @@ -
+
--}}
- - + +
Lainnya
- +
- +
-
Gambar Zona
+
Draw Zona
- - + +
- +
- - @foreach ($boundarys as $boundary) @php - if ($boundary['id'] == \App\Models\Zone::ZONE_BOUNDARY_POLYGON) continue; + if ($boundary['id'] == \App\Models\Zone::ZONE_BOUNDARY_POLYGON) { + continue; + } @endphp @endforeach @@ -143,18 +131,15 @@
- +
- +
- +
@@ -165,8 +150,8 @@
- Batal - + Cancel +
@@ -175,11 +160,8 @@ @section('customjs') - - + + - - + +