Everything is green
This commit is contained in:
+5
-4
@@ -146,12 +146,13 @@ class List
|
||||
self.user_requests_closing = false # if a user requested closing, not needed anymore
|
||||
self.closed_at = Time.now
|
||||
if save
|
||||
broadcast_info = supplier_counter_info.merge(id: id)
|
||||
for user in users
|
||||
user.active_list_id = nil
|
||||
user.save
|
||||
broadcast_user user.id, 'list_closed', id: id
|
||||
broadcast_user user.id, 'list_closed', broadcast_info
|
||||
end
|
||||
broadcast_supplier supplier_id, 'list_closed', id: id
|
||||
broadcast_supplier supplier_id, 'list_closed', broadcast_info
|
||||
end
|
||||
end
|
||||
|
||||
@@ -275,8 +276,8 @@ class List
|
||||
broadcast_users 'new_order', order: order.with_products_as_json, total_amount: price
|
||||
broadcast_users 'orders_placed_count', count: orders_placed_count
|
||||
|
||||
broadcast_supplier supplier.id, 'list_update', active_model_serializer.new(self).as_json
|
||||
broadcast_supplier supplier.id, 'new_order', OrderSerializer.new(order)
|
||||
broadcast_supplier supplier.id, 'list_update', SupplierListSerializer.new(self).as_json
|
||||
# broadcast_supplier supplier.id, 'new_order', OrderSerializer.new(order)
|
||||
broadcast_supplier supplier.id, 'orders_placed_count', count: orders_placed_count
|
||||
order
|
||||
end
|
||||
|
||||
+2
-2
@@ -113,10 +113,10 @@ class Order
|
||||
broadcast_options = {id: id}
|
||||
if original_state.placed?
|
||||
reduced_count = supplier.decrement_orders_placed_count!
|
||||
broadcast_options[:orders_placed_count] = reduced_count
|
||||
broadcast_options[:supplier_orders_placed_count] = reduced_count
|
||||
elsif original_state.active?
|
||||
reduced_count = supplier.decrement_orders_in_process_count!
|
||||
broadcast_options[:orders_in_process_count] = reduced_count
|
||||
broadcast_options[:supplier_orders_in_process_count] = reduced_count
|
||||
end
|
||||
list.broadcast_users 'order_cancelled', broadcast_options
|
||||
broadcast_supplier supplier_id, 'order_cancelled', broadcast_options
|
||||
|
||||
Reference in New Issue
Block a user