raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Renaming admin.order_cycles to admin.orderCycles for consistency

Browse Source
This commit is contained in:
Rob Harrington
2015-11-05 14:40:42 +11:00
parent 4d4e2d4abd
commit 66d1e4297e
18 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/all.js
View File

@@ -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

2
app/assets/javascripts/admin/line_items/line_items.js.coffee
View File

@@ -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"])

2
app/assets/javascripts/admin/order_cycles/controllers/order_cycle_controller.js.coffee
View File

@@ -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

2
app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee
View File

@@ -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) =>

2
app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
View File

@@ -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]

2
app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee
View File

@@ -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)

2
app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee
View File

@@ -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])

2
app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee
View File

@@ -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)

1
app/assets/javascripts/admin/order_cycles/order_cycles.js.coffee Normal file
View File

@@ -0,0 +1 @@
angular.module('admin.orderCycles', ['ngResource'])

2
app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee
View File

@@ -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'

2
app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee
View File

@@ -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'

2
app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee
View File

@@ -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" } }

2
app/helpers/admin/injection_helper.rb
View File

@@ -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

2
app/views/admin/order_cycles/edit.html.haml
View File

@@ -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

2
app/views/admin/order_cycles/new.html.haml
View File

@@ -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

2
spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
View File

@@ -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}

2
spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
View File

@@ -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}

10
spec/javascripts/unit/order_cycle_spec.js.coffee
View File

@@ -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