spree_multi_domain 3.0.4 → 3.0.5

data/Versionfile

@@ -0,0 +1,5 @@
+"0.30.x" => { :branch => "0-30-x" }
+"0.40.x" => { :branch => "0-40-stable" }
+"0.50.x" => { :branch => "0-40-stable" }
+"0.60.x" => { :branch => "0-60-stable" }
+"0.70.x" => { :branch => "master" }

data/app/controllers/admin/products_controller_decorator.rb

@@ -1,7 +1,7 @@
 Admin::ProductsController.class_eval do
-  update.before << :set_stores
+  update.before :set_stores
 
-  create.before << :add_to_all_stores
+  create.before :add_to_all_stores
 
   private
   def set_stores

data/app/controllers/products_controller_decorator.rb

@@ -3,9 +3,10 @@ ProductsController.class_eval do
 
   private
   def can_show_product
-   if @product.stores.empty? || @product.stores.include?(@site)
-     render :file => "public/404.html", :status => 404
-   end
+    @product ||= Product.find_by_permalink!(params[:id])
+    if @product.stores.empty? || @product.stores.include?(@site)
+      render :file => "public/404.html", :status => 404
+    end
   end
 
 end

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

@@ -1 +1 @@
-<th><%= order @search, :by => :store, :as => t("stores") %></th>
+<th><%= t("stores") %></th>

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

@@ -1,62 +1,41 @@
 <% if tracker = current_tracker %>
 
   <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '<%= tracker.analytics_id -%>']);
+  _gaq.push(['_trackPageview']);
+  
+  <%- if flash[:commerce_tracking] -%>
+  
+  _gaq.push(['_addTrans',
+    '<%= "#{"QA-" if request.server_name =~ /^(dev.|localhost)/ }#{@order.number}" %>', // order ID - required
+    '<%= tracker.store.name -%>', // affiliation or store name
+    '<%= @order.total -%>', // total - required
+    '<%= @order.adjustments.tax.sum(:amount).to_s -%>', // tax
+    '<%= @order.adjustments.shipping.sum(:amount).to_s -%>', // shipping
+    '<%= @order.ship_address.city if @order.ship_address -%>', // city
+    '<%= @order.ship_address.state.name if @order.ship_address and @order.ship_address.state -%>', // state or province
+    '<%= @order.ship_address.country.name if @order.ship_address && @order.ship_address.country -%>' // country
+  ]);
 
-  <script type="text/javascript">
-    var pageTracker = _gat._getTracker("<%= tracker.analytics_id %>");
-    pageTracker._initData();
-    pageTracker._trackPageview();
+   <%- @order.line_items.each do |line_item| -%>
+  _gaq.push(['_addItem',
+    '<%= "#{"QA-" if request.server_name =~ /^(dev.|localhost)/ }#{@order.number}" %>', // order ID - required
+    '<%= line_item.variant.sku -%>', // SKU/code - required
+    '<%= line_item.variant.product.name -%>', // product name
+    '-', // category or variation
+    '<%= line_item.price -%>', // unit price - required
+    '<%= line_item.quantity -%>' // quantity - required
+  ]);
+  <%- end -%>
+  _gaq.push(['_trackTrans']); //submits transaction to the Analytics servers
+  
+  <%- end -%>
+  
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
   </script>
-
-  <% if @analytics_page %>
-    <script type="text/javascript">document.strTrackPageView="<%= @analytics_page %>";</script>
-  <% end %>
-
-  <!-- Primary Tracking -->
-  <script type="text/javascript" src="/javascripts/VKIga.js"></script>
-
-  <% if flash[:commerce_tracking] %>
-    <script type="text/javascript">
-
-      try {
-        // report e-commerce transaction information when applicable
-        /*
-         *  transaction ID - prepend dev/QA sites with 'QA-'
-         *  affiliate - always empty string
-         *  total - order total including tax & shipping
-         *  tax
-         *  shipping
-         *  ship-to city
-         *  ship-to province
-         *  ship-to country
-         */
-        VKIPageTracker._addTrans(
-          "<%= "#{"QA-" if request.server_name =~ /^(dev.|localhost)/ }#{@order.number}" %>",
-          "",
-          "<%= @order.total %>",
-          "<%= @order.adjustments.tax.sum(:amount).to_s %>",
-          "<%= @order.adjustments.shipping.sum(:amount).to_s %>",
-          "<%= @order.ship_address.city if @order.ship_address %>",
-          "<%= @order.ship_address.state.name if @order.ship_address && @order.ship_address.state %><%= @order.ship_address.state_name if @order.ship_address && @order.ship_address.state.nil? %>",
-          "<%= @order.ship_address.country.name if @order.ship_address && @order.ship_address.country %>"
-        );
-        <% @order.line_items.each do |line_item| -%>
-        VKIPageTracker._addItem(
-          "<%= "#{"QA-" if request.server_name =~ /^(dev.|localhost)/ }#{@order.number}" %>",
-          "<%= line_item.variant.sku %>",
-          "<%= line_item.variant.product.name %>",
-          "-",
-          "<%= line_item.price %>",
-          "<%= line_item.quantity %>"
-        );
-        <% end -%>
-        VKIPageTracker._trackTrans();
-      } catch (err) {
-      }
-
-    </script>
-  <% end %>
 <% end %>

