From 457b3212f95b47697507a662aaded61fa522cd97 Mon Sep 17 00:00:00 2001
From: "alextselegidis@gmail.com"
 <alextselegidis@gmail.com@9c3f3e9a-ba09-77dc-566e-c2017f8391d2>
Date: Thu, 7 Nov 2013 11:25:59 +0000
Subject: [PATCH] Minor changes and fixes: * Fixed provider disabling sync
 privileges problem. * Fixed backend/services categories tab footer position.
 * Corrected success message in frontent. * Fixed provider appointment link on
 emails (on manage mode). * Downcreased email header (in order to display
 bigger company names).

---
 src/application/controllers/backend_api.php   | 11 +++++-----
 src/application/views/appointments/book.php   | 20 ++++++++++---------
 .../views/appointments/book_success.php       |  2 +-
 .../views/emails/appointment_details.php      |  5 +++--
 .../views/emails/delete_appointment.php       |  5 +++--
 src/application/views/emails/new_password.php |  5 +++--
 src/assets/js/backend_calendar.js             |  4 +++-
 src/assets/js/backend_services.js             |  1 +
 8 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/application/controllers/backend_api.php b/src/application/controllers/backend_api.php
index 2b1f4552..44361d07 100644
--- a/src/application/controllers/backend_api.php
+++ b/src/application/controllers/backend_api.php
@@ -196,7 +196,7 @@ class Backend_api extends CI_Controller {
 
                     $provider_title = 'Appointment details have changed.';
                     $provider_message = '';
-                    $provider_link = $this->config->item('base_url') . 'backend/' 
+                    $provider_link = $this->config->item('base_url') . 'backend/index/' 
                             . $appointment['hash'];
                 }
             
