spree_enhanced_option_types 0.30.0

data/app/views/admin/option_types/_option_value_fields.html.erb

@@ -0,0 +1,10 @@
+<tr class="option_value fields" id="<%= dom_id(f.object) %>">
+  <td><%= f.text_field :name %></td>
+  <td><%= f.text_field :presentation %></td>
+  <td>
+    <%= f.text_field :amount %>
+    <%= t(:'number.currency.format.unit') %>
+  </td>
+  <td><%= f.text_field :sku %></td>
+  <td class="actions"><%= link_to_remove_fields t("remove"), f %></td>
+</tr>

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

@@ -0,0 +1,34 @@
+<%= render :partial => 'admin/shared/product_sub_menu' %>
+<h1><%= t("editing_option_type") %></h1>
+<%= render 'shared/error_messages', :target => @option_type %>
+<%= form_for(@option_type, :url => object_url, :html => { :method => :put }) do |f| %>
+<fieldset>
+  <legend><%= t("editing_option_type") %></legend>
+
+  <%= render :partial => "form", :locals => { :f => f } %>
+
+  <h3><%= t("option_values") %></h3>
+  <table class="index">
+    <thead>
+      <tr>
+        <th><%= t("name") %></th>
+        <th><%= t("display") %></th>
+        <th><%= t("price_modifier") %></th>
+        <th><%= t("sku_modifier") %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="option_values">
+      <tr id="none">
+        <td colspan="4"><%= @option_type.option_values.empty? ? t("none") : "" %></td>
+      </tr>
+      <% f.fields_for :option_values do |option_value_form| %>
+        <%= render "option_value_fields", :f => option_value_form %>
+      <% end %>
+    </tbody>
+  </table>
+  <%= link_to_add_fields t("add_option_value"), "tbody#option_values", f, :option_values %>
+
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
+</fieldset>
+<% end %>

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

@@ -0,0 +1,58 @@
+<%= render :partial => 'admin/shared/product_sub_menu' %>
+
+<%= render "shared/error_messages", :target => @product %>
+
+<%= form_for(:product,  :url => collection_url, :html => { :multipart => true }) do |f| %>
+<fieldset>
+
+  <%= f.field_container :name do %>
+    <%= f.label :name, t("name") %> <span class="required">*</span><br />
+    <%= f.text_field :name, :class => 'fullwidth title'  %>
+    <%= f.error_message_on :name %>
+  <% end %>
+
+  <div class="yui-gb">
+    <div class="yui-u first">
+
+      <% unless @product.has_variants? %>
+      <%= f.field_container :sku do %>
+        <%= f.label :sku, t("sku") %><br />
+        <%= f.text_field :sku, :size => 16 %>
+        <%= f.error_message_on :sku %>
+      <% end %>
+      <% end %>
+
+      <p>
+        <%= f.label :prototype_id, t("prototype") %><br />
+        <%= f.collection_select :prototype_id, Prototype.all, :id, :name, :include_blank => true %>
+      </p>
+
+        <p>
+          <%= f.check_box :create_variants %>
+          <%= f.label :create_variants, t("create_variants") %><br />
+        </p>
+
+    </div>
+    <div class="yui-u">
+
+      <%= f.field_container :price do %>
+        <%= f.label :price, t("master_price")%> <span class="required">*</span><br />
+        <%= f.text_field :price  %>
+        <%= f.error_message_on :price%>
+      <% end %>
+
+      <p>
+        <%= f.label :available_on, t("available_on") %><br />
+        <%= f.error_message_on :available_on %>
+        <%= f.spree_date_picker :available_on, :style=>"width:150px" %>
+      </p>
+
+
+    </div>
+  </div>
+
+  <%= render :partial => 'admin/shared/new_resource_links' %>
+
+</fieldset>
+<% end %>
+<%= javascript_tag "datePickerController.create();" %>

data/app/views/admin/prototypes/_form.html.erb

