stall 0.3.2 → 0.3.3

data/app/helpers/stall/omniauth_helper.rb

@@ -0,0 +1,7 @@
+module Stall
+  module OmniauthHelper
+    def user_omniauth_authorize_path_for(provider)
+      send(:"user_#{ provider }_omniauth_authorize_path")
+    end
+  end
+end

data/app/helpers/stall/prices_helper.rb

@@ -0,0 +1,12 @@
+module Stall
+  module PricesHelper
+    def displayed_price_for_variants variants
+      if variants.length == 1
+        number_to_currency(variants.first.price)
+      else
+        price = variants.map(&:price).min
+        t('stall.products.prices.from', price: number_to_currency(price)) if price
+      end
+    end
+  end
+end

data/app/helpers/stall/products_filters_helper.rb

@@ -0,0 +1,34 @@
+module Stall
+  module ProductsFiltersHelper
+    # Display various filters for the given products including :
+    #
+    #   - Product categories filters (:category)
+    #   - Manufacturer filters (:manufacturer)
+    #   - Price filter (:price)
+    #   - Properties filters (:property)
+    #
+    # Those filters allow automatically searching into the provided products
+    # and should only be provided a list of prodcts that can be displayed
+    # for the current products list. e.g. for the brands#show products list,
+    # we pass the filters all the products from the manufacturer.
+    #
+    # In Stall, it is handled by the @filterable_products instance variables
+    # from the ProductCategoriesController, ManufacturersController and
+    # ProductsController.
+    #
+    # By default, all available filters (which contains possible results) are
+    # shown. If you need to remove a filter, you can pass an option with
+    # its name as false. The following would remove the category filter :
+    #
+    #   product_filters_for(@filterable_products, category: false)
+    #
+    # If, at the opposite, you need to force the display of a certain filter
+    # even if there's no results available, you can do the following :
+    #
+    #   product_filters_for(@filterable_products, category: { force: true })
+    #
+    def product_filters_for(products, options = {})
+      Stall::ProductFilters::Builder.new(products, options).filters.select(&:available?)
+    end
+  end
+end

data/app/mailers/stall/customer_mailer.rb

@@ -14,10 +14,11 @@ module Stall
       I18n.with_locale(cart.customer.locale) do
         @cart = cart
 
-        calculator_class = Stall::Shipping::Calculator.for(cart.shipment.shipping_method)
-        @calculator = calculator_class.new(cart, cart.shipment.shipping_method)
+        @calculator = if (calculator_class = Stall::Shipping::Calculator.for(cart.shipment.shipping_method))
+          calculator_class.new(cart, cart.shipment.shipping_method)
+        end
 
-        @tracking_url = if @calculator.trackable?
+        @tracking_url = if @calculator.try(:trackable?)
           cart.shipment.tracking_code.presence && @calculator.tracking_url
         end
 

data/app/models/curated_list_product.rb

@@ -0,0 +1,3 @@
+class CuratedListProduct < ActiveRecord::Base
+  include Stall::Models::CuratedListProduct
+end

data/app/models/curated_product_list.rb

@@ -0,0 +1,3 @@
+class CuratedProductList < ActiveRecord::Base
+  include Stall::Models::CuratedProductList
+end

data/app/models/image.rb

@@ -0,0 +1,3 @@
+class Image < ActiveRecord::Base
+  include Stall::Models::Image
+end

data/app/models/product_suggestion.rb

@@ -0,0 +1,3 @@
+class ProductSuggestion < ActiveRecord::Base
+  include Stall::Models::ProductSuggestion
+end

data/app/models/stall/models/curated_list_product.rb

@@ -0,0 +1,15 @@
+module Stall
+  module Models
+    module CuratedListProduct
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_curated_list_products'
+        acts_as_orderable
+
+        belongs_to :product
+        belongs_to :curated_product_list
+      end
+    end
+  end
+end

data/app/models/stall/models/curated_product_list.rb

@@ -0,0 +1,22 @@
+module Stall
+  module Models
+    module CuratedProductList
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_curated_product_lists'
+
+        has_many :curated_list_products, -> { ordered }, dependent: :destroy
+        has_many :products, through: :curated_list_products
+
+        accepts_nested_attributes_for :curated_list_products,
+          allow_destroy: true
+
+        extend FriendlyId
+        friendly_id :name, use: [:slugged, :finders]
+
+        validates :name, presence: true
+      end
+    end
+  end
+end

data/app/models/stall/models/customer.rb

@@ -8,15 +8,14 @@ module Stall
 
         include Stall::Addressable
 
