update version and dependencies

application/config/app.php

@@ -9,7 +9,7 @@
 |
 */
 
-$config['version'] = '1.5.0-p1'; // This must be changed manually.
+$config['version'] = '1.5.0-p3'; // This must be changed manually.
 
 $config['url'] = Config::BASE_URL;
 

application/config/config.php

@@ -94,13 +94,13 @@ $languages = [
 
 $config['language_codes'] = $languages;
 
-$language_code = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : 'en';
+$language_code = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : 'tr';
 
 $config['language'] = isset($_SERVER['HTTP_ACCEPT_LANGUAGE'], $languages[$language_code])
     ? $languages[$language_code]
     : Config::LANGUAGE;
 
-$config['language_code'] = array_search($config['language'], $languages) ?: 'en';
+$config['language_code'] = array_search($config['language'], $languages) ?: 'tr';
 
 /*
 |--------------------------------------------------------------------------
@@ -151,7 +151,7 @@ $config['enable_hooks'] = TRUE;
 | http://codeigniter.com/user_guide/general/creating_libraries.html
 |
 */
-$config['subclass_prefix'] = 'EA_';
+$config['subclass_prefix'] = 'EA_'; //TODO create new MAKET_ prefix in future
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Installation.php

@@ -52,7 +52,7 @@ class Installation extends EA_Controller
     }
 
     /**
-     * Installs Easy!Appointments on the server.
+     * Installs MAKET Randevu on the server.
      */
     public function perform()
     {
@@ -67,7 +67,7 @@ class Installation extends EA_Controller
             $this->instance->migrate();
 
             // Insert admin
-            $admin['timezone'] = 'UTC';
+            $admin['timezone'] = 'Istanbul (+3:00)'; // REVIEW is it working properly ?!
             $admin['settings']['username'] = $admin['username'];
             $admin['settings']['password'] = $admin['password'];
             $admin['settings']['notifications'] = true;
@@ -92,8 +92,8 @@ class Installation extends EA_Controller
 
             // Service
             $service_id = $this->services_model->save([
-                'name' => 'Service',
+                'name' => 'Hizmet İsmini Buraya Girin',
-                'duration' => '30',
+                'duration' => '60',
                 'price' => '0',
                 'currency' => '',
                 'availabilities_type' => 'flexible',
@@ -102,13 +102,13 @@ class Installation extends EA_Controller
 
             // Provider
             $this->providers_model->save([
-                'first_name' => 'Jane',
+                'first_name' => 'Hizmet Sağlayıcı İsmini Buraya Girin',
-                'last_name' => 'Doe',
+                'last_name' => 'Hizmet Sağlayıcı Soyismini Buraya Girin',
-                'email' => 'jane@example.org',
+                'email' => 'hizmet_saglayici_mail@example.org',
-                'phone_number' => '+1 (000) 000-0000',
+                'phone_number' => '+90 (000) 000-0000',
                 'services' => [$service_id],
                 'settings' => [
-                    'username' => 'janedoe',
+                    'username' => 'ilkhizmetsaglayici',
                     'password' => random_string(),
                     'working_plan' => setting('company_working_plan'),
                     'notifications' => true,
@@ -121,10 +121,10 @@ class Installation extends EA_Controller
 
             // Customer
             $this->customers_model->save([
-                'first_name' => 'James',
+                'first_name' => 'Örnek Müşteri İsmi',
-                'last_name' => 'Doe',
+                'last_name' => 'Örnek Müşteri Soyismi',
-                'email' => 'james@example.org',
+                'email' => 'ornek_musteri@example.org',
-                'phone_number' => '+1 (000) 000-0000',
+                'phone_number' => '+90 (000) 000-0000',
             ]);
 
             json_response([

application/language/english/translations_lang.php

@@ -175,22 +175,22 @@ $lang['visible'] = 'Visible';
 $lang['hidden'] = 'Hidden';
 $lang['business_logic'] = 'Business Logic';
 $lang['current_user'] = 'Current User';
-$lang['about_app'] = 'About Easy!Appointments';
+$lang['about_app'] = 'About MAKET Randevu';
 $lang['edit_working_plan_hint'] = 'Mark below the days and hours that your company will accept appointments. You will be able to adjust appointments in non-working hours but the customers will not be able to book appointments by themselves in non-working periods. This working plan will be the default for every new provider record, but you will be able to change each provider\'s plan separately by editing his record. After that you can add break periods.';
 $lang['edit_breaks_hint'] = 'Add the working breaks during each day. These breaks will be applied for all new providers.';
 $lang['book_advance_timeout'] = 'Book Advance Timeout';
 $lang['book_advance_timeout_hint'] = 'Define the timeout (in minutes) before the customers can book or re-arrange appointments with the company.';
 $lang['timeout_minutes'] = 'Timeout (Minutes)';
-$lang['about_app_info'] = 'Easy!Appointments is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar, so you can use them with other services.';
+$lang['about_app_info'] = 'MAKET Randevu is a highly customizable web application that allows your customers to book appointments with you via the web. Moreover, it provides the ability to sync your data with Google Calendar, so you can use them with other services.';
 $lang['current_version'] = 'Current Version';
 $lang['support'] = 'Support';
-$lang['about_app_support'] = 'If you encounter any problems when using Easy!Appointments you can search the official Google Group for answers. You might also need to create a new issue on the Google Code page in order to help the development progress.';
+$lang['about_app_support'] = 'If you encounter any problems when using MAKET Randevu you can search the official Google Group for answers. You might also need to create a new issue on the Google Code page in order to help the development progress.';
 $lang['official_website'] = 'Official Website';
 $lang['google_plus_community'] = 'Google+ Community';
 $lang['support_group'] = 'Support Group';
 $lang['project_issues'] = 'Project Issues';
 $lang['license'] = 'License';
-$lang['about_app_license'] = 'Easy!Appointments is licensed under the GPLv3 license. By using the code of Easy!Appointments in any way you are agreeing to the terms described in the following url:';
+$lang['about_app_license'] = 'MAKET Randevu is licensed under the GPLv3 license. By using the code of MAKET Randevu in any way you are agreeing to the terms described in the following url:';
 $lang['logout_success'] = 'You have been successfully logged out! Click on one of the following buttons to navigate to a different page.';
 $lang['book_appointment_title'] = 'Book Appointment';
 $lang['backend_section'] = 'Backend Section';
@@ -272,7 +272,7 @@ $lang['select_google_calendar_prompt'] = 'Select the calendar that you want to s
 $lang['google_calendar_selected'] = 'Google calendar has been successfully selected.';
 $lang['oops_something_went_wrong'] = 'Oops! Something Went Wrong.';
 $lang['could_not_add_to_google_calendar'] = 'Your appointment could not be added to your Google Calendar account.';
-$lang['ea_update_success'] = 'Easy!Appointments has been successfully updated.';
+$lang['ea_update_success'] = 'MAKET Randevu has been successfully updated.';
 $lang['require_captcha'] = 'Require CAPTCHA';
 $lang['require_captcha_hint'] = 'When enabled, the customers will have to type a random generated CAPTCHA string before booking/updating an appointment.';
 $lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
@@ -320,7 +320,7 @@ $lang['add_working_plan_exception'] = 'Add Working Plan Exception';
 $lang['require_phone_number'] = 'Require phone number';
 $lang['require_phone_number_hint'] = 'When enabled, customers and users will need to enter the customer\'s phone number when booking an appointment';
 $lang['check_spam_folder'] = 'Please check your spam folder if the email does not arrive within a few minutes.';
-$lang['api_token_hint'] = 'Set a secret token in order to enable the token based authentication of the Easy!Appointments API.';
+$lang['api_token_hint'] = 'Set a secret token in order to enable the token based authentication of the MAKET Randevu API.';
 $lang['timezone'] = 'Timezone';
 $lang['overwrite_existing_working_plans'] = 'This will overwrite the existing provider working plans, are you sure that you want to continue?';
 $lang['working_plans_got_updated'] = 'All the working plans got updated.';
@@ -396,7 +396,7 @@ $lang['google_analytics_info'] = 'Google Analytics enable you to automatically a
 $lang['matomo_analytics'] = 'Matomo Analytics';
 $lang['matomo_analytics_info'] = 'Matomo Analytics enable you to automatically add the tracking code and HTML markup to the public page and track all the public booking sessions.';
 $lang['api'] = 'API';
-$lang['api_info'] = 'API enable you to interact with all the Easy!Appointments data via the HTTP protocol and the available API endpoints and create your own integrations.';
+$lang['api_info'] = 'API enable you to interact with all the MAKET Randevu data via the HTTP protocol and the available API endpoints and create your own integrations.';
 $lang['google_analytics_code'] = 'Google Analytics Code';
 $lang['matomo_analytics_url'] = 'Matomo Analytics URL';
 $lang['future_booking_limit'] = 'Future Booking Limit';

application/language/turkish/translations_lang.php

@@ -175,22 +175,22 @@ $lang['visible'] = 'Gözle görülür';
 $lang['hidden'] = 'Gizli';
 $lang['business_logic'] = 'İş Mantığı';
 $lang['current_user'] = 'Mevcut Kullanıcı';
-$lang['about_app'] = 'Easy!Appointments Hakkında';
+$lang['about_app'] = 'MAKET Randevu Hakkında';
 $lang['edit_working_plan_hint'] = 'Aağıda şirketinizin kabul edeceği günleri ve saatleri işaretleyin. Çalışma saatleri dışında randevuları ayarlayabilirsiniz, ancak bu saatlere müşterilerin kendileri randevu kaydedemeyecektir. Bu çalışma planı tüm sağlayıcılar için varsayılan değer olup, daha sonra her biri için ayrıca özel plan da girebilir ve araları ekleyebilirsiniz.';
 $lang['edit_breaks_hint'] = 'Gün içindeki çalışma aralarını ekleyin. Bu aralar tüm yeni hizmet sağlayıcılar için geçerli olacaktır.';
 $lang['book_advance_timeout'] = 'Erken Randevu Zamanaşımı Değeri';
 $lang['book_advance_timeout_hint'] = 'Müşterilerin en az ne kadar önceden randevu alması veya randevu düzenlemesi gerektiğini girin (dakika cinsinden).';
 $lang['timeout_minutes'] = 'Zamanaşımı (Dakika)';
-$lang['about_app_info'] = 'Easy!Appointments yüksek ölçüde özelleştirilebilen, müşterilerinizin web üzerinden randevu almasını sağlayan bir uygulamadır. Ayrıca, bilgilerinizi Google Takvim ile eşitleyerek diğer uygulamalarla da entegre olmasını sağlar. ';
+$lang['about_app_info'] = 'MAKET Randevu yüksek ölçüde özelleştirilebilen, müşterilerinizin web üzerinden randevu almasını sağlayan bir uygulamadır. Ayrıca, bilgilerinizi Google Takvim ile eşitleyerek diğer uygulamalarla da entegre olmasını sağlar. ';
 $lang['current_version'] = 'Mevcut Versiyon';
 $lang['support'] = 'Destek';
-$lang['about_app_support'] = 'Easy!Appointments kullanımı sırasında sorun yaşamanız halinde resmi Google Group üzerinde arama yapabilirsiniz. Ayrıca geliştirmeye destek olmak için Google Code sayfasında yeni sorun girişi de yapabilirsiniz.';
+$lang['about_app_support'] = 'MAKET Randevu kullanımı sırasında sorun yaşamanız halinde resmi Google Group üzerinde arama yapabilirsiniz. Ayrıca geliştirmeye destek olmak için Google Code sayfasında yeni sorun girişi de yapabilirsiniz.';
 $lang['official_website'] = 'Resmi Web Sitesi';
 $lang['google_plus_community'] = 'Google+ Çevresi';
 $lang['support_group'] = 'Destek Grubu';
 $lang['project_issues'] = 'Proje Sorunları';
 $lang['license'] = 'Lisans';
-$lang['about_app_license'] = 'Easy!Appointments GPLv3 kapsamında lisanslıdır. Bu yazılımı herhangi bir biçimde kullanarak aşağıdaki adreste belirtilen koşulları kabul etmiş olursunuz:';
+$lang['about_app_license'] = 'MAKET Randevu GPLv3 kapsamında lisanslıdır. Bu yazılımı herhangi bir biçimde kullanarak aşağıdaki adreste belirtilen koşulları kabul etmiş olursunuz:';
 $lang['logout_success'] = 'Başarı ile sistemden çıkış yaptınız! Aşağıdaki butonlara tıklayarak diğer sayfalara geçebilirsiniz.';
 $lang['book_appointment_title'] = 'Randevu Al';
 $lang['backend_section'] = 'Yönetim Paneli';
@@ -272,7 +272,7 @@ $lang['select_google_calendar_prompt'] = 'Randevularınızı eşitlemek istediğ
 $lang['google_calendar_selected'] = 'Google Takvimi başarıyla seçildi.';
 $lang['oops_something_went_wrong'] = 'Oops! Bir Sorun Oluştu.';
 $lang['could_not_add_to_google_calendar'] = 'Randevunuz Google Takvim hesabınıza eklenemedi.';
-$lang['ea_update_success'] = 'Easy!Appointments başarı ile güncellendi.';
+$lang['ea_update_success'] = 'MAKET Randevu başarı ile güncellendi.';
 $lang['require_captcha'] = 'CAPTCHA gereklidir';
 $lang['require_captcha_hint'] = 'When enabled, the customers will have to type a random generated CAPTCHA string before booking/updating an appointment.';
 $lang['captcha_is_wrong'] = 'CAPTCHA verification failed, please try again.';
@@ -320,7 +320,7 @@ $lang['add_working_plan_exception'] = 'İstisna ekle';
 $lang['require_phone_number'] = 'Telefon num. gerekli';
 $lang['require_phone_number_hint'] = 'Etkinleştirildiğinde, müşterilerin ve kullanıcıların randevu alırken müşterinin telefon numarasını girmeleri gerekir.';
 $lang['check_spam_folder'] = 'E-posta birkaç dakika içinde gelmezse lütfen spam klasörünüzü kontrol edin.';
-$lang['api_token_hint'] = 'Easy!Appointments Api sinin belirteç tabanlı kimlik doğrulamasını etkinleştirmek için gizli bir belirteç ayarlayın.';
+$lang['api_token_hint'] = 'MAKET Randevu Api sinin belirteç tabanlı kimlik doğrulamasını etkinleştirmek için gizli bir belirteç ayarlayın.';
 $lang['timezone'] = 'Saat Dilimi';
 $lang['overwrite_existing_working_plans'] = 'This will overwrite the existing provider working plans, are you sure that you want to continue?';
 $lang['working_plans_got_updated'] = 'Tüm çalışma planları güncellendi.';
@@ -396,7 +396,7 @@ $lang['google_analytics_info'] = 'Google Analytics enable you to automatically a
 $lang['matomo_analytics'] = 'Matomo Analytics';
 $lang['matomo_analytics_info'] = 'Matomo Analytics enable you to automatically add the tracking code and HTML markup to the public page and track all the public booking sessions.';
 $lang['api'] = 'API';
-$lang['api_info'] = 'API enable you to interact with all the Easy!Appointments data via the HTTP protocol and the available API endpoints and create your own integrations.';
+$lang['api_info'] = 'API enable you to interact with all the MAKET Randevu data via the HTTP protocol and the available API endpoints and create your own integrations.';
 $lang['google_analytics_code'] = 'Google Analytics Code';
 $lang['matomo_analytics_url'] = 'Matomo Analytics URL';
 $lang['future_booking_limit'] = 'Future Booking Limit';

application/libraries/Api.php

@@ -151,7 +151,7 @@ class Api
     #[NoReturn]
     public function request_authentication(): void
     {
-        header('WWW-Authenticate: Basic realm="Easy!Appointments"');
+        header('WWW-Authenticate: Basic realm="MAKET Randevu"');
         header('HTTP/1.0 401 Unauthorized');
         exit('You are not authorized to use the API.');
     }

application/libraries/Captcha_builder.php

@@ -1,7 +1,7 @@
 <?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /* ----------------------------------------------------------------------------
- * Easy!Appointments - Open Source Web Scheduler
+ * MAKET Randevu - Open Source Web Scheduler
  *
  * @package     EasyAppointments
  * @author      A.Tselegidis <alextselegidis@gmail.com>

application/libraries/Instance.php

@@ -125,16 +125,15 @@ class Instance
         // Provider
 
         $this->CI->providers_model->save([
-            'first_name' => 'Jane',
+            'first_name' => 'Hizmet Sağlayıcı İsmini Buraya Girin',
-            'last_name' => 'Doe',
+            'last_name' => 'Hizmet Sağlayıcı Soyismini Buraya Girin',
-            'email' => 'jane@example.org',
+            'email' => 'hizmet_saglayici_mail@example.org',
-            'phone_number' => '+10000000000',
+            'phone_number' => '+90 (000) 000-0000',
             'services' => [$service_id],
             'settings' => [
-                'username' => 'janedoe',
+                'username' => 'ilkhizmetsaglayici',
                 'password' => random_string(),
                 'working_plan' => setting('company_working_plan'),
-                'working_plan_exceptions' => '{}',
                 'notifications' => true,
                 'google_sync' => false,
                 'sync_past_days' => 30,
@@ -146,10 +145,10 @@ class Instance
         // Customer
 
         $this->CI->customers_model->save([
-            'first_name' => 'James',
+            'first_name' => 'Örnek Müşteri İsmi',
-            'last_name' => 'Doe',
+            'last_name' => 'Örnek Müşteri Soyismi',
-            'email' => 'james@example.org',
+            'email' => 'ornek_musteri@example.org',
-            'phone_number' => '+10000000000',
+            'phone_number' => '+90 (000) 000-0000',
         ]);
 
         return $password;

application/libraries/Timezones.php

@@ -28,15 +28,15 @@ class Timezones
     /**
      * @var string
      */
-    protected string $default = 'UTC';
+    protected string $default = 'Istanbul (+3:00)'; // REVIEW is it working??
 
     /**
      * @var array
      */
     protected array $timezones = [
-        'UTC' => [
+        'General' => [
-            'UTC' => 'UTC',
+            'General/UTC' => 'UTC',
-            // 'Türkiye' => 'Istanbul (+3:00)', // TODO add this line in proper way
+            'General/Istanbul' => 'Istanbul (+3:00)', // REVIEW is this line proper and working correctly???
         ],
         'America' => [
             'America/Adak' => 'Adak (-10:00)',
@@ -531,7 +531,7 @@ class Timezones
      */
     public function get_default_timezone(): string
     {
-        return 'UTC'; // TODO change this to +3 in proper way
+        return 'Istanbul (+3:00)'; // REVIEW  is it working in proper way?         
     }
 
     /**

application/migrations/018_add_timezone_to_users.php

@@ -23,7 +23,7 @@ class Migration_Add_timezone_to_users extends EA_Migration
                 'timezone' => [
                     'type' => 'VARCHAR',
                     'constraint' => '256',
-                    'default' => 'UTC',
+                    'default' => 'Istanbul (+3:00)', // REVIEW Works under migration ?
                     'after' => 'notes',
                 ],
             ];

application/views/components/appointments_modal.php

@@ -172,7 +172,7 @@
                                             <small>
                                                 <?= lang('current_user') ?>:
                                                 <span>
-                                                    <?= $timezones[session('timezone', 'UTC')] ?>
+                                                    <?= $timezones[session('timezone', 'Istanbul (+3:00)')] ?>
                                                 </span>
                                             </small>
                                         </div>

application/views/components/backend_footer.php

@@ -7,7 +7,7 @@
 ?>
 <div id="footer" class="d-lg-flex justify-content-lg-start align-items-lg-center p-2 text-center text-lg-left mt-auto">
     <div class="mb-3 me-lg-5 mb-lg-0">
-        <img class="me-1" src="<?= base_url('assets/img/logo-16x16.png') ?>" alt="Easy!Appointments Logo">
+        <img class="me-1" src="<?= base_url('assets/img/logo-16x16.png') ?>" alt="MAKET Randevu Logo">
 
         <a href="<?= branding('software','website')?>"><?= branding('software','name')?></a>
 

application/views/components/booking_time_step.php

@@ -23,7 +23,7 @@
                             <?= lang('timezone') ?>
                         </label>
                         <?php component('timezone_dropdown', [
-                            'attributes' => 'id="select-timezone" class="form-control" value="UTC"',
+                            'attributes' => 'id="select-timezone" class="form-control" value="Istanbul (+3:00)"',
                             'grouped_timezones' => $grouped_timezones,
                         ]); ?>
                     </div>

application/views/components/unavailabilities_modal.php

@@ -63,7 +63,7 @@
                                     <small>
                                         <?= lang('current_user') ?>:
                                         <span>
-                                                    <?= $timezones[session('timezone', 'UTC')] ?>
+                                                    <?= $timezones[session('timezone', 'Istanbul (+3:00)')] ?>
                                                 </span>
                                     </small>
                                 </div>

application/views/errors/html/error_general.php

@@ -13,7 +13,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-    <title>Error | Easy!Appointments</title>
+    <title>Error | MAKET Randevu</title>
     <style>
         #error-container {
             background: #ffffff;
@@ -74,7 +74,7 @@
     <p>
         <small>
             
-        <a href="https://easyappointments.org">Easy!Appointments</a>
+        <a href="https://iflpanel.com/about/maketrandevu">MAKET Randevu</a>
         </small>
     </p>
 </div>

application/views/layouts/backend_layout.php

@@ -9,7 +9,7 @@
 
     <?php slot('meta'); ?>
 
-    <title><?= vars('page_title') ?? lang('backend_section') ?> | Easy!Appointments</title>
+    <title><?= vars('page_title') ?? lang('backend_section') ?> | MAKET Randevu</title>
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">

application/views/layouts/booking_layout.php

@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#35A768">
     <meta name="google" content="notranslate">
 
-    <meta property="og:title" content="<?= lang('page_title') . ' ' . vars('company_name') ?> | Easy!Appointments"/>
+    <meta property="og:title" content="<?= lang('page_title') . ' ' . vars('company_name') ?> | MAKET Randevu"/>
     <meta property="og:description" content="Book Your Appointment With A Few Clicks"/>
     <meta property="og:url" content="<?= base_url() ?>">
     <meta property="og:image" content="<?= base_url('assets/img/social-card.png') ?>"/>
@@ -15,7 +15,7 @@
 
     <?php slot('meta'); ?>
 
-    <title><?= lang('page_title') . ' ' . vars('company_name') ?> | Easy!Appointments</title>
+    <title><?= lang('page_title') . ' ' . vars('company_name') ?> | MAKET Randevu</title>
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">

application/views/layouts/message_layout.php

@@ -9,7 +9,7 @@
 
     <?php slot('meta'); ?>
 
-    <title><?= vars('page_title') ?> | Easy!Appointments</title>
+    <title><?= vars('page_title') ?> | MAKET Randevu</title>
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="icon" sizes="192x192" href="<?= asset_url('assets/img/logo.png') ?>">

application/views/pages/about.php

@@ -6,7 +6,7 @@
     <div id="about" class="col-lg-8 offset-lg-2">
 
         <div class="text-center my-5">
-            <img src="<?= base_url('assets/img/logo.png') ?>" alt="Easy!Appointments Logo" class="mb-5">
+            <img src="<?= base_url('assets/img/logo.png') ?>" alt="MAKET Randevu Logo" class="mb-5">
 
             <h3>
                 <?= branding("software", "name") ?>

application/views/pages/installation.php

@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-    <title>Installation | Easy!Appointments</title>
+    <title>Installation | MAKET Randevu</title>
 
     <link rel="icon" type="image/x-icon" href="<?= asset_url('assets/img/favicon.ico') ?>">
     <link rel="stylesheet" type="text/css" href="<?= asset_url('assets/css/themes/default.min.css') ?>">
@@ -17,20 +17,20 @@
 
 <header>
     <div class="container">
-        <h1 class="page-title">Easy!Appointments Installation</h1>
+        <h1 class="page-title">MAKET Randevu Installation</h1>
     </div>
 </header>
 
 <div class="content container">
     <div class="welcome">
-        <h3>Welcome to the Easy!Appointments installation page.</h3>
+        <h3>Welcome to the MAKET Randevu installation page.</h3>
         <p>
-            This page will help you set the main settings of your Easy!Appointments installation. You will be able to
+            This page will help you set the main settings of your MAKET Randevu installation. You will be able to
             edit these settings and many more in the backend session of your system. Remember to use the
             <strong class="text-primary"><?= site_url('user/login') ?></strong> URL to connect to the backend section
-            of Easy!Appointments.
+            of MAKET Randevu.
 
-            If you face any problems during the usage of Easy!Appointments you can always check the
+            If you face any problems during the usage of MAKET Randevu you can always check the
             <a href="https://easyappointments.org/docs.html">Documentation</a> and
             <a href="https://groups.google.com/group/easy-appointments">Support Group</a> for getting help. You may also
             submit new issues on
@@ -113,9 +113,9 @@
 
     <div class="mb-2">
         <h3>License</h3>
-        Easy!Appointments is licensed under the <span class="badge bg-secondary">GPL-3.0 license</span>. By using the
+        MAKET Randevu is licensed under the <span class="badge bg-secondary">GPL-3.0 license</span>. By using the
         code
-        of Easy!Appointments in any way <br> you agree with the terms described in the following url:
+        of MAKET Randevu in any way <br> you agree with the terms described in the following url:
         <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">https://www.gnu.org/licenses/gpl-3.0.en.html</a>
     </div>
 
@@ -123,13 +123,13 @@
 
     <button type="button" id="install" class="btn btn-primary">
         <i class="icon-white icon-ok me-2"></i>
-        Install Easy!Appointments
+        Install MAKET Randevu
     </button>
 </div>
 
 <footer>
     
-<a href="https://easyappointments.org">Easy!Appointments</a>
+<a href="https://easyappointments.org">MAKET Randevu</a>
 </footer>
 
 <?php component('js_vars_script'); ?>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "maket/maketrandevu",
     "description": "MAKET Randevu Portalı",
-    "version": "1.5.0-p1",
+    "version": "1.5.0-p3",
     "homepage": "https://iflpanel.com/about/maketrandevu",
     "type": "project",
     "license": "GPL-3.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "70cead7cce550cc0e5a37eb1e558aee9",
+    "content-hash": "eafeafe75a984017de7900242825c958",
     "packages": [
         {
             "name": "firebase/php-jwt",
@@ -140,7 +140,7 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.329.0",
+            "version": "v0.330.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
@@ -178,7 +178,7 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
-                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.329.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.330.0"
             },
             "time": "2023-12-24T01:02:15+00:00"
         },

docker/build/docker.sh

@@ -5,7 +5,7 @@
 # Approximately 10min (tested with 4vcpu / 8GB RAM / 30Mbps network speed)
 
 # MAKETRANDEVU_VER="test"
-MAKETRANDEVU_VER="1.5.0-p1" # UPDATE MANUALLY !
+MAKETRANDEVU_VER="1.5.0-p3" # UPDATE MANUALLY !
 
 _RED='\033[0;31m'
 _NC='\033[0m \e[0m' # No Color, No Effect

gulpfile.js

@@ -25,7 +25,7 @@ const zip = require('zip-dir');
 // const debug = require('gulp-debug');
 
 function archive(done) {
-    const version = "1.5.0-p1"
+    const version = "1.5.0-p3"
     const filename = 'maketrandevu-' + version + '.zip';
 
     fs.removeSync('build');

nginx_docker_localtest.sh

@@ -8,7 +8,7 @@ SCRIPT_NAME="nginx_docker_localtest.sh" # name of the *this* file
 DEBUG="FALSE"
 
 ### REMOTE RELEASE ###
-LATEST_RELEASE="1.5.0-p1"
+LATEST_RELEASE="1.5.0-p3"
 FILE_NAME="maketrandevu-$LATEST_RELEASE.zip"
 DOWNLOAD_LINK=https://git.aliberksandikci.com.tr/maket/maketrandevu/releases/download/$LATEST_RELEASE/$FILE_NAME
 

package-lock.json

@@ -60,12 +60,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.21.4",
+      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.23.4",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -111,12 +112,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.5",
+      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
+      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -226,34 +227,34 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.21.5",
+      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
+      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.20.7",
+        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.21.0"
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
+      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -383,30 +384,30 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
+      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.21.5",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
+      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -451,13 +452,13 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.0.0",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -465,9 +466,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.8",
+      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
-      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==",
+      "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1593,34 +1594,34 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
+      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
+        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.20.7",
+        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.20.7"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.5",
+      "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz",
-      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
+      "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.21.4",
+        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.21.5",
+        "@babel/generator": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.21.5",
+        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.21.5",
+        "@babel/types": "^7.23.6",
-        "debug": "^4.1.0",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1628,13 +1629,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.5",
+      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz",
-      "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
+      "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.21.5",
+        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -5814,9 +5815,9 @@
       }
     },
     "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.1",
+      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
@@ -7051,9 +7052,9 @@
       "integrity": "sha512-Hr9TdhyHCZUtwznEH2CBf7967mEM0idtJ5nMtjvk3Up5tPukOLXbHUNmh10oRfeNIhj+3GD3niu+g6sVK+gK0A=="
     },
     "node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "bin": {
         "semver": "bin/semver.js"