@@ -0,0 +1,57 @@
+<%= f.field_container :name do %>
+  <%= f.label :name, t("name") %><br />
+  <%= f.text_field :name %>
+  <%= f.error_message_on :name %>
+<% end %>
+
+<h3><%= t("properties") %></h3>
+
+<ul class='checkbox-list' id='properties'>
+	<% Property.sorted.each do |property| %>
+  <% selected = if @prototype.new_record?
+    (params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
+  else
+    @prototype.properties.include?(property)
+  end %>
+		<li>
+	  	<label>
+	  	  <%= check_box_tag "property[id][]", "#{property.id}", selected %>
+        <%= property.name %>
+      </label>
+		</li>
+	<% end %>
+</ul>
+
+<hr />
+
+<h3><%= t("option_types") %></h3>
+
+<ul class='checkbox-list' id='option-types'>
+  <% OptionType.all.sort_by{|ot|
+    [
+      @prototype.option_types.include?(ot) ? 0 : 1,
+      @prototype.option_types.index(ot) || ot.name
+    ]
+  }.each do |option_type| %>
+    <% selected = if @prototype.new_record?
+      (params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
+    else
+      @prototype.option_types.include?(option_type)
+    end %>
+    <li>
+      <%= check_box_tag "option_type[id][]", "#{option_type.id}", selected %>
+      <label> <%= option_type.name %> </label>
+      <br />
+    </li>
+  <% end %>
+</ul>
+
+<hr />
+(hint: You can drag and drop option types to select their order)
+<script type="text/javascript"> jQuery("#option-types").sortable() </script>
+<style>
+  #option-types.checkbox-list li {
+    display: block;
+    float: none;
+  }
+</style>

data/app/views/admin/prototypes/_sortable_header.rhtml

@@ -0,0 +1,3 @@
+<% content_for(:head,
+  javascript_include_tag('ui.core', 'ui.draggable', 'ui.sortable')
+) %>

data/app/views/admin/variants/_form.html.erb

@@ -0,0 +1,45 @@
+<div class="yui-gb">
+  <div class="yui-u first">
+
+    <% @product.options.each do |option| %>
+      <p>
+        <%= label :new_variant, option.option_type.presentation %><br />
+        <% if @variant.new_record? %>
+          <%= select(:new_variant, option.option_type.presentation,
+            option.option_type.option_values.collect {|ov| [ ov.presentation, ov.id ] },
+            {})
+          %>
+        <% else %>
+          <% opt = @variant.option_values.detect {|o| o.option_type == option.option_type }.presentation %>
+          <%= text_field(:new_variant,  option.option_type.presentation, :value => opt, :disabled => 'disabled') %>
+        <% end %>
+      </p>
+    <% end %>
+
+    <p><%= f.label :sku, t("sku") %><br />
+    <%= f.text_field :sku %></p>
+
+    <p>
+      <%= f.label :price, t("price") %>:<br />
+      <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %>
+      <br/>
+      (* if left empty - price will be calculated automatically from option values and master price)
+    </p>
+
+
+    <p><%= f.label :cost_price, t("cost_price") %>:<br />
+    <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
+
+    <% if Spree::Config[:track_inventory_levels] %>
+      <p><%= f.label :on_hand, t("on_hand") %>: <br />
+      <%= f.text_field :on_hand %></p>
+    <% end %>
+  </div>
+  <div class="yui-u">
+
+    <% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
+      <%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
+    <% end %>
+
+  </div>
+</div>

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

@@ -0,0 +1,62 @@
+<div class='toolbar'>
+  <ul class='actions'>
+    <li id="regenerate_variants_link">
+      <%= button_link_to t(:regenerate), {:action => :regenerate, :product_id => params[:product_id]},
+                          {:method => :post, :icon => 'exclamation', :style   => "float: right", :confirm => t(:regenerate_confirm)} %>
+    </li>
+  </ul>
+  <br class='clear' />
+</div>
+
+
+<%= render :partial => 'admin/shared/product_sub_menu' %>
+
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"} %>
+
+<table class="index">
+  <tr>
+    <th><%= t("options") %></th>
+    <th><%= t("price") %></th>
+    <th><%= t("sku") %></th>
+    <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
+      <th><%= t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize) %></th>
+    <% end %>
+    <th><%= t("on_hand") %></th>
+    <th><%= t("action") %></th>
+  </tr>
+  <% @variants.each do |variant| %>
+    <!-- you can skip variant with no options: that's just the default variant that all products have -->
+    <% next if variant.option_values.empty? %>
+    <tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' if variant.deleted? %>>
+      <td><%= variant_options variant %></td>
+      <td><%= variant.price %></td>
+      <td><%= variant.sku %></td>
+      <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
+        <td><%= variant[field[:name].gsub(" ", "_").downcase] %></td>
+      <% end %>
+      <td><%= variant.on_hand %></td>
+      <td valign="top">
+        <%= link_to_edit(variant) unless variant.deleted? %>
+        &nbsp;
+        <%= link_to_delete(variant) unless variant.deleted? %>
+      </td>
+    </tr>
+  <% end %>
+  <% unless @product.has_variants? %>
+    <tr><td colspan="5"><%= t("none") %>.</td></tr>
+  <% end %>
+</table>
+
+<% if @product.options.empty? %>
+  <p>
+    <%= t("to_add_variants_you_must_first_define") %>  <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
+  </p>
+<% else %>
+  <div id="new_variant"></div>
+  <br/>
+  <p id="new_var_link">
+    <%= link_to icon('add') + ' ' + t("new_variant"), new_admin_product_variant_url(@product), :remote => :true, 'data-update' => 'new_variant', :class => 'iconlink' %>
+    &nbsp;|&nbsp;<%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"), admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
+  </p>
+  <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
+<% end %>

