spree_froomerce_fconnect 0.70.3 → 0.70.4

data/app/controllers/admin/froomerces_controller.rb

@@ -123,7 +123,7 @@ class Admin::FroomercesController < Admin::BaseController
           flash[:error] = I18n.t(".error.e#{result['error']['code']}")
         end
       else
-        flash[:error] = I18n.t('.error.HTTPfaliur')
+        flash[:error] = I18n.t('.error.HTTPfaliure')
       end
     end
   end
@@ -165,7 +165,7 @@ class Admin::FroomercesController < Admin::BaseController
         flash[:error] = I18n.t(".error.e#{result['error']['code']}")
       end
     else
-      flash[:error] = I18n.t('.error.HTTPfaliur')
+      flash[:error] = I18n.t('.error.HTTPfaliure')
     end
     redirect_to(:action => "export_facebook_widgets")
   end
@@ -193,7 +193,7 @@ class Admin::FroomercesController < Admin::BaseController
         redirect_to :action => "index"
       end
     else
-      flash[:error] = I18n.t('.error.HTTPfaliur')
+      flash[:error] = I18n.t('.error.HTTPfaliure')
       redirect_to :action => "index"
     end
   end

data/app/controllers/froomerce_products_controller.rb

@@ -7,9 +7,9 @@ class FroomerceProductsController < ApplicationController
     @products = searcher.retrieve_products
     @taxon = nil
     if Taxonomy.exists?
-      @taxon = Taxon.find(:all)
+      @taxon = Taxon.order('lft ASC')
     end
-    if @products.count < FroomerceConfig::FEED_CONFIG[:temp_limit]
+    if @products.size < FroomerceConfig::FEED_CONFIG[:temp_limit]
       config = FroomerceConfig.first
       user = FroomerceUser.first
       call = {'secret_token' => FroomerceConfig::VERIFICATION[:token],'user_id'=> user.froomerce_user_id, 'shop_id' => config.froomerce_shop_id, 'action_type' => 'update_feed_status' }
@@ -24,15 +24,16 @@ class FroomerceProductsController < ApplicationController
   end
   
   def feed_url
+    @flag = false
     @page_no = params[:page].to_i
     searcher = Spree::Config.searcher_class.new(params)
     @products = searcher.retrieve_products
-    if  @products.count < FroomerceConfig::FEED_CONFIG[:feed_per_page]
-      @page_no = nil
+    if  @products.size < FroomerceConfig::FEED_CONFIG[:feed_per_page]
+      @flag = true
     end
     @taxon = nil
     if Taxonomy.exists?
-      @taxon = Taxon.find(:all)
+      @taxon = Taxon.order('lft ASC')
     end
     render :template => 'froomerce_products/feed_url.xml.builder', :layout => false
   end

data/app/views/froomerce_products/feed_url.xml.builder

@@ -59,7 +59,7 @@ xml.data do
       end
     end
   end
-  if @taxon && @page_no == 1
+  if @taxon and @page_no == 1
     xml.categories do
       @taxon.each do |tax|
         if tax.parent_id.blank?
@@ -68,6 +68,7 @@ xml.data do
               xml.parent_id{xml.cdata!("0")}
               xml.category_id{xml.cdata!("#{tax.id}")}
               xml.category_name{xml.cdata!(tax.name)}
+              xml.position{xml.cdata!("#{tax.lft}")}
             end
           end
         else
@@ -75,12 +76,13 @@ xml.data do
             xml.parent_id{xml.cdata!("#{tax.parent_id}")}
             xml.category_id{xml.cdata!("#{tax.id}")}
             xml.category_name{xml.cdata!(tax.name)}
+            xml.position{xml.cdata!("#{tax.lft}")}
           end
         end
       end
     end
   end
-  if @page_no
+  unless @flag
     xml.next_page{xml.cdata!(root_url+"froomerce_feed?page=#{@page_no+1}&per_page=#{FroomerceConfig::FEED_CONFIG[:feed_per_page]}")}
   end
 end

data/app/views/froomerce_products/index.xml.builder

@@ -68,6 +68,7 @@ xml.data do
               xml.parent_id{xml.cdata!("0")}
               xml.category_id{xml.cdata!("#{tax.id}")}
               xml.category_name{xml.cdata!(tax.name)}
+              xml.position{xml.cdata!("#{tax.lft}")}
             end
           end
         else
@@ -75,6 +76,7 @@ xml.data do
             xml.parent_id{xml.cdata!("#{tax.parent_id}")}
             xml.category_id{xml.cdata!("#{tax.id}")}
             xml.category_name{xml.cdata!(tax.name)}
+            xml.position{xml.cdata!("#{tax.lft}")}
           end
         end
       end

data/lib/call_backs.rb

@@ -12,32 +12,30 @@ class CallBacks
     return nil unless options.count > 1
     types = []
     types = options.collect {|opt| opt.option_type }
-    variants = Variant.find_all_by_product_id(id)
+    variants = product.variants
     prod_images = product.images.collect {|img| root_url.chop + img.attachment.url}
     product_images = prod_images.join('^')
     i = 0; j=0
     variants.each do |variant|
-      unless variant.is_master
-        values = variant.option_values.order('option_type_id ASC')
-        images = variant.images.collect {|img| root_url.chop + img.attachment.url}
-        additional_images = images.join('^')
-        if additional_images.blank?
-          additionl_images_url = product_images
-        else
-          additionl_images_url = product_images + '^' + additional_images
-        end
-        if additional_images.blank?
-          hash[i] = {'product_id' => variant.id, 'price' => variant.price}
-        else
-          hash[i] = {'product_id' => variant.id, 'price' => variant.price, 'additional_imgs' => additionl_images_url, 'cart_img' => root_url.chop +  variant.images.first.attachment.url}
-        end
-        types.each do |type|
-          hash[i][type.presentation] = values[j].presentation
-          j = j.succ
-        end
-        i = i.succ
-        j = 0
+      values = variant.option_values.order('option_type_id ASC')
+      images = variant.images.collect {|img| root_url.chop + img.attachment.url}
+      additional_images = images.join('^')
+      if additional_images.blank?
+        additionl_images_url = product_images
+      else
+        additionl_images_url = product_images + '^' + additional_images
+      end
+      if additional_images.blank?
+        hash[i] = {'product_id' => variant.id, 'price' => variant.price}
+      else
+        hash[i] = {'product_id' => variant.id, 'price' => variant.price, 'additional_imgs' => additionl_images_url, 'cart_img' => root_url.chop +  variant.images.first.attachment.url}
+      end
+      types.each do |type|
+        hash[i][type.presentation] = values[j].presentation
+        j = j.succ
       end
+      i = i.succ
+      j = 0
       additional_images = ''
       additionl_images_url = ''
     end

data/spree_froomerce_fconnect.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform     = Gem::Platform::RUBY
   s.name         = 'spree_froomerce_fconnect'
-  s.version      = '0.70.3'
+  s.version      = '0.70.4'
   s.summary      = 'Create your store to Facebook and create product widgets for your Fan Page'
   s.description  = 'Create your store to Facebook and create product widgets for your Fan Page'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_froomerce_fconnect
 version: !ruby/object:Gem::Version
-  version: 0.70.3
+  version: 0.70.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000Z
+date: 2012-04-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &78167060 !ruby/object:Gem::Requirement
+  requirement: &81699450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.70.0
   type: :runtime
   prerelease: false
-  version_requirements: *78167060
+  version_requirements: *81699450
 description: Create your store to Facebook and create product widgets for your Fan
   Page
 email: ali.naqi@coeus-solutions.de