diff --git a/app/controllers/users/orders_controller.rb b/app/controllers/users/orders_controller.rb index 22d04294..934a0f64 100644 --- a/app/controllers/users/orders_controller.rb +++ b/app/controllers/users/orders_controller.rb @@ -8,7 +8,7 @@ module Users @list = List.find(params[:list_id]) render json: {}, status: :not_found and return unless @list.present? && Array.wrap(@list.user_ids).include?(current_user.id) orders = @list.orders.include_relation(:product_orders) - render json: JSONAPI::Serializer.serialize(orders, serializer: Users::OrderSerializer, include: %w[list product_orders product_orders.order], is_collection: true) + render json: JSONAPI::Serializer.serialize(orders, serializer: Users::OrderSerializer, include: %w[list user product_orders product_orders.order], is_collection: true) end end diff --git a/app/models/list.rb b/app/models/list.rb index 340cb653..deddf76f 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -312,7 +312,7 @@ class List # broadcast_supplier supplier.id, 'new_order', OrderSerializer.new(order) else # broadcast_users 'new_order', order: order.with_products_as_json, total_amount: price - user_payload = JSONAPI::Serializer.serialize(order, serializer: Users::OrderSerializer, include: %w[product_orders]) + user_payload = JSONAPI::Serializer.serialize(order, serializer: Users::OrderSerializer, include: %w[list user product_orders product_orders.order]) broadcast_users 'new_order', user_payload broadcast_supplier supplier.id, 'list_update', Supplier::ListSerializer.new(self).as_json.merge(new_order_id: order.id) end diff --git a/app/serializers/users/order_serializer.rb b/app/serializers/users/order_serializer.rb index afc7a33e..8f9768df 100644 --- a/app/serializers/users/order_serializer.rb +++ b/app/serializers/users/order_serializer.rb @@ -4,6 +4,7 @@ class Users::OrderSerializer has_many :product_orders, serializer: Users::ProductOrderSerializer has_one(:list, serializer: Users::ListSerializer ) #{ List.new(id: object.list_id )} + has_one :user, serializer: Users::UserSerializer #belongs_to :section #belongs_to :table end