counter fixes

2014-03-10 10:10:54 +01:00
parent a2ce77e9e1
commit c4e002104c
6 changed files with 89 additions and 36 deletions
@@ -92,19 +92,16 @@ class Order
  end

  def is_delivered!
-    decrement_placed = placed?
+    decrement_counter = placed? ? 'placed' : 'in_process'
    self.state = 'delivered'
    if save
-      orders_in_process_count = supplier.decrement_orders_in_process_count!
-      orders_placed_count = supplier.decrement_orders_placed_count! if decrement_placed
+      reduced_count = supplier.public_send "decrement_orders_#{decrement_counter}_count!"
      for user_id in list.user_ids
        broadcast_user user_id, 'order_being_delivered', id: id, list_id: list_id
-        broadcast_user user_id, 'orders_in_process_count', count: orders_in_process_count
-        broadcast_user user_id, 'orders_placed_count', count: orders_placed_count if decrement_placed
+        broadcast_user user_id, "orders_#{decrement_counter}_count", count: reduced_count
      end
      broadcast_supplier supplier_id, 'order_being_delivered', id: id, list_id: list_id
-      broadcast_supplier supplier_id, 'orders_in_process_count', count: orders_in_process_count
-      broadcast_supplier supplier_id, 'orders_placed_count', count: orders_placed_count if decrement_placed
+      broadcast_supplier supplier_id, "orders_#{decrement_counter}_count", count: reduced_count
    end
  end