From fa992b824a54fcbe8b356e26702ced2934512e8c Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Fri, 1 Jan 2016 20:40:10 +0100
Subject: [PATCH] Moved the customer-notifications setting in the 'general
 settings' tab.

---
 src/application/views/backend/settings.php | 24 ++++++++++------------
 src/assets/js/backend_settings.js          | 10 ++++-----
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/application/views/backend/settings.php b/src/application/views/backend/settings.php
index d3e2b107..d71ad699 100644
--- a/src/application/views/backend/settings.php
+++ b/src/application/views/backend/settings.php
@@ -117,6 +117,17 @@
                                 <?php echo $this->lang->line('date_format_hint'); ?>
                             </span>
                         </div>
+                        <div class="form-group">
+                            <label><?php echo $this->lang->line('customer_notifications'); ?></label>
+                            <br>
+                            <button type="button" id="customer-notifications" class="btn btn-default" data-toggle="button" aria-pressed="false">
+                                <span class="glyphicon glyphicon-envelope"></span>
+                                <?php echo $this->lang->line('receive_notifications'); ?>
+                            </button>
+                            <span class="help-block">
+                                <?php echo $this->lang->line('customer_notifications_hint'); ?>
+                            </span>
+                        </div>
                         <div class="form-group">
                             <label for="require-captcha">
                                 CAPTCHA
@@ -270,19 +281,6 @@
                             <label for="book-advance-timeout"><?php echo $this->lang->line('timeout_minutes'); ?></label>
                             <input type="text" id="book-advance-timeout" data-field="book_advance_timeout" class="form-control" />
                         </div>
-
-                        <br>
-
-                        <h4><?php echo $this->lang->line('customer_notifications'); ?></h4>
-                        <span class="help-block">
-                            <?php echo $this->lang->line('customer_notifications_hint'); ?>
-                        </span>
-                        <div class="form-group">
-                            <button type="button" id="customer-notifications" class="btn btn-default" data-toggle="button" aria-pressed="false">
-                                <span class="glyphicon glyphicon-envelope"></span>
-                                <?php echo $this->lang->line('receive_notifications'); ?>
-                            </button>
-                        </div>
                     </div>
                     <div class="col-md-5 breaks-wrapper">
                         <h4><?php echo $this->lang->line('breaks'); ?></h4>
diff --git a/src/assets/js/backend_settings.js b/src/assets/js/backend_settings.js
index 692e54ba..cd2456d2 100644
--- a/src/assets/js/backend_settings.js
+++ b/src/assets/js/backend_settings.js
@@ -271,6 +271,11 @@ SystemSettings.prototype.get = function() {
         });
     });
 
+    settings.push({
+        'name': 'customer_notifications',
+        'value': $('#customer-notifications').hasClass('active') === true ? '1' : '0'
+    });
+
     settings.push({
         'name': 'require_captcha',
         'value': $('#require-captcha').hasClass('active') === true ? '1' : '0'
@@ -287,11 +292,6 @@ SystemSettings.prototype.get = function() {
         'value': $('#book-advance-timeout').val()
     });
 
-    settings.push({
-        'name': 'customer_notifications',
-        'value': $('#customer-notifications').hasClass('active') === true ? '1' : '0'
-    });
-
     return settings;
 };