From 87e791e8531b263fe0841aefe0bb8f6acb07d9d3 Mon Sep 17 00:00:00 2001
From: Jay Huang <vijay.huang@gmail.com>
Date: Sun, 1 Sep 2024 22:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/AppointmentSearch.php | 64 ++++++-------------
 .../views/emails/account_recovery_email.php   |  4 +-
 .../emails/appointment_deleted_email.php      |  4 +-
 .../views/emails/appointment_saved_email.php  |  4 +-
 application/views/errors/html/error_404.php   |  2 +-
 application/views/errors/html/error_db.php    |  2 +-
 .../views/errors/html/error_general.php       |  2 +-
 .../views/layouts/home_search_layout.php      | 28 +++++---
 application/views/pages/installation.php      |  2 +-
 .../js/http/customers_search_http_client.js   | 45 +++++++++++++
 10 files changed, 89 insertions(+), 68 deletions(-)
 create mode 100755 assets/js/http/customers_search_http_client.js

diff --git a/application/controllers/AppointmentSearch.php b/application/controllers/AppointmentSearch.php
index 3fda4d63..6030b7e7 100644
--- a/application/controllers/AppointmentSearch.php
+++ b/application/controllers/AppointmentSearch.php
@@ -1,54 +1,28 @@
-<?php defined('BASEPATH') or exit('No direct script access allowed');
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
 
