From 66d1e4297e8ec8e73ba37b134606c7d6586ed4ac Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Thu, 5 Nov 2015 14:40:42 +1100
Subject: [PATCH] WIP: Renaming admin.order_cycles to admin.orderCycles for
 consistency

---
 app/assets/javascripts/admin/all.js                    |  1 +
 .../javascripts/admin/line_items/line_items.js.coffee  |  2 +-
 .../controllers/order_cycle_controller.js.coffee       |  2 +-
 .../order_cycles/controllers/simple_create.js.coffee   |  2 +-
 .../order_cycles/controllers/simple_edit.js.coffee     |  2 +-
 .../filters/filter_exchange_variants.js.coffee         |  2 +-
 .../filters/visible_product_variants.js.coffee         |  2 +-
 .../order_cycles/filters/visible_products.js.coffee    |  2 +-
 .../admin/order_cycles/order_cycles.js.coffee          |  1 +
 .../admin/order_cycles/services/enterprise.js.coffee   |  2 +-
 .../order_cycles/services/enterprise_fee.js.coffee     |  2 +-
 .../admin/order_cycles/services/order_cycle.js.coffee  |  2 +-
 app/helpers/admin/injection_helper.rb                  |  2 +-
 app/views/admin/order_cycles/edit.html.haml            |  2 +-
 app/views/admin/order_cycles/new.html.haml             |  2 +-
 .../order_cycles/controllers/simple_create.js.coffee   |  2 +-
 .../order_cycles/controllers/simple_edit.js.coffee     |  2 +-
 spec/javascripts/unit/order_cycle_spec.js.coffee       | 10 +++++-----
 18 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 831fc3db4b..30c8e1a7b9 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -30,6 +30,7 @@
 //= require ./index_utils/index_utils
 //= require ./line_items/line_items
 //= require ./orders/orders
