From fd07830c02c5612f26aa9b128461f746ee820f19 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 16 Dec 2016 15:36:43 +1100 Subject: [PATCH] Adding order_update_issues to serialized proxy orders --- app/controllers/admin/standing_orders_controller.rb | 3 ++- app/serializers/api/admin/proxy_order_serializer.rb | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/standing_orders_controller.rb b/app/controllers/admin/standing_orders_controller.rb index 3eb9d674f5..61f3072ff0 100644 --- a/app/controllers/admin/standing_orders_controller.rb +++ b/app/controllers/admin/standing_orders_controller.rb @@ -36,7 +36,7 @@ module Admin def update form = StandingOrderForm.new(@standing_order, params[:standing_order], fee_calculator) if form.save - render_as_json @standing_order, ams_prefix: params[:ams_prefix], fee_calculator: fee_calculator + render_as_json @standing_order, fee_calculator: fee_calculator, order_update_issues: form.order_update_issues else render json: { errors: form.json_errors }, status: :unprocessable_entity end @@ -85,6 +85,7 @@ module Admin @schedules = Schedule.with_coordinator(@standing_order.shop) @payment_methods = Spree::PaymentMethod.for_distributor(@standing_order.shop) @shipping_methods = Spree::ShippingMethod.for_distributor(@standing_order.shop) + @order_cycles = OrderCycle.joins(:schedules).managed_by(spree_current_user) @fee_calculator = fee_calculator end diff --git a/app/serializers/api/admin/proxy_order_serializer.rb b/app/serializers/api/admin/proxy_order_serializer.rb index 7dcbb4b383..7e8a52bc07 100644 --- a/app/serializers/api/admin/proxy_order_serializer.rb +++ b/app/serializers/api/admin/proxy_order_serializer.rb @@ -1,5 +1,6 @@ class Api::Admin::ProxyOrderSerializer < ActiveModel::Serializer attributes :id, :state, :edit_path, :number, :completed_at, :order_cycle_id, :total + attributes :update_issues def total if object.total.present? @@ -9,6 +10,10 @@ class Api::Admin::ProxyOrderSerializer < ActiveModel::Serializer end end + def update_issues + options[:order_update_issues].andand[object.order_id] || [] + end + def completed_at object.completed_at.blank? ? "" : object.completed_at.strftime("%F %T") end