opensteam 0.9.2 → 0.9.3

data/generators/opensteam/templates/app/views/admin/tax_zones/index.html.erb

@@ -0,0 +1,16 @@
+<h2>TaxZones</h2>
+
+
+<%= header_with_links("Overview",
+  link_to("New", new_admin_tax_zone_path) ) %>
+
+<div id="tax_zone_content_div">
+  <%= render :partial => "tax_zones", :object => @tax_zones, :locals => { :id => "tax_zones_content" } %>
+</div>
+
+
+
+<% content_for( :admin_sidebar2 ) do %>
+  <%= render :partial => "admin/filters/filter", :locals => { :id => "tax_zone_filter", :model => "TaxZone" } %>
+<% end %>
+

data/generators/opensteam/templates/app/views/admin/tax_zones/new.html.erb

@@ -0,0 +1,14 @@
+<% content_for :admin_sidebar do %>
+    <%= link_to "Tax Zones", admin_tax_zones_path %>
+<% end %>
+
+
+<h2>Create TaxZone</h2>
+
+<%= error_messages_for :tax_zone %>
+
+<% form_for :tax_zone, @tax_zone, :url => { :controller => "admin/tax_zones", :action => 'create' } do |f| %>
+
+  <%= render :partial => "attributes", :locals => { :f => f, :button => "Create" } %>
+
+<% end %>

data/generators/opensteam/templates/app/views/admin/tax_zones/show.html.erb

@@ -0,0 +1,15 @@
+<h2>Tax Zone #<%= @tax_zone.id %></h2>
+
+<%= header_with_links("Show",
+  link_to("Edit", edit_admin_tax_zone_path( @tax_zone ) ),
+  link_to("Delete", admin_tax_zone_path( @tax_one), :method => :delete, :confirm => "Are your sure?" )) %>
+
+<p>
+  <b>Country:</b> <%= @tax_zone.country %>
+</p>
+<p>
+  <b>State</b> <%= @tax_zone.state %>
+</p>
+<p>
+  <b>Rate</b> <%= @tax_zone.rate %>
+</p>

data/generators/opensteam/templates/app/views/admin/users.html.erb

@@ -1,4 +1,3 @@
 <ul>
-  <li><%= link_to "Admins", admin_users_admins_path() %></li>
   <li><%= link_to "Customers", admin_users_customers_path() %></li>
 </ul>

data/generators/opensteam/templates/app/views/admin/users/show.html.erb

@@ -1,3 +1,13 @@
+<% content_for(:admin_sidebar) do %>
+  <%= link_to "Users", admin_users_path %>
+  <br />
+  <%= link_to "New User", new_admin_user_path %>
+
+
+
+<% end %>
+
+
 <h3><%=h @user.profile.name %> Info # <%=h @user.id %> </h3>
 <br />
 <b>Email:</b> <%= @user.email %><br /><br />

data/generators/opensteam/templates/app/views/administration_mailer/order_customer.erb

@@ -1,6 +1,6 @@
 Dear <%=h @order.customer.firstname %> <%=h @order.customer.lastname %> (<%= @order.customer.email %>),
 
-Thank you for you order @ the Opensteam-Petstore.
+Thank you for you order @ the Opensteam-Store.
 
 Your order:
 <% for order_item in @order.order_items  %>

data/generators/opensteam/templates/app/views/carts/_cart.html.erb

@@ -0,0 +1,7 @@
+<%% if ! @cart.items.empty?  %>
+  <div id="cart_content">
+    <%%= render :partial => "carts/cart_content" %>
+  </div>
+  <%%= button_to "checkout" , { :controller => '<%= file_name %>', :action => :start_checkout }, :confirm => "checkout?" %>
+  <%%= button_to "empty cart" , { :controller => 'carts', :action => :destroy }, :method => :delete, :confirm => "empty cart?" %>
+<%% end %>

data/generators/opensteam/templates/app/views/carts/_cart_content.html.erb

