From 47ba1cfbd8b1f349bd47920a1c7bed4bf0594ae4 Mon Sep 17 00:00:00 2001 From: Ian Wendt Date: Tue, 17 Nov 2015 14:48:06 -0800 Subject: [PATCH 1/2] [#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 863d0f57d48d907cd82c1909ec4318fa2454c494 Mon Sep 17 00:00:00 2001 From: Adam Knox Date: Tue, 24 Nov 2015 08:49:07 -0500 Subject: [PATCH 2/2] [#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 @@

Order Details

+ + name="status" + id="status" + ng-model="order.status"> + +