From 7841535802e280c9ee1ad0f6038ae8274dedd869 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Thu, 25 Nov 2021 08:46:01 +0100
Subject: [PATCH] Corrections in the customers page

---
 .../views/layouts/backend/backend_header.php  |  2 +-
 .../views/pages/customers/customers_page.php  | 34 +++++--------------
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/application/views/layouts/backend/backend_header.php b/application/views/layouts/backend/backend_header.php
index e6674ad0..d6675bfb 100755
--- a/application/views/layouts/backend/backend_header.php
+++ b/application/views/layouts/backend/backend_header.php
@@ -32,7 +32,7 @@
             <?php $hidden = ($privileges[PRIV_CUSTOMERS]['view'] == TRUE) ? '' : 'd-none' ?>
             <?php $active = ($active_menu == PRIV_CUSTOMERS) ? 'active' : '' ?>
             <li class="nav-item <?= $active . $hidden ?>">
-                <a href="<?= site_url('backend/customers') ?>" class="nav-link"
+                <a href="<?= site_url('customers') ?>" class="nav-link"
                    data-tippy-content="<?= lang('manage_customers_hint') ?>">
                     <i class="fas fa-user-friends me-2"></i>
                     <?= lang('customers') ?>
diff --git a/application/views/pages/customers/customers_page.php b/application/views/pages/customers/customers_page.php
index 42402252..4f62868f 100755
--- a/application/views/pages/customers/customers_page.php
+++ b/application/views/pages/customers/customers_page.php
@@ -1,19 +1,7 @@
 <?php
 /**
- * @var array $available_providers
- * @var array $available_services
- * @var array $secretary_providers
- * @var string $date_format
- * @var string $time_format
- * @var string $base_url
- * @var array $customers
  * @var string $timezones
- * @var string $user_id
- * @var string $user_email
- * @var string $timezone
- * @var string $role_slug
  * @var array $privileges
- * @var string $require_phone_number
  */
 ?>
 
@@ -27,19 +15,15 @@
 <script>
     var GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
-        availableProviders: <?= json_encode($available_providers) ?>,
-        availableServices: <?= json_encode($available_services) ?>,
-        secretaryProviders: <?= json_encode($secretary_providers) ?>,
-        dateFormat: <?= json_encode($date_format) ?>,
-        timeFormat: <?= json_encode($time_format) ?>,
-        baseUrl: <?= json_encode($base_url) ?>,
-        customers: <?= json_encode($customers) ?>,
+        baseUrl: <?= json_encode(config('base_url')) ?>,
+        dateFormat: <?= json_encode(setting('date_format')) ?>,
+        timeFormat: <?= json_encode(setting('time_format')) ?>,
         timezones: <?= json_encode($timezones) ?>,
         user: {
-            id: <?= $user_id ?>,
-            email: <?= json_encode($user_email) ?>,
-            timezone: <?= json_encode($timezone) ?>,
-            role_slug: <?= json_encode($role_slug) ?>,
+            d: <?= session('user_id') ?>,
+            email: <?= json_encode(session('user_email')) ?>,
+            timezone: <?= json_encode(session('timezone')) ?>,
+            role_slug: <?= json_encode(session('role_slug')) ?>,
             privileges: <?= json_encode($privileges) ?>
         }
     };
@@ -147,9 +131,9 @@
                     <div class="mb-3">
                         <label class="form-label" for="phone-number">
                             <?= lang('phone_number') ?>
-                            <?= $require_phone_number === '1' ? '<span class="text-danger">*</span>' : ''; ?></label>
+                            <?= setting('require_phone_number') === '1' ? '<span class="text-danger">*</span>' : '' ?></label>
                         <input id="phone-number" class="form-control
-                            <?= $require_phone_number === '1' ? 'required' : '' ?>">
+                            <?= setting('require_phone_number') === '1' ? 'required' : '' ?>">
                     </div>
 
                     <div class="mb-3">