diff --git a/app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee b/app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee index 62584115e9..a3ea670c6f 100644 --- a/app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee +++ b/app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee @@ -1,2 +1,3 @@ -angular.module("admin.standingOrders").controller "OrdersPanelController", ($scope) -> +angular.module("admin.standingOrders").controller "OrdersPanelController", ($scope, OrderCycles) -> $scope.standingOrder = $scope.object + $scope.orderCyclesByID = OrderCycles.byID diff --git a/app/controllers/admin/standing_orders_controller.rb b/app/controllers/admin/standing_orders_controller.rb index fd752a700f..5fe47a68fd 100644 --- a/app/controllers/admin/standing_orders_controller.rb +++ b/app/controllers/admin/standing_orders_controller.rb @@ -11,6 +11,7 @@ module Admin def index respond_to do |format| format.html do + @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user) @payment_methods = Spree::PaymentMethod.managed_by(spree_current_user) @shipping_methods = Spree::ShippingMethod.managed_by(spree_current_user) end diff --git a/app/views/admin/standing_orders/_data.html.haml b/app/views/admin/standing_orders/_data.html.haml index 40add13521..e13e76f1e3 100644 --- a/app/views/admin/standing_orders/_data.html.haml +++ b/app/views/admin/standing_orders/_data.html.haml @@ -4,4 +4,5 @@ = admin_inject_json_ams_array "admin.standingOrders", "schedules", @schedules, Api::Admin::IdNameSerializer if @schedules = admin_inject_json_ams_array "admin.standingOrders", "paymentMethods", @payment_methods, Api::Admin::IdNameSerializer if @payment_methods = admin_inject_json_ams_array "admin.standingOrders", "shippingMethods", @shipping_methods, Api::Admin::IdNameSerializer if @shipping_methods += admin_inject_json_ams_array "admin.standingOrders", "orderCycles", @order_cycles, Api::Admin::BasicOrderCycleSerializer if @order_cycles = admin_inject_available_countries(module: "admin.standingOrders") diff --git a/app/views/admin/standing_orders/_orders_panel.html.haml b/app/views/admin/standing_orders/_orders_panel.html.haml index 8955744d3a..ac2f917d91 100644 --- a/app/views/admin/standing_orders/_orders_panel.html.haml +++ b/app/views/admin/standing_orders/_orders_panel.html.haml @@ -17,7 +17,7 @@ %tr{ ng: { repeat: 'order in standingOrder.not_closed_standing_order_orders' } } %td %a{ ng: { href: "{{::order.edit_path}}", bind: '::order.number' }, target: '_blank' } - %td{ ng: { bind: '::OrderCycles.byID[order.order_cycle_id].name' } } + %td{ ng: { bind: '::orderCyclesByID[order.order_cycle_id].name' } } %td{ ng: { bind: '::order.status' } } %td{ ng: { bind: '::order.total' } } %td.actions