Commit 1a8d06d0 by hades

reskin

parent 6a645571
...@@ -362,6 +362,7 @@ footer { ...@@ -362,6 +362,7 @@ footer {
width: 100%; width: 100%;
clear: left; clear: left;
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px;
} }
.item { .item {
.thumbnail { .thumbnail {
......
...@@ -107,7 +107,7 @@ class CardsController < ApplicationController ...@@ -107,7 +107,7 @@ class CardsController < ApplicationController
end end
def confirm_checkout def confirm_checkout
add_breadcrumb "Checkout", url_for(action: 'checkout') add_breadcrumb "Check out", url_for(action: 'checkout')
add_breadcrumb "Confirm", url_for(action: 'confirm_checkout') add_breadcrumb "Confirm", url_for(action: 'confirm_checkout')
@card_infos = Hash.new @card_infos = Hash.new
if session[:SHOPPING_CARD_SESSION_NAME] != nil if session[:SHOPPING_CARD_SESSION_NAME] != nil
...@@ -116,8 +116,13 @@ class CardsController < ApplicationController ...@@ -116,8 +116,13 @@ class CardsController < ApplicationController
if @card_infos.empty? if @card_infos.empty?
redirect_to cards_path redirect_to cards_path
end end
if request.post?
redirect_to url_for(action: 'thankyou')
end
end end
def thankyou def thankyou
add_breadcrumb "Thank out", url_for(action: 'thankyou')
render :layout => "application_one_col"
end end
end end
...@@ -11,26 +11,28 @@ ...@@ -11,26 +11,28 @@
<td><%= customer_info[:full_name] %></td> <td><%= customer_info[:full_name] %></td>
</tr> </tr>
<tr> <tr>
<td>Email:</td> <td><b>Email</b>:</td>
<td><%= customer_info[:email] %></td> <td><%= customer_info[:email] %></td>
</tr> </tr>
<tr> <tr>
<td>Phone:</td> <td><b>Phone</b>:</td>
<td><%= customer_info[:phone] %></td> <td><%= customer_info[:phone] %></td>
</tr> </tr>
<tr> <tr>
<td>Address:</td> <td><b>Address</b>:</td>
<td><%= customer_info[:address] %></td> <td><%= customer_info[:address] %></td>
</tr> </tr>
<tr> <tr>
<td>Note:</td> <td><b>Note</b>:</td>
<td><%= customer_info[:note] %></td> <td><%= customer_info[:note] %></td>
</tr> </tr>
</table> </table>
<%= render partial: 'cards/item_list', locals: { card_infos: @card_infos, can_edit: false } %> <%= render partial: 'cards/item_list', locals: { card_infos: @card_infos, can_edit: false } %>
<%= form_tag do %>
<div class="text-center"> <div class="text-center">
The information above The information above
<a href="<%= url_for(action: 'checkout') %>" class="btn btn-default">Incorrect, click here</a> <a href="<%= url_for(action: 'checkout') %>" class="btn btn-default">Incorrect, click here</a>
<%= submit_tag "Correct, click here", class: 'btn btn-primary btn-submit' %> <%= submit_tag "Correct, click here", class: 'btn btn-primary btn-submit' %>
</div> </div>
<% end %>
</div> </div>
<h1>Cards#thankyou</h1> <% provide(:title, "Thank you") %>
<p>Find me in app/views/cards/thankyou.html.erb</p> <div class="body-box">
<h2 class="sprite-2">
Thank you<span class="sprite-2"></span>
</h2>
<p>&nbsp;</p>
<p>
Successfully order!
<br />We will contact you as soon as possible!
</p>
<p>&nbsp;</p>
<div class="clearfix"></div>
</div>
...@@ -21,7 +21,10 @@ ...@@ -21,7 +21,10 @@
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
</div> </div>
<div class="container"> <div class="container">
<%= render 'layouts/breadcrumb', breadcrumbs: yield(:breadcrumbs) %> <nav class="breadcrumb">
<span>You are in: </span>
<%= render_breadcrumbs %>
</nav>
<div class="clearfix"></div> <div class="clearfix"></div>
<% if flash.any? %> <% if flash.any? %>
<div id="block-message" class="hidden"> <div id="block-message" class="hidden">
......
...@@ -6,6 +6,7 @@ VenshopApp::Application.routes.draw do ...@@ -6,6 +6,7 @@ VenshopApp::Application.routes.draw do
get "cards/checkout" get "cards/checkout"
post "cards/checkout" post "cards/checkout"
get "cards/confirm_checkout" get "cards/confirm_checkout"
post "cards/confirm_checkout"
get "cards/thankyou" get "cards/thankyou"
resources :users resources :users
resources :sessions, only: [:new, :create, :destroy] resources :sessions, only: [:new, :create, :destroy]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment