非会員で購入できないバグを修正

diff --git a/app/controllers/cart_controller.rb b/app/controllers/cart_controller.rb
index 1d57233..73a8e97 100644 (file)
--- a/app/controllers/cart_controller.rb
+++ b/app/controllers/cart_controller.rb
@@ -3,7 +3,7 @@ require 'timeout'
 require 'open-uri'
 class CartController < BaseController
   before_filter :cart_check, :only => [:temporary_shipping,:shipping, :purchase,:purchase2, :confirm, :complete, :delivery, :delivery2]
-  before_filter :login_divaricate ,:only =>[:purchase,:purchase2,:confirm, :complete, :delivery]
+  before_filter :login_divaricate ,:only =>[:purchase,:purchase2,:confirm, :complete, :delivery, :delivery2]
   before_filter :login_check, :only => [:shipping]
   before_filter :force_post, :only => [:delivery, :purchase,:purchase2,:confirm, :complete]
   after_filter :save_carts
@@ -131,7 +131,8 @@ class CartController < BaseController
      @optional_address = DeliveryAddress.new(params[:optional_address])
      #戻るボタンから戻る時
       if params[:back] == "1"
-        convert(params[:order_delivery])
+        logger.debug params[:order_deliveries]["1"]
+        convert(params[:order_deliveries].first[1])
      end
   end
  
@@ -160,7 +161,7 @@ class CartController < BaseController
       
       # 確認画面から戻る時
       if params[:back] == "1"
-        convert(params[:order_delivery])
+        convert(params[:order_deliveries].first[1])
       end
       # 入力チェック
       # メールアドレス重複チェックを除き
@@ -237,7 +238,11 @@ class CartController < BaseController
     else
       #error
     end
-    
+   
+    if params[:back] == "1"
+      @payment_id = @order_deliveries.first[1].payment_id
+    end
+
     render :action => 'purchase'
   end
   

diff --git a/app/views/cart/confirm.html.erb b/app/views/cart/confirm.html.erb
index 542561a..a44fcb9 100644 (file)
--- a/app/views/cart/confirm.html.erb
+++ b/app/views/cart/confirm.html.erb
@@ -187,6 +187,12 @@
         <%= hidden_field_tag "order_deliveries[#{key}][#{column}]", order_delivery[column] %>
       <%- end %>
     <%- end -%>
+    <% if @not_login_customer%>
+    <%=hidden_field_tag "temporary_customer_flag","1"%>
+      <% if !params[:address_enable].nil?%>
+        <%=hidden_field_tag "address_enable","1"%>
+      <% end%>  
+    <% end%>
     
          <%= hidden_field_tag "point_after_operation", @point_after_operation %>
     <div class="cart_btn">

diff --git a/app/views/cart/confirm_mobile.html.erb b/app/views/cart/confirm_mobile.html.erb
index 7c4bef5..96d67b7 100644 (file)
--- a/app/views/cart/confirm_mobile.html.erb
+++ b/app/views/cart/confirm_mobile.html.erb
@@ -37,7 +37,6 @@
 <br/>
 -<%= number_with_delimiter(order_delivery.use_point.to_i) %>Pt
 <br/>
-<% end %>
 
 
 ご注文前のポイント
@@ -45,9 +44,11 @@
 <%= number_with_delimiter(@login_customer.point.to_i) %>Pt
 <br/>
 <div style="background-color:#F3F3EC;"><%= image_tag_mobile "spacer", :width => "1", :height => "2" %><br /></div>
+<% end %>
 
 <% end %>
 
+<% unless @not_login_customer %>
 <div style="background-color:#F3F3EC;"><%= image_tag_mobile "spacer", :width => "1", :height => "2" %><br /></div>
 今回加算されるポイント
 <br/>
@@ -60,6 +61,8 @@
 <br/>
 <div style="background-color:#F3F3EC;"><%= image_tag_mobile "spacer", :width => "1", :height => "2" %><br /></div>
 
+<% end %>
+
 <div style="background-color:#F3F3EC;"><%= image_tag_mobile "spacer", :width => "1", :height => "4" %><br /></div>
 <div style="text-align:center;">【 支払金額  <%= number_with_delimiter @payment_total %>円 】</div>
 <div style="background-color:#F3F3EC;"><%= image_tag_mobile "spacer", :width => "1", :height => "4" %><br /></div>
