spree_wholesale 0.40.0.beta4.1 → 0.40.0.beta4.2

data/app/views/admin/wholesalers/_user_options.html.erb

@@ -0,0 +1,6 @@
+<% wholesaler ||= @wholesaler %>
+<% if wholesaler.active? %>
+  <%= link_to "deny", reject_admin_wholesaler_path(wholesaler) %>
+<% else %>
+  <%= link_to "approve", approve_admin_wholesaler_path(wholesaler) %>
+<% end %>

data/app/views/admin/wholesalers/edit.html.erb

@@ -0,0 +1,13 @@
+<%= hook :admin_wholesaler_edit_form_header do %>
+  <h1><%= t("editing_wholesaler") %></h1>
+<% end %>
+
+<%= hook :admin_wholesaler_edit_form do %>
+  <%= form_for(:wholesaler, :url => object_url, :html => { :method => :put }) do |f| %>
+    <%= render :partial => "form", :locals => { :f => f } %>
+
+    <%= hook :admin_wholesaler_edit_form_buttons do %>
+      <%= render :partial => "admin/shared/edit_resource_links" %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/admin/wholesalers/index.html.erb

@@ -0,0 +1,88 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <li>
+      <p><%= button_link_to t("new_wholesaler"), new_object_url, :icon => 'add' %></p>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>
+
+
+<h1><%= t("listing_wholesalers") %></h1>
+
+
+<table class="index">
+  <thead>
+  <tr>
+    <%= hook :admin_wholesalers_index_headers do %>
+      <th><%= order @search, :by => :company, :as => t("wholesaler") %></th>
+      <th><%= order @search, :by => :buyer_contact, :as => t("buyer_contact") %></th>
+      <th><%= order @search, :by => :email, :as => t("email") %></th>
+      <th><%= order @search, :by => :phone, :as => t("phone") %></th>
+      <th><%= t('active') %></th>
+      <th>
+        <%= hook :admin_wholesalers_index_header_actions %>
+      </th>
+    <% end %>
+  </tr>
+  </thead>
+  <tbody>
+    <% @wholesalers.each do |wholesaler|%>
+      <tr id="<%= dom_id wholesaler %>">
+        <%- locals = {:wholesaler => wholesaler} %>
+        <%= hook :admin_wholesalers_index_rows, locals do %>
+          <td><%=link_to wholesaler.company, object_url(wholesaler) %></td>
+          <td><%= wholesaler.buyer_contact %></td>
+          <td><%= mail_to wholesaler.email %></td>
+          <td><%= wholesaler.phone %></td>
+          <td width="50px"><%= wholesaler.roles.include?(wholesale_role) ? 'yes' : 'no' %></td>
+        <% end %>
+        <td>
+          <%= hook :admin_wholesalers_index_row_actions, locals do %>
+            <%= link_to_edit wholesaler %> &nbsp;
+            <%= link_to_delete wholesaler %> &nbsp;
+            <%= render 'user_options', :wholesaler => wholesaler %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+
+
+<% content_for :sidebar do %>
+  <div class="box">
+    <h3><%= t(:search) %></h3>
+    <%= form_for @search do |f| %>
+      <%- locals = {:f => f} %>
+      <%= hook :admin_wholesalers_index_search, locals do %>
+        <p>
+          <%= t(".company") %><br />
+          <%= f.text_field :company_contains, :size=>18 %>
+        </p>
+        <p>
+          <%= t(".buyer_contact") %><br />
+          <%= f.text_field :buyer_contact_contains, :size=>18 %>
+        </p>
+        <p>
+          <%= t(".manager_contact") %><br />
+          <%= f.text_field :manager_contact_contains, :size=>18 %>
+        </p>
+        <p>
+          <%= t("phone") %><br />
+          <%= f.text_field :phone_contains, :size=>18 %>
+        </p>
+        <p>
+          <%= t(".notes") %><br />
+          <%= f.text_field :notes_contains, :size=>18 %>
+        </p>
+        
+      <% end %>
+      <%= hook :admin_wholesalers_index_search_buttons, locals do %>
+        <p><%= button t("search") %></p>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/admin/wholesalers/new.html.erb

@@ -0,0 +1,13 @@
+<%= hook :admin_wholesaler_new_form_header do %>
+  <h1><%= t("new_wholesaler") %></h1>
+<% end %>
+
+<%= hook :admin_wholesaler_new_form do %>
+  <%= form_for(:wholesaler, :url => collection_url) do |f| %>
+    <%= render :partial => "form", :locals => { :f => f } %>
+
+    <%= hook :admin_wholesaler_new_form_buttons do %>
+      <%= render :partial => "admin/shared/new_resource_links" %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/admin/wholesalers/show.html.erb

