mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-02-27 01:43:22 +00:00
Adding order_update_issues to serialized proxy orders
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user