maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Improvements in the user language storage feature.

Browse source
This commit is contained in:
Alex Tselegidis 2020-09-23 13:48:07 +03:00
parent 5706447ea6
commit a3dfb91550
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/Appointments.php
View file

@ -1041,7 +1041,7 @@ class Appointments extends CI_Controller {
$appointment['location'] = $service['location'];
}
// save customer language (the language which is used to render the booking page)
// 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);

2
application/migrations/020_add_language_to_users.php
View file

@ -29,7 +29,7 @@ class Migration_Add_language_to_users extends CI_Migration {
'language' => [
'type' => 'VARCHAR',
'constraint' => '256',
'default' => '',
'default' => 'english',
'after' => 'timezone'
]
];

4
assets/js/backend_customers.js
View file

@ -42,13 +42,11 @@ window.BackendCustomers = window.BackendCustomers || {};
exports.initialize = function (defaultEventHandlers) {
defaultEventHandlers = defaultEventHandlers || false;
// Fill available service categories listbox.
// Add the available languages to the language dropdown.
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('');

15
assets/js/backend_customers_helper.js
View file

@ -125,15 +125,10 @@
city: $('#city').val(),
zip_code: $('#zip-code').val(),
notes: $('#notes').val(),
timezone: $('#timezone').val()
timezone: $('#timezone').val(),
language: $('#language').val() || 'english'
};
if ($('#language').val() !== 'null') {
customer.language = $('#language').val();
} else {
customer.language = '';
}
if ($('#customer-id').val()) {
customer.id = $('#customer-id').val();
}
@ -265,7 +260,7 @@
.val('')
.prop('disabled', true);
$('#language').val('null');
$('#language').val('english');
$('#customer-appointments').empty();
$('#edit-customer, #delete-customer').prop('disabled', true);
@ -296,9 +291,7 @@
$('#zip-code').val(customer.zip_code);
$('#notes').val(customer.notes);
$('#timezone').val(customer.timezone);
var language = (customer.language !== '') ? customer.language : 'null';
$('#language').val(language);
$('#language').val(customer.language || 'english');
$('#customer-appointments').empty();