-        if Stall.config.default_user_model
-          belongs_to :user, polymorphic: true, inverse_of: :customer
-          accepts_nested_attributes_for :user
+        belongs_to :user, polymorphic: true, inverse_of: :customer
+        accepts_nested_attributes_for :user
 
-          before_validation :ensure_user_email
-        end
+        before_validation :ensure_user_email
 
         has_many :product_lists, dependent: :destroy
         has_many :credit_notes, dependent: :destroy
+        has_many :carts, dependent: :nullify
 
         validates :email, presence: true,
                           format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\W]+\z/ }
@@ -26,9 +25,7 @@ module Stall
         end
 
         def build_user(attributes = {})
-          (self.user = Stall.config.default_user_model.new(attributes)).tap do
-            user.customer = self if user.respond_to?(:customer)
-          end if Stall.config.default_user_model
+          self.user = ::User.new(attributes.merge(customer: self))
         end
 
         def credit(currency = Stall.config.default_currency)

data/app/models/stall/models/image.rb

@@ -0,0 +1,21 @@
+module Stall
+  module Models
+    module Image
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_images'
+
+        acts_as_orderable
+
+        belongs_to :imageable, polymorphic: true
+
+        has_attached_file :file, styles: {
+          thumb: '100x100#',
+          show: '555x'
+        }
+        validates_attachment :file, content_type: { content_type: /\Aimage\/.*\z/ }
+      end
+    end
+  end
+end

data/app/models/stall/models/manufacturer.rb

@@ -6,6 +6,10 @@ module Stall
       included do
         self.table_name = 'stall_manufacturers'
 
+        acts_as_orderable
+        extend FriendlyId
+        friendly_id :name, use: [:slugged, :finders]
+
         has_many :products, dependent: :nullify
 
         has_attached_file :logo

data/app/models/stall/models/product.rb

@@ -16,16 +16,28 @@ module Stall
         has_many :variants, dependent: :destroy, inverse_of: :product
         accepts_nested_attributes_for :variants, allow_destroy: true
 
-        has_many :product_details, dependent: :destroy, inverse_of: :product
+        has_many :product_details, -> { ordered }, dependent: :destroy,
+                                                   inverse_of: :product
         accepts_nested_attributes_for :product_details, allow_destroy: true
 
-        has_attached_file :image, styles: {
-          thumb: '100x100#',
-          show: '555x'
-        }
+        has_many :product_suggestions, dependent: :destroy
+        has_many :suggested_products, through: :product_suggestions,
+                                      source: :suggestion
 
-        validates :name, :image, presence: true
-        validates_attachment :image, content_type: { content_type: /\Aimage\/.*\z/ }
+        has_many :suggester_product_suggestions, dependent: :destroy,
+                                                 foreign_key: :suggestion_id,
+                                                 class_name: 'ProductSuggestion'
+        has_many :suggester_products, through: :suggester_product_suggestions,
+                                      source: :product
+
+        has_many :images, -> { ordered },  as: :imageable
+
+        has_many :curated_list_products, dependent: :destroy
+        has_many :curated_product_lists, through: :curated_list_products
+
+        accepts_nested_attributes_for :images, allow_destroy: true
+
+        validates :name, presence: true
 
         scope :visible, -> { where(visible: true) }
       end
@@ -37,6 +49,17 @@ module Stall
       def price
         variants.map(&:price).min
       end
+
+      def image(*args)
+        if (image = images.first)
+          image.file
+        end
+      end
+
+      # Support paperclip attachment presence helper for #image
+      def image?
+        !!image
+      end
     end
   end
 end

data/app/models/stall/models/product_category.rb

@@ -7,7 +7,6 @@ module Stall
         self.table_name = 'stall_product_categories'
 
         acts_as_tree order: 'position'
-        class_attribute :max_depth
 
         extend FriendlyId
         friendly_id :name, use: [:slugged, :finders]
@@ -16,7 +15,11 @@ module Stall
 
         validates :name, presence: true
 
-        scope :ordered, -> { order(position: 'asc') }
+        scope :ordered, -> { order(position: 'ASC') }
+      end
+
+      def all_child_products
+        ::Product.where(product_category_id: ([id] + descendant_ids))
       end
 
       module ClassMethods

data/app/models/stall/models/product_list.rb

@@ -64,7 +64,7 @@ module Stall
       end
 
       def total_quantity
-        line_items.map(&:quantity).sum
+        line_items.map(&:quantity).compact.sum
       end
 
       def wizard