@@ -0,0 +1,45 @@
+<% form_remote_tag :url => { :controller => 'carts', :action => :update }, :html => { :method => :put } do %>
+  <table class="cart">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Qnty</th>
+        <th>Price</th>
+        <th>Tax (incl)</th>
+        <th>Price (netto)</th>
+        <th>Total</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @cart.items.each_with_index do |i,k| %>
+        <tr class="cart_item" id="cart_item_<%=h k %>">
+      
+          <td><%= i.product.class.to_s %><br /><%= link_to i.product.name, :controller => 'carts', :action => :show, :id => k %></td>
+          <td><%= text_field_tag "quantity[#{k}]", i.quantity.to_s, :id => "quantity", :size => 1 %> : <%=h i.quantity %></td>
+          <td><%= i.price %></td>
+          <td><%= calculate_tax_for i %> (<%= get_rate_for(i) %> %) <%= Opensteam::Config[:default_country] %>  </td>
+          <td><%= i.price - calculate_tax_for( i ) %>
+          <td><%= i.total_price %></td>
+          <td>   
+            <%= link_to_remote image_tag( "/images/plus.png", :border => "0" ), :url => { :controller => 'carts', :action => :update, :id => k, :incr => 1 } -%>
+            <%= link_to_remote image_tag( "/images/minus.png", :border => "0"), :url => { :controller => 'carts', :action => :update, :id => k, :decr => 1 } -%>
+            <%= link_to_remote image_tag( "/images/cancel.png", :border => "0"), :url => { :controller => 'carts', :action => :destroy, :id => k } -%>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <div id="cart_actions">
+    <%- if !@cart.items.empty? -%>
+      <%= submit_tag "Update" %>
+      <br /><br />
+      <b>Total Price:</b> <%= @cart.total_price %>
+    <% end %>
+  
+  </div>
+
+<% end %>
+
+
+

data/generators/opensteam/templates/app/views/carts/create.rjs

@@ -0,0 +1,3 @@
+page.replace_html :cart, :partial => "carts/cart"
+page.replace_html :header, :partial => "common/header"
+page.select("#cart_item_#{@cart.index(@cart.find_item(@inventory))}").each { |e| e.visual_effect :highlight, :duration => 1, :startcolor => '#cccccc' }

data/generators/opensteam/templates/app/views/carts/update.rjs

@@ -0,0 +1,11 @@
+page.replace_html :cart, :partial => "carts/cart"
+page.replace_html :header, :partial => "common/header"
+if params[:quantity]
+  Hash[params[:quantity]].keys.each { |k| 
+    page.select("#cart_item_#{k}").each { |e| e.visual_effect :highlight, :duration => 1, :startcolor => '#cccccc' }
+  }
+end
+
+if params[:id]
+  page.select("#cart_item_#{params[:id]}").each { |e| e.visual_effect :highlight, :duration => 1, :startcolor => '#cccccc' }
+end

data/generators/opensteam/templates/app/views/checkout/_address.html.erb

@@ -0,0 +1,42 @@
+
+<%- unless @addresses.empty? -%>
+  <b>Select saved <%= type %> address:</b>
+  <ul>
+    <% for address in @addresses %>
+      <li>
+        <%= fill_address_link "order_#{type}_address", address %>
+      </li>
+    <% end %>
+  </ul>
+<%- end -%>
+
+<b>Enter <%= type.to_s.humanize %> Address </b>
+<% f.fields_for "#{type}_address", @order.send( "#{type}_address" ) do |a|  %>
+  <% field_set_tag do %>
+    <p>
+      <%= a.label :firstname %>
+      <%= a.text_field :firstname %>
+    </p>
+    <p>
+      <%= a.label :lastname %>
+      <%= a.text_field :lastname %>
+    </p>
+    <p>
+      <%= a.label :country %>
+      <%= a.select :country, @countries %>
+    </p>
+    <p>
+      <%= a.label :postal %>
+      <%= a.text_field :postal %>
+    </p>
+    <p>
+      <%= a.label :city %>
+      <%= a.text_field :city %>
+    </p>
+    <p>
+      <%= a.label :street %>
+      <%= a.text_field :street %>
+    </p>
+  <% end %>
+<% end %>
+

data/generators/opensteam/templates/app/views/checkout/_customer.html.erb

@@ -0,0 +1,31 @@
+<h3>Customer</h3>
+
+<%- if @customer.new_record? || @customer.is_guest? -%>
+  <% fields_for "guest_customer", @customer do |c| %>
+    <% field_set_tag do %>
+      <p>
+        <%= c.label :email %>
+        <%= c.text_field :email %>
+      </p>
+    <% end %>
+  <% end %>
+<%- else -%>
+  <% field_set_tag do %>
+    <p>
+      <%= label_tag "id" %>
+      <%= @customer.id %>
+    </p>
+    <p>
+      <%= label_tag "email" %>
+      <%= @customer.email %>
+    </p>
+    <p>
+      <%= label_tag "firstname" %>
+      <%= @customer.firstname %>
+    </p>
+    <p>
+      <%= label_tag "lastname" %>
+      <%= @customer.lastname %>
+    </p>
+  <% end %>
+<%- end -%>

data/generators/opensteam/templates/app/views/checkout/_edit_checkout.html.erb

