diff --git a/app/scripts/order/controller/edit.js b/app/scripts/order/controller/edit.js index 6456c6c6..8592109a 100644 --- 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 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"> + +
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 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",