@@ -0,0 +1,68 @@
+<h1><%= t("wholesaler_account") %></h1>
+
+<div class="leftie">
+
+  <h5>Company:</h5>
+  <h3><%= @wholesaler.company %></h3>
+  
+  <h5>Buyer_contact:</h5>
+  <h3><%= @wholesaler.buyer_contact %></h3>
+  
+  <h5>Manager_contact:</h5>
+  <h3><%= @wholesaler.manager_contact %></h3>
+  
+  <h5>Phone:</h5>
+  <h3><%= @wholesaler.phone %></h3>
+  
+  <h5>Fax:</h5>
+  <h3><%= @wholesaler.fax %></h3>
+  
+  <h5>Resale_number:</h5>
+  <h3><%= @wholesaler.resale_number %></h3>
+  
+  <h5>Taxid:</h5>
+  <h3><%= @wholesaler.taxid %></h3>
+  
+  <h5>Web_address:</h5>
+  <h3><%= @wholesaler.web_address %></h3>
+  
+  <h5>Terms:</h5>
+  <h3><%= @wholesaler.terms %></h3>
+  
+  <h5>Notes:</h5>
+  <h3><%= simple_format @wholesaler.notes %></h3>
+
+</div>
+
+<div class="rightie">
+
+  <div class="adr">
+    <h4><%= t("bill_address") %></h4>
+    <%= render 'admin/shared/address', :address => @wholesaler.bill_address %>
+  </div>
+  <div class="adr">
+    <h4><%= t("ship_address") %></h4>
+    <%= render 'admin/shared/address', :address => @wholesaler.ship_address %>
+  </div>
+  
+  <div class="adr">
+    <h4><%= t("user_details") %></h4>
+    <p>
+      ID: <%= @wholesaler.user.id %>
+      <br/>
+      Email: <%= @wholesaler.user.email %>
+      <br/>
+      <%= link_to "view user", admin_user_path(@wholesaler.user) %> / 
+      <%= link_to "edit user", edit_admin_user_path(@wholesaler.user) %> /
+      <%= render "user_options", :user => @wholesaler.user %>
+    </p>
+  </div>
+    
+</div>
+
+<hr/>
+
+<p>
+  <%= link_to_edit @wholesaler %> <%= t('or') %>
+  <%= link_to t('back'), collection_url %>
+</p>

data/app/views/hooks/_wholesale_static_content.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('wholesalers') %></h1>
+
+<p>Aenean facilisis nulla vitae urna tincidunt congue sed ut dui. Morbi malesuada nulla nec purus convallis consequat. Vivamus id mollis quam. Morbi ac commodo nulla. In condimentum orci id nisl volutpat bibendum. Quisque commodo hendrerit lorem quis egestas. Maecenas quis tortor arcu. Vivamus rutrum nunc non neque consectetur quis placerat neque lobortis. Nam vestibulum, arcu sodales feugiat consectetur, nisl orci bibendum elit, eu euismod magna sapien ut nibh. Donec semper quam scelerisque tortor dictum gravida. In hac habitasse platea dictumst. Nam pulvinar, odio sed rhoncus suscipit, sem diam ultrices mauris, eu consequat purus metus eu velit. Proin metus odio, aliquam eget molestie nec, gravida ut sapien. Phasellus quis est sed turpis sollicitudin venenatis sed eu odio. Praesent eget neque eu eros interdum malesuada non vel leo. Sed fringilla porta ligula egestas tincidunt. Nullam risus magna, ornare vitae varius eget, scelerisque a libero. Morbi eu porttitor ipsum. Nullam lorem nisi, posuere quis volutpat eget, luctus nec massa. Pellentesque aliquam lacinia tellus sit amet bibendum. Ut posuere justo in enim pretium scelerisque. Etiam ornare vehicula euismod. Vestibulum at risus augue. Sed non semper dolor. Sed fringilla consequat.</p>

data/app/views/shared/_address_form.html.erb

