upgrade develop to master

application/controllers/Appointments.php

@@ -35,6 +35,7 @@ public function __construct()
         $this->load->model('services_model');
         $this->load->model('customers_model');
         $this->load->model('settings_model');
+        $this->load->model('host_model');
         $this->load->library('timezones');
         $this->load->library('synchronization');
         $this->load->library('notifications');
@@ -79,6 +80,14 @@ public function index($appointment_hash = '')
             $privacy_policy_content = $this->settings_model->get_setting('privacy_policy_content');
             $display_any_provider = $this->settings_model->get_setting('display_any_provider');
             $timezones = $this->timezones->to_array();
+            $chinese_name = $this->host_model->get_host('chinese_name');
+            $english_name = $this->host_model->get_host('english_name');
+            $url = $this->host_model->get_host('url');
+            $logo = $this->host_model->get_host('logo');
+            $description = $this->host_model->get_host('description');
+            $main_color = $this->host_model->get_host('main_color');
+            $secondary_color = $this->host_model->get_host('secondary_color');
+            $text_color = $this->host_model->get_host('text_color');
 
             // Remove the data that are not needed inside the $available_providers array.
             foreach ($available_providers as $index => $provider)
@@ -182,6 +191,14 @@ public function index($appointment_hash = '')
                 'privacy_policy_content' => $privacy_policy_content,
                 'timezones' => $timezones,
                 'display_any_provider' => $display_any_provider,
+                'chinese_name' => $chinese_name,
+                'english_name' => $english_name,
+                'url' => $url,
+                'logo' => $logo,
+                'description' => $description,
+                'main_color' => $main_color,
+                'secondary_color' => $secondary_color,
+                'text_color' => $text_color
             ];
         }
         catch (Exception $exception)
@@ -711,5 +728,45 @@ protected function search_providers_by_service($service_id)
         return $provider_list;
     }
 
+    /**
+     * 
+     */
+    public function book_record()
+    {
+        try
+        {
+            $company_name = $this->settings_model->get_setting('company_name');
+            $company_address = $this->settings_model->get_setting('company_address');
+            $company_logo = $this->settings_model->get_setting('company_logo');
+            $company_banner = $this->settings_model->get_setting('company_banner');
+            $timezones = $this->timezones->to_array();
+            $chinese_name = $this->host_model->get_host('chinese_name');
+            $english_name = $this->host_model->get_host('english_name');
+            $url = $this->host_model->get_host('url');
+            $logo = $this->host_model->get_host('logo');
+            $description = $this->host_model->get_host('description');
+            $main_color = $this->host_model->get_host('main_color');
+
+            // Load the book appointment view.
+            $variables = [
+                'company_name' => $company_name,
+                'company_address' => $company_address,
+                'company_logo' => $company_logo,
+                'company_banner' => $company_banner,
+                'timezones' => $timezones,
+                'chinese_name' => $chinese_name,
+                'english_name' => $english_name,
+                'url' => $url,
+                'logo' => $logo,
+                'description' => $description,
+                'main_color' => $main_color,
+            ];
+        }
+        catch (Exception $exception)
+        {
+            $variables['exceptions'][] = $exception;
+        }
+        $this->load->view('appointments/book_record', $variables);
+    }
 
 }

application/controllers/Backend.php

@@ -34,6 +34,7 @@ public function __construct()
         $this->load->model('roles_model');
         $this->load->model('user_model');
         $this->load->model('secretaries_model');
+        $this->load->model('host_model');
         $this->load->model('admins_model');
         $this->load->library('timezones');
         $this->load->library('migration');
@@ -79,6 +80,14 @@ public function index($appointment_hash = '')
         $view['customers'] = $this->customers_model->get_batch();
         $view['calendar_view'] = ! empty($calendar_view_query_param) ? $calendar_view_query_param : $user['settings']['calendar_view'];
         $view['timezones'] = $this->timezones->to_array();
