spree_zoned 0.5.17 → 0.5.18

data/app/controllers/spree/admin/products_controller_decorator.rb

@@ -1,5 +1,9 @@
+require 'delocalize'
+
 Spree::Admin::ProductsController.class_eval do
   
+  before_filter :deloc_master_price
+
   def deletefc
     inorout(@product.method :delfrom)
   end
@@ -85,4 +89,11 @@ protected
     end
   end
 
+  def deloc_master_price
+    if params[:product] && params[:product][:price]
+      params[:product][:price] = Delocalize::LocalizedNumericParser.parse(
+        params[:product][:price])
+    end
+  end
+
 end

data/app/overrides/replace_admin_product_right.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  :name             => "replace_admin_product_right",
+  :virtual_path     => "spree/admin/products/_form",
+  :replace_contents => "[data-hook='admin_product_form_right']",
+  :partial          => "spree/admin/zoned/productright",
+)

data/app/views/spree/admin/zoned/_productright.html.erb

@@ -0,0 +1,73 @@
+  <%= f.field_container :price do %>
+    <%= f.label :price, t(:master_price) %> <span class="required">*</span>
+    <br />(<%= t('country') + ": " -%>
+    <% country = session[:zoned] && session[:zoned][:prd_country].to_i %>
+    <% c = Rails.application.config.commonCountriesForSelect.select {|e| e[1]==country} %>
+    <%= c.length == 1 ? c[0][0] : t(:nocountrysel) -%>
+    )<br />
+    <%= f.text_field :price, :value => number_with_precision(
+       @product.price, precision: 2)%>
+    <%= f.error_message_on :price %>
+  <% end %>
+
+  <%= f.field_container :cost_price do %>
+    <%= f.label :cost_price, t(:cost_price) %><br />
+    <%= f.text_field :cost_price, :value => number_with_precision(
+      @product.cost_price, precision: 2) %>
+    <%= f.error_message_on :cost_price %>
+  <% end %>
+
+  <%= f.field_container :available_on do %>
+    <%= f.label :available_on, t(:available_on) %><br />
+    <%= f.error_message_on :available_on %>
+    <%= f.text_field :available_on, :class => 'datepicker' %>
+  <% end %>
+
+  <% unless @product.has_variants? %>
+    <%= f.field_container :sku do %>
+      <%= f.label :sku, t(:sku) %><br />
+      <%= f.text_field :sku, :size => 16 %>
+    <% end %>
+
+    <% if Spree::Config[:track_inventory_levels] %>
+      <%= f.field_container :on_hand do %>
+        <%= f.label :on_hand, t(:on_hand) %><br />
+        <%= f.number_field :on_hand, :min => 0 %>
+      <% end %>
+    <% end %>
+
+    <ul id="shipping_specs">
+      <li id="shipping_specs_weight_field">
+        <%= f.label :weight, t(:weight) %>
+        <%= f.text_field :weight, :size => 4, :value => number_with_precision(
+          @product.weight, precision: 1) %>
+      </li>
+      <li id="shipping_specs_height_field">
+        <%= f.label :height, t(:height) %>
+        <%= f.text_field :height, :size => 4, :value => number_with_precision(
+          @product.height, precision: 1) %>
+      </li>
+      <li id="shipping_specs_width_field">
+        <%= f.label :width, t(:width) %>
+        <%= f.text_field :width, :size => 4, :value => number_with_precision(
+          @product.width, precision: 1) %>
+      </li>
+      <li id="shipping_specs_depth_field">
+        <%= f.label :depth, t(:depth) %>
+        <%= f.text_field :depth, :size => 4, :value => number_with_precision(
+          @product.depth, precision: 1) %>
+      </li>
+    </ul>
+<% end %>
+
+<%= f.field_container :shipping_categories do %>
+  <%= f.label :shipping_category_id, t(:shipping_categories) %><br />
+  <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
+  <%= f.error_message_on :shipping_category %>
+<% end %>
+
+<%= f.field_container :tax_category do %>
+  <%= f.label :tax_category_id, t(:tax_category) %><br />
+  <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
+  <%= f.error_message_on :tax_category %>
+<% end %>

data/spree_zoned.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zoned'
-  s.version     = '0.5.17'
+  s.version     = '0.5.18'
   s.summary     = 'A Spree extension to make your store zoned'
   s.description = "Everything you need for a zoned Spree store: zoned pricing, zoned products, zoned product ordering, zoned locales, ...\nProbalbly essential to you if you operate outside of the US."
   s.required_ruby_version = '>= 1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zoned
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -142,8 +142,10 @@ files:
 - app/overrides/add_delfc.rb
 - app/overrides/add_prd_country.rb
 - app/overrides/add_prd_handles.rb
+- app/overrides/replace_admin_product_right.rb
 - app/views/spree/admin/zoned/_delfc.html.erb
 - app/views/spree/admin/zoned/_prd_country.html.erb
+- app/views/spree/admin/zoned/_productright.html.erb
 - app/views/spree/admin/zoned/setcountry.js.erb
 - app/views/spree/zoned/_countryselect.html.erb
 - app/views/spree/zoned/setcountry.js.erb