@@ -0,0 +1,77 @@
+<% address ||= @address %>
+<% billing ||= false %>
+
+<p>
+  <%= form.label :firstname, t(billing ? 'billing_firstname' : 'shipping_firstname') %><br/>
+  <%= form.text_field :firstname, :class => 'required' %><span class="req">*</span>
+</p>
+<p>
+  <%= form.label :lastname, t(billing ? 'billing_lastname' : 'shipping_lastname') %><br/>
+  <%= form.text_field :lastname %>
+</p>
+<p>
+  <%= form.label :address1, t(:street_address) %><br/>
+  <%= form.text_field :address1, :class => 'required' %><span class="req">*</span>
+</p>
+<p>
+  <%= form.label :address2, t(:street_address_2) %><br/>
+  <%= form.text_field :address2 %>
+</p>
+<p>
+  <%= form.label :city, t(:city) %><br/>
+  <%= form.text_field :city, :class => 'required' %><span class="req">*</span>
+</p>
+<% if Spree::Config[:address_requires_state] %>
+  <p>
+    <span id="bstate">
+      <% have_states = !address.country.states.empty? %>
+      <%= form.label :state, t(:state) %><br/>
+      <noscript>
+        <%= form.text_field :state_name, :class => 'required' %>
+      </noscript>
+      <% state_elements = [
+         form.collection_select(:state_id, address.country.states,
+                            :id, :name,
+                            {:include_blank => true},
+                            {:class => have_states ? "required" : "hidden",
+                            :disabled => !have_states}) +
+          form.text_field(:state_name,
+                            :class => !have_states ? "required" : "hidden",
+                            :disabled => have_states)
+          ].join.gsub('"', "'").gsub("\n", "")
+      %>
+      <script type="text/javascript" language="javascript" charset="utf-8">
+      // <![CDATA[
+      document.write("<%= raw state_elements %>");
+      // ]]>
+      </script>
+    </span>
+    <span class="req">*</span>
+  </p>
+<% end %>
+<p>
+  <%= form.label :zipcode, t(:zip) %><br/>
+  <%= form.text_field :zipcode, :class => 'required' %><span class="req">*</span>
+</p>
+<p>
+  <%= form.label :country_id, t(:country) %><br/>
+  <span id="bcountry"><%= form.collection_select :country_id, Country.all, :id, :name, {}, {:class => 'required'} %></span>
+  <span class="req">*</span>
+</p>
+<p>
+  <%= form.label :phone, t(:phone) %><br/>
+  <%= form.text_field :phone, :class => 'required' %><span class="req">*</span>
+</p>
+<% if Spree::Config[:alternative_billing_phone] %>
+  <p>
+    <%= form.label :alternative_phone, t(:alternative_phone) %><br/>
+    <%= form.text_field :alternative_phone %>
+  </p>
+<% end %>
+<% if billing %>
+  <p class="field checkbox">
+    <label for="wholesaler_use_billing">
+      <%= check_box_tag 'wholesaler[use_billing]', '1', (!(@wholesaler.bill_address.nil? && @wholesaler.ship_address.nil?) && @wholesaler.bill_address.eql?(@wholesaler.ship_address)) %> <%= t(".use_for_shipping") %>
+    </label>
+  </p>  
+<% end %>

data/app/views/shared/_store_menu.html.erb

@@ -0,0 +1,4 @@
+<li><%= link_to t("home") , root_path %></li>
+<li><%= link_to t("wholesalers") , wholesalers_path %></li>
+<li class="cart-indicator"><%= link_to_cart %></li>
+

data/app/views/wholesalers/_fields.html.erb