@@ -332,14 +332,15 @@ class Backend_api extends CI_Controller {
      */
     public function ajax_disable_provider_sync() {
         try { 
-            if ($this->privileges[PRIV_USERS]['edit'] == FALSE) {
-                throw new Exception('You do not have the required privileges for this task.');
-            }
-            
             if (!isset($_POST['provider_id'])) {
                 throw new Exception('Provider id not specified.');
             }
             
+            if ($this->privileges[PRIV_USERS]['edit'] == FALSE
+                    && $this->session->userdata('user_id') != $_POST['provider_id']) {
+                throw new Exception('You do not have the required privileges for this task.');
+            }
+            
             $this->load->model('providers_model');
             $this->providers_model->set_setting('google_sync', FALSE, $_POST['provider_id']);
             $this->providers_model->set_setting('google_token', NULL, $_POST['provider_id']);
diff --git a/src/application/views/appointments/book.php b/src/application/views/appointments/book.php
index 86a11639..a0d38ad6 100644
--- a/src/application/views/appointments/book.php
+++ b/src/application/views/appointments/book.php
@@ -200,16 +200,18 @@
                                         }
                                     }
 
-                                    foreach($grouped_services as $group) {
-                                        $group_label = ($group[0]['category_name'] != NULL) 
-                                                ? $group[0]['category_name'] : 'Uncategorized'; 
-
-                                        echo '<optgroup label="' . $group_label . '">';
-                                        foreach($group as $service) {
-                                            echo '<option value="' . $service['id'] . '">' 
-                                                . $service['name'] . '</option>';
+                                    foreach($grouped_services as $key => $group) {
+                                        $group_label = ($key != 'uncategorized')
+                                                ? $group[0]['category_name'] : 'Uncategorized';
+                                        
+                                        if (count($group) > 0) {
+                                            echo '<optgroup label="' . $group_label . '">';
+                                            foreach($group as $service) {
+                                                echo '<option value="' . $service['id'] . '">' 
+                                                    . $service['name'] . '</option>';
+                                            }
+                                            echo '</optgroup>';
                                         }
-                                        echo '</optgroup>';
                                     }
                                 }  else {
                                     foreach($available_services as $service) {
diff --git a/src/application/views/appointments/book_success.php b/src/application/views/appointments/book_success.php
index e6df0eba..30d3492f 100644
--- a/src/application/views/appointments/book_success.php
+++ b/src/application/views/appointments/book_success.php
@@ -146,7 +146,7 @@
                                     '<div class="alert alert-success">' +
                                         '<h4>Success!</h4>' +
                                         '<p>' +
-                                            'Your appointment has successfully been added to ' +
+                                            'Your appointment has been added to ' +
                                             'your Google Calendar account. <br>' + 
                                             '<a href="' + response.htmlLink + '" target="_blank">' + 
                                                 'Click here to view your appointment on Google ' +
diff --git a/src/application/views/emails/appointment_details.php b/src/application/views/emails/appointment_details.php
index 7d160a98..82d80d2d 100644
--- a/src/application/views/emails/appointment_details.php
+++ b/src/application/views/emails/appointment_details.php
@@ -6,8 +6,9 @@
     <div class="email-container" style="width: 650px;border: 1px solid #eee;">
         <div id="header" style="background-color: #3DD481; border-bottom: 4px solid #1A865F; 
                 height: 40px;padding: 10px 15px;">
-            <strong id="logo" style="color: white; font-size: 31px; 
-                    text-shadow: 1px 1px 1px #8F8888;">$company_name</strong>
+            <strong id="logo" style="color: white; font-size: 24px; 
+                    text-shadow: 1px 1px 1px #8F8888; margin-top: 5px; display: inline-block">
+                    $company_name</strong>
         </div>
 
         <div id="content" style="padding: 10px 15px;">
diff --git a/src/application/views/emails/delete_appointment.php b/src/application/views/emails/delete_appointment.php
index c87bfcb2..5f63a625 100644
--- a/src/application/views/emails/delete_appointment.php
+++ b/src/application/views/emails/delete_appointment.php
@@ -6,8 +6,9 @@
     <div class="email-container" style="width: 650px;border: 1px solid #eee;">
         <div id="header" style="background-color: #3DD481; border-bottom: 4px solid #1A865F; 
                 height: 40px;padding: 10px 15px;">
-            <strong id="logo" style="color: white; font-size: 31px; 
-                    text-shadow: 1px 1px 1px #8F8888;">$company_name</strong>
+            <strong id="logo" style="color: white; font-size: 24px; 
+                    text-shadow: 1px 1px 1px #8F8888; margin-top: 5px; display: inline-block">
+                    $company_name</strong>
         </div>
         
         <div id="content" style="padding: 10px 15px;">
diff --git a/src/application/views/emails/new_password.php b/src/application/views/emails/new_password.php
index e70ce310..c7f4dc06 100644
--- a/src/application/views/emails/new_password.php
+++ b/src/application/views/emails/new_password.php
@@ -6,8 +6,9 @@
     <div class="email-container" style="width: 650px;border: 1px solid #eee;">
         <div id="header" style="background-color: #3DD481; border-bottom: 4px solid #1A865F; 
                 height: 40px;padding: 10px 15px;">
-            <strong id="logo" style="color: white; font-size: 31px; 
-                    text-shadow: 1px 1px 1px #8F8888;">$company_name</strong>
+            <strong id="logo" style="color: white; font-size: 24px; 
+                    text-shadow: 1px 1px 1px #8F8888; margin-top: 5px; display: inline-block">
+                    $company_name</strong>
         </div>
 
         <div id="content" style="padding: 10px 15px;">
diff --git a/src/assets/js/backend_calendar.js b/src/assets/js/backend_calendar.js
index 3ae416a8..12ffc3e8 100644
--- a/src/assets/js/backend_calendar.js
+++ b/src/assets/js/backend_calendar.js
@@ -610,7 +610,7 @@ var BackendCalendar = {
                 }
                 
                 // Display success message to the user.
-                $dialog.find('.modal-message').text('Appointment saved successfully!');
+                $dialog.find('.modal-message').text('Unavailable period saved successfully!');
                 $dialog.find('.modal-message').removeClass('alert-error');
                 $dialog.find('.modal-message').addClass('alert-success');
                 $dialog.find('.modal-message').fadeIn();
@@ -680,6 +680,7 @@ var BackendCalendar = {
                             $('#enable-sync i').addClass('icon-white');
                             $('#enable-sync span').text('Disable Sync');
                             $('#google-sync').prop('disabled', false);
+                            $('#select-filter-item option:selected').attr('google-sync', 'true');
                         }
                     }
                 }, 100);
@@ -699,6 +700,7 @@ var BackendCalendar = {
                         $('#enable-sync i').removeClass('icon-white');
                         $('#enable-sync span').text('Enable Sync');
                         $('#google-sync').prop('disabled', true);
+                        $('#select-filter-item option:selected').attr('google-sync', 'false');
                         
                         return false;
                     }
diff --git a/src/assets/js/backend_services.js b/src/assets/js/backend_services.js
index ca20b718..82785d79 100644
--- a/src/assets/js/backend_services.js
+++ b/src/assets/js/backend_services.js
@@ -69,6 +69,7 @@ var BackendServices = {
             BackendServices.helper.resetForm();
             BackendServices.helper.filter('');
             $('.filter-key').val('');
+            Backend.placeFooterToBottom();
         });
         
         ServicesHelper.prototype.bindEventHandlers();