data/config/locales/en.yml

@@ -1,8 +1,9 @@
 en:
+  store: Store
   stores: Stores
   new_store: New Store
   domains: Domains
   stores_admin: "Stores & Domains"
   manage_stores: Configure multiple stores and associated domain names
   editing_store: Editing Store
-  default: Default
+  default: Default

data/config/locales/fr.yml

@@ -0,0 +1,9 @@
+fr:
+  store: Boutique
+  stores: Boutiques
+  new_store: Nouvelle Boutique
+  domains: Domaines
+  stores_admin: "Boutiques & Domaines"
+  manage_stores: Configurer les boutiques et les domaines associés
+  editing_store: Modifier une boutique
+  default: Defaut

data/config/locales/ru.yml

@@ -0,0 +1,9 @@
+ru:
+  store: "Магазин"
+  stores: "Магазины"
+  new_store: "Новый магазин"
+  domains: "Домены"
+  stores_admin: "Магазины и домены"
+  manage_stores: "Управление магазинами и привязка доменов"
+  editing_store: "Редактирование магазина"
+  default: "По умолчанию"

data/lib/spree_multi_domain_hooks.rb

@@ -1,19 +1,55 @@
-class SpreeMultiDomainHooks < Spree::ThemeSupport::HookListener
+Deface::Override.new(
+  :virtual_path => "admin/products/index",
+  :name => "multi_domain_admin_products_index_headers",
+  :insert_before => "[data-hook='admin_products_index_header_actions']",
+  :partial => "admin/products/index_headers",
+  :disabled => false)
 
-  insert_after :admin_products_index_headers, :partial => "admin/products/index_headers"
-  insert_after :admin_products_index_rows, :partial => "admin/products/index_rows"
-  insert_before :admin_products_index_search, :partial => "admin/products/index_search_fields"
+Deface::Override.new(
+  :virtual_path => "admin/products/index",
+  :name => "multi_domain_admin_products_index_rows",
+  :insert_before => "[data-hook='admin_products_index_row_actions']",
+  :partial => "admin/products/index_rows",
+  :disabled => false)
+  
+Deface::Override.new(
+  :virtual_path => "admin/products/index",
+  :name => "multi_domain_admin_products_index_search",
+  :insert_top => "[data-hook='admin_products_index_search']",
+  :partial => "admin/products/index_search_fields",
+  :disabled => false)  
 
-  insert_after :admin_product_form_meta, :partial => "admin/products/stores"
+Deface::Override.new(
+  :virtual_path => "admin/products/_form",
+  :name => "multi_domain_admin_product_form_meta",
+  :insert_bottom => "[data-hook='admin_product_form_meta']",
+  :partial => "admin/products/stores",
+  :disabled => false)
 
-  insert_after :admin_trackers_index_headers do
-    "<th>#{I18n.t(:store)}</th>"
-  end
-  insert_after :admin_trackers_index_rows, 'admin/trackers/index_rows'
-  replace :additional_tracker_fields, 'admin/trackers/store'
+Deface::Override.new(
+  :virtual_path => "admin/trackers/index",
+  :name => "multi_domain_admin_trackers_index_headers",
+  :insert_before => "[data-hook='admin_trackers_index_headers'] th:last",
+  :text => "<th><%= I18n.t(:store) %></th>",
+  :disabled => false)
 
-  insert_after :admin_configurations_menu do
-    "<%= configurations_menu_item(I18n.t('stores_admin'), admin_stores_url, I18n.t('manage_stores')) %>"
-  end
+Deface::Override.new(
+  :virtual_path => "admin/trackers/index",
+  :name => "multi_domain_admin_trackers_index_rows",
+  :insert_before => "[data-hook='admin_trackers_index_rows'] td:last",
+  :partial => "admin/trackers/index_rows",
+  :disabled => false)
 
