When all Inventory Units are "picked", the Shipment gets "picked" sta…

…te too
Genshin · Mar 26, 2012 · cbb4a4e · cbb4a4e
1 parent fb02361
commit cbb4a4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/app/controllers/spree/admin/inventory_units_controller_decorator.rb b/app/controllers/spree/admin/inventory_units_controller_decorator.rb
@@ -3,12 +3,16 @@ module Admin
     InventoryUnitsController.class_eval do 
 
       before_filter :load_inventory_unit , :only => [:fire]
-
       respond_to :html
 
       def fire
         if @iu.send("#{params[:e]}")
-          flash.notice = t(:unit_picked)
+          if @iu.shipment.state == 'picked'
+            flash.notice = t(:shipment_is_picked)
+          else
+            flash.notice = t(:unit_picked)
+          end
+
         else
           flash[:error] = t(:cannot_perform_operation)
         end

diff --git a/app/models/spree/inventory_unit_decorator.rb b/app/models/spree/inventory_unit_decorator.rb
@@ -33,23 +33,18 @@ def after_picked
     end
 
     def update_shipment_state
-      @shipment_state =
-      case shipment.inventory_units.count
-      when 0
-        nil
-      when shipment.inventory_units.picked.count
-        'picked'
-        puts "They are picked all"
+      if shipment.inventory_units.count == shipment.inventory_units.picked.count
+        self.shipment.update_attribute_without_callbacks('state', 'picked')
       end
+
+     # self.shipment.update_attribute_without_callbacks('state', @shipment_state)
 
-      self.shipment.update_attribute('state', @shipment_state)
      # self.state_changes.create({
      #     :previous_state => 'not_picked',
      #     :next_state     => @shipment_state,
      #     :name           => 'shipment',
      #     :user_id        => (User.respond_to?(:current) && User.current && User.current.id) || self.user_id
      # })
-
     end
 
     def not_packed?

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -40,6 +40,7 @@ en:
   pick: "Pick"
   picked: "Picked"
   unit_picked: "Unit Picked"
+  shipment_is_picked: "Shipment is Picked"
 
   picking_list: "Picking List"
   picking_list_for_order: "Picking List for Order : "