Merge pull request #1410 from laravel-vesuvius/develop

Fix search Appointments_model
This commit is contained in:
Alex Tselegidis 2023-10-09 15:49:07 +02:00 committed by GitHub
commit 784cb0c877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -466,11 +466,11 @@ class Appointments_model extends EA_Model {
$appointments = $this
->db
->select()
->select('appointments.*')
->from('appointments')
->join('services', 'services.id = appointments.id_services', 'left')
->join('users AS providers', 'providers.id = appointments.id_users_provider', 'inner')
->join('users AS customers', 'customers.id = appointment.id_users_customer', 'left')
->join('users AS customers', 'customers.id = appointments.id_users_customer', 'left')
->where('is_unavailability', FALSE)
->group_start()
->like('appointments.start_datetime', $keyword)
@ -478,8 +478,8 @@ class Appointments_model extends EA_Model {
->or_like('appointments.location', $keyword)
->or_like('appointments.hash', $keyword)
->or_like('appointments.notes', $keyword)
->or_like('service.name', $keyword)
->or_like('service.description', $keyword)
->or_like('services.name', $keyword)
->or_like('services.description', $keyword)
->or_like('providers.first_name', $keyword)
->or_like('providers.last_name', $keyword)
->or_like('providers.email', $keyword)