Grouped the property tag into parent core classes so that it does not need to be repeated.

This commit is contained in:
Alex Tselegidis 2020-11-16 10:29:36 +02:00
parent 46804fab7b
commit 75a5addbc2
61 changed files with 214 additions and 607 deletions

View File

@ -183,7 +183,7 @@ $config['enable_hooks'] = TRUE;
| http://codeigniter.com/user_guide/general/creating_libraries.html
|
*/
$config['subclass_prefix'] = 'MY_';
$config['subclass_prefix'] = 'EA_';
/*

View File

@ -14,34 +14,9 @@
/**
* Appointments Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
* @property Timezones $timezones
* @property Synchronization $synchronization
* @property Notifications $notifications
* @property Availability $availability
*
* @package Controllers
*/
class Appointments extends CI_Controller {
class Appointments extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -15,30 +15,10 @@
* Backend Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Backend extends CI_Controller {
class Backend extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -21,33 +21,9 @@ use EA\Engine\Types\Url;
*
* Contains all the backend AJAX callbacks.
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Synchronization $synchronization
* @property Notifications $notifications
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Backend_api extends CI_Controller {
class Backend_api extends EA_Controller {
/**
* @var array
*/

View File

@ -14,31 +14,9 @@
/**
* Captcha Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Captcha extends CI_Controller {
class Captcha extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -16,32 +16,9 @@
*
* Handles user consent related operations.
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Consents_Model consents_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Consents extends CI_Controller {
class Consents extends EA_Controller {
/**
* Save the user's consent.
*/

View File

@ -17,11 +17,8 @@ require_once __DIR__ .'/Google.php';
* Class Console
*
* CLI commands of Easy!Appointments, can only be executed from a terminal and not with a direct request.
*
* @property CI_Migration $migration
* @property Providers_model $providers_model
*/
class Console extends CI_Controller {
class Console extends EA_Controller {
/**
* Console constructor.
*/

View File

@ -14,31 +14,9 @@
/**
* Errors Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Errors extends CI_Controller {
class Errors extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -16,31 +16,9 @@
*
* This controller handles the Google Calendar synchronization operations.
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Google extends CI_Controller {
class Google extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -16,32 +16,9 @@
*
* This controller will handle the installation procedure of Easy!Appointments.
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property CI_Migration migration
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Installation extends CI_Controller {
class Installation extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -14,31 +14,9 @@
/**
* Class Privacy
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Privacy extends CI_Controller {
class Privacy extends EA_Controller {
/**
* Remove all customer data (including appointments from the system).
*/

View File

@ -18,31 +18,9 @@ use EA\Engine\Types\NonEmptyText;
/**
* User Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class User extends CI_Controller {
class User extends EA_Controller {
/**
* Class Constructor
*/

View File

@ -22,7 +22,7 @@ use EA\Engine\Types\NonEmptyText;
*
* @package Controllers
*/
class API_V1_Controller extends CI_Controller {
class API_V1_Controller extends EA_Controller {
/**
* Class Constructor
*

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Admins Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Admins extends API_V1_Controller {

View File

@ -20,30 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Appointments Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Notifications $notifications
* @property Synchronization $synchronization
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Appointments extends API_V1_Controller {

View File

@ -19,28 +19,6 @@ use EA\Engine\Types\UnsignedInteger;
/**
* Availabilities Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Availabilities extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Categories Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Categories extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Customers Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Customers extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Providers Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Providers extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Secretaries Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Secretaries extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Services Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Services extends API_V1_Controller {

View File

@ -19,28 +19,6 @@ use EA\Engine\Api\V1\Response;
/**
* Settings Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Settings extends API_V1_Controller {

View File

@ -20,28 +20,6 @@ use EA\Engine\Types\NonEmptyText;
/**
* Unavailabilities Controller
*
* @property CI_Session $session
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Security $security
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Appointments_model $appointments_model
* @property Providers_model $providers_model
* @property Services_model $services_model
* @property Customers_model $customers_model
* @property Settings_model $settings_model
* @property Timezones $timezones
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Admins_model $admins_model
* @property User_model $user_model
*
* @package Controllers
*/
class Unavailabilities extends API_V1_Controller {

View File

@ -0,0 +1,48 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
/* ----------------------------------------------------------------------------
* Easy!Appointments - Open Source Web Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
* @copyright Copyright (c) 2013 - 2020, Alex Tselegidis
* @license https://opensource.org/licenses/GPL-3.0 - GPLv3
* @link https://easyappointments.org
* @since v1.4.0
* ---------------------------------------------------------------------------- */
/**
* Class MY_Controller
*
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Session $session
* @property CI_Security $security
* @property CI_Migration $migration
* @property Admins_model $admins_model
* @property Appointments_model $appointments_model
* @property Consents_model $consents_model
* @property Customers_model $customers_model
* @property Providers_model $providers_model
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Services_model $services_model
* @property Settings_model $settings_model
* @property User_model $user_model
*
* @property Availability $availability
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Notifications $notifications
* @property Synchronization $synchronization
* @property Timezones $timezones
*/
class EA_Controller extends CI_Controller {
//
}

View File

@ -0,0 +1,48 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
/* ----------------------------------------------------------------------------
* Easy!Appointments - Open Source Web Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
* @copyright Copyright (c) 2013 - 2020, Alex Tselegidis
* @license https://opensource.org/licenses/GPL-3.0 - GPLv3
* @link https://easyappointments.org
* @since v1.4.0
* ---------------------------------------------------------------------------- */
/**
* Class MY_Migration
*
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Session $session
* @property CI_Security $security
* @property CI_Migration $migration
*
* @property Admins_model $admins_model
* @property Appointments_model $appointments_model
* @property Consents_model $consents_model
* @property Customers_model $customers_model
* @property Providers_model $providers_model
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Services_model $services_model
* @property Settings_model $settings_model
* @property User_model $user_model
*
* @property Availability $availability
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Notifications $notifications
* @property Synchronization $synchronization
* @property Timezones $timezones
*/
class EA_Migration extends CI_Model {
//
}

View File

@ -0,0 +1,48 @@
<?php defined('BASEPATH') or exit('No direct script access allowed');
/* ----------------------------------------------------------------------------
* Easy!Appointments - Open Source Web Scheduler
*
* @package EasyAppointments
* @author A.Tselegidis <alextselegidis@gmail.com>
* @copyright Copyright (c) 2013 - 2020, Alex Tselegidis
* @license https://opensource.org/licenses/GPL-3.0 - GPLv3
* @link https://easyappointments.org
* @since v1.4.0
* ---------------------------------------------------------------------------- */
/**
* Class MY_Model
*
* @property CI_Loader $load
* @property CI_Input $input
* @property CI_Output $output
* @property CI_Config $config
* @property CI_Lang $lang
* @property CI_Cache $cache
* @property CI_DB_query_builder $db
* @property CI_Session $session
* @property CI_Security $security
* @property CI_Migration $migration
*
* @property Admins_model $admins_model
* @property Appointments_model $appointments_model
* @property Consents_model $consents_model
* @property Customers_model $customers_model
* @property Providers_model $providers_model
* @property Roles_model $roles_model
* @property Secretaries_model $secretaries_model
* @property Services_model $services_model
* @property Settings_model $settings_model
* @property User_model $user_model
*
* @property Availability $availability
* @property Google_Sync $google_sync
* @property Ics_file $ics_file
* @property Notifications $notifications
* @property Synchronization $synchronization
* @property Timezones $timezones
*/
class EA_Model extends CI_Model {
//
}

View File

@ -19,7 +19,7 @@
*/
class Availability {
/**
* @var CI_Controller
* @var EA_Controller
*/
protected $CI;

View File

@ -24,9 +24,9 @@ class Google_Sync {
/**
* CodeIgniter Instance
*
* @var CI_Controller
* @var EA_Controller
*/
protected $framework;
protected $CI;
/**
* Google API Client
@ -50,17 +50,17 @@ class Google_Sync {
*/
public function __construct()
{
$this->framework =& get_instance();
$this->CI =& get_instance();
$this->framework->load->library('session');
$this->CI->load->library('session');
// Initialize google client and calendar service.
$this->client = new Google_Client();
$this->client->setApplicationName($this->framework->config->item('google_application_name'));
$this->client->setClientId($this->framework->config->item('google_client_id'));
$this->client->setClientSecret($this->framework->config->item('google_client_secret'));
$this->client->setDeveloperKey($this->framework->config->item('google_api_key'));
$this->client->setApplicationName($this->CI->config->item('google_application_name'));
$this->client->setClientId($this->CI->config->item('google_client_id'));
$this->client->setClientSecret($this->CI->config->item('google_client_secret'));
$this->client->setDeveloperKey($this->CI->config->item('google_api_key'));
$this->client->setRedirectUri(site_url('google/oauth_callback'));
$this->client->setAccessType('offline');
$this->client->addScope([
@ -145,7 +145,7 @@ class Google_Sync {
*/
public function add_appointment($appointment, $provider, $service, $customer, $settings)
{
$this->framework->load->helper('general');
$this->CI->load->helper('general');
$event = new Google_Service_Calendar_Event();
$event->setSummary(($service != NULL) ? $service['name'] : 'Unavailable');
@ -199,7 +199,7 @@ class Google_Sync {
*/
public function update_appointment($appointment, $provider, $service, $customer, $settings)
{
$this->framework->load->helper('general');
$this->CI->load->helper('general');
$event = $this->service->events->get($provider['settings']['google_calendar'],
$appointment['id_google_calendar']);
@ -268,7 +268,7 @@ class Google_Sync {
*/
public function add_unavailable($provider, $unavailable)
{
$this->framework->load->helper('general');
$this->CI->load->helper('general');
$event = new Google_Service_Calendar_Event();
$event->setSummary('Unavailable');
@ -299,7 +299,7 @@ class Google_Sync {
*/
public function update_unavailable($provider, $unavailable)
{
$this->framework->load->helper('general');
$this->CI->load->helper('general');
$event = $this->service->events->get($provider['settings']['google_calendar'],
$unavailable['id_google_calendar']);
@ -362,7 +362,7 @@ class Google_Sync {
*/
public function get_sync_events($google_calendar, $start, $end)
{
$this->framework->load->helper('general');
$this->CI->load->helper('general');
$params = [
'timeMin' => date3339($start),

View File

@ -23,7 +23,7 @@ use EA\Engine\Types\Url;
*/
class Notifications {
/**
* @var CI_Controller
* @var EA_Controller
*/
protected $CI;

View File

@ -18,7 +18,7 @@
*/
class Synchronization {
/**
* @var CI_Controller
* @var EA_Controller
*/
protected $CI;

View File

@ -20,9 +20,9 @@
*/
class Timezones {
/**
* @var CI_Controller
* @var EA_Controller
*/
protected $framework;
protected $CI;
/**
* @var string
@ -464,13 +464,16 @@ class Timezones {
],
];
/**
* Timezones constructor.
*/
public function __construct()
{
$this->framework = & get_instance();
$this->CI = & get_instance();
$this->framework->load->model('user_model');
$this->CI->load->model('user_model');
$this->framework->load->library('session');
$this->CI->load->library('session');
}
/**
@ -499,7 +502,7 @@ class Timezones {
throw new Exception('The provided event does not have the required properties: ' . print_r($event));
}
$user_timezone = $this->framework->user_model->get_user_timezone($event['id_users_provider']);
$user_timezone = $this->CI->user_model->get_user_timezone($event['id_users_provider']);
$session_timezone = $this->get_session_timezone();
@ -522,8 +525,8 @@ class Timezones {
{
$default_timezone = $this->get_default_timezone();
return $this->framework->session->has_userdata('timezone')
? $this->framework->session->userdata('timezone')
return $this->CI->session->has_userdata('timezone')
? $this->CI->session->userdata('timezone')
: $default_timezone;
}

View File

@ -16,11 +16,8 @@
*
* Notice: This first migration got altered to include the creation of the initial database structure so that external
* SQL are not required.
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Specific_calendar_sync extends CI_Migration {
class Migration_Specific_calendar_sync extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_google_analytics_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_google_analytics_setting extends CI_Migration {
class Migration_Add_google_analytics_setting extends EA_Migration {
/**
* Upgrade method.
*

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_customer_notifications_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_customer_notifications_setting extends CI_Migration {
class Migration_Add_customer_notifications_setting extends EA_Migration {
/**
* Upgrade method.
*

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_date_format_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_date_format_setting extends CI_Migration {
class Migration_Add_date_format_setting extends EA_Migration {
/**
* Upgrade method.
*

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_require_captcha_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_require_captcha_setting extends CI_Migration {
class Migration_Add_require_captcha_setting extends EA_Migration {
/**
* Upgrade method.
*

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_calendar_view_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_calendar_view_setting extends CI_Migration {
class Migration_Add_calendar_view_setting extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_service_availabilities_type
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_service_availabilities_type extends CI_Migration {
class Migration_Add_service_availabilities_type extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_service_attendants_number
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_service_attendants_number extends CI_Migration {
class Migration_Add_service_attendants_number extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Change_column_types
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Change_column_types extends CI_Migration {
class Migration_Change_column_types extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_time_format_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_time_format_setting extends CI_Migration {
class Migration_Add_time_format_setting extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Remove_prefix_from_foreign_keys
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Remove_prefix_from_fkey_constraints extends CI_Migration {
class Migration_Remove_prefix_from_fkey_constraints extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Create_consents_table
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Legal_contents extends CI_Migration {
class Migration_Legal_contents extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_weekday_start_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_weekday_start_setting extends CI_Migration {
class Migration_Add_weekday_start_setting extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Create_appointment_location_column
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Create_appointment_location_column extends CI_Migration {
class Migration_Create_appointment_location_column extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_working_plan_exceptions_to_user_settings
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_working_plan_exceptions_to_user_settings extends CI_Migration {
class Migration_Add_working_plan_exceptions_to_user_settings extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_require_phone_number_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_require_phone_number_setting extends CI_Migration {
class Migration_Add_require_phone_number_setting extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_api_token_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_api_token_setting extends CI_Migration {
class Migration_Add_api_token_setting extends EA_Migration {
/**
* Upgrade method.
*

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_timezone_to_users
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_timezone_to_users extends CI_Migration {
class Migration_Add_timezone_to_users extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_display_any_provider_setting
*
* @property CI_DB_query_builder $db
* @property CI_DB_forge dbforge
*/
class Migration_Add_display_any_provider_setting extends CI_Migration {
class Migration_Add_display_any_provider_setting extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -13,11 +13,8 @@
/**
* Class Migration_Add_language_to_users
*
* @property CI_DB_query_builder db
* @property CI_DB_forge dbforge
*/
class Migration_Add_language_to_users extends CI_Migration {
class Migration_Add_language_to_users extends EA_Migration {
/**
* Upgrade method.
*/

View File

@ -16,12 +16,9 @@
*
* Handles the database actions for admin users management.
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Admins_model extends CI_Model {
class Admins_model extends EA_Model {
public function __construct()
{
parent::__construct();

View File

@ -14,12 +14,9 @@
/**
* Appointments Model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Appointments_model extends CI_Model {
class Appointments_model extends EA_Model {
/**
* Appointments_Model constructor.
*/

View File

@ -14,12 +14,9 @@
/**
* Class Consents_model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Consents_model extends CI_Model {
class Consents_model extends EA_Model {
/**
* Add a consent record to the database.
*

View File

@ -14,12 +14,9 @@
/**
* Customers Model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Customers_model extends CI_Model {
class Customers_model extends EA_Model {
/**
* Customers_Model constructor.
*/

View File

@ -16,12 +16,9 @@
*
* Contains the database operations for the service provider users of Easy!Appointments.
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Providers_model extends CI_Model {
class Providers_model extends EA_Model {
/**
* Providers_Model constructor.
*/

View File

@ -14,12 +14,9 @@
/**
* Roles Model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Roles_model extends CI_Model {
class Roles_model extends EA_Model {
/**
* Get the record id of a particular role.
*

View File

@ -16,12 +16,9 @@
*
* Handles the db actions that have to do with secretaries.
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Secretaries_model extends CI_Model {
class Secretaries_model extends EA_Model {
/**
* Secretaries_Model constructor.
*/

View File

@ -14,12 +14,9 @@
/**
* Services Model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Services_model extends CI_Model {
class Services_model extends EA_Model {
/**
* Services_Model constructor.
*/

View File

@ -14,12 +14,9 @@
/**
* Settings Model
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class Settings_model extends CI_Model {
class Settings_model extends EA_Model {
/**
* Get setting value from database.
*

View File

@ -16,12 +16,9 @@
*
* Contains current user's methods.
*
* @property CI_DB_query_builder $db
* @property CI_Loader $load
*
* @package Models
*/
class User_model extends CI_Model {
class User_model extends EA_Model {
/**
* User_Model constructor.
*/