mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-22 07:52:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Save customer language.

Browse source
This commit is contained in:
Sébastien 2020-06-16 17:01:27 +02:00
parent e857d3a37e
commit 1e6a13d146
9 changed files with 79 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/config/migration.php
View file

@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 19;
$config['migration_version'] = 20;
/*

2
application/controllers/Appointments.php
View file

@ -1024,6 +1024,8 @@ class Appointments extends CI_Controller {
$appointment['location'] = $service['location'];
}
// save customer language (the language which is used to render the booking page)
$customer['language'] = $this->config->item('language');
$customer_id = $this->customers_model->add($customer);
$appointment['id_users_customer'] = $customer_id;

2
application/language/english/translations_lang.php
View file

@ -20,6 +20,8 @@ $lang['address'] = 'Address';
$lang['city'] = 'City';
$lang['zip_code'] = 'Zip Code';
$lang['notes'] = 'Notes';
$lang['language'] = 'Language';
$lang['no_language'] = 'No language';
$lang['fields_are_required'] = 'Fields with * are required!';
$lang['step_four_title'] = 'Confirm Appointment';
$lang['confirm'] = 'Confirm';

2
application/language/french/translations_lang.php
View file

@ -20,6 +20,8 @@ $lang['address'] = 'Adresse';
$lang['city'] = 'Ville';
$lang['zip_code'] = 'Code postal';
$lang['notes'] = 'Commentaires';
$lang['language'] = 'Langue';
$lang['no_language'] = 'Pas de langue';
$lang['fields_are_required'] = 'Les champs avec * sont obligatoires';
$lang['step_four_title'] = 'Confirmez votre rendez-vous';
$lang['confirm'] = 'Confirmation';

1
application/language/german/translations_lang.php
View file

@ -20,6 +20,7 @@ $lang['address'] = 'Adresse';
$lang['city'] = 'Stadt';
$lang['zip_code'] = 'Postleitzahl';
$lang['notes'] = 'Bemerkungen';
$lang['language'] = 'Sprache';
$lang['fields_are_required'] = 'Die Felder mit einem * sind Pflichtfelder!';
$lang['step_four_title'] = 'Bitte bestätigen Sie die Terminauswahl';
$lang['confirm'] = 'Bestätigung';

48
application/migrations/020_add_language_to_users.php Normal file
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 http://opensource.org/licenses/GPL-3.0 - GPLv3
* @link http://easyappointments.org
* @since v1.4.0
* ---------------------------------------------------------------------------- */
/**
* 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 {
/**
* Upgrade method.
*/
public function up()
{
if ( ! $this->db->field_exists('language', 'users'))
{
$fields = [
'language' => [
'type' => 'VARCHAR',
'constraint' => '256',
'default' => '',
'after' => 'timezone'
]
];
$this->dbforge->add_column('users', $fields);
}
}
/**
* Downgrade method.
*/
public function down()
{
$this->dbforge->drop_column('users', 'language');
}
}

5
application/views/backend/customers.php
View file

@ -132,6 +132,11 @@
<input id="zip-code" class="form-control">
</div>
<div class="form-group">
<label for="language"><?= lang('language') ?></label>
<select id="language" class="form-control"></select>
</div>
<div class="form-group">
<label for="timezone"><?= lang('timezone') ?></label>
<?= render_timezone_dropdown('id="timezone" class="form-control"') ?>

7
assets/js/backend_customers.js
View file

@ -42,6 +42,13 @@ window.BackendCustomers = window.BackendCustomers || {};
exports.initialize = function (defaultEventHandlers) {
defaultEventHandlers = defaultEventHandlers || false;
// Fill available service categories listbox.
availableLanguages.forEach(function (language) {
$('#language').append(new Option(language, language));
});
$('#language').append(new Option('- ' + EALang.no_language + ' -', null)).val('null');
helper = new CustomersHelper();
helper.resetForm();
helper.filter('');

11
assets/js/backend_customers_helper.js
View file

@ -150,6 +150,12 @@
timezone: $('#timezone').val()
};
if ($('#language').val() !== 'null') {
customer.language = $('#language').val();
} else {
customer.language = '';
}
if ($('#customer-id').val()) {
customer.id = $('#customer-id').val();
}
@ -279,6 +285,8 @@
$('.record-details').find('input, textarea').val('');
$('.record-details').find('input, textarea').prop('readonly', true);
$('#language').val('null');
$('#customer-appointments').empty();
$('#appointment-details').toggleClass('hidden', true).empty();
$('#edit-customer, #delete-customer').prop('disabled', true);
@ -310,6 +318,9 @@
$('#notes').val(customer.notes);
$('#timezone').val(customer.timezone);
var language = (customer.language !== '') ? customer.language : 'null';
$('#language').val(language);
$('#customer-appointments').empty();
customer.appointments.forEach(function (appointment) {
if (GlobalVariables.user.role_slug === Backend.DB_SLUG_PROVIDER && parseInt(appointment.id_users_provider) !== GlobalVariables.user.id) {