spree_my_favourites 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e138eb08cb7bd31035ef5f66c10fe1fa061070ca
-  data.tar.gz: 893f57b744021c6908bf3ea7f9de086bc5c6691f
+  metadata.gz: ca15c424578e7cce907fead66f437544466cf821
+  data.tar.gz: 204a968c3deee63617596830e0bf08da6474e840
 SHA512:
-  metadata.gz: 6f31e7e6ae122d84cef74cac190435157b99afd677d19fdaf553ddc60f2205b3b0f072cc9b26b5fa151e7f5a093800d6c292eeef378acf222db4a84ad5856462
-  data.tar.gz: c91c96335fc354810f6da2f6a078eebbde7c88f41e2f979607d54ddbf32f4746eb8d082dab6f0b2cf6dedbea2b82ce378f2c5a14f0d962c32db02e3ad692e6e4
+  metadata.gz: 2f94190ef6e7ed0f5837952a004cc69820a31e92df789a873d274c52f284a00cd3ffe5c654bd53118fd15e530a78bba68defc690d549c1a862a525fe1bf19c86
+  data.tar.gz: 3a4092c53fb95329f20595d518fe9280d067354d0b72e178b5550e4d5742f6bd8690c4817441ef29dfb5fe261e10a1843ac9978755cedbc81f44ae17319e808b

data/README.md

@@ -4,6 +4,8 @@ SpreeMyFavourites
 Adds a My Favourites page to the My Account section of spree frontend. At the moment, the favourites list is
 just all the items a customer has ordered, sorted by the number of times they have been ordered.
 
