Merge remote-tracking branch 'origin/master' into uk/trial-length

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.customers").controller "customersCtrl", ($scope, CustomerResource, Columns, pendingChanges, shops) ->
+angular.module("admin.customers").controller "customersCtrl", ($scope, CustomerResource, TagsResource, $q, Columns, pendingChanges, shops) ->
   $scope.shop = {}
   $scope.shops = shops
   $scope.submitAll = pendingChanges.submitAll
@@ -12,6 +12,16 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, CustomerR
     if $scope.shop.id?
       $scope.customers = index {enterprise_id: $scope.shop.id}
 
+  $scope.findTags = (query) ->
+    defer = $q.defer()
+    params =
+      enterprise_id: $scope.shop.id
+    TagsResource.index params, (data) =>
+      filtered = data.filter (tag) ->
+        tag.text.toLowerCase().indexOf(query.toLowerCase()) != -1
+      defer.resolve filtered
+    defer.promise
+
   $scope.add = (email) ->
     params =
       enterprise_id: $scope.shop.id

app/assets/javascripts/admin/customers/services/tags_resource.js.coffee

@@ -0,0 +1,9 @@
+angular.module("admin.customers").factory 'TagsResource', ($resource) ->
+  $resource('/admin/tags.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+      cache: true
+      params:
+        enterprise_id: '@enterprise_id'
+  })

app/assets/javascripts/admin/directives/track_master.js.coffee

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").directive "ofnTrackMaster", ["DirtyProducts", (DirtyProducts) ->
+angular.module("ofn.admin").directive "ofnTrackMaster", (DirtyProducts) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     ngModel.$parsers.push (viewValue) ->
@@ -6,4 +6,3 @@ angular.module("ofn.admin").directive "ofnTrackMaster", ["DirtyProducts", (Dirty
         DirtyProducts.addMasterProperty scope.product.id, scope.product.master.id, attrs.ofnTrackMaster, viewValue
         scope.displayDirtyProducts()
       viewValue
-  ]

app/assets/javascripts/admin/filters/translate.js.coffee

@@ -1,7 +0,0 @@
-angular.module('ofn.admin').filter "translate", ->
-  (key, options) ->
-    t(key, options)
-
-angular.module('ofn.admin').filter "t", ->
-  (key, options) ->
-    t(key, options)

app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee

@@ -1,5 +1,5 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
     order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
     $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
     $scope.supplier_enterprises = Enterprise.producer_enterprises
@@ -12,6 +12,9 @@ angular.module('admin.orderCycles')
 
     $scope.StatusMessage = StatusMessage
 
+    $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
     $scope.loaded = ->
       Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -60,6 +63,7 @@ angular.module('admin.orderCycles')
     $scope.removeExchange = ($event, exchange) ->
       $event.preventDefault()
       OrderCycle.removeExchange(exchange)
+      $scope.order_cycle_form.$dirty = true
 
     $scope.addCoordinatorFee = ($event) ->
       $event.preventDefault()
@@ -81,4 +85,9 @@ angular.module('admin.orderCycles')
       OrderCycle.removeDistributionOfVariant(variant_id)
 
     $scope.submit = (destination) ->
+      StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
+      $scope.order_cycle_form.$setPristine()
+
+    $scope.cancel = (destination) ->
+      $window.location = destination

app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee

@@ -9,6 +9,9 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 
+  $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
   $scope.loaded = ->
     Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -35,5 +38,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
     OrderCycle.removeCoordinatorFee(index)
 
   $scope.submit = (destination) ->
+    StatusMessage.display 'progress', "Saving..."
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination)

app/assets/javascripts/admin/shipping_methods/shipping_methods.js.coffee

@@ -1 +1 @@
-angular.module("admin.shippingMethods", ["ngTagsInput", 'admin.utils'])
+angular.module("admin.shippingMethods", ["ngTagsInput", 'admin.utils', 'templates'])

app/assets/javascripts/admin/utils/directives/save_bar.js.coffee

@@ -1,8 +1,8 @@
 angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
   restrict: "E"
   scope:
-    save: "&"
     form: "="
+    buttons: "="
   templateUrl: "admin/save_bar.html"
   link: (scope, element, attrs) ->
     scope.StatusMessage = StatusMessage

app/assets/javascripts/admin/utils/directives/tags_with_translation.js.coffee

@@ -1,10 +1,11 @@
 angular.module("admin.utils").directive "tagsWithTranslation", ($timeout) ->
   restrict: "E"
-  template: "<tags-input ng-model='object[tagsAttr]'>"
+  templateUrl: "admin/tags_input.html"
   scope:
     object: "="
     tagsAttr: "@?"
     tagListAttr: "@?"
+    findTags: "&"
   link: (scope, element, attrs) ->
     $timeout ->
       scope.tagsAttr ||= "tags"

app/assets/javascripts/admin/utils/filters/translate.js.coffee

@@ -0,0 +1,7 @@
+angular.module("admin.utils").filter "translate", ->
+  (key, options) ->
+    t(key, options)
+
+angular.module("admin.utils").filter "t", ->
+  (key, options) ->
+    t(key, options)