Merge remote-tracking branch 'origin/master' into HEAD

2026-01-31 21:37:16 +00:00 · 2017-02-01 10:35:53 +11:00
parent bc5672b5eb b8ed7789f0
commit f8341dccd4
333 changed files with 9333 additions and 5396 deletions
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -6,6 +6,7 @@
 //

 //= require jquery
+//= require jquery-migrate-min
 //= require jquery_ujs
 //= require jquery-ui
 //= require shared/jquery-ui-timepicker-addon
@@ -36,6 +37,7 @@
 //= require ./order_cycles/order_cycles
 //= require ./payment_methods/payment_methods
 //= require ./products/products
+//= require ./resources/resources
 //= require ./shipping_methods/shipping_methods
 //= require ./side_menu/side_menu
 //= require ./tag_rules/tag_rules
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -22,7 +22,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout


    $scope.producers = producers
-    $scope.taxons = Taxons.taxons
+    $scope.taxons = Taxons.all
    $scope.tax_categories = tax_categories
    $scope.filterProducers = [{id: "0", name: ""}].concat $scope.producers
    $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons
--- a/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee
+++ b/app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee
@@ -3,8 +3,8 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
  $scope.availableCountries = availableCountries
  $scope.RequestMonitor = RequestMonitor
  $scope.submitAll = pendingChanges.submitAll
-  $scope.add = Customers.add
  $scope.customerLimit = 20
+  $scope.customers = Customers.all
  $scope.columns = Columns.columns

  $scope.confirmRefresh = (event) ->
@@ -16,7 +16,6 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
      Customers.index({enterprise_id: $scope.shop_id}).then (data) ->
        pendingChanges.removeAll()
        $scope.customers_form.$setPristine()
-        $scope.customers = data

  $scope.shop_id = shops[0].id if shops.length == 1

--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -27,7 +27,7 @@ angular.module("admin.enterprises")

    # Provide a callback for generating warning messages displayed before leaving the page. This is passed in
    # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
-    # and on all new uses of this contoller, and we might not want that .
+    # and on all new uses of this contoller, and we might not want that.
    enterpriseNavCallback = ->
      if $scope.Enterprise.$dirty
        "Your changes to the enterprise are not saved yet."
