Merge pull request #208 from ottemo/isw_108390636_order_states_on_det…

…ail_page [#108390636 Finish] Removed New/Pending selections from order detail …
ottemo · Nov 25, 2015 · e266dbc · e266dbc
2 parents c4e58c9 + 863d0f5
commit e266dbc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 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>