@@ -159,6 +162,13 @@ Tel. <%=h od.deliv_tel01 %>-<%=h od.deliv_tel02 %>-<%=h od.deliv_tel03 %>
         <%= hidden_field_tag "order_deliveries[#{key}][#{column}]", order_delivery[column] %>
       <%- end %>
     <%- end -%>
+    <% if @not_login_customer%>
+    <%=hidden_field_tag "temporary_customer_flag","1"%>
+      <% if !params[:address_enable].nil?%>
+        <%=hidden_field_tag "address_enable","1"%>
+      <% end%>  
+    <% end%>
+
     <%= submit_tag '注文' %>
 </div>
 <% end %>
@@ -170,6 +180,12 @@ Tel. <%=h od.deliv_tel01 %>-<%=h od.deliv_tel02 %>-<%=h od.deliv_tel03 %>
         <%= hidden_field_tag "order_deliveries[#{key}][#{column}]", order_delivery[column] %>
       <%- end %>
     <%- end -%>
+    <% if @not_login_customer%>
+    <%=hidden_field_tag "temporary_customer_flag","1"%>
+      <% if !params[:address_enable].nil?%>
+        <%=hidden_field_tag "address_enable","1"%>
+      <% end%>  
+    <% end%>
     <%=hidden_field_tag "back","1" %>
     <%= submit_tag '戻る' %>
     <br/>

diff --git a/app/views/cart/delivery2_mobile.html.erb b/app/views/cart/delivery2_mobile.html.erb
index 0cb8bb2..3cc53a4 100644 (file)
--- a/app/views/cart/delivery2_mobile.html.erb
+++ b/app/views/cart/delivery2_mobile.html.erb
@@ -1,12 +1,18 @@
 <% form_for :order_delivery, :url => {:action => :purchase} do |f| %>
   <span style="color:#FF9775;">■</span> 発送時間選択<br />
   <% @delivery_time_options.each do |retailer_id, options| %>
+    
+    <% carts = @carts_map[retailer_id.to_i] %>
+    <% carts.each do |cart| %>
+  <%= cart.product_style.product.name %><br />
+<% end %>
   <p>配達時間をお選びください</p>
   <select id="delivery_time_<%= retailer_id %>" name="order_deliveries[<%= retailer_id %>][delivery_time_id]">
     <% options.each do |option| %>
       <option value="<%= option[1] %>"><%= option[0] %></option>
     <% end %>
   </select>
+  <br />
   <% end %>
   <div style="text-align:center;">
     <%= render :partial => "order_deliveries" %>

diff --git a/app/views/cart/purchase.html.erb b/app/views/cart/purchase.html.erb
index 1ff8d3a..2f31417 100644 (file)
--- a/app/views/cart/purchase.html.erb
+++ b/app/views/cart/purchase.html.erb
@@ -18,7 +18,12 @@
       <ul>
         <% Payment::find_for_price(@cart_price).each do |payment| %>
           <li>
-            <%= f.radio_button :payment_id, payment.id %><%= f.label 'payment_id_%d' % payment.id, payment.name, :class => "radio_btn" %>
+            <%- if @payment_id == payment.id %>
+              <%= f.radio_button :payment_id, payment.id, :checked => "checked" %>
+            <%- else -%>
+              <%= f.radio_button :payment_id, payment.id %>
+            <%- end -%>
+              <%= f.label 'payment_id_%d' % payment.id, payment.name, :class => "radio_btn" %>
             <%= payment_image_tag payment, {:controller => "/image_resource", :action => "show", :id => payment.id} %>
           </li>
         <% end %>
@@ -61,6 +66,13 @@
     <%- end -%>
     <div class="my_btn2">
       <%=hidden_field_tag "back"%>
+      <% if @not_login_customer%>
+      <%=hidden_field_tag "temporary_customer_flag","1"%>
+        <% if !params[:address_enable].nil?%>
+          <%=hidden_field_tag "address_enable","1"%>
+        <% end%>  
+      <% end%>
+
       <%= image_submit_tag '/images/cart/cart_btn05.gif', {:onclick => "this.form.action='/cart/delivery'; this.form.submit();document.getElementById('back').value=1",:width=>'101', :height=>'28', :alt=>'戻る', :class=>'hoverImg'} %>
       <%= image_submit_tag '/images/entry/entry_btn3.gif', :width=>'101', :height=>'28', :alt=>'次へ', :class=>'hoverImg' %>
     </div>