--- a/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
@@ -6,7 +6,6 @@ angular.module("admin.enterprises")

    $scope.menu.setItems [
      { name: 'primary_details', label: t('primary_details'), icon_class: "icon-home" }
-      { name: 'users', label: t('users'), icon_class: "icon-user" }
      { name: 'address', label: t('address'), icon_class: "icon-map-marker" }
      { name: 'contact', label: t('contact'), icon_class: "icon-phone" }
      { name: 'social', label: t('social'), icon_class: "icon-twitter" }
@@ -20,11 +19,11 @@ angular.module("admin.enterprises")
      { name: 'inventory_settings', label: t('inventory_settings'), icon_class: "icon-list-ol", show: "enterpriseIsShop()" }
      { name: 'tag_rules', label: t('tag_rules'), icon_class: "icon-random", show: "enterpriseIsShop()" }
      { name: 'shop_preferences', label: t('shop_preferences'), icon_class: "icon-shopping-cart", show: "enterpriseIsShop()" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
    ]

    $scope.select(0)

-
    $scope.showItem = (item) ->
      if item.show?
        $parse(item.show)($scope)
--- a/app/assets/javascripts/admin/index_utils/directives/ofn-select2.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/directives/ofn-select2.js.coffee
@@ -3,19 +3,42 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
  restrict: 'C'
  scope:
    data: "="
-    minSearch: "@?"
-    text: "@?"
+    minSearch: "@"
+    text: "@"
    blank: "=?"
    filter: "=?"
    onSelecting: "=?"
+    multiple: '@'
  link: (scope, element, attrs, ngModel) ->
    $timeout ->
-      scope.text ||= 'name'
-      scope.filter ||= -> true
+      scope.text ?= 'name'
+      scope.multiple ?= false
+      scope.filter ?= -> true
+
+      if scope.data.$promise
+        scope.data.$promise.then -> init()
+      else
+        init()
+
+    element.on "select2-opening", scope.onSelecting || angular.noop
+
+    attrs.$observe 'disabled', (value) ->
+      element.select2('enable', !value)
+
+    ngModel.$formatters.push (value) ->
+      element.select2('val', value)
+      value
+
+    ngModel.$parsers.push (value) ->
+      return value.split(",") if scope.multiple
+      value
+
+    init = ->
      scope.data.unshift(scope.blank) if scope.blank? && typeof scope.blank is "object"

      item.name = $sanitize(item.name) for item in scope.data
      element.select2
+        multiple: scope.multiple
        minimumResultsForSearch: scope.minSearch || 0
        data: ->
          filtered = $filter('filter')(scope.data,scope.filter)
@@ -24,12 +47,3 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
          item[scope.text]
        formatResult: (item) ->
          item[scope.text]
-
-      element.on "select2-opening", scope.onSelecting || angular.noop
-
-    attrs.$observe 'disabled', (value) ->
-      element.select2('enable', !value)
-
-    ngModel.$formatters.push (value) ->
-      element.select2('val', value)
-      value
--- a/app/assets/javascripts/admin/index_utils/index_utils.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/index_utils.js.coffee
@@ -1 +1 @@
-angular.module("admin.indexUtils", ['ngResource', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
+angular.module("admin.indexUtils", ['admin.resources', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
--- a/app/assets/javascripts/admin/index_utils/services/dereferencer.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/dereferencer.js.coffee
@@ -3,7 +3,8 @@ angular.module("admin.indexUtils").factory 'Dereferencer', ->
    dereference: (array, data)->
      if array
        for object, i in array
-          array[i] = data[object.id]
+          match = data[object.id]
+          array[i] = match if match?

    dereferenceAttr: (array, attr, data)->
      if array
--- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
+++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, blankOption, VariantUnitManager, RequestMonitor) ->
+angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
  $scope.initialized = false
  $scope.RequestMonitor = RequestMonitor
  $scope.filteredLineItems = []
@@ -15,31 +15,31 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
    LineItems.allSaved() || confirm(t("unsaved_changes_warning"))

  $scope.resetSelectFilters = ->
-    $scope.distributorFilter = blankOption().id
-    $scope.supplierFilter = blankOption().id
-    $scope.orderCycleFilter = blankOption().id
+    $scope.distributorFilter = 0
+    $scope.supplierFilter = 0
+    $scope.orderCycleFilter = 0
    $scope.quickSearch = ""

  $scope.refreshData = ->
-    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == "0"
-      $scope.startDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].first_order
-      $scope.endDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].last_order
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
+      $scope.startDate = OrderCycles.byID[$scope.orderCycleFilter].first_order
+      $scope.endDate = OrderCycles.byID[$scope.orderCycleFilter].last_order

    RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gt]": "#{parseDate($scope.startDate)}", "q[completed_at_lt]": "#{parseDate($scope.endDate)}")
    RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gt]": "#{parseDate($scope.startDate)}", "q[order][completed_at_lt]": "#{parseDate($scope.endDate)}")

    unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(includeBlank: true, ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+      RequestMonitor.load $scope.distributors = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
+      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")

    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise]).then ->
-      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.enterprisesByID
-      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.orderCyclesByID
+      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID

    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
-      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.enterprisesByID
-      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.ordersByID
+      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
      $scope.bulk_order_form.$setPristine()
      StatusMessage.clear()
      unless $scope.initialized
--- a/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee
+++ b/app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee
@@ -1,8 +1,8 @@
-angular.module("admin.lineItems").filter "selectFilter", (blankOption, RequestMonitor) ->
+angular.module("admin.lineItems").filter "selectFilter", (RequestMonitor) ->
    return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) ->
      filtered = []
      unless RequestMonitor.loading