data/app/views/products/_cart_form.html.erb

@@ -0,0 +1,37 @@
+<%= form_for :order, :url => populate_orders_url do |f| %>
+
+<%= hook :inside_product_cart_form do %>
+
+  <% if product_price(@product) %>
+    <%= hook :product_price do %>
+      <p class="prices">
+        <%= t("price") %>
+        <br />
+        <span class="price selling update"><%= product_price(@product) %></span>
+      </p>
+    <% end %>
+  <% end %>
+
+  <% if @product.has_variants? %>
+    <div id="product-variants">
+        <%= render :partial => 'radio_sets', :locals => {:f => f} %>
+    </div>
+  <% end%>
+  <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
+    <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
+      1, :class => "title", :size => 3 %>
+    &nbsp;
+    <button type='submit' class='large primary'>
+      <%= image_tag('/images/add-to-cart.png') + t('add_to_cart') %>
+    </button>
+  <% else %>
+    <%= content_tag('strong', t('out_of_stock')) %>
+  <% end %>
+
+<% end %>
+<% end %>
+
+<% content_for :head do %>
+  <%= javascript_include_tag 'product' %>
+<% end %>
+

data/app/views/products/_eot_includes.html.erb

@@ -0,0 +1,25 @@
+<%
+js_ov_to_variant_map    = {}
+variant_attributes_hash = {}
+
+ov_to_variant_map(@product).each_pair do |k,v|
+  js_ov_to_variant_map[k.join(',')] = v.id
+  variant_attributes_hash[v.id]     = v.attributes.merge(:on_hand => v.on_hand, :description => variant_options(v))
+end
+
+%>
+<script type="text/javascript">
+  // set of all possible combination of option values
+  var ov_combinations = <%= ov_combinations.to_json.html_safe %>;
+  // maps variant attributes to variant id
+  var ov_to_variant = <%= js_ov_to_variant_map.to_json.html_safe %>;
+  // mapping from variant id to variant attributes
+  var variant_attributes = <%= variant_attributes_hash.to_json.html_safe %>;
+</script>
+<%#
+  WARNING! This scripts are inlined here on purpose! for ease of embeding and customization.
+  If you plan to extract them and put them into header, don't.
+  And if you really really really want to please make sure they are wrapped into
+  document ready event (it's not needed here as we put script AFTER everything we need is in DOM and loaded)
+%>
+<%= javascript_include_tag('enhanced-option-types.js') %>

data/app/views/products/_radio_2d.html.erb

@@ -0,0 +1,82 @@
+<% ov_combinations = options_values_combinations(@product) %>
+<% ov_to_vhash = ov_to_variant_map(@product) %>
+
+<% x_option_type, y_option_type = *@product.option_types.uniq[0..1] %>
+<% width = x_option_type.option_values.length %>
+<% height = y_option_type.option_values.length %>
+<% default = @product.default_variant %>
+
+<table class="t2d">
+  <thead>
+    <tr>
+      <th>&nbsp;</th>
+      <th>&nbsp;</th>
+      <th colspan="<%= width %>" class="x-axis"><%= x_option_type.presentation %></th>
+    </tr>    
+  </thead>
+
+  <tbody>
+    <tr>
+      <td rowspan="<%= height+1 %>" class="y-axis">
+        <%== y_option_type.presentation.split(//u).join("<br />") %>
+      </td>
+      <td class="option top left">&nbsp;</td>
+      <% x_option_type.option_values.each do |ov| %>
+        <td class="option top"><%== ov.presentation.split(//u)[0..4].join("<br />") %></td>
+      <% end %>
+    </tr>
+
+    <% y_option_type.option_values.each_with_index do |yov, i| %>
+      <tr>
+        <td class="option left"><%= yov.presentation %></td>
+        <% x_option_type.option_values.each do |xov| %>
+          <td>
+            <%=
+            v = ov_to_vhash[[xov.id, yov.id]]
+            radio_button_tag(
+              "products[#{@product.id}]",
+              v ? v.id : "",
+              v && (v == default),
+              :disabled => !(v && (v.in_stock || Spree::Config[:allow_backorders]))
+            ) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= render :partial => 'eot_includes', :locals => {:ov_combinations => ov_combinations} %>
+
+<style type="text/css">
+  table.t2d {
+
+  }
+
+  table.t2d td{
+    width: 30px;
+    height: 30px;
+    vertical-align: middle;
+    text-align: center;
+    margin: 0px;
+    padding: 0px;
+  }
+
+  table.t2d th{
+    text-align: center;
+  }
+
+  table.t2d td.option.left{
+    text-align: right;
+    border-bottom: 1px solid #444;
+  }
+
+  table.t2d td.option.top{
+    border-right: 1px solid #444;
+  }
+
+  table.t2d td.y-axis {
+    font-weight: bold;
+    border: none;
+  }
+</style>

data/app/views/products/_radio_sets.html.erb

@@ -0,0 +1,31 @@
+<% ov_combinations = options_values_combinations(@product) %>
+
+<% default_values = @product.default_variant.option_values.group_by{|ov| ov.option_type_id} if @product.default_variant %>
+<% selected_values = [] %>
+<% @product.option_types.uniq.each do |option_type|
+  default_value = default_values[option_type.id].first;
+%>
+  <fieldset>
+    <legend> <%= option_type.presentation %> </legend>
+    <ul><% option_type.option_values.each_with_index do |option_value, i| %>
+        <li>
+          <%= radio_button_tag(
+            "option_values[#{@product.id}][#{option_type.id}]",
+            option_value.id,
+            option_value == default_value,
+            :disabled => !possible_combination?(ov_combinations, selected_values+[option_value.id]),
+            :id => "ov_"+option_value.id.to_s, :class=> "option-value"
+          ) %>
+          <%= option_value.presentation %>
+          <% unless option_value.amount.blank? %>
+            <span class="modifier" style="white-space:nowrap;">
+              (<%= "#{option_value.amount.sign_symbol} #{number_with_precision(option_value.amount.abs, :precision => 2)}" %>)
+            </span>
+          <% end %>
+        </li>
+    <% end %></ul>
+  </fieldset>
+  <% selected_values << default_value.id;
+end %>
+
+<%= render :partial => 'eot_includes', :locals => {:ov_combinations => ov_combinations} %>