+This gem can also be used with the Spree Quick Cart gem (https://github.com/frankmt/spree_quick_cart), so that an Add to Cart button is added to the favourites table
+
 Installation
 ------------
 

data/app/assets/stylesheets/spree/frontend/my_account.scss

@@ -22,16 +22,29 @@
 
   .account-my-favourites {
 
+    nav.pagination {
+      margin-top: 10px;
+    }
+
     table {
 
       width: 100%;
 
+      th.favourite-image, td.favourite-image {
+        width: 20%;
+      }
+
       th.favourite-description, td.favourite-description {
-        width: 70%;
+        width: 35%;
+      }
+
+      th.favourite-price, td.favourite-price {
+        width: 15%;
+        text-align: center;
       }
 
-      th.favourite-number-orders, td.favourite-number-orders {
-        width: 30%;
+      th.favourite-add-to-cart, td.favourite-add-to-cart {
+        width: 40%;
         text-align: center;
       }
     }

data/app/controllers/spree/account/favourites_controller.rb

@@ -7,16 +7,7 @@ module Spree
       def index
         @user = try_spree_current_user
         if @user
-          @line_items_by_variant = Spree::Variant.includes(line_items: [:order])
-            .where(['spree_orders.email = ?', @user.email])
-            .where(['spree_orders.completed_at IS NOT NULL'])
-            .references(:orders).group('spree_variants.id')
-            .order('COUNT(spree_line_items.id) DESC').page(params[:page] || 1).per(15)
-
-          @favourites = []
-          @line_items_by_variant.count('spree_line_items.id').each do |variant_id, number_of_orders| 
-            @favourites << {variant: Spree::Variant.find(variant_id), number_of_orders: number_of_orders}
-          end
+          @favourites = Spree::Variant.favourites_by_user(@user).page(params[:page] ||= 1).per(15)
         else
           unauthorized
         end

data/app/models/spree/variant_decorator.rb

@@ -0,0 +1,13 @@
+Spree::Variant.class_eval do
+
+  def self.favourites_by_user(user)
+    Spree::Variant.joins(line_items: [order: [:user]])
+    .where(['spree_users.id = ?', user.id])
+    .where(['spree_orders.completed_at IS NOT NULL'])
+    .references(:orders)
+    .group('spree_variants.id')
+    .order('COUNT(spree_line_items.id) DESC')
+    .select('spree_variants.*')
+  end
+
+end

data/app/views/spree/account/favourites/index.haml

@@ -3,8 +3,8 @@
 
   .account-my-favourites(data-hook="account_my_favourites")
     - if @favourites.present?
-      = render partial: "spree/account/favourites/table", locals: {favourites: @favourites}
+      = render partial: "spree/shared/user_favourites_table", locals: {favourites: @favourites}
       
-      = paginate(@line_items_by_variant)
+      = paginate(@favourites)
     - else
       %p= Spree.t(:you_have_no_orders_yet)

data/app/views/spree/shared/_user_favourites_table.haml

@@ -0,0 +1,21 @@
+%table.favourites-summary
+  %thead
+    %tr
+      %th.favourite-image
+      %th.favourite-description= Spree.t(:name)
+      %th.favourite-price= Spree.t(:price)
+      - if SpreeMyFavourites::Config.use_quick_add_to_cart_form
+        %th.favourite-add-to-cart  
+  %tbody
+    - favourites.each do |favourite|
+      %tr
+        %td.favourite-image
+          - if favourite.images.length == 0
+            = link_to mini_image(favourite.product), favourite.product
+          - else
+            = link_to image_tag(favourite.images.first.attachment.url(:mini)), favourite.product
+        %td.favourite-description(data-hook='favourite_name')= favourite.name
+        %td.favourite-price= display_price(favourite)
+        - if SpreeMyFavourites::Config.use_quick_add_to_cart_form
+          %td.favourite-add-to-cart      
+            = render partial: "spree/shared/quick_cart_add_button", locals: {product: favourite.product}

data/lib/spree_my_favourites/configuration.rb

@@ -0,0 +1,5 @@
+module SpreeMyFavourites
+  class Configuration < Spree::Preferences::Configuration
+    preference :use_quick_add_to_cart_form, :boolean, default: false
+  end
+end

data/lib/spree_my_favourites/engine.rb

@@ -6,6 +6,10 @@ module SpreeMyFavourites
 
     config.autoload_paths += %W(#{config.root}/lib)
 
+    initializer "spree.spree_my_favourites.preferences", :after => "spree.environment" do |app|
+      SpreeMyFavourites::Config = SpreeMyFavourites::Configuration.new
+    end
+
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec

data/spree_my_favourites.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_my_favourites'
-  s.version     = '2.2.5'
+  s.version     = '2.2.6'
   s.summary     = 'Adds My Favourites tab to My Account section of the website'
   s.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_my_favourites
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -239,10 +239,11 @@ files:
 - app/assets/stylesheets/spree/frontend/spree_my_favourites.css
 - app/controllers/spree/account/favourites_controller.rb
 - app/controllers/spree/account/orders_controller.rb
-- app/views/spree/account/favourites/_table.haml
+- app/models/spree/variant_decorator.rb
 - app/views/spree/account/favourites/index.haml
 - app/views/spree/account/orders/index.haml
 - app/views/spree/shared/_account_header.haml
+- app/views/spree/shared/_user_favourites_table.haml
 - app/views/spree/shared/_user_orders.haml
 - app/views/spree/users/show.haml
 - bin/rails
@@ -250,6 +251,7 @@ files:
 - config/routes.rb
 - lib/generators/spree_my_favourites/install/install_generator.rb
 - lib/spree_my_favourites.rb
+- lib/spree_my_favourites/configuration.rb
 - lib/spree_my_favourites/engine.rb
 - lib/spree_my_favourites/factories.rb
 - spec/controllers/spree/account/favourites_controller_spec.rb

data/app/views/spree/account/favourites/_table.haml

@@ -1,15 +0,0 @@
-%table.favourites-summary
-  %thead
-  %tr
-    %th.favourite-description= Spree.t(:name)
-    %th.favourite-number-orders= Spree.t(:number_of_orders)
-  %tbody
-  - favourites.each do |favourite|
-    %tr
-      %td.favourite-image
-        - if variant.images.length == 0
-          = link_to mini_image(variant.product), variant.product
-        - else
-          = link_to image_tag(variant.images.first.attachment.url(:small)), variant.product
-      %td.favourite-description= favourite[:variant].name
-      %td.favourite-number-orders= favourite[:number_of_orders]