-class AppointmentSearch extends EA_Controller
-{
-    /**
-     * AppointmentSearch constructor.
-     */
-    public function __construct()
-    {
+class AppointmentSearch extends CI_Controller {
+
+    public function __construct() {
         parent::__construct();
-
-        $this->load->model('users_model');
-        $this->load->model('appointments_model');
+        $this->load->model('Appointment_model');
     }
 
-    /**
-     * Search appointments by phone number.
-     */
-    public function search_by_phone(): void
-    {
-        try {
-            $phone_number = request('phone_number', '');
+    public function search_by_phone() {
+        $this->security->get_csrf_hash(); // 获取CSRF Token
+        $phone_number = $this->input->post('phone_number');
 
-            if (empty($phone_number)) {
-                json_response([
-                    'success' => false,
-                    'message' => 'Phone number is required.'
-                ]);
-                return;
-            }
+        if (!$phone_number) {
+            echo json_encode(['success' => false, 'message' => 'Phone number is required']);
+            return;
+        }
 
-            // 查询ea_users表中id_roles为3的用户ID
-            $user = $this->users_model->get_user_by_phone($phone_number, 3);
+        $appointments = $this->Appointment_model->get_appointments_by_phone($phone_number);
 
-            if (!$user) {
-                json_response([
-                    'success' => false,
-                    'message' => 'No user found with this phone number.'
-                ]);
-                return;
-            }
-
-            // 用用户ID查询ea_appointments表中的记录
-            $appointments = $this->appointments_model->get_appointments_by_user_id($user->id);
-
-            json_response([
-                'success' => true,
-                'appointments' => $appointments
-            ]);
-        } catch (Throwable $e) {
-            json_exception($e);
+        if ($appointments) {
+            echo json_encode(['success' => true, 'appointments' => $appointments]);
+        } else {
+            echo json_encode(['success' => false, 'message' => 'No appointments found']);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/application/views/emails/account_recovery_email.php b/application/views/emails/account_recovery_email.php
index 19fa48c2..bd6b5b5e 100755
--- a/application/views/emails/account_recovery_email.php
+++ b/application/views/emails/account_recovery_email.php
@@ -32,9 +32,7 @@
     <div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
                 border-top: 1px solid #EEE; background: #FAFAFA;">
         Powered by
-        <a href="https://easyappointments.org" style="text-decoration: none;">
-            Easy!Appointments
-        </a>
+        <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         |
         <a href="<?= $settings['company_link'] ?>" style="text-decoration: none;">
             <?= e($settings['company_name']) ?>
diff --git a/application/views/emails/appointment_deleted_email.php b/application/views/emails/appointment_deleted_email.php
index 35d55a3d..f2fefb23 100755
--- a/application/views/emails/appointment_deleted_email.php
+++ b/application/views/emails/appointment_deleted_email.php
@@ -175,9 +175,7 @@
     <div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
                 border-top: 1px solid #EEE; background: #FAFAFA;">
         Powered by
-        <a href="https://easyappointments.org" style="text-decoration: none;">
-            Easy!Appointments
-        </a>
+        <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         |
         <a href="<?= e($settings['company_link']) ?>" style="text-decoration: none;">
             <?= e($settings['company_name']) ?>
diff --git a/application/views/emails/appointment_saved_email.php b/application/views/emails/appointment_saved_email.php
index cbfb85be..2ec3db13 100755
--- a/application/views/emails/appointment_saved_email.php
+++ b/application/views/emails/appointment_saved_email.php
@@ -179,9 +179,7 @@
     <div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
                 border-top: 1px solid #EEE; background: #FAFAFA;">
         Powered by
-        <a href="https://easyappointments.org" style="text-decoration: none;">
-            Easy!Appointments
-        </a>
+        <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         |
         <a href="<?= e($settings['company_link']) ?>" style="text-decoration: none;">
             <?= e($settings['company_name']) ?>
diff --git a/application/views/errors/html/error_404.php b/application/views/errors/html/error_404.php
index 309a598b..2f736acb 100755
--- a/application/views/errors/html/error_404.php
+++ b/application/views/errors/html/error_404.php
@@ -74,7 +74,7 @@
     <p>
         <small>
             Powered by
-            <a href="https://easyappointments.org">Easy!Appointments</a>
+            <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         </small>
     </p>
 </div>
diff --git a/application/views/errors/html/error_db.php b/application/views/errors/html/error_db.php
index f8bd6e4f..e9c9b505 100755
--- a/application/views/errors/html/error_db.php
+++ b/application/views/errors/html/error_db.php
@@ -74,7 +74,7 @@
     <p>
         <small>
             Powered by
-            <a href="https://easyappointments.org">Easy!Appointments</a>
+            <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         </small>
     </p>
 </div>
diff --git a/application/views/errors/html/error_general.php b/application/views/errors/html/error_general.php
index 4d2a8b4f..ef02430a 100755
--- a/application/views/errors/html/error_general.php
+++ b/application/views/errors/html/error_general.php
@@ -74,7 +74,7 @@
     <p>
         <small>
             Powered by
-            <a href="https://easyappointments.org">Easy!Appointments</a>
+            <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
         </small>
     </p>
 </div>
diff --git a/application/views/layouts/home_search_layout.php b/application/views/layouts/home_search_layout.php
index 721ec1e5..3569ddbf 100755
--- a/application/views/layouts/home_search_layout.php
+++ b/application/views/layouts/home_search_layout.php
@@ -89,19 +89,21 @@
                 'company_logo' => vars('company_logo'),
             ]); ?>
             <div class="search-container-wrapper">
-                <h2 class="search-container-title"><?= lang('search_appointments_title') ?></h2>
+                <h2 class="search-container-title">查询预约信息</h2>
                 <div class="search-container">
-                    <input type="text" id="phoneNumber" placeholder="<?= lang('enter_phone_number') ?>">
-                    <button id="searchButton"><?= lang('search_button') ?></button>
+                    <input type="text" id="phoneNumber" placeholder="请输入手机号">
+                    <button id="searchButton">查询</button>
                 </div>
                 <div class="appointments-container" id="appointmentsContainer">
-                    <h3><?= lang('appointment_results') ?></h3>
+                    <h3>预约结果</h3>
                     <ul id="appointmentsList"></ul>
                 </div>
                 <div class="no-appointments" id="noAppointmentsMessage">
-                    <?= lang('no_appointments_message') ?>
+                    未找到预约信息。
                 </div>
             </div>
+
+            </div>
             <?php component('booking_footer', ['display_login_button' => vars('display_login_button')]); ?>
 
         </div>
@@ -145,19 +147,26 @@
 <script src="<?= asset_url('assets/js/layouts/booking_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/http/localization_http_client.js') ?>"></script>
 
+<script src="<?= asset_url('assets/js/http/customers_search_http_client.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/customers.js') ?>"></script>
+
 <script>
     document.getElementById('searchButton').addEventListener('click', function() {
         var phoneNumber = document.getElementById('phoneNumber').value;
 
         if (phoneNumber.trim() === '') {
-            alert('<?= lang('enter_valid_phone_number') ?>');
+            alert('请输入有效的手机号');
             return;
         }
 
-        fetch('/index.php/home_search/search_by_phone', {
+        // 发送请求前获取CSRF token
+        var csrfToken = document.querySelector('meta[name="csrf_token"]').getAttribute('content');
+
+        fetch('/index.php/appointmentSearch/search_by_phone', {
             method: 'POST',
             headers: {
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
+                'X-CSRF-TOKEN': csrfToken // 添加CSRF Token到请求头
             },
             body: JSON.stringify({ phone_number: phoneNumber })
         })
@@ -182,8 +191,7 @@
         appointmentsList.innerHTML = '';
         appointments.forEach(function(appointment) {
             var listItem = document.createElement('li');
-            // 根据实际返回的预约信息字段进行调整
-            listItem.textContent = `Appointment on ${appointment.start_datetime} with provider ID ${appointment.id_users_provider}`;
+            listItem.textContent = `预约时间：${appointment.start_datetime}，提供者ID：${appointment.id_users_provider}`;
             appointmentsList.appendChild(listItem);
         });
 
diff --git a/application/views/pages/installation.php b/application/views/pages/installation.php
index bdbdbf91..e2bff5cf 100755
--- a/application/views/pages/installation.php
+++ b/application/views/pages/installation.php
@@ -192,7 +192,7 @@
 </div>
 
 <footer>
-    Powered by <a href="https://easyappointments.org">Easy!Appointments</a>
+    <a href="https://www.tfe.com.hk/" target="_blank">TFE Group</a>
 </footer>
 
 <?php component('js_vars_script'); ?>
diff --git a/assets/js/http/customers_search_http_client.js b/assets/js/http/customers_search_http_client.js
new file mode 100755
index 00000000..4e560f09
--- /dev/null
+++ b/assets/js/http/customers_search_http_client.js
@@ -0,0 +1,45 @@
+/* ----------------------------------------------------------------------------
+ * Easy!Appointments - Online Appointment Scheduler
+ *
+ * @package     EasyAppointments
+ * @author      A.Tselegidis <alextselegidis@gmail.com>
+ * @copyright   Copyright (c) Alex Tselegidis
+ * @license     https://opensource.org/licenses/GPL-3.0 - GPLv3
+ * @link        https://easyappointments.org
+ * @since       v1.5.0
+ * ---------------------------------------------------------------------------- */
+
+/**
+ * Customers HTTP client.
+ *
+ * This module implements the customers related HTTP requests.
+ */
+App.Http.Customers = (function () {
+    /**
+     * Search customers by keyword.
+     *
+     * @param {String} keyword
+     * @param {Number} [limit]
+     * @param {Number} [offset]
+     * @param {String} [orderBy]
+     *
+     * @return {Object}
+     */
+    function search(keyword, limit = null, offset = null, orderBy = null) {
+        const url = App.Utils.Url.siteUrl('customers/search');
+
+        const data = {
+            csrf_token: vars('csrf_token'),
+            keyword,
+            limit,
+            offset,
+            order_by: orderBy,
+        };
+
+        return $.post(url, data);
+    }
+
+    return {
+        search,
+    };
+})();