From 47ba1cfbd8b1f349bd47920a1c7bed4bf0594ae4 Mon Sep 17 00:00:00 2001
From: Ian Wendt <ian@ottemo.io>
Date: Tue, 17 Nov 2015 14:48:06 -0800
Subject: [PATCH 1/4] [#108390636 Finish] Removed New/Pending selections from
 order detail page

---
 app/scripts/order/controller/edit.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/scripts/order/controller/edit.js b/app/scripts/order/controller/edit.js
index 6456c6c6..5545d02a 100644
--- a/app/scripts/order/controller/edit.js
+++ b/app/scripts/order/controller/edit.js
@@ -42,14 +42,6 @@ function ($scope, $routeParams, $location, $q, $orderApiService, $dashboardUtils
     $scope.order = getDefaultOrder();
 
     $scope.statuses = [
-        {
-            "value": "new",
-            "label": "New"
-        },
-        {
-            "value": "pending",
-            "label": "Pending"
-        },
         {
             "value": "processed",
             "label": "Processed"

From 24821494c3ff5d9627b51dfccfef6a6783ebeebf Mon Sep 17 00:00:00 2001
From: Ian Wendt <ian@ottemo.io>
Date: Wed, 18 Nov 2015 15:32:51 -0800
Subject: [PATCH 2/4] [#108472894] Added ub-prod.json to config directory

---
 config/ub-prod.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 config/ub-prod.json

diff --git a/config/ub-prod.json b/config/ub-prod.json
new file mode 100644
index 00000000..296dc1a2
--- /dev/null
+++ b/config/ub-prod.json
@@ -0,0 +1,6 @@
+{
+    "useStrict"    : "",
+    "apiUrl"       : "https://api.ub.production.ottemo.io",
+    "mediaPath"    : "media/",
+    "itemsPerPage" : "15"
+}
\ No newline at end of file

From 863d0f57d48d907cd82c1909ec4318fa2454c494 Mon Sep 17 00:00:00 2001
From: Adam Knox <adam.w.knox@gmail.com>
Date: Tue, 24 Nov 2015 08:49:07 -0500
Subject: [PATCH 3/4] [#108390636] add disabled options to order status drop

---
 app/scripts/order/controller/edit.js | 30 ++++++++++++++++++++++------
 app/themes/views/order/edit.html     | 16 ++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/app/scripts/order/controller/edit.js b/app/scripts/order/controller/edit.js
index 5545d02a..8592109a 100644
--- a/app/scripts/order/controller/edit.js
+++ b/app/scripts/order/controller/edit.js
@@ -43,16 +43,34 @@ function ($scope, $routeParams, $location, $q, $orderApiService, $dashboardUtils
 
     $scope.statuses = [
         {
-            "value": "processed",
-            "label": "Processed"
+            value: 'new',
+            label: 'New',
+            isDisabled: true
         },
         {
-            "value": "completed",
-            "label": "Completed"
+            value: 'pending',
+            label: 'Pending',
+            isDisabled: true
         },
         {
-            "value": "cancelled",
-            "label": "Cancel Order"
+            value: 'processed',
+            label: 'Processed',
+            isDisabled: false
+        },
+        {
+            value: 'declined',
+            label: 'Declined',
+            isDisabled: true
+        },
+        {
+            value: 'completed',
+            label: 'Completed',
+            isDisabled: false
+        },
+        {
+            value: 'cancelled',
+            label: 'Cancelled',
+            isDisabled: false
         }
     ];
 
diff --git a/app/themes/views/order/edit.html b/app/themes/views/order/edit.html
index cf0a430d..c22e9ad2 100644
--- a/app/themes/views/order/edit.html
+++ b/app/themes/views/order/edit.html
@@ -147,12 +147,18 @@ <h4>Order Details</h4>
             <div class="panel-body">
                 <div class="">
                     <label class="">Change status</label>
+
                     <select class="form-control"
-                    name="status"
-                    id="status"
-                    ng-model="order.status"
-                    ng-init="order.status"
-                    ng-options="obj.value as obj.label for obj in statuses"></select>
+                        name="status"
+                        id="status"
+                        ng-model="order.status">
+                        <option
+                            ng-repeat="option in statuses"
+                            ng-disabled="option.isDisabled"
+                            value="{{option.value}}">
+                            {{ option.label }}
+                        </option>
+                    </select>
                 </div>
             </div>
         </div>

From 2e3641b055c85ca1c227a58edee11aaeb16c78c7 Mon Sep 17 00:00:00 2001
From: James Vastbinder <james.vastbinder@gmail.com>
Date: Wed, 25 Nov 2015 12:07:02 -0800
Subject: [PATCH 4/4] bump version for release 1.0.47

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5ecd4c00..01d694eb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Dashboard",
-  "version": "0.9.7",
-  "description": "Ottemo Administration Dashboard",
+  "version": "1.0.47",
+  "description": "Ottemo Administration Dash",
   "main": "gulpfile.js",
   "repository": {
     "type": "git",