From efc532664a13324193f3023c4bb6c107453207cb Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Tue, 29 Mar 2022 10:16:07 +0200 Subject: [PATCH] Use grouped_timezones consistently across the app controllers --- application/controllers/Account.php | 2 +- application/controllers/Admins.php | 2 +- application/controllers/Customers.php | 3 ++- application/controllers/Providers.php | 2 +- application/controllers/Secretaries.php | 2 +- application/views/components/booking_time_step.php | 2 +- application/views/pages/account.php | 2 +- application/views/pages/admins.php | 2 +- application/views/pages/customers.php | 2 +- application/views/pages/providers.php | 2 +- application/views/pages/secretaries.php | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/application/controllers/Account.php b/application/controllers/Account.php index fd67780c..cb4c15fd 100644 --- a/application/controllers/Account.php +++ b/application/controllers/Account.php @@ -71,7 +71,7 @@ class Account extends EA_Controller { 'page_title' => lang('settings'), 'active_menu' => PRIV_SYSTEM_SETTINGS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), - 'timezones' => $this->timezones->to_grouped_array(), + 'grouped_timezones' => $this->timezones->to_grouped_array(), ]); $this->load->view('pages/account'); diff --git a/application/controllers/Admins.php b/application/controllers/Admins.php index 37210a17..4032d47d 100644 --- a/application/controllers/Admins.php +++ b/application/controllers/Admins.php @@ -70,7 +70,7 @@ class Admins extends EA_Controller { 'page_title' => lang('admins'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), - 'timezones' => $this->timezones->to_grouped_array(), + 'grouped_timezones' => $this->timezones->to_grouped_array(), 'privileges' => $this->roles_model->get_permissions_by_slug($role_slug), ]); diff --git a/application/controllers/Customers.php b/application/controllers/Customers.php index 67ced057..5ae99760 100644 --- a/application/controllers/Customers.php +++ b/application/controllers/Customers.php @@ -92,7 +92,8 @@ class Customers extends EA_Controller { 'page_title' => lang('customers'), 'active_menu' => PRIV_CUSTOMERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), - 'timezones' => $this->timezones->to_grouped_array(), + 'timezones' => $this->timezones->to_array(), + 'grouped_timezones' => $this->timezones->to_grouped_array(), 'privileges' => $this->roles_model->get_permissions_by_slug($role_slug), 'require_first_name' => $require_first_name, 'require_last_name' => $require_last_name, diff --git a/application/controllers/Providers.php b/application/controllers/Providers.php index a3c67507..d9e7dfbb 100644 --- a/application/controllers/Providers.php +++ b/application/controllers/Providers.php @@ -83,7 +83,7 @@ class Providers extends EA_Controller { 'page_title' => lang('providers'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), - 'timezones' => $this->timezones->to_grouped_array(), + 'grouped_timezones' => $this->timezones->to_grouped_array(), 'privileges' => $this->roles_model->get_permissions_by_slug($role_slug), 'services' => $this->services_model->get(), ]); diff --git a/application/controllers/Secretaries.php b/application/controllers/Secretaries.php index 6cac5729..7b43cd5d 100644 --- a/application/controllers/Secretaries.php +++ b/application/controllers/Secretaries.php @@ -83,7 +83,7 @@ class Secretaries extends EA_Controller { 'page_title' => lang('secretaries'), 'active_menu' => PRIV_USERS, 'user_display_name' => $this->accounts->get_user_display_name($user_id), - 'timezones' => $this->timezones->to_grouped_array(), + 'grouped_timezones' => $this->timezones->to_grouped_array(), 'privileges' => $this->roles_model->get_permissions_by_slug($role_slug), 'providers' => $this->providers_model->get(), ]); diff --git a/application/views/components/booking_time_step.php b/application/views/components/booking_time_step.php index f4351904..6fd6a6bb 100644 --- a/application/views/components/booking_time_step.php +++ b/application/views/components/booking_time_step.php @@ -22,7 +22,7 @@ 'id="select-timezone" class="form-control" value="UTC"', - 'timezones' => $grouped_timezones + 'grouped_timezones' => $grouped_timezones ]) ?> diff --git a/application/views/pages/account.php b/application/views/pages/account.php index 20f93ccf..91591dab 100644 --- a/application/views/pages/account.php +++ b/application/views/pages/account.php @@ -138,7 +138,7 @@ 'id="timezone" class="form-control required"', - 'timezones' => vars('timezones') + 'grouped_timezones' => vars('grouped_timezones') ]) ?> diff --git a/application/views/pages/admins.php b/application/views/pages/admins.php index 5fee48c3..5516b51f 100755 --- a/application/views/pages/admins.php +++ b/application/views/pages/admins.php @@ -178,7 +178,7 @@ 'id="timezone" class="form-control required" disabled', - 'timezones' => vars('timezones') + 'grouped_timezones' => vars('grouped_timezones') ]) ?> diff --git a/application/views/pages/customers.php b/application/views/pages/customers.php index 78b1677c..9ebe14a0 100755 --- a/application/views/pages/customers.php +++ b/application/views/pages/customers.php @@ -162,7 +162,7 @@ 'id="timezone" class="form-control required" disabled', - 'timezones' => vars('timezones') + 'grouped_timezones' => vars('grouped_timezones') ]) ?> diff --git a/application/views/pages/providers.php b/application/views/pages/providers.php index 22a049a0..e83e1860 100755 --- a/application/views/pages/providers.php +++ b/application/views/pages/providers.php @@ -214,7 +214,7 @@ 'id="timezone" class="form-control required" disabled', - 'timezones' => vars('timezones') + 'grouped_timezones' => vars('grouped_timezones') ]) ?> diff --git a/application/views/pages/secretaries.php b/application/views/pages/secretaries.php index 9a99efa6..340c55d4 100755 --- a/application/views/pages/secretaries.php +++ b/application/views/pages/secretaries.php @@ -177,7 +177,7 @@ 'id="timezone" class="form-control required" disabled', - 'timezones' => vars('timezones') + 'grouped_timezones' => vars('grouped_timezones') ]) ?>