+        $view['chinese_name'] = $this->host_model->get_host('chinese_name');
+        $view['english_name'] = $this->host_model->get_host('english_name');
+        $view['url'] = $this->host_model->get_host('url');
+        $view['logo'] = $this->host_model->get_host('logo');
+        $view['description'] = $this->host_model->get_host('description');
+        $view['main_color'] = $this->host_model->get_host('main_color');
+        $view['secondary_color'] = $this->host_model->get_host('secondary_color');
+        $view['text_color'] = $this->host_model->get_host('text_color');
         $this->set_user_data($view);
 
         if ($this->session->userdata('role_slug') === DB_SLUG_SECRETARY)
@@ -199,6 +208,14 @@ public function customers()
         $view['available_providers'] = $this->providers_model->get_available_providers();
         $view['available_services'] = $this->services_model->get_available_services();
         $view['timezones'] = $this->timezones->to_array();
+        $view['chinese_name'] = $this->host_model->get_host('chinese_name');
+        $view['english_name'] = $this->host_model->get_host('english_name');
+        $view['url'] = $this->host_model->get_host('url');
+        $view['logo'] = $this->host_model->get_host('logo');
+        $view['description'] = $this->host_model->get_host('description');
+        $view['main_color'] = $this->host_model->get_host('main_color');
+        $view['secondary_color'] = $this->host_model->get_host('secondary_color');
+        $view['text_color'] = $this->host_model->get_host('text_color');
 
         if ($this->session->userdata('role_slug') === DB_SLUG_SECRETARY)
         {
@@ -245,6 +262,14 @@ public function services()
         $view['services'] = $this->services_model->get_batch();
         $view['categories'] = $this->services_model->get_all_categories();
         $view['timezones'] = $this->timezones->to_array();
+        $view['chinese_name'] = $this->host_model->get_host('chinese_name');
+        $view['english_name'] = $this->host_model->get_host('english_name');
+        $view['url'] = $this->host_model->get_host('url');
+        $view['logo'] = $this->host_model->get_host('logo');
+        $view['description'] = $this->host_model->get_host('description');
+        $view['main_color'] = $this->host_model->get_host('main_color');
+        $view['secondary_color'] = $this->host_model->get_host('secondary_color');
+        $view['text_color'] = $this->host_model->get_host('text_color');
         $this->set_user_data($view);
 
         $this->load->view('backend/header', $view);
@@ -282,6 +307,14 @@ public function users()
         $view['working_plan'] = $this->settings_model->get_setting('company_working_plan');
         $view['timezones'] = $this->timezones->to_array();
         $view['working_plan_exceptions'] = '{}';
+        $view['chinese_name'] = $this->host_model->get_host('chinese_name');
+        $view['english_name'] = $this->host_model->get_host('english_name');
+        $view['url'] = $this->host_model->get_host('url');
+        $view['logo'] = $this->host_model->get_host('logo');
+        $view['description'] = $this->host_model->get_host('description');
+        $view['main_color'] = $this->host_model->get_host('main_color');
+        $view['secondary_color'] = $this->host_model->get_host('secondary_color');
+        $view['text_color'] = $this->host_model->get_host('text_color');
         $this->set_user_data($view);
 
         $this->load->view('backend/header', $view);
@@ -319,6 +352,14 @@ public function settings()
         $view['system_settings'] = $this->settings_model->get_settings();
         $view['user_settings'] = $this->user_model->get_user($user_id);
         $view['timezones'] = $this->timezones->to_array();
+        $view['chinese_name'] = $this->host_model->get_host('chinese_name');
+        $view['english_name'] = $this->host_model->get_host('english_name');
+        $view['url'] = $this->host_model->get_host('url');
+        $view['logo'] = $this->host_model->get_host('logo');
+        $view['description'] = $this->host_model->get_host('description');
+        $view['main_color'] = $this->host_model->get_host('main_color');
+        $view['secondary_color'] = $this->host_model->get_host('secondary_color');
+        $view['text_color'] = $this->host_model->get_host('text_color');
 
         // book_advance_timeout preview
         $book_advance_timeout = $this->settings_model->get_setting('book_advance_timeout');

application/controllers/Backend_api.php

@@ -313,7 +313,10 @@ public function ajax_save_appointment()
             $response = AJAX_SUCCESS;
 
             //send appointment change line message
-            line_message_change($settings, $customer, $service, $appointment);
+            $is_notification = $this->input->post('is_notification');
+            if($is_notification == 1){
+                line_message_change($settings, $customer, $service, $appointment);
+            }
 
         }
         catch (Exception $exception)