data/app/models/stall/models/product_suggestion.rb

@@ -0,0 +1,14 @@
+module Stall
+  module Models
+    module ProductSuggestion
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_product_suggestions'
+
+        belongs_to :product
+        belongs_to :suggestion, class_name: 'Product'
+      end
+    end
+  end
+end

data/app/models/stall/models/shipment.rb

@@ -17,8 +17,6 @@ module Stall
                  with_model_currency: :currency, allow_nil: true
 
         enum state: { pending: 0, shipped: 1 }
-
-        validates :cart, :shipping_method, presence: true
       end
 
       def currency

data/app/models/stall/models/user.rb

@@ -0,0 +1,18 @@
+module Stall
+  module Models
+    module User
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_users'
+
+        devise :database_authenticatable, :registerable, :recoverable,
+               :rememberable, :trackable, :validatable, :omniauthable,
+               omniauth_providers: Stall.config.omniauth_providers.map(&:name)
+
+        has_one :customer, as: :user, dependent: :nullify
+        has_many :user_omniauth_accounts, dependent: :destroy
+      end
+    end
+  end
+end

data/app/models/stall/models/user_omniauth_account.rb

@@ -0,0 +1,13 @@
+module Stall
+  module Models
+    module UserOmniauthAccount
+      extend ActiveSupport::Concern
+
+      included do
+        self.table_name = 'stall_user_omniauth_accounts'
+
+        belongs_to :user
+      end
+    end
+  end
+end

data/app/models/stall/models/variant.rb

@@ -26,22 +26,22 @@ module Stall
         delegate :image, :image?, :vat_rate, to: :product, allow_nil: true
 
         scope :published, -> { where(published: true) }
+      end
 
-        def currency
-          @currency ||= Money::Currency.new(Stall.config.default_currency)
-        end
-
-        private
+      def currency
+        @currency ||= Money::Currency.new(Stall.config.default_currency)
+      end
 
-        def refresh_name
-          product_name = product.try(:name)
+      private
 
-          properties = variant_property_values.map do |variant_property_value|
-            variant_property_value.property_value.name
-          end
+      def refresh_name
+        product_name = product.try(:name)
 
-          self.name = [product_name, properties.join(' - ')].join(' / ')
+        properties = variant_property_values.map do |variant_property_value|
+          variant_property_value.property_value.name
         end
+
+        self.name = [product_name, properties.join(' - ')].join(' / ')
       end
     end
   end

data/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  include Stall::Models::User
+end

data/app/models/user_omniauth_account.rb

@@ -0,0 +1,3 @@
+class UserOmniauthAccount < ActiveRecord::Base
+  include Stall::Models::UserOmniauthAccount
+end

data/app/services/stall/add_to_cart_service.rb

@@ -8,7 +8,7 @@ module Stall
     end
 
     def call
-      return false unless line_item.valid?
+      return false unless line_item_valid?
 
       unless assemble_identical_line_items
         cart.line_items << line_item
@@ -23,9 +23,18 @@ module Stall
       end
     end
 
+    def line_item_valid?
+      line_item.valid? && enough_stock?
+    end
+
+    def enough_stock?
+      stock_service = Stall.config.service_for(:available_stocks).new
+      stock_service.on_hand?(line_item)
+    end
+
     def line_item
       @line_item ||= sellable.to_line_item.tap do |line_item|
-        line_item.quantity = params[:quantity]
+        line_item.quantity = line_item_params[:quantity]
       end
     end
 
@@ -48,15 +57,21 @@ module Stall
     end
 
     def sellable
-      @sellable ||= sellable_class.find(params[:sellable_id])
+      @sellable ||= sellable_class.find(line_item_params[:sellable_id])
     end
 
     def sellable_class
-      @sellable_class ||= params[:sellable_type].camelize.constantize
+      @sellable_class ||= line_item_params[:sellable_type].camelize.constantize
     end
 
     def shipping_fee_service
       @shipping_fee_service ||= Stall::ShippingFeeCalculatorService.new(cart)
     end
+
+    def line_item_params
+      @line_item_params ||= params.require(:line_item).permit(
+        :sellable_type, :sellable_id, :quantity
+      )
+    end
   end
 end

data/app/services/stall/available_stocks_service.rb

@@ -0,0 +1,11 @@
+module Stall
+  class AvailableStocksService < Stall::BaseService
+    def on_hand?(line_item)
+      if Stall.config.manage_inventory
+        line_item.variant.stock >= line_item.quantity
+      else
+        true
+      end
+    end
+  end
+end