Merge branch 'develop' for release 1.0.47

ottemo · Nov 25, 2015 · 5b65a15 · 5b65a15
2 parents 28856e5 + 2e3641b
commit 5b65a15
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 17 deletions.
diff --git a/app/scripts/order/controller/edit.js b/app/scripts/order/controller/edit.js
@@ -43,24 +43,34 @@ function ($scope, $routeParams, $location, $q, $orderApiService, $dashboardUtils
 
     $scope.statuses = [
         {
-            "value": "new",
-            "label": "New"
+            value: 'new',
+            label: 'New',
+            isDisabled: true
         },
         {
-            "value": "pending",
-            "label": "Pending"
+            value: 'pending',
+            label: 'Pending',
+            isDisabled: true
         },
         {
-            "value": "processed",
-            "label": "Processed"
+            value: 'processed',
+            label: 'Processed',
+            isDisabled: false
         },
         {
-            "value": "completed",
-            "label": "Completed"
+            value: 'declined',
+            label: 'Declined',
+            isDisabled: true
         },
         {
-            "value": "cancelled",
-            "label": "Cancel Order"
+            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
@@ -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>

diff --git a/config/ub-prod.json b/config/ub-prod.json
@@ -0,0 +1,6 @@
+{
+    "useStrict"    : "",
+    "apiUrl"       : "https://api.ub.production.ottemo.io",
+    "mediaPath"    : "media/",
+    "itemsPerPage" : "15"
+}
diff --git 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",