spree_zoned 0.5.18 → 0.5.19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_zoned (0.5.0)
+    spree_zoned (0.5.18)
       spree_core (~> 1.1.1)
 
 GEM

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

@@ -2,7 +2,7 @@ require 'delocalize'
 
 Spree::Admin::ProductsController.class_eval do
   
-  before_filter :deloc_master_price
+  before_filter :delocSetPrice, :only => :update
 
   def deletefc
     inorout(@product.method :delfrom)
@@ -82,18 +82,23 @@ protected
 
   def inorout(m)
     country = session[:zoned] && session[:zoned][:prd_country]
-    m.call(country.to_i) if country
+    m.call(country.to_i) if country && country.to_i != 0
     respond_to do |format|
       format.html { redirect_to collection_url }
       format.js { render nothing: true }
     end
   end
 
-  def deloc_master_price
+  def delocSetPrice
     if params[:product] && params[:product][:price]
       params[:product][:price] = Delocalize::LocalizedNumericParser.parse(
         params[:product][:price])
     end
+    country = session[:zoned] && session[:zoned][:prd_country]
+    if country && country != 0 && params[:product] && params[:product][:price]
+      @product.setprice(country.to_i, BigDecimal.new(params[:product][:price]))
+    end
+    params[:product][:price] = @product.price
   end
 
 end

data/app/helpers/spree/admin/products_helper_decorator.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    ProductsHelper.module_eval do
+
+      def getCPrice(p)
+      	c = session[:zoned] && session[:zoned][:prd_country]
+      	c = c ? c.to_i : 0
+      	return p.price if c == 0
+      	zpl = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", p.id, c
+      	zpl == [] ? p.price : zpl[0].cprice
+      end
+
+    end
+  end
+end

data/app/models/spree/product_decorator.rb

@@ -14,9 +14,23 @@ module Spree
       setorderno country, 0
     end
 
+    def setprice(country, price)
+      clist = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", id, country
+      if !clist || clist == []
+        zp = Spree::Zoned::Product.new
+        zp.spree_country_id = country
+        zp.spree_product_id = id
+        zp.orderno = 0
+      else
+        zp = clist[0]
+      end
+      zp.cprice = price
+      zp.save
+    end
+
   protected
 
-    def setorderno(country, ono)
+    def setorderno(country, price)
       clist = Spree::Zoned::Product.where "spree_product_id = ? AND spree_country_id = ?", id, country
       if clist == []
         zp = Spree::Zoned::Product.new

data/app/overrides/replace_index_rows.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  :name             => "replace_index_rows",
+  :virtual_path     => "spree/admin/products/index",
+  :replace_contents => "[data-hook='admin_products_index_rows']",
+  :partial          => "spree/admin/zoned/index_rows",
+)

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

@@ -0,0 +1,17 @@
+<td>
+  <span class="handle"></span>&nbsp;
+  <%= product.sku rescue '' %>
+</td>
+<td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
+<td><%= number_to_currency getCPrice(product) rescue '' %></td>
+<td class="actions" data-hook="admin_products_index_row_actions">
+  <%= link_to_edit product, :class => 'edit' unless product.deleted? %>
+  &nbsp;
+  <%= link_to_clone product, :class => 'clone' %>
+  &nbsp;
+  <%= link_to_delete product unless product.deleted? %>
+  <span class='delfromcountry'>
+    &nbsp;
+    <%= link_to_deletefc product unless product.deleted? %>
+  </span>
+</td>

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

@@ -1,12 +1,13 @@
   <%= 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 %>
+    <% country = session[:zoned] && session[:zoned][:prd_country] %>
+    <% country = country ? country.to_i : 0 %>
     <% 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)%>
+       getCPrice(@product), precision: 2)%>
     <%= f.error_message_on :price %>
   <% end %>
 

data/db/migrate/20120630201058_add_cprice_to_spree_zoned_products.rb

@@ -0,0 +1,5 @@
+class AddCpriceToSpreeZonedProducts < ActiveRecord::Migration
+  def change
+    add_column :spree_zoned_products, :cprice, :decimal, :null => true, :default => nil, :precision => 8, :scale => 2
+  end
+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.18'
+  s.version     = '0.5.19'
   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.18
+  version: 0.5.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -135,15 +135,15 @@ files:
 - app/controllers/spree/products_controller_decorator.rb
 - app/controllers/spree/zoned_controller.rb
 - app/helpers/spree/admin/navigation_helper_decorator.rb
+- app/helpers/spree/admin/products_helper_decorator.rb
 - app/helpers/spree/base_helper_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/zoned/product.rb
 - app/overrides/add_country_selectbox.rb
-- 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/overrides/replace_index_rows.rb
+- app/views/spree/admin/zoned/_index_rows.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
@@ -154,6 +154,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120611133806_create_spree_zoned_products.rb
+- db/migrate/20120630201058_add_cprice_to_spree_zoned_products.rb
 - lib/generators/spree_zoned/install/install_generator.rb
 - lib/spree/zoned/search/base.rb
 - lib/spree_zoned.rb

data/app/overrides/add_delfc.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(
-  :name          => "add_delfc",
-  :virtual_path  => "spree/admin/products/index",
-  :insert_bottom => "[data-hook='admin_products_index_row_actions']",
-  :partial       => "spree/admin/zoned/delfc",
-)

data/app/overrides/add_prd_handles.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(
-  :name          => "add_prd_handles",
-  :virtual_path  => "spree/admin/products/index",
-  :insert_top    => "[data-hook='admin_products_index_rows'] > td:first-child",
-  :text          => '<span class="handle"></span>&nbsp;',
-)

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

@@ -1,4 +0,0 @@
-<span class='delfromcountry'>
-	&nbsp;
-  <%= link_to_deletefc product unless product.deleted? %>
-</span>