spree_my_favourites 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a09c2b3ecb78d979ede4c8eb194c6933f6c4ac3
-  data.tar.gz: bd4df516a5a5fa4ac5fa72e7c1acb8f516777266
+  metadata.gz: 767fd8140f37c1168e7ae807c1fee928b9e28eb6
+  data.tar.gz: d32632f29744a46d183fc95f065b15e0b18656e2
 SHA512:
-  metadata.gz: 9680b9b345bd186fa293d45ab4be40fa9c344135a61bba1240ecb28c3c085427659a74822b8037f3017b74a59704cd506bb735e47b913c1d7a683a7c53792f79
-  data.tar.gz: bb72e3e562a83520078b8443391d69d2a2edc7f9c010b07c97e4401a53c73c65c1b6833d5ca65feb71d7a08a745e69dd22f79f85d8d4e540a31371aaa2554f42
+  metadata.gz: c09a6229ea8304c76722c578ee73bef7b1e6774c107a8f0e74ac93c5177950266a2675df1a6a8d9b75d989151f20393c757bc142f41170c2b6f584bca7eb01a3
+  data.tar.gz: 48313c8636310f1a590bfede83da3474484e0b17e98ab48e32f5f13cecb5ea59cb8244bcde424b9a684d64410908cf1e76b414b62b6dcea0ec5c2873d1bbf8ef

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

@@ -37,3 +37,19 @@
     }
   }
 }
+
+@media screen and (max-width: '768px') {
+
+  #my-account table {
+
+    td.favourite-image {
+      display: none !important;
+    }
+
+    th, td {
+      width: 100% !important;
+      display: block;
+      text-align: center;
+    }
+  }
+}

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

@@ -2,26 +2,32 @@ module Spree
   module Account
     class FavouritesController < Spree::StoreController
 
+      before_filter :check_logged_in_user
+
       def index
         @user = try_spree_current_user
         if @user
-          line_items = Spree::LineItem.includes(:variant, order: [:user]).where(['spree_orders.user_id = ?', @user.id]).all
-          ordered_items = line_items.inject({}) do |result, line_item|
-            if result[line_item.variant.sku]
-              result[line_item.variant.sku][:number_of_orders] = result[line_item.variant.sku][:number_of_orders] + 1
-            else
-              result[line_item.variant.sku] = {variant: line_item.variant, number_of_orders: 1}
-            end
-            result
-          end
+          @line_items_by_variant = Spree::Variant.includes(line_items: [:order])
+            .where(['spree_orders.email = ?','francisco@yourgrocer.com.au'])
+            .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 = ordered_items.values
-          @favourites = @favourites.sort_by{|favourite| favourite[:number_of_orders]}.reverse
+          @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
         else
           unauthorized
         end
       end
 
+      private
+
+      def check_logged_in_user
+        redirect_to spree_login_path unless try_spree_current_user
+      end
+
     end
   end
 end

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

@@ -2,19 +2,23 @@ module Spree
   module Account
     class OrdersController < Spree::StoreController
 
+      before_filter :check_logged_in_user
+
       def index
-        if try_spree_current_user
-          @user = try_spree_current_user
-          @orders = @user.orders.complete.order('completed_at desc')
-        else
-          unauthorized
-        end
+        @user = try_spree_current_user
+        @orders = @user.orders.complete.order('completed_at desc')
       end
 
       def accurate_title
         Spree.t(:my_account)
       end
 
+      private
+
+      def check_logged_in_user
+        redirect_to spree_login_path unless try_spree_current_user
+      end
+
     end
   end
 end

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

@@ -6,5 +6,10 @@
   %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]

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

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

data/spec/controllers/spree/account/favourites_controller_spec.rb

@@ -16,7 +16,7 @@ describe Spree::Account::FavouritesController do
     it 'should redirect to login if user is not logged in' do
       controller.stub(:spree_current_user).and_return nil
       spree_get :index
-      response.status.should == 401
+      response.should redirect_to(spree.login_path)
     end
 
   end

data/spec/controllers/spree/account/orders_controller_spec.rb

@@ -23,7 +23,7 @@ describe Spree::Account::OrdersController do
     it 'should redirect to login if user is not logged in' do
       controller.stub(:spree_current_user).and_return nil
       spree_get :index
-      response.status.should == 401
+      response.should redirect_to(spree.login_path)
     end
 
   end

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.2'
+  s.version     = '2.2.4'
   s.summary     = 'Adds My Favourites tab to My Account section of the website'
   s.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_my_favourites
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Francisco Trindade