在庫管理機能追加-在庫切れ一覧検索に条件追加

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/elecoma/trunk@36 06daa6dd-5c14-464e-8a85-0d68c524be32

diff --git a/app/controllers/admin/home_controller.rb b/app/controllers/admin/home_controller.rb
index e16a1d8..bf8cfb0 100644 (file)
--- a/app/controllers/admin/home_controller.rb
+++ b/app/controllers/admin/home_controller.rb
@@ -37,7 +37,7 @@ class Admin::HomeController < Admin::BaseController
                                                 today_one.to_s, today.to_s, OrderDelivery::JUTYUU, OrderDelivery::HASSOU_TEHAIZUMI, OrderDelivery::HASSOU_TYUU, OrderDelivery::HAITATU_KANRYO])
     #品切れ商品
     @sold_outs = ProductStyle.find(:all, :conditions => <<-EOS,
-                   product_styles.actual_count <= 0
+                   product_styles.actual_count <= 0 or product_styles.actual_count is null
                    EOS
                    :joins => "LEFT JOIN products ON products.id = product_styles.product_id ",
                    :select => "products.name, product_styles.code",

diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb
index ea7af5e..5f31bf3 100644 (file)
--- a/app/controllers/admin/products_controller.rb
+++ b/app/controllers/admin/products_controller.rb
@@ -85,7 +85,7 @@ class Admin::ProductsController < Admin::BaseController
   def actual_count_search
     get_search_form(true)
     unless @search.no_product_style_count && @search.no_product_style_count.to_s == 1.to_s
-      @search_list << ["product_styles.actual_count<=0"]
+      @search_list << ["product_styles.actual_count<=0 or product_styles.actual_count is null"]
     end
     find_options = {
       :page => params[:page],

diff --git a/spec/controllers/admin/product_styles_controller_spec.rb b/spec/controllers/admin/product_styles_controller_spec.rb
index a076832..d12714b 100644 (file)
--- a/spec/controllers/admin/product_styles_controller_spec.rb
+++ b/spec/controllers/admin/product_styles_controller_spec.rb
@@ -56,7 +56,7 @@ describe Admin::ProductStylesController do
 
     it '確認画面に正常に遷移' do
       product_styles = Hash.new
-      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :actual_count => 10, :sell_price => 1200}
+      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :sell_price => 1200}
       product_styles[product_styles.count.to_s] = one_product_style
       post 'confirm', :id => @product_style_test.id, :product_id => @product_style_test.id, :product_styles => product_styles
       assigns[:save_flg].should be_true
@@ -70,7 +70,7 @@ describe Admin::ProductStylesController do
 
     it '登録可能な状態' do
       product_styles = Hash.new
-      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :actual_count => 10, :sell_price => 1200}
+      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :sell_price => 1200}
       product_styles[product_styles.count.to_s] = one_product_style
       post 'create', :id => @product_style_test.id, :product_id => @product_style_test.id, :product_styles => product_styles
       assigns[:save_flg].should be_true
@@ -78,7 +78,7 @@ describe Admin::ProductStylesController do
 
     it '登録失敗' do
       product_styles = Hash.new
-      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :actual_count => 10, :sell_price => "334io"}
+      one_product_style = {:enable => "on", :style_category1 => 50, :style_category2 => 60, :code => "VVM0001", :sell_price => "334io"}
       product_styles[product_styles.count.to_s] = one_product_style
       post 'create', :id => @product_style_test.id, :product_id => @product_style_test.id, :product_styles => product_styles
       assigns[:save_flg].should_not be_true