+//= require ./order_cycles/order_cycles
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
diff --git a/app/assets/javascripts/admin/line_items/line_items.js.coffee b/app/assets/javascripts/admin/line_items/line_items.js.coffee
index dddc793895..a3328c572e 100644
--- a/app/assets/javascripts/admin/line_items/line_items.js.coffee
+++ b/app/assets/javascripts/admin/line_items/line_items.js.coffee
@@ -1 +1 @@
-angular.module("admin.lineItems", ["admin.indexUtils", "admin.products", "admin.orders", "admin.enterprises", "admin.order_cycles"])
+angular.module("admin.lineItems", ["admin.indexUtils", "admin.products", "admin.orders", "admin.enterprises", "admin.orderCycles"])
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_controller.js.coffee
index 2b5ca05f42..a59d43a5bb 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles', ['ngResource'])
+angular.module('admin.orderCycles')
   .controller('AdminCreateOrderCycleCtrl', ['$scope', '$filter', 'OrderCycle', 'Enterprise', 'EnterpriseFee', 'ocInstance', ($scope, $filter, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
     $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
     $scope.supplied_products = Enterprise.supplied_products
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
index 771902ca5b..dea95063c0 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
+angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
   $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, =>
     # TODO: make this a get method, which only fetches one enterprise
     $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
index cab677407e..db805f0521 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
+angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
   $scope.orderCycleId = ->
     $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
 
diff --git a/app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee
index 2b22b1d60c..2fc5c9ff39 100644
--- a/app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.order_cycles").filter "filterExchangeVariants", ->
+angular.module("admin.orderCycles").filter "filterExchangeVariants", ->
   return (variants, rules) ->
     if variants? && rules?
       return (variant for variant in variants when variant in rules)
diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee
index 8989af5b9d..d2e69ad64f 100644
--- a/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.order_cycles").filter "visibleProductVariants", ->
+angular.module("admin.orderCycles").filter "visibleProductVariants", ->
   return (product, exchange, rules) ->
     variants = product.variants.concat( [{ "id": product.master_id}] )
     return (variant for variant in variants when variant.id in rules[exchange.enterprise_id])
diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee
index 3afff183a1..40586854c1 100644
--- a/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee
@@ -1,3 +1,3 @@
-angular.module("admin.order_cycles").filter "visibleProducts", ($filter) ->
+angular.module("admin.orderCycles").filter "visibleProducts", ($filter) ->
   return (products, exchange, rules) ->
     return (product for product in products when $filter('visibleProductVariants')(product, exchange, rules).length > 0)
diff --git a/app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee b/app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee
new file mode 100644
index 0000000000..1362751b80
--- /dev/null
+++ b/app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee
@@ -0,0 +1 @@
+angular.module('admin.orderCycles', ['ngResource'])
diff --git a/app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee b/app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee
index 5e40f621dc..f19e33d98d 100644
--- a/app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
+angular.module('admin.orderCycles').factory('Enterprise', ($resource) ->
   Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {
     'index':
       method: 'GET'
diff --git a/app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee b/app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee
index fe443a7cf5..5d8ebf6d59 100644
--- a/app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').factory('EnterpriseFee', ($resource) ->
+angular.module('admin.orderCycles').factory('EnterpriseFee', ($resource) ->
   EnterpriseFee = $resource('/admin/enterprise_fees/for_order_cycle/:enterprise_fee_id.json', {},  {
     'index':
       method: 'GET'
diff --git a/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee b/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
index 95dc62ca4e..2d66a9e377 100644
--- a/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window) ->
+angular.module('admin.orderCycles').factory('OrderCycle', ($resource, $window) ->
   OrderCycle = $resource '/admin/order_cycles/:action_name/:order_cycle_id.json', {}, {
     'index':  { method: 'GET', isArray: true}
     'new'   : { method: 'GET', params: { action_name: "new" } }
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 250a241625..d341f1d801 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -71,7 +71,7 @@ module Admin
     end
 
     def admin_inject_order_cycle_instance
-      render partial: "admin/json/injection_ams", locals: {ngModule: 'admin.order_cycles', name: 'ocInstance', json: "{coordinator_id: '#{@order_cycle.coordinator.id}'}"}
+      render partial: "admin/json/injection_ams", locals: {ngModule: 'admin.orderCycles', name: 'ocInstance', json: "{coordinator_id: '#{@order_cycle.coordinator.id}'}"}
     end
 
     def admin_inject_spree_api_key
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 2f17ecf85b..f96d10e01e 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -2,7 +2,7 @@
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
   - if order_cycles_simple_form
     = render 'simple_form', f: f
   - else
diff --git a/app/views/admin/order_cycles/new.html.haml b/app/views/admin/order_cycles/new.html.haml
index 770eac0269..ac21e2d5b7 100644
--- a/app/views/admin/order_cycles/new.html.haml
+++ b/app/views/admin/order_cycles/new.html.haml
@@ -3,7 +3,7 @@
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl'
 = admin_inject_order_cycle_instance
 
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.order_cycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, 'ng-submit' => 'submit($event)'} do |f|
   - if order_cycles_simple_form
     = render 'simple_form', f: f
   - else
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
index 0f1e043467..09d5524fac 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
@@ -27,7 +27,7 @@ describe "AdminSimpleCreateOrderCycleCtrl", ->
       index: jasmine.createSpy()
     ocInstance = {}
 
-    module('admin.order_cycles')
+    module('admin.orderCycles')
     inject ($controller) ->
       ctrl = $controller 'AdminSimpleCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee, ocInstance: ocInstance}
 
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
index 0e3275d886..1350c290fe 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -23,7 +23,7 @@ describe "AdminSimpleEditOrderCycleCtrl", ->
     EnterpriseFee =
       index: jasmine.createSpy()
 
-    module('admin.order_cycles')
+    module('admin.orderCycles')
     inject ($controller) ->
       ctrl = $controller 'AdminSimpleEditOrderCycleCtrl', {$scope: scope, $location: location, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee}
 
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index c14de6742d..d94c146f5c 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -39,7 +39,7 @@ describe 'OrderCycle controllers', ->
         forEnterprise: jasmine.createSpy('forEnterprise').andReturn('enterprise fees for enterprise')
       ocInstance = {}
 
-      module('admin.order_cycles')
+      module('admin.orderCycles')
       inject ($controller) ->
         ctrl = $controller 'AdminCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee, ocInstance: ocInstance}
 
@@ -202,7 +202,7 @@ describe 'OrderCycle controllers', ->
         index: jasmine.createSpy('index').andReturn('enterprise fees list')
         forEnterprise: jasmine.createSpy('forEnterprise').andReturn('enterprise fees for enterprise')
 
-      module('admin.order_cycles')
+      module('admin.orderCycles')
       inject ($controller) ->
         ctrl = $controller 'AdminEditOrderCycleCtrl', {$scope: scope, $location: location, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee}
 
@@ -330,7 +330,7 @@ describe 'OrderCycle services', ->
     Enterprise = null
 
     beforeEach ->
-      module 'admin.order_cycles'
+      module 'admin.orderCycles'
       inject ($injector, _$httpBackend_)->
         Enterprise = $injector.get('Enterprise')
         $httpBackend = _$httpBackend_
@@ -396,7 +396,7 @@ describe 'OrderCycle services', ->
     EnterpriseFee = null
 
     beforeEach ->
-      module 'admin.order_cycles'
+      module 'admin.orderCycles'
       inject ($injector, _$httpBackend_)->
         EnterpriseFee = $injector.get('EnterpriseFee')
         $httpBackend = _$httpBackend_
@@ -438,7 +438,7 @@ describe 'OrderCycle services', ->
     beforeEach ->
       $window = {navigator: {userAgent: 'foo'}}
 
-      module 'admin.order_cycles', ($provide)->
+      module 'admin.orderCycles', ($provide)->
         $provide.value('$window', $window)
         null