受注管理周りの表示の体裁を整えた

diff --git a/ChangeLog b/ChangeLog
index 25bc7ad..27094ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-3-21  Matsumoto Yasuhito  <ymatsumoto _at_ appirits.com>
+
+       * 2.1.6 Release
+       * [管理画面] 受注管理画面の検索内容に「受注日」を追加
+       * [管理画面] 納品書・ピッキングリストの作成機能追加
+       * [管理画面] 納品書・ピッキングリストのPDF出力機能追加
+       * [bugfix] 商品別集計が正しく集計されない不具合修正
+       * [bugfix] 商品マスタ管理、在庫切れ一覧、顧客マスタで日付で絞り込むとCSV DOWNLOADできないバグ修正
+
 2012-12-27  YOSHIDA Hiroki  <hyoshida _at_ appirits.com>
 
        * 2.1.5 Release

diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb
index 874417d..d278128 100644 (file)
--- a/app/controllers/admin/orders_controller.rb
+++ b/app/controllers/admin/orders_controller.rb
@@ -113,7 +113,7 @@ class Admin::OrdersController < Admin::BaseController
                     :shop_name        => @shop.try(:corp_name))
       
       @order_delivery.order_details.each do | detail |
-        r.page.list(:product).add_row(:quantity       => detail.quantity,
+        r.page.list(:product).add_row(:quantity       => number_with_delimiter(detail.quantity),
                                       :product_name   => detail.product_name,
                                       :category_name1 => detail.style_category_name1,
                                       :category_name2 => detail.style_category_name2,
@@ -167,7 +167,7 @@ class Admin::OrdersController < Admin::BaseController
                                                 :product_name   => detail.product_name,
                                                 :category_name1 => detail.style_category_name1,
                                                 :category_name2 => detail.style_category_name2,
-                                                :quantity       => detail.quantity)
+                                                :quantity       => number_with_delimiter(detail.quantity))
       end
     end
 

diff --git a/app/views/admin/orders/_form.html.erb b/app/views/admin/orders/_form.html.erb
index b8e81c1..85448a0 100644 (file)
--- a/app/views/admin/orders/_form.html.erb
+++ b/app/views/admin/orders/_form.html.erb
@@ -105,7 +105,7 @@
     <td><%=h detail.product_code %></td>
     <td><%=h detail.product_name %>/<br /><%=h detail.style_category_name1 %>/<br /><%=h detail.style_category_name2 %></td>
     <td><%=h number_with_delimiter(detail.price) %>円</td>
-    <td><%=h detail.quantity %></td>
+    <td><%=h number_with_delimiter(detail.quantity) %></td>
     <td><%= number_with_delimiter(detail.price_with_tax) %>円</td>
     <td><%= number_with_delimiter(detail.subtotal) %>円</td>
    </tr>
@@ -116,15 +116,15 @@
   </tr>
   <tr>
    <th colspan="5">値引</th>
-   <td><%=h @order_delivery.discount %>円</td>
+   <td><%=h number_with_delimiter(@order_delivery.discount) || 0 %>円</td>
   </tr>
   <tr>
    <th colspan="5">送料</th>
-   <td><%=h @order_delivery.deliv_fee %>円</td>
+   <td><%=h number_with_delimiter(@order_delivery.deliv_fee) %>円</td>
   </tr>
   <tr>
    <th colspan="5">手数料</th>
-   <td><%=h @order_delivery.charge %>円</td>
+   <td><%=h number_with_delimiter(@order_delivery.charge) %>円</td>
   </tr>
   <tr>
    <th colspan="5">合計</th>

diff --git a/app/views/admin/orders/_show.html.erb b/app/views/admin/orders/_show.html.erb
index b1406e9..4391e33 100644 (file)
--- a/app/views/admin/orders/_show.html.erb
+++ b/app/views/admin/orders/_show.html.erb
@@ -107,7 +107,7 @@
  </tr>
  <tr>
   <th colspan="5">値引</th>
-  <td><%= number_with_delimiter @order_delivery.discount %>円</td>
+  <td><%= number_with_delimiter @order_delivery.discount || 0 %>円</td>
  </tr>
  <tr>
   <th colspan="5">送料</th>

diff --git a/app/views/admin/orders/statement.html.erb b/app/views/admin/orders/statement.html.erb
index 4341886..cd99979 100644 (file)
--- a/app/views/admin/orders/statement.html.erb
+++ b/app/views/admin/orders/statement.html.erb
@@ -81,7 +81,7 @@
         <%=h detail.style_category_name2 %>
       </td>
       <td><%=h number_with_delimiter(detail.price) %>円</td>
-      <td><%=h detail.quantity %></td>
+      <td><%=h number_with_delimiter(detail.quantity) %></td>
       <td><%= number_with_delimiter(detail.price_with_tax) %>円</td>
       <td><%= number_with_delimiter(detail.subtotal) %>円</td>
     </tr>
@@ -95,17 +95,17 @@
   <% unless @order_delivery.discount.blank? %>
     <tr>
       <th colspan="5">値引</th>
-        <td><%=h @order_delivery.discount %>円</td>
+        <td><%=h number_with_delimiter(@order_delivery.discount) || 0 %>円</td>
     </tr>
   <% end %>
   
     <tr>
        <th colspan="5">送料</th>
-         <td><%=h @order_delivery.deliv_fee %>円</td>
+         <td><%=h number_with_delimiter(@order_delivery.deliv_fee) %>円</td>
     </tr>
     <tr>
       <th colspan="5">手数料</th>
-        <td><%=h @order_delivery.charge %>円</td>
+        <td><%=h number_with_delimiter(@order_delivery.charge) %>円</td>
     </tr>
     <tr>
       <th colspan="5">合計</th>