-        filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,"0") || lineItem.supplier.id == selectedSupplier) &&
-          (angular.equals(selectedDistributor,"0") || lineItem.order.distributor.id == selectedDistributor) &&
-          (angular.equals(selectedOrderCycle,"0") || lineItem.order.order_cycle.id == selectedOrderCycle)
+        filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,0) || lineItem.supplier.id == selectedSupplier) &&
+          (angular.equals(selectedDistributor,0) || lineItem.order.distributor.id == selectedDistributor) &&
+          (angular.equals(selectedOrderCycle,0) || lineItem.order.order_cycle.id == selectedOrderCycle)
      filtered
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -68,6 +68,7 @@ angular.module('admin.orderCycles')
    $scope.removeCoordinatorFee = ($event, index) ->
      $event.preventDefault()
      OrderCycle.removeCoordinatorFee(index)
+      $scope.order_cycle_form.$dirty = true

    $scope.addExchangeFee = ($event, exchange) ->
      $event.preventDefault()
@@ -76,6 +77,7 @@ angular.module('admin.orderCycles')
    $scope.removeExchangeFee = ($event, exchange, index) ->
      $event.preventDefault()
      OrderCycle.removeExchangeFee(exchange, index)
+      $scope.order_cycle_form.$dirty = true

    $scope.removeDistributionOfVariant = (variant_id) ->
      OrderCycle.removeDistributionOfVariant(variant_id)
--- a/app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.orderCycles', ['ngResource', 'admin.utils', 'admin.indexUtils', 'ngTagsInput'])
+angular.module('admin.orderCycles', ['admin.utils', 'admin.indexUtils', 'ngTagsInput'])

  .config ($httpProvider) ->
    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
--- a/app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee
@@ -1,3 +1,3 @@
 angular.module("admin.paymentMethods").controller "paymentMethodsCtrl", ($scope, PaymentMethods) ->
  $scope.findPaymentMethodByID = (id) ->
