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

Merged pull request #60 which fixes issue #56

Browse source
This commit is contained in:
Alex Tselegidis 2015-10-07 22:51:12 +02:00
parent 6eb710801b
commit daa4d28a6e
2 changed files with 128 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/application/controllers/appointments.php
View file

@ -114,6 +114,7 @@ class Appointments extends CI_Controller {
// sync is enabled then add the appointment to the provider's account. // sync is enabled then add the appointment to the provider's account.
try { try {
$view = array();
$post_data = json_decode($_POST['post_data'], true); $post_data = json_decode($_POST['post_data'], true);
$appointment = $post_data['appointment']; $appointment = $post_data['appointment'];
$customer = $post_data['customer']; $customer = $post_data['customer'];
@ -213,6 +214,11 @@ class Appointments extends CI_Controller {
} catch(Exception $exc) { } catch(Exception $exc) {
$view['exceptions'][] = $exc; $view['exceptions'][] = $exc;
} }
// Save any exceptions to the session and redirect to another page so that the user
// will not add a new appointment on page reload.
$this->load->helper('url');
$view['exceptions'] = (!empty($view['exceptions'])) ? $view['exceptions'] : array();
$this->session->set_flashdata('book_exceptions', $view['exceptions']); $this->session->set_flashdata('book_exceptions', $view['exceptions']);
redirect('appointments/book_success/'.$appointment['id']); redirect('appointments/book_success/'.$appointment['id']);
} }

12
src/application/views/appointments/book_success.php
View file

@ -42,10 +42,14 @@
</div> </div>
<div class="col-xs-12 col-sm-10"> <div class="col-xs-12 col-sm-10">
<?php <?php
echo '<h3>' . $this->lang->line('appointment_registered') . '</h3>'; echo '
echo '<p>' . $this->lang->line('appointment_details_was_sent_to_you') . '</p>'; <h3>' . $this->lang->line('appointment_registered') . '</h3>
echo '<a href="'.$this->config->item('base_url').'" class="btn btn-primary btn-large"> <p>' . $this->lang->line('appointment_details_was_sent_to_you') . '</p>
<span class="glyphicon glyphicon-calendar"></span>'.$this->lang->line('go_to_booking_page').'</a>'; <a href="'.$this->config->item('base_url').'" class="btn btn-success btn-large">
<span class="glyphicon glyphicon-calendar"></span>' .
$this->lang->line('go_to_booking_page') . '
</a>
';
if ($this->config->item('ea_google_sync_feature')) { if ($this->config->item('ea_google_sync_feature')) {
echo ' echo '