raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Displaying Order Cycle names in orders panel on standing orders index

Browse Source
This commit is contained in:
Rob Harrington
2016-12-01 17:53:53 +11:00
parent a57815edbb
commit 9160a3ff6b
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee
View File

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

1
app/controllers/admin/standing_orders_controller.rb
View File

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

1
app/views/admin/standing_orders/_data.html.haml
View File

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

2
app/views/admin/standing_orders/_orders_panel.html.haml
View File

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