@@ -0,0 +1,42 @@
+<%= error_messages_for :order %>
+<%= error_messages_for :customer %>
+<%= error_messages_for :shipping_address %>
+<%= error_messages_for :payment_address %>
+<%= error_messages_for :payment %>
+
+
+<% form_for :order, @order, :url => { :action => :update }, :html => { :method => :put } do |f| %>
+
+  <div id="customer">
+    <%= render :partial => "customer", :object => @customer, :locals => { :f => f } %>
+  </div>
+
+  <div class="addresses">
+    <h3>Addresses</h3>
+    <div id="shipping">
+      <%= render :partial => "address", :locals => { :type => :shipping, :f => f } %>
+    </div>
+  
+    <div id=="payment">
+      <%= render :partial => "address", :locals => { :type => :payment, :f => f } %>
+    </div>
+  </div>
+
+  <h3>Payment Method</h3>
+  <%= payment_types_radio_buttons f %>
+  <div id="payment_type">
+    <%- if @order.payment_type -%>
+      <%= render :partial => "payment/#{@order.payment_type}_payment", :object => Opensteam::Payment::Base[ @order.payment_type ].new %>
+    <%- end -%>
+  </div>
+
+  <h3>Shipping Metthod</h3>
+  <div id="shipping_types_buttons">
+    <%= render :partial => "shipping_buttons", :object => @order,
+      :locals => { :payment_type => nil, :country => Opensteam::Config[:default_country] } %>
+  </div>
+
+
+  <%= submit_tag "Continue"  %>
+
+<% end %>

data/generators/opensteam/templates/app/views/checkout/_new_checkout.html.erb

@@ -0,0 +1,44 @@
+<%= error_messages_for :order %>
+<%= error_messages_for :customer %>
+
+
+<% form_for :order, @order, :url => { :action => :create }, :html => { :id => "order", :method => :post } do |f| %>
+
+  <div id="customer">
+    <%= render :partial => "customer", :object => @customer, :locals => { :f => f } %>
+  </div>
+
+  <div class="addresses">
+    <h3>Addresses</h3>
+    <div id="shipping">
+      <%= error_messages_for :shipping_address, :object => @order.shipping_address %>
+      <%= render :partial => "address", :locals => { :type => :shipping, :f => f } %>
+    </div>
+    <div id="payment">
+      <%= error_messages_for :payment_address, :object => @order.payment_address %>
+      <%= render :partial => "address", :locals => { :type => :payment, :f => f } %>
+    </div>
+  
+    <h3>Payment Method</h3>
+    <%= payment_types_radio_buttons f %>
+    <div id="payment_type">
+      <%- if @order.payment_type -%>
+        <%= render :partial => "payment/#{@order.payment_type}_payment", :object => @payment %>
+      <%- end -%>
+    </div>
+  
+    <h3>Shipping Metthod</h3>
+  
+    <div id="shipping_types_buttons">
+      <%= render :partial => "shipping_buttons", :object => @order,
+        :locals => { :f => f, :payment_type => nil, :country => Opensteam::Config[:default_country] } %>
+    </div>
+  
+    <div id="shipping_types">
+    </div>
+  
+  </div>
+
+  <%= submit_tag "Continue"  %>
+
+<% end %>

data/generators/opensteam/templates/app/views/checkout/_shipping_buttons.html.erb

@@ -0,0 +1,8 @@
+<% for st in Opensteam::ShipmentBase::RegionShippingRate.all.collect(&:shipping_method ).uniq   %>
+  <%= f.radio_button :shipping_type, st %>
+  <%= label "order_shipping_type_#{st}", st %>
+  <span id="shipping_type_rate_<%= st.underscore %>">
+    <%= shipping_buttons.calculate_shipping_rate( :shipping_method => st, :country => country, :payment_type => payment_type ) %>
+  </span>
+  <br />
+<% end %>

data/generators/opensteam/templates/app/views/checkout/edit.html.erb

@@ -0,0 +1,7 @@
+<h1>Checkout - New Order</h1>
+
+<div id="checkout_order">
+  
+  <%= render :partial => "edit_checkout" %>
+  
+</div>

data/generators/opensteam/templates/app/views/checkout/new.html.erb

@@ -0,0 +1,11 @@
+<h1>Checkout - New Order</h1>
+
+<div id="checkout_order">
+  
+  <%= render :partial => "new_checkout" %>
+    
+</div>
+
+<%= observe_form :order,
+  :url => { :action => :shipping_types }
+%>

data/generators/opensteam/templates/app/views/checkout/outro.html.erb

@@ -1,5 +1,2 @@
 <h1>Thanks for your order </h1>
-
-<%= link_to "shop", :action => :endstep %>
-
-<br />
+<%= link_to "shop", shop_index_path %>

data/generators/opensteam/templates/app/views/checkout/show.html.erb