@@ -474,7 +477,10 @@ public function ajax_delete_appointment()
             }
 
             //send appointment delet line message
-            line_message_delete($settings, $customer, $service, $appointment);
+            $is_notification = $this->input->post('is_notification');
+            if($is_notification == 1){
+                line_message_delete($settings, $customer, $service, $appointment);
+            }
 
         }
         catch (Exception $exception)

application/controllers/Cronjob.php

@@ -0,0 +1,41 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+class Cronjob extends EA_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->load->helper('line_message');
+        $this->load->model('appointments_model');
+        $this->load->model('providers_model');
+        $this->load->model('services_model');
+        $this->load->model('customers_model');
+        $this->load->model('settings_model');
+        $this->load->library('timezones');
+    }
+
+    public function send_notify_to_appoiment()
+    {   
+        $appointment = [];
+        $remind_time = $this->settings_model->get_setting('remind_time');
+        $day_start = $remind_time;
+        $day_end = $remind_time +1;
+        $appointments = $this->appointments_model->get_scheduled_appointments($day_start, $day_end);
+
+        if(count($appointments) > 0){
+            $settings = [
+                'company_name' => $this->settings_model->get_setting('company_name'),
+                'company_address' => $this->settings_model->get_setting('company_address'),
+            ];
+            foreach ($appointments as $appointment) {
+                $provider = $this->providers_model->get_row($appointment['id_users_provider']);
+                $service = $this->services_model->get_row($appointment['id_services']);
+                $customer = $this->customers_model->get_row($appointment['id_users_customer']);
+                line_message_cronjob($settings, $provider, $service, $customer, $appointment);
+            }
+        }
+        print_r($appointments);
+        // echo json_encode($datetime);
+    }
+}

application/controllers/Customer.php

@@ -0,0 +1,31 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+class Customer extends EA_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->load->model('customers_model');
+    }
+
+    public function send_customer_to_appoiment()
+    {   
+        $lineUserId = $this->input->post('lineUserId');
+
+        if (empty($lineUserId))
+        {
+            $response = ['warnings' => 'Error line user id is required'];
+        }
+        else
+        {
+            $lineUserId_customerData = $this->customers_model->get_data_from_line_id($lineUserId);
+            $response = $lineUserId_customerData; 
+        }
+
+        $this->output
+            ->set_content_type('application/json')
+            ->set_output(json_encode($response));          
+
+    }
+}

application/controllers/Record.php

@@ -0,0 +1,39 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+class Record extends EA_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->load->model('appointments_model');
+        $this->load->model('providers_model');
+        $this->load->model('services_model');
+        $this->load->model('customers_model');
+        $this->load->model('settings_model');
+    }
+
+    public function get_appointments_from_line_id()
+    {   
+        $lineUserId = $this->input->post('lineUserId');
+
+        if (empty($lineUserId))
+        {
+            $response = ['warnings' => 'Error line user id is required'];
+        }
+        else
+        {
+            $customer_id = $this->customers_model->get_value_from_line_id('id', $lineUserId);
+            $appointments = $this->appointments_model->get_appointments_from_customer($customer_id);
+
+            foreach($appointments as $id_services => $appointments)
+            {
+                $service = $this->services_model->get_row($appointments['id_services']);
+                $response[] = $appointments + $service;
+            }
+        }
+        $this->output
+            ->set_content_type('application/json')
+            ->set_output(json_encode($response));  
+    }
+}