maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Providers and services are ordered alphabetically (#568).

Browse source
This commit is contained in:
Alex Tselegidis 2020-03-27 11:11:51 +01:00
parent 2321c3b7fc
commit 12f6833ca5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
application/models/Providers_model.php
View file

@ -502,7 +502,8 @@ class Providers_Model extends CI_Model {
->select('ea_users.*') ->select('ea_users.*')
->from('ea_users') ->from('ea_users')
->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner') ->join('ea_roles', 'ea_roles.id = ea_users.id_roles', 'inner')
->where('ea_roles.slug', DB_SLUG_PROVIDER); ->where('ea_roles.slug', DB_SLUG_PROVIDER)
->order_by('first_name ASC, last_name ASC, email ASC');
$providers = $this->db->get()->result_array(); $providers = $this->db->get()->result_array();

3
application/models/Services_model.php
View file

@ -163,7 +163,7 @@ class Services_Model extends CI_Model {
} }
} }
// Availabilities type must have the correct value. // Availabilities type must have the correct value.
if ($service['availabilities_type'] !== NULL && $service['availabilities_type'] !== AVAILABILITIES_TYPE_FLEXIBLE if ($service['availabilities_type'] !== NULL && $service['availabilities_type'] !== AVAILABILITIES_TYPE_FLEXIBLE
&& $service['availabilities_type'] !== AVAILABILITIES_TYPE_FIXED) && $service['availabilities_type'] !== AVAILABILITIES_TYPE_FIXED)
{ {
@ -337,6 +337,7 @@ class Services_Model extends CI_Model {
'ea_services_providers.id_services = ea_services.id', 'inner') 'ea_services_providers.id_services = ea_services.id', 'inner')
->join('ea_service_categories', ->join('ea_service_categories',
'ea_service_categories.id = ea_services.id_service_categories', 'left') 'ea_service_categories.id = ea_services.id_service_categories', 'left')
->order_by('name ASC')
->get()->result_array(); ->get()->result_array();
} }