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

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
p0zi 2016-10-21 02:04:59 +02:00
commit c6c66536bc
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/application/controllers/Backend_api.php
View file

@ -217,7 +217,7 @@ class Backend_api extends CI_Controller {
// :: SAVE CUSTOMER CHANGES TO DATABASE
if (isset($_POST['customer_data'])) {
$customer = json_decode(stripcslashes($_POST['customer_data']), true);
$customer = json_decode($_POST['customer_data'], true);
$REQUIRED_PRIV = (!isset($customer['id']))
? $this->privileges[PRIV_CUSTOMERS]['add']
@ -231,7 +231,7 @@ class Backend_api extends CI_Controller {
// :: SAVE APPOINTMENT CHANGES TO DATABASE
if (isset($_POST['appointment_data'])) {
$appointment = json_decode(stripcslashes($_POST['appointment_data']), true);
$appointment = json_decode($_POST['appointment_data'], true);
$REQUIRED_PRIV = (!isset($appointment['id']))
? $this->privileges[PRIV_APPOINTMENTS]['add']

4
src/application/language/italian/translations_lang.php
View file

@ -26,7 +26,7 @@ $lang['step_four_title'] = 'Conferma appuntamento';
$lang['confirm'] = 'Conferma';
$lang['update'] = 'Aggiorna';
$lang['cancel_appointment_hint'] = 'Clicca sul bottone "Cancella" per rimuovere l\'appuntamento dalla pianificazione aziendale.';
$lang['cancel'] = 'Cancella';
$lang['cancel'] = 'Annulla';
$lang['appointment_registered'] = 'Il tuo appuntamento è stato registrato con successo!';
$lang['cancel_appointment_title'] = 'Cancella appuntamento';
$lang['appointment_cancelled'] = 'Il tuo appuntamento è stato cancellato con successo!';
@ -94,7 +94,7 @@ $lang['reload_appointments_hint'] = 'Ricarica gli appuntamenti a calendario.';
$lang['trigger_google_sync_hint'] = 'Avvia il processo di sincronizzazione con Google Calendar.';
$lang['appointment_updated'] = 'Appuntamento aggiornato con successo!';
$lang['undo'] = 'Annulla';
$lang['cancel'] = 'Cancella';
$lang['cancel'] = 'Annulla';
$lang['appointment_details_changed'] = 'I dettagli dell\'appuntamento sono cambiati.';
$lang['appointment_changes_saved'] = 'Le modifiche all\'appuntamento sono state salvate con successo!';
$lang['save'] = 'Salva';

10
src/application/views/backend/calendar.php
View file

@ -204,7 +204,7 @@
<div class="form-group">
<label for="select-provider" class="col-sm-3 control-label"><?php echo $this->lang->line('provider'); ?> *</label>
<div class="col-md-7">
<div class="col-sm-7">
<select id="select-provider" class="required form-control"></select>
</div>
</div>
@ -288,7 +288,7 @@
<div class="form-group">
<label for="address" class="control-label col-sm-3">
<?php echo $this->lang->line('address'); ?></label>
<div class="col-md-8">
<div class="col-sm-8">
<input type="text" id="address" class="form-control" />
</div>
</div>
@ -296,7 +296,7 @@
<div class="form-group">
<label for="city" class="control-label col-sm-3">
<?php echo $this->lang->line('city'); ?></label>
<div class="col-md-8">
<div class="col-sm-8">
<input type="text" id="city" class="form-control" />
</div>
</div>
@ -304,7 +304,7 @@
<div class="form-group">
<label for="zip-code" class="control-label col-sm-3">
<?php echo $this->lang->line('zip_code'); ?></label>
<div class="col-md-8">
<div class="col-sm-8">
<input type="text" id="zip-code" class="form-control" />
</div>
</div>
@ -312,7 +312,7 @@
<div class="form-group">
<label for="customer-notes" class="control-label col-sm-3">
<?php echo $this->lang->line('notes'); ?></label>
<div class="col-md-8">
<div class="col-sm-8">
<textarea id="customer-notes" rows="3" class="form-control"></textarea>
</div>
</div>

10
src/assets/js/backend_calendar_appointments_modal.js
View file

@ -49,10 +49,8 @@ window.BackendCalendarAppointmentsModal = window.BackendCalendarAppointmentsModa
// ID must exist on the object in order for the model to update the record and not to perform
// an insert operation.
var startDatetime = $dialog.find('#start-datetime')
.datepicker('getDate').toString('yyyy-MM-dd HH:mm:ss');
var endDatetime = $dialog.find('#end-datetime')
.datepicker('getDate').toString('yyyy-MM-dd HH:mm:ss');
var startDatetime = Date.parse($dialog.find('#start-datetime').val()).toString('yyyy-MM-dd HH:mm:ss');
var endDatetime = Date.parse($dialog.find('#end-datetime').val()).toString('yyyy-MM-dd HH:mm:ss');
var appointment = {
id_services: $dialog.find('#select-service').val(),
@ -483,8 +481,8 @@ window.BackendCalendarAppointmentsModal = window.BackendCalendarAppointmentsModa
}
// Check appointment start and end time.
var start = $('#start-datetime').datepicker('getDate');
var end = $('#end-datetime').datepicker('getDate');
var start = Date.parse($('#start-datetime').val());
var end = Date.parse($('#end-datetime').val());
if (start > end) {
$dialog.find('#start-datetime').parents('.form-group').addClass('has-error');
$dialog.find('#end-datetime').parents('.form-group').addClass('has-error');

4
src/assets/js/backend_calendar_unavailabilities_modal.js
View file

@ -30,8 +30,8 @@ window.BackendCalendarUnavailabilitiesModal = window.BackendCalendarUnavailabili
*/
$('#manage-unavailable #save-unavailable').click(function() {
var $dialog = $('#manage-unavailable');
var start = $dialog.find('#unavailable-start').datetimepicker('getDate');
var end = $dialog.find('#unavailable-end').datetimepicker('getDate');
var start = Date.parse($dialog.find('#unavailable-start').val());
var end = Date.parse($dialog.find('#unavailable-end').val());
if (start > end) {
// Start time is after end time - display message to user.