@@ -0,0 +1,91 @@
+<fieldset class="leftie">
+  
+  <fieldset>
+    <legend>User</legend>
+    <%= fields_for :user, @user do |uf| %>
+      <%= render "shared/error_messages", :target => @user %>
+      <%= render 'shared/user_form', :f => uf %>
+    <% end %>
+  </fieldset>
+
+  <fieldset>
+    <legend>Company Information</legend>
+    <%= render "shared/error_messages", :target => @wholesaler %>
+    <p>
+      <%= form.label :company %><br/>
+      <%= form.text_field :company, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :buyer_contact %><br/>
+      <%= form.text_field :buyer_contact, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :manager_contact %><br/>
+      <%= form.text_field :manager_contact, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :phone %><br/>
+      <%= form.text_field :phone, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :fax %><br/>
+      <%= form.text_field :fax, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :resale_number %><br/>
+      <%= form.text_field :resale_number, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :taxid %><br/>
+      <%= form.text_field :taxid, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :web_address %><br/>
+      <%= form.text_field :web_address, :class => 'required' %><span class="req">*</span>
+    </p>
+    <p>
+      <%= form.label :terms %><br/>
+      <%= form.select :terms, Wholesaler.term_options, :class => 'required' %><span class="req">*</span>
+    </p>
+  </fieldset>
+</fieldset>
+
+<fieldset class="rightie">
+
+  
+  
+  <br/>
+  
+  <fieldset>
+    <legend>Billing Address</legend>
+    <%= fields_for :bill_address, @bill_address do |af| %>
+      <%= render "shared/error_messages", :target => @bill_address %>
+      <%= render 'shared/address_form', :form => af, :address => @bill_address, :billing => true %>
+    <% end %>
+  </fieldset>
+  
+  <fieldset id="fields_ship_address">
+    <legend>Shipping Address</legend>
+    <%= fields_for :ship_address, @ship_address do |af| %>
+      <%= render "shared/error_messages", :target => @ship_address %>
+      <%= render 'shared/address_form', :form => af, :address => @ship_address %>
+    <% end %>
+  </fieldset>
+  
+  <p class="action">
+    <%= form.submit t("wholesale_apply"), :class => 'button' %>
+  </p>
+  
+</fieldset>
+
+<br class="clear"/>
+
+<script type="text/javascript">
+//<![CDATA[
+
+	$('#wholesaler_use_billing').change(function(evt) {
+    $('#fields_ship_address').css('display', $(this).is(':checked') ? 'none' : 'block');
+  }).attr('checked', true).change(); 
+   
+//]]>
+</script>

data/app/views/wholesalers/index.html.erb

@@ -0,0 +1,21 @@
+<div class="left">
+  <%= hook :wholesale_index_content do %>
+    <%= render 'hooks/wholesale_static_content' %>
+  <% end %>
+</div>
+<div class="right">
+  <div class="left">  
+    <%= hook :wholesale_index_signup do %>
+      <h3><%= t('wholesale_apply') %></h3>
+      <p>Maecenas quis tortor arcu. Vivamus rutrum nunc non neque consectetur quis placerat neque lobortis. Nam vestibulum, arcu sodales feugiat consectetur, nisl orci bibendum elit, eu euismod magna sapien ut nibh.</p>
+      <%= link_to 'Apply Now!', new_wholesaler_path, :class => 'button' %>
+    <% end %>  
+  </div>
+  <div class="right">  
+    <%= hook :wholesale_index_login do %>
+      <h3><%= t('wholesale_login') %></h3>
+      <%= render 'shared/login' %>
+    <% end %>
+  </div>
+</div>
+ 

data/app/views/wholesalers/new.html.erb

@@ -0,0 +1,8 @@
+<h1>Wholesale Signup</h1>
+
+<%= form_for @wholesaler do |form| %>
+  
+  <%= render 'fields', :form => form %>
+
+  
+<% end %>

data/config/locales/en.yml

@@ -1,8 +1,34 @@
 en:
+
+  billing_firstname: "Billing First Name"
+  billing_lastname: "Billing Last Name"
+  shipping_firstname: "Shipping First Name"
+  shipping_lastname: "Shipping Last Name"
+  
+  buyer_contact: "Buyer Contact"
+
   wholesale: "Wholesale"
+  wholesaler: "Wholesaler"
+  wholesalers: "Wholesalers"
+  new_wholesaler: "New Wholesaler"
+  editing_wholesaler: "Edit Wholesaler"
+  wholesaler_account: "Wholesaler Account"
+  listing_wholesalers: "Listing Wholesaler"
+  wholesale_login: "Wholesale Login"
+  wholesale_apply: "Apply for a wholesale account"
+  
+  
+  
+  
+  shared:
+    address_form:
+      use_for_shipping: "Use billing address for shipping"
+
   wholesale_customer: "Wholesale Customer ID: #%{id}"
+
   
   admin:
+  
     hooks:
       product_form_right:
         master_wholesale_price: "Master Wholesale Price"
@@ -12,4 +38,22 @@ en:
     variants:
       form:
         wholesale_price: "Wholesale Price"
-    
+    
+    
+    wholesalers:
+      index:
+        company: "Company"
+        buyer_contact: "Buyer contact"
+        manager_contact: "Manager contact"
+        notes: "Notes"
+      form:
+        company: "Company"
+        buyer_contact: "Buyer contact"
+        manager_contact: "Manager contact"
+        phone: "Phone"
+        fax: "Fax"
+        resale_number: "Resale number"
+        taxid: "Taxid"
+        web_address: "Web address"
+        terms: "Terms"
+        notes: "Notes"