From 5426d9f35f72d88bd80a7e5effd2d96d01559ce3 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Sat, 23 Mar 2024 12:56:25 +0700
Subject: [PATCH] show maps on customer view

---
 CHANGELOG.md                     |  6 +++++
 system/controllers/customers.php |  1 +
 ui/ui/customers-view.tpl         | 38 +++++++++++++++++++++++++-------
 ui/ui/customers.tpl              | 36 +++++++++++++++---------------
 version.json                     |  2 +-
 5 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f89ef8ab..5bf3a1d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 # CHANGELOG
 
+## 2024.3.23
+
+- Maps full height
+- Show Get Directions instead Coordinates
+- Maps Label always show
+
 ## 2024.3.22
 
 - Fix Broadcast Message by @Focuslinkstech
diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index 4a62781d..b956613c 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -245,6 +245,7 @@ switch ($action) {
             $ui->assign('v', $v);
             $ui->assign('d', $customer);
             $ui->assign('customFields', $customFields);
+            $ui->assign('xheader', $leafletpickerHeader);
             $ui->display('customers-view.tpl');
         } else {
             r2(U . 'customers/list', 'e', $_L['Account_Not_Found']);
diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index 755130e0..8cb1ae3d 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -37,14 +37,6 @@
                                 onclick="this.select()">
                         </li>
                     {/if}
-                    {if $d['coordinates']}
-                        <li class="list-group-item">
-                            <b>{Lang::T('Coordinates')}</b> <span class="pull-right">
-                                <a href="https://www.google.com/maps/dir//{$d['coordinates']}/" target="_blank">Get
-                                    Directions</a>
-                            </span>
-                        </li>
-                    {/if}
                     <!--Customers Attributes view start -->
                     {if $customFields}
                         {foreach $customFields as $customField}
@@ -82,6 +74,16 @@
                         <b>{Lang::T('Last Login')}</b> <span
                             class="pull-right">{Lang::dateTimeFormat($d['last_login'])}</span>
                     </li>
+                    {if $d['coordinates']}
+                        <li class="list-group-item">
+                            <b>{Lang::T('Coordinates')}</b> <span class="pull-right">
+                                <i class="glyphicon glyphicon-road"></i> <a style="color: black;"
+                                    href="https://www.google.com/maps/dir//{$d['coordinates']}/" target="_blank">Get
+                                    Directions</a>
+                            </span>
+                            <div id="map" style="width: '100%'; height: 100px;"></div>
+                        </li>
+                    {/if}
                 </ul>
                 <div class="row">
                     <div class="col-xs-4">
@@ -230,4 +232,24 @@
     </div>
 </div>
 
+{if $d['coordinates']}
+{literal}
+<script src="https://unpkg.com/leaflet@1.9.3/dist/leaflet.js"></script>
+<script>
+    function setupMap(lat, lon) {
+        var map = L.map('map').setView([lat, lon], 17);
+        L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
+            attribution:
+                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
+                subdomains: 'abcd',
+                maxZoom: 20
+        }).addTo(map);
+        var marker = L.marker([lat, lon]).addTo(map);
+    }
+    window.onload = function() {
+        {/literal}setupMap({$d['coordinates']});{literal}
+    }
+</script>
+{/literal}
+{/if}
 {include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/customers.tpl b/ui/ui/customers.tpl
index 6ae2aec4..a89a4748 100644
--- a/ui/ui/customers.tpl
+++ b/ui/ui/customers.tpl
@@ -18,8 +18,8 @@
                     <div class="col-md-8">
                         <form id="site-search" method="post" action="{$_url}customers/list/">
                             <div class="input-group">
-                                <input type="text" id="search-input" name="search" value="{$search}" class="form-control"
-                                    placeholder="{Lang::T('Search')}...">
+                                <input type="text" id="search-input" name="search" value="{$search}"
+                                    class="form-control" placeholder="{Lang::T('Search')}...">
                                 <div class="input-group-btn">
                                     <button class="btn btn-success" type="submit"><span
                                             class="fa fa-search"></span></button>
@@ -28,8 +28,8 @@
                         </form>
                     </div>
                     <div class="col-md-4">
-                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i
-                                class="ion ion-android-add"> </i> {Lang::T('Add New Contact')}</a>
+                        <a href="{$_url}customers/add" class="btn btn-primary btn-block"><i class="ion ion-android-add">
+                            </i> {Lang::T('Add New Contact')}</a>
                     </div>&nbsp;
                 </div>
                 <div class="table-responsive table_mobile">
@@ -53,7 +53,7 @@
                                 <tr>
                                     <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
                                         style="cursor:pointer;">{$ds['username']}</td>
-                                          <td>{$ds['account_type']}</td>
+                                    <td>{$ds['account_type']}</td>
                                     <td onclick="window.location.href = '{$_url}customers/view/{$ds['id']}'"
                                         style="cursor: pointer;">{$ds['fullname']}</td>
                                     <td>{Lang::moneyFormat($ds['balance'])}</td>
@@ -83,23 +83,23 @@
 
 <script>
     // Functionality to filter table rows based on admin input
-    document.addEventListener('DOMContentLoaded', function () {
-            var searchInput = document.getElementById('search-input');
-            var tableRows = document.querySelectorAll('tbody tr');
+    document.addEventListener('DOMContentLoaded', function() {
+        var searchInput = document.getElementById('search-input');
+        var tableRows = document.querySelectorAll('tbody tr');
 
-            searchInput.addEventListener('input', function () {
-                var searchText = this.value.toLowerCase();
+        searchInput.addEventListener('input', function() {
+            var searchText = this.value.toLowerCase();
 
-                tableRows.forEach(function (row) {
-                    var rowData = row.textContent.toLowerCase();
+            tableRows.forEach(function(row) {
+                var rowData = row.textContent.toLowerCase();
 
-                    if (rowData.includes(searchText)) {
-                        row.style.display = '';
-                    } else {
-                        row.style.display = 'none';
-                    }
-                });
+                if (rowData.includes(searchText)) {
+                    row.style.display = '';
+                } else {
+                    row.style.display = 'none';
+                }
             });
         });
+    });
 </script>
 {include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/version.json b/version.json
index d3f813d5..cbc7f71f 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.3.22.1"
+    "version": "2024.3.23"
 }
\ No newline at end of file