@@ -0,0 +1,63 @@
+<% form_for :payment, @payment, :url => { :action => :place_order }, :html => { :method => :post } do |f| %>
+
+  <h1>Order - #<%= @order.id %></h1>
+  <%= @order.state %>
+  <div>
+    <b>Created At:</b> <%= @order.created_at %>
+    <br />
+    <b>Updated At:</b> <%= @order.updated_at %>
+    <br />
+  
+    <h2>Customer</h2>
+    <div class="order_show" id="customer">
+      <%= @order.customer.email %><br />
+      <%= @order.customer.full_name %>
+    </div>
+    
+    <br />
+    
+    <h2>Shipping Information</h2>
+    <div class="order_show">
+      <b>Shipping Type:</b> <%= @order.shipping_type %><br />
+      <b>Shipping Rate:</b> <%= @order.shipping_rate %><br />
+    
+      <h3>Shipping Address</h3>
+      <%= @order.shipping_address.to_a.join("<br />") %>
+    </div>
+    
+    <br />
+    
+    <h2>Payment Information</h2>
+    <div class="order_show">
+      <b>Payment Type:</b> <%= Opensteam::Payment::Base[ @order.payment_type ].display_name %><br />
+      <%= render :partial => "payment/#{@order.payment_type}_payment_confirmation", :object => @payment, :locals => { :f => f } %>
+      <br />
+      <h3>Billing Address</h3>
+      <%= @order.payment_address.to_a.join("<br />") %>
+    </div>
+  
+    <h2>Order Items</h2>
+    <div class="order_show" id="items">
+      <%= render :partial => "admin/order_items/items_table", :object => @order %>
+    </div>
+  
+    <h2> Total Price</h2>
+    <div class="order_show" id="price_info">
+      <% total_tax = @order.items.collect(&:tax).sum
+      total_price = @order.items.collect(&:total_price).sum %>
+      <table>
+        <tr><td style="font-weight:bold;">Items Netto Price</td><td><%= total_price - total_tax %></td></tr>
+        <tr><td style="font-weight:bold;">Items Tax</td><td><%= total_tax %></td></tr>
+        <tr><td style="font-weight:bold;">Shipping Rate</td><td><%= @order.shipping_rate %></td></tr>
+        
+        <tr />
+        <tr style="font-weight:bold;"><td>Total Price</td><td><%= @order.total_price %></td></tr>
+      </table>
+    </div>
+  
+  </div>
+
+  <%= submit_tag "Place Order", :disable_with => "Sending Order..." %>
+
+<% end %>
+<%= button_to "Edit Order Information", :action => :edit  %>

data/generators/opensteam/templates/app/views/common/_header_admin.html.erb

@@ -0,0 +1,5 @@
+<div id="logo_top">
+  <%= link_to( image_tag( "opensteam_black.jpg", :border => "0", :align => "top"), top_link || shop_index_path ) -%> &nbsp; 
+  <div class="top_header_link"><%= link_to "View Site", shop_index_path %></div>
+  <br />
+</div>

data/generators/opensteam/templates/app/views/layouts/admin.html.erb

@@ -8,33 +8,36 @@
     
     <%= javascript_include_tag :defaults %>
     <%= javascript_include_tag "opensteam" %>
-    <%= stylesheet_link_tag 'opensteam_white' %>
-              
+    <%= stylesheet_link_tag 'opensteam_admin' %>
+                                                      
   </head>
   <body>
     <div id="top"></div>
     <div id="page">
       
       <div id="header">
-        <%= render :partial => 'common/header', :locals => { :top_link => admin_path } %>
+        <%= render :partial => 'common/header_admin', :locals => { :top_link => admin_path } %>
       </div>
       
-      <div id="menu">
-        <%= render :partial => "common/header_flash" %>
-        <%= render :partial => 'admin/nav' %>
-      </div>
       
       <div id="content_box">
         
-        <div id="sidebar">
-          <%= yield(:admin_sidebar) || "" %>
+        
+        <div class="sub_content" id="sidebar">
+          <%= render :partial => "admin/menu" %>
         </div>
         
-        <div id="content">
-          <%= yield %>
+        <div class="sub_content" id="content">
+          <div id="sub_menu">
+            <%= yield(:admin_sidebar) || "" %>
+          </div>
+          
+          <div id="page_sub_content">
+            <%= yield %>
+          </div>
         </div>
         
-        <div id="sidebar2">
+        <div class="sub_content" id="sidebar2">
           <%= yield(:admin_sidebar2) || "" %>
         </div>
       </div>
@@ -44,6 +47,19 @@
       </div>
       
     </div>
+    
+    <%- if flash[:error] -%>
+      <div class="flash_error">
+        <div id="flash_error_box" style="text-align:center;color:black;background:red;padding:10px;position:absolute;top:30%;left:30%;border:1px solid black;">
+          <%= flash[:error] %><br />
+          <%= link_to_function "Close", "$(this).up('.flash_error').remove()" %>
+        </div>
+        <%= draggable_element :flash_error_box %>
+      </div>
+    <%- end -%>
+                
+                
+                
   </body>
   
 </html>