-    $scope.PaymentMethod = PaymentMethods.findByID(id)
+    $scope.PaymentMethod = PaymentMethods.byID[id]
--- a/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee
@@ -1,8 +0,0 @@
-angular.module("admin.paymentMethods")
-  .factory "PaymentMethods", (paymentMethods) ->
-    new class PaymentMethods
-      paymentMethods: paymentMethods
-
-      findByID: (id) ->
-        for paymentMethod in @paymentMethods
-          return paymentMethod if paymentMethod.id is id
--- a/app/assets/javascripts/admin/resources/resources.js.coffee
+++ b/app/assets/javascripts/admin/resources/resources.js.coffee
@@ -0,0 +1 @@
+angular.module("admin.resources", ['ngResource'])
--- a/app/assets/javascripts/admin/resources/resources/customer_resource.js.coffee
+++ b/app/assets/javascripts/admin/resources/resources/customer_resource.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.customers").factory 'CustomerResource', ($resource) ->
+angular.module("admin.resources").factory 'CustomerResource', ($resource) ->
  $resource('/admin/customers/:id.json', {}, {
    'index':
      method: 'GET'
--- a/app/assets/javascripts/admin/enterprises/services/enterprise_resource.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/services/enterprise_resource.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").factory 'EnterpriseResource', ($resource) ->
+angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
  ignoredAttrs = ->
    ["$$hashKey", "producer", "package", "producerError", "packageError", "status"]

--- a/app/assets/javascripts/admin/resources/resources/line_item_resource.js.coffee
+++ b/app/assets/javascripts/admin/resources/resources/line_item_resource.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.lineItems").factory 'LineItemResource', ($resource) ->
+angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
  $resource('/admin/:orders/:order_number/line_items/:id.json', {}, {
    'index':
      method: 'GET'
--- a/app/assets/javascripts/admin/order_cycles/services/order_cycle_resource.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/order_cycle_resource.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.orderCycles").factory 'OrderCycleResource', ($resource) ->
+angular.module("admin.resources").factory 'OrderCycleResource', ($resource) ->
  $resource('/admin/order_cycles/:id/:action.json', {}, {
    'index':
      method: 'GET'
--- a/app/assets/javascripts/admin/resources/resources/order_resource.js.coffee
+++ b/app/assets/javascripts/admin/resources/resources/order_resource.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.orders").factory 'OrderResource', ($resource) ->
+angular.module("admin.resources").factory 'OrderResource', ($resource) ->
  $resource('/admin/orders/:id/:action.json', {}, {
    'index':
      method: 'GET'
--- a/app/assets/javascripts/admin/resources/services/customers.js.coffee
+++ b/app/assets/javascripts/admin/resources/services/customers.js.coffee
@@ -1,19 +1,24 @@
-angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
+angular.module("admin.resources").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
  new class Customers
-    customers: []
+    all: []
+    byID: {}
+    pristineByID: {}

    add: (email) ->
      params =
        enterprise_id: CurrentShop.shop.id
        email: email
      CustomerResource.create params, (customer) =>
-        @customers.unshift customer if customer.id
+        if customer.id
+          @all.unshift customer
+          @byID[customer.id] = customer
+          @pristineByID[customer.id] = angular.copy(customer)

    remove: (customer) ->
      params = id: customer.id
      CustomerResource.destroy params, =>
-        i = @customers.indexOf customer
-        @customers.splice i, 1 unless i < 0
+        i = @all.indexOf customer
+        @all.splice i, 1 unless i < 0
      , (response) =>
        errors = response.data.errors
        if errors?
@@ -22,10 +27,17 @@ angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestM
          InfoDialog.open 'error', "Could not delete customer: #{customer.email}"

    index: (params) ->
-      request = CustomerResource.index(params, (data) => @customers = data)
+      @clear()
+      request = CustomerResource.index(params, (data) => @load(data))
      RequestMonitor.load(request.$promise)
      request.$promise

+    load: (customers) ->
+      for customer in customers
+        @all.push customer
+        @byID[customer.id] = customer
+        @pristineByID[customer.id] = angular.copy(customer)
+
    update: (address, customer, addressType) ->
      params =
        id: customer.id
@@ -33,3 +45,5 @@ angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestM
          "#{addressType}_attributes": address
      CustomerResource.update params

+    clear: ->
+      @all.length = 0
--- a/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee
@@ -1,21 +1,18 @@
-angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource, blankOption) ->
+angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource) ->
  new class Enterprises
-    enterprisesByID: {}
+    byID: {}
    pristineByID: {}

    index: (params={}, callback=null) ->
-      includeBlank = !!params['includeBlank']
-      delete params['includeBlank']
-      EnterpriseResource.index(params, (data) =>
-        for enterprise in data
-          @enterprisesByID[enterprise.id] = enterprise
-          @pristineByID[enterprise.id] = angular.copy(enterprise)
-
+      EnterpriseResource.index params, (data) =>
+        @load(data)
        (callback || angular.noop)(data)
-
-        data.unshift(blankOption()) if includeBlank
        data
-      )
+
+    load: (enterprises) ->
+      for enterprise in enterprises
+        @byID[enterprise.id] = enterprise
+        @pristineByID[enterprise.id] = angular.copy(enterprise)

    save: (enterprise) ->
      deferred = $q.defer()
--- a/app/assets/javascripts/admin/line_items/services/line_items.js.coffee
+++ b/app/assets/javascripts/admin/line_items/services/line_items.js.coffee
@@ -1,23 +1,25 @@
-angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
+angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
  new class LineItems
-    lineItemsByID: {}
+    byID: {}
    pristineByID: {}

    index: (params={}, callback=null) ->
    	LineItemResource.index params, (data) =>
-        @resetData()
-        for lineItem in data
-          @lineItemsByID[lineItem.id] = lineItem
-          @pristineByID[lineItem.id] = angular.copy(lineItem)
-
+        @load(data)
        (callback || angular.noop)(data)

    resetData: ->
-      @lineItemsByID = {}
+      @byID = {}
      @pristineByID = {}

+    load: (lineItems) ->
+      @resetData()
+      for lineItem in lineItems
+        @byID[lineItem.id] = lineItem
+        @pristineByID[lineItem.id] = angular.copy(lineItem)
+
    saveAll: ->
-      for id, lineItem of @lineItemsByID
+      for id, lineItem of @byID
        lineItem.errors = {} # removes errors when line_item has been returned to original state
        @save(lineItem) if !@isSaved(lineItem)

@@ -34,7 +36,7 @@ angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
      deferred.promise

    allSaved: ->
-      for id, lineItem of @lineItemsByID
+      for id, lineItem of @byID
        return false unless @isSaved(lineItem)
      true

@@ -54,7 +56,7 @@ angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
      deferred = $q.defer()
      lineItem.$delete({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
      .then( (data) =>
-        delete @lineItemsByID[lineItem.id]
+        delete @byID[lineItem.id]
        delete @pristineByID[lineItem.id]
        (callback || angular.noop)(data)
        deferred.resolve(data)
--- a/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/order_cycles.js.coffee
@@ -1,21 +1,24 @@
-angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource, blankOption) ->
+angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCycleResource) ->
  new class OrderCycles
-    orderCyclesByID: {}
+    all: []
+    byID: {}
    pristineByID: {}

+    constructor: ->
+      if $injector.has('orderCycles')
+        @load($injector.get('orderCycles'))
+
    index: (params={}, callback=null) ->
-      includeBlank = !!params['includeBlank']
-      delete params['includeBlank']
-      OrderCycleResource.index(params, (data) =>
-        for orderCycle in data
-          @orderCyclesByID[orderCycle.id] = orderCycle
-          @pristineByID[orderCycle.id] = angular.copy(orderCycle)
-
+      OrderCycleResource.index params, (data) =>
+        @load(data)
        (callback || angular.noop)(data)
-
-        data.unshift(blankOption()) if includeBlank
        data
-      )
+
+    load: (orderCycles) ->
+      for orderCycle in orderCycles
+        @all.push orderCycle
+        @byID[orderCycle.id] = orderCycle
+        @pristineByID[orderCycle.id] = angular.copy(orderCycle)

    save: (order_cycle) ->
      deferred = $q.defer()
--- a/app/assets/javascripts/admin/resources/services/orders.js.coffee
+++ b/app/assets/javascripts/admin/resources/services/orders.js.coffee
@@ -1,16 +1,18 @@
-angular.module("admin.orders").factory 'Orders', ($q, OrderResource) ->
+angular.module("admin.resources").factory 'Orders', ($q, OrderResource) ->
  new class Orders
-    ordersByID: {}
+    byID: {}
    pristineByID: {}

    index: (params={}, callback=null) ->
    	OrderResource.index params, (data) =>
-        for order in data
-          @ordersByID[order.id] = order
-          @pristineByID[order.id] = angular.copy(order)
-
+        @load(data)
        (callback || angular.noop)(data)

+    load: (orders) ->
+      for order in orders
+        @byID[order.id] = order
+        @pristineByID[order.id] = angular.copy(order)
+
    save: (order) ->
      deferred = $q.defer()
      order.$update({id: order.number})
--- a/app/assets/javascripts/admin/resources/services/payment_methods.js.coffee
+++ b/app/assets/javascripts/admin/resources/services/payment_methods.js.coffee
@@ -0,0 +1,16 @@
+angular.module("admin.resources")
+  .factory "PaymentMethods", ($injector) ->
+    new class PaymentMethods
+      paymentMethods: []
+      byID: {}
+      pristineByID: {}
+
+      constructor: ->
+        if $injector.has('paymentMethods')
+          @load($injector.get('paymentMethods'))
+
+      load: (paymentMethods) ->
+        for paymentMethod in paymentMethods
+          @paymentMethods.push paymentMethod
+          @byID[paymentMethod.id] = paymentMethod
+          @pristineByID[paymentMethod.id] = angular.copy(paymentMethod)
--- a/app/assets/javascripts/admin/resources/services/shipping_methods.js.coffee
+++ b/app/assets/javascripts/admin/resources/services/shipping_methods.js.coffee
@@ -0,0 +1,16 @@
+angular.module("admin.resources")
+  .factory "ShippingMethods", ($injector) ->
+    new class ShippingMethods
+      shippingMethods: []
+      byID: {}
+      pristineByID: {}
+
+      constructor: ->
+        if $injector.has('shippingMethods')
+          @load($injector.get('shippingMethods'))
+
+      load: (shippingMethods) ->
+        for shippingMethod in shippingMethods
+          @shippingMethods.push shippingMethod
+          @byID[shippingMethod.id] = shippingMethod
+          @pristineByID[shippingMethod.id] = angular.copy(shippingMethod)
--- a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
@@ -1,3 +1,3 @@
 angular.module("admin.shippingMethods").controller "shippingMethodsCtrl", ($scope, ShippingMethods) ->
  $scope.findShippingMethodByID = (id) ->
-    $scope.ShippingMethod = ShippingMethods.findByID(id)
+    $scope.ShippingMethod = ShippingMethods.byID[id]
--- a/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
@@ -1,8 +0,0 @@
-angular.module("admin.shippingMethods")
-  .factory "ShippingMethods", (shippingMethods) ->
-    new class ShippingMethods
-      shippingMethods: shippingMethods
-
-      findByID: (id) ->
-        for shippingMethod in @shippingMethods
-          return shippingMethod if shippingMethod.id is id
--- a/app/assets/javascripts/admin/taxons/services/taxons.js.coffee
+++ b/app/assets/javascripts/admin/taxons/services/taxons.js.coffee
@@ -1,19 +1,20 @@
 angular.module("admin.taxons").factory "Taxons", (taxons, $filter) ->
  new class Taxons
-    taxons: taxons
-    taxonsByID: {}
+    all: []
+    byID: {}

    constructor: ->
-      for taxon in @taxons
-        @taxonsByID[taxon.id] = taxon
+      for taxon in taxons
+        @all.push taxon
+        @byID[taxon.id] = taxon

    # For finding a single Taxon
    findByID: (id) ->
-      @taxonsByID[id]
+      @byID[id]

    # For finding multiple Taxons represented by comma delimited string
    findByIDs: (ids) ->
-      @taxonsByID[taxon_id] for taxon_id in ids.split(",") when @taxonsByID[taxon_id]
+      @byID[taxon_id] for taxon_id in ids.split(",") when @byID[taxon_id]

    findByTerm: (term) ->
-      $filter('filter')(@taxons, term)
+      $filter('filter')(@all, term)
--- a/app/assets/javascripts/admin/util.js.erb
+++ b/app/assets/javascripts/admin/util.js.erb
@@ -30,8 +30,16 @@ show_flash_error = function(message) {
 }

 $(document).ready(function(){
-    $('a.close').click(function(event){
-      event.preventDefault();
-      $(this).parent().slideUp(250);
-    });
+  $('a.close').click(function(event){
+    event.preventDefault();
+    $(this).parent().slideUp(250);
+  });
+
+  // Spree locates hidden with prev(), which with our current version of jQuery
+  // does not locate the hidden field, resulting in the delete failing. This
+  // handler updates the hidden field, fixing the problem.
+  $('body').on('click', 'a.remove_fields', function() {
+    $(this).next("input[type=hidden]").val("1");
+    return false;
+  });
 });
--- a/app/assets/javascripts/admin/utils/services/blank_option.js.coffee
+++ b/app/assets/javascripts/admin/utils/services/blank_option.js.coffee
@@ -1,2 +0,0 @@
-angular.module("admin.utils").value "blankOption", ->
-  { id: "0", name: "All" }
				`@@ -0,0 +1 @@`
				`angular.module("admin.resources", ['ngResource'])`