diff --git a/app/views/cart/purchase2_mobile.html.erb b/app/views/cart/purchase2_mobile.html.erb
index 82e11ba..793f930 100644 (file)
--- a/app/views/cart/purchase2_mobile.html.erb
+++ b/app/views/cart/purchase2_mobile.html.erb
@@ -12,6 +12,12 @@
        <% if @login_customer && @order_delivery.use_point && @order_delivery.use_point > 0%>
        <%=hidden_field_tag "point_check","true"%>
        <% end %>
+  <% if @not_login_customer%>
+  <%=hidden_field_tag "temporary_customer_flag","1"%>
+    <% if !params[:address_enable].nil?%>
+      <%=hidden_field_tag "address_enable","1"%>
+    <% end%>  
+  <% end%>
        <%=hidden_field :order_delivery,:payment_id%>
     <%=hidden_field :order_delivery,:use_point %>
     <%= submit_tag '次へ' %><br />
@@ -23,6 +29,12 @@
        <% if @login_customer && @order_delivery.use_point && @order_delivery.use_point > 0%>
        <%=hidden_field_tag "point_check","true"%>
        <% end %>
+  <% if @not_login_customer%>
+  <%=hidden_field_tag "temporary_customer_flag","1"%>
+    <% if !params[:address_enable].nil?%>
+      <%=hidden_field_tag "address_enable","1"%>
+    <% end%>  
+  <% end%>
        <%=hidden_field :order_delivery,:payment_id%>
     <%=hidden_field :order_delivery,:use_point %>
        <%=hidden_field_tag "back","1"%>
@@ -34,4 +46,4 @@
    
    
    
-   
\ No newline at end of file
+   

diff --git a/app/views/cart/purchase_mobile.html.erb b/app/views/cart/purchase_mobile.html.erb
index e73d90d..0e0dc89 100644 (file)
--- a/app/views/cart/purchase_mobile.html.erb
+++ b/app/views/cart/purchase_mobile.html.erb
@@ -38,6 +38,12 @@
         <%- end %>
       <%- end %>
     <%- end -%>
+    <% if @not_login_customer%>
+    <%=hidden_field_tag "temporary_customer_flag","1"%>
+      <% if !params[:address_enable].nil?%>
+        <%=hidden_field_tag "address_enable","1"%>
+      <% end%>  
+    <% end%>
     <%= submit_tag '次へ' -%>
   </div>
 <% end %>
@@ -51,6 +57,12 @@
       <%- end %>
     <%- end -%>
   <%=hidden_field_tag "back","1" %>
+  <% if @not_login_customer%>
+  <%=hidden_field_tag "temporary_customer_flag","1"%>
+    <% if !params[:address_enable].nil?%>
+      <%=hidden_field_tag "address_enable","1"%>
+    <% end%>  
+  <% end%>
   <div style="text-align:center;">
     <%= submit_tag '戻る' %>
   </div>

diff --git a/app/views/cart/temporary_shipping.html.erb b/app/views/cart/temporary_shipping.html.erb
index 7170375..7f4b429 100644 (file)
--- a/app/views/cart/temporary_shipping.html.erb
+++ b/app/views/cart/temporary_shipping.html.erb
@@ -75,7 +75,11 @@
         <th>性別<span class="must">※</span></th>
         <td>
           <% [System::MALE, System::FEMALE].each do | value | %>
+            <%- if @temporary_customer.sex == value %>
+            <%= f.radio_button :sex, value, :checked => "checked" %>
+            <%- else %>
             <%= f.radio_button :sex, value %>
+            <%- end %>
             <%= content_tag :label, System::SEX_NAMES[value], :for => "customer_sex_%d" % value %>
           <% end %>
         </td>

diff --git a/app/views/cart/temporary_shipping_mobile.html.erb b/app/views/cart/temporary_shipping_mobile.html.erb
index b7c5810..4050169 100644 (file)
--- a/app/views/cart/temporary_shipping_mobile.html.erb
+++ b/app/views/cart/temporary_shipping_mobile.html.erb
@@ -6,7 +6,7 @@
 <%= @temporary_customer && error_messages_for(:temporary_customer) %>
 <%= @optional_address && error_messages_for(:optional_address) %>
 
-<% form_tag({:action => 'purchase'}) do %>
+<% form_tag({:action => 'delivery'}) do %>
   <% fields_for :temporary_customer do |f| %>
 
 <span style="color:#ff0000;">※</span>お名前<br />