-end
+Deface::Override.new(
+  :virtual_path => "admin/trackers/_form",
+  :name => "multi_domain_additional_tracker_fields",
+  :replace => "[data-hook='additional_tracker_fields']",
+  :partial => "admin/trackers/store",
+  :disabled => false)
+
+Deface::Override.new(
+  :virtual_path => "admin/configurations/index",
+  :name => "multi_domain_admin_configurations_menu",
+  :insert_bottom => "[data-hook='admin_configurations_menu']",
+  :text => "<%= configurations_menu_item(I18n.t('stores_admin'), admin_stores_url, I18n.t('manage_stores')) %>",
+  :disabled => false)

data/lib/tasks/install.rake

@@ -0,0 +1,19 @@
+namespace :spree_multi_domain do
+  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
+  task :install do
+    Rake::Task['spree_multi_domain:install:migrations'].invoke
+  end
+
+  namespace :install do
+    desc "Copies all migrations (NOTE: This will be obsolete with Rails 3.1)"
+    task :migrations do
+      source = File.join(File.dirname(__FILE__), '..', '..', 'db')
+      destination = File.join(Rails.root, 'db')
+      puts "INFO: Mirroring assets from #{source} to #{destination}"
+      Spree::FileUtilz.mirror_files(source, destination)
+    end
+
+  end
+
+end
+

data/spree_multi_domain.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_multi_domain'
-  s.version     = '3.0.4'
+  s.version     = '3.0.5'
   s.summary     = 'Adds multiple site support to Spree'
   s.description = 'Multiple Spree stores on different domains - single unified backed for processing orders.'
   s.required_ruby_version = '>= 1.8.7'
@@ -16,7 +16,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.has_rdoc = false
-
-  s.add_dependency('spree_core',  '>= 0.40.0')
+  s.add_dependency('spree_core',  '>= 0.60.0')
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Brian Quinn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +03:00
+date: 2011-05-29 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 40
+        - 60
         - 0
-        version: 0.40.0
+        version: 0.60.0
   type: :runtime
   version_requirements: *id001
 description: Multiple Spree stores on different domains - single unified backed for processing orders.
@@ -45,6 +45,7 @@ files:
 - .gitignore
 - README.md
 - Rakefile
+- Versionfile
 - app/controllers/admin/products_controller_decorator.rb
 - app/controllers/admin/stores_controller.rb
 - app/controllers/products_controller_decorator.rb
@@ -65,18 +66,20 @@ files:
 - app/views/admin/trackers/_store.html.erb
 - app/views/shared/_google_analytics.html.erb
 - config/locales/en.yml
+- config/locales/fr.yml
+- config/locales/ru.yml
 - config/routes.rb
-- lib/generators/spree_multi_domain/install_generator.rb
-- lib/generators/templates/db/migrate/20091202122944_create_stores.rb
-- lib/generators/templates/db/migrate/20091202123245_add_order_store.rb
-- lib/generators/templates/db/migrate/20100114020535_add_store_to_tracker.rb
-- lib/generators/templates/db/migrate/20100227175140_add_default_store.rb
-- lib/generators/templates/db/migrate/20100227180338_create_products_stores.rb
-- lib/generators/templates/db/migrate/20100616204303_store_id_for_taxonomies.rb
-- lib/generators/templates/db/migrate/20110223141800_add_email_to_stores.rb
+- db/migrate/20091202122944_create_stores.rb
+- db/migrate/20091202123245_add_order_store.rb
+- db/migrate/20100114020535_add_store_to_tracker.rb
+- db/migrate/20100227175140_add_default_store.rb
+- db/migrate/20100227180338_create_products_stores.rb
+- db/migrate/20100616204303_store_id_for_taxonomies.rb
+- db/migrate/20110223141800_add_email_to_stores.rb
 - lib/spree/search/multi_domain.rb
 - lib/spree_multi_domain.rb
 - lib/spree_multi_domain_hooks.rb
+- lib/tasks/install.rake
 - spree_multi_domain.gemspec
 has_rdoc: true
 homepage: http://spreecommerce.com

data/lib/generators/spree_multi_domain/install_generator.rb

@@ -1,15 +0,0 @@
-module SpreeMultiDomain
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-
-      desc "Configures your Rails application for use with spree_multi_domain"
-
-      def copy_migrations
-        directory "db"
-      end
-
-    end
-  end
-end
-