stall 0.3.2 → 0.3.3

data/db/migrate/20170308163532_create_stall_curated_list_products.rb

@@ -0,0 +1,14 @@
+class CreateStallCuratedListProducts < ActiveRecord::Migration
+  def change
+    create_table :stall_curated_list_products do |t|
+      t.references :product, index: true
+      t.references :curated_product_list
+      t.integer :position, default: 0
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :stall_curated_list_products, :stall_products, column: :product_id
+    add_foreign_key :stall_curated_list_products, :stall_products, column: :curated_product_list_id
+  end
+end

data/db/migrate/20170317103740_create_stall_users.rb

@@ -0,0 +1,28 @@
+class CreateStallUsers < ActiveRecord::Migration
+  def change
+    create_table :stall_users do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.inet     :current_sign_in_ip
+      t.inet     :last_sign_in_ip
+
+      t.timestamps null: false
+    end
+
+    add_index :stall_users, :email,                unique: true
+    add_index :stall_users, :reset_password_token, unique: true
+  end
+end

data/db/migrate/20170317104332_create_stall_user_omniauth_accounts.rb

@@ -0,0 +1,14 @@
+class CreateStallUserOmniauthAccounts < ActiveRecord::Migration
+  def change
+    create_table :stall_user_omniauth_accounts do |t|
+      t.references :user, index: true
+      t.string :provider
+      t.string :uid
+      t.jsonb :scopes
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :stall_user_omniauth_accounts, :stall_users, column: 'user_id'
+  end
+end

data/db/migrate/20170320133513_fix_curated_product_list_bad_foreign_key.rb

@@ -0,0 +1,6 @@
+class FixCuratedProductListBadForeignKey < ActiveRecord::Migration
+  def change
+    remove_foreign_key :stall_curated_list_products, column: :curated_product_list_id
+    add_foreign_key :stall_curated_list_products, :stall_curated_product_lists, column: :curated_product_list_id
+  end
+end

data/db/migrate/20170321104203_create_stall_images.rb

@@ -0,0 +1,11 @@
+class CreateStallImages < ActiveRecord::Migration
+  def change
+    create_table :stall_images do |t|
+      t.integer :position, default: 0
+      t.references :imageable, polymorphic: true, index: true
+      t.attachment :file
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20170321112248_remove_image_attachment_to_stall_products.rb

@@ -0,0 +1,5 @@
+class RemoveImageAttachmentToStallProducts < ActiveRecord::Migration
+  def change
+    remove_attachment :stall_products, :image
+  end
+end

data/db/migrate/20170411134756_add_stock_to_stall_variants.rb

@@ -0,0 +1,5 @@
+class AddStockToStallVariants < ActiveRecord::Migration
+  def change
+    add_column :stall_variants, :stock, :integer, default: 0
+  end
+end

data/lib/ext/ransack.rb

@@ -0,0 +1,13 @@
+module Stall
+  module Ransack
+    def self.configure
+      ::Ransack.configure do |config|
+        config.add_predicate 'between_cents',
+          arel_predicate: 'between',
+          formatter: proc { |v| Range.new(*v.split(',').map { |s| (s.to_i * 100) }) },
+          validator: proc { |v| v.present? },
+          type: :string
+      end
+    end
+  end
+end

data/lib/generators/stall/install/templates/initializer.rb

@@ -25,20 +25,6 @@ Stall.configure do |config|
   #
   # config.sender_email = ENV['STALL_SENDER_EMAIL']
 
-  # Set the customer associated user model used by the shop to bind user
-  # accounts to.
-  #
-  # This model should have an e-mail, password and password_confirmation
-  # fields.
-  #
-  # config.default_user_model_name = 'User'
-
-  # A method available in all controllers to fetch the current signed in user
-  # in your app. It should return a user model if the visitor is signed in, and
-  # nil if it's unsigned.
-  #
-  # config.default_user_helper_method = :current_user
-
   # Global default VAT rate, can be overrided by products
   #
   # config.vat_rate = BigDecimal.new('20.0')
@@ -47,17 +33,57 @@ Stall.configure do |config|
   #
   # config.prices_precision = 2
 
+  # User omniauth providers that will be allowed for customers to authenticate
+  # with.
+  #
+  # For each activated integration, you need to add the app id and secret key
+  # environment variables.
+  #
+  #   Example :
+  #
+  #     For Facebook, add the FACEBOOK_APP_ID and FACEBOOK_SECRET_KEY environment
+  #     variables.
+  #
+  # If you prefer, you can pass the app id and secret key to the
+  # config.omniauth_provider options.
+  #
+  #   Example :
+  #
+  #     config.omniauth_provider :facebook, app_id: '000000', secret_key; 'xxxxxx'
+  #
+  # Note that Facebook and Google omniauth integrations are included by default,
+  # and you can remove them as you want, but if you want to add a new provider,
+  # you'll have to include the `omniauth-<provider_name>` gem in your app's
+  # Gemfile to make it work.
+  #
+  # config.omniauth_provider :facebook
+  # config.omniauth_provider :google_oauth2, display_name: 'Google', icon: 'google'
+
+  # Configure `devise_for :user` call, if you need to customize some
+  # controllers behavior.
+  #
+  # config.devise_for_user_config = {
+  #  controllers: { omniauth_callbacks: 'stall/omniauth_callbacks' }
+  # }
+
   # Default engine's controllers ancestor class
   #
   # config.application_controller_ancestor = '::ApplicationController'
 
-  # Set a layout to use in the checkouts controllers
+  # Set a layout to use across all stall controllers
   #
   # The default is set to nil, which will make the controllers inherit from the
   # layout of the controller set in `config.application_controller_ancestor`
   #
   # config.default_layout = nil
 
+  # Set a layout to use in the checkouts controllers
+  #
+  # The default is set to nil, which will make it inherit from the
+  # `default_checkout` config behavior defined above.
+  #
+  # config.checkout_layout = nil
+
   # Defines the parent mailer for the Stall customer and admin mailers
   #
   # If commented out, ActionMailer::Base will be used
@@ -72,6 +98,15 @@ Stall.configure do |config|
   #
   # config.default_currency = 'EUR'
 
+  # Define if inventory levels should be managed through variants stocks.
+  #
+  # It defaults to `false`, allowing customers to order any quantity of products
+  # at the same time, but can be set to true, which would allow managing
+  # stocks for every variants and add inventory levels handling when adding
+  # to cart and on payment.
+  #
+  # config.manage_inventory = false
+
   # Default app domain use for building URLs in payment gateway forms and in
   # e-mails.
   #

data/lib/generators/stall/service/service_generator.rb

@@ -11,10 +11,6 @@ module Stall
     end
 
     def post_template_message
-      puts "\n" +
-           "Service class generated. Please add the service to the " +
-           "`config.services` hash in your config/initializers/stall.rb file\n\n"
-
       return if @services_folder_existed
 
       puts " * Warning : app/services folder was just created, \n" +

data/lib/generators/stall/view/view_generator.rb

@@ -37,16 +37,18 @@ module Stall
         return @file_path_with_ext if @file_path_with_ext
         @file_path += '.html.haml' unless file_path.match(/\.html\.haml\z/)
 
-        if File.exist?(source_file_for(file_path))
-          @file_path_with_ext = file_path
-          return @file_path_with_ext
-        end
-
         partial_path = [File.dirname(file_path), File.basename(file_path)].join('/_')
 
-        if File.exist?(source_file_for(partial_path))
-          @file_path_with_ext = partial_path
-          return @file_path_with_ext
+        stall_file_path = ['stall', file_path].join('/')
+        stall_partial_path = ['stall', partial_path].join('/')
+
+        paths = [file_path, partial_path, stall_file_path, stall_partial_path]
+
+        paths.each do |path|
+          if File.exist?(source_path = source_file_for(path))
+            @file_path_with_ext = path
+            return @file_path_with_ext
+          end
         end
 
         raise ViewNotFound, "No Stall view was found for #{ file_path } !"

data/lib/para/stall/inputs/variant_select_input.rb

@@ -14,7 +14,9 @@ module Para
             foreign_key: foreign_key,
             properties: properties,
             variants_data: variants_data,
-            price_selector: price_selector
+            price_selector: price_selector,
+            variant_label_class: variant_label_class,
+            variant_property_class: variant_property_class
           }
         end
 
@@ -73,6 +75,14 @@ module Para
             end
           end
         end
+
+        def variant_label_class
+          options.fetch(:variant_label_class, 'col-md-3')
+        end
+
+        def variant_property_class
+          options.fetch(:variant_property_class, 'col-md-9')
+        end
       end
     end
   end

data/lib/para/stall/inputs/variants_matrix_input.rb

@@ -12,6 +12,8 @@ module Para
         def input(wrapper_options = nil)
           ensure_target_relation_present!
 
+          ensure_empty_variant_if_needed
+
           template.render partial: 'para/stall/inputs/variants_matrix', locals: {
             form: @builder,
             model: model,
@@ -19,9 +21,9 @@ module Para
             all_properties: all_properties,
             properties: properties,
             variants: variants,
-            require_all_properties: require_all_properties,
             dom_identifier: dom_identifier,
-            variant_row_locals: variant_row_locals
+            variant_row_locals: variant_row_locals,
+            allow_empty_variant: allow_empty_variant
           }
         end
 
@@ -45,10 +47,6 @@ module Para
           @variants ||= unsorted_variants.sort_by(&method(:variant_sort_method))
         end
 
-        def require_all_properties
-          options[:require_all_properties] || false
-        end
-
         def dom_identifier
           @dom_identifier ||= [
             model.model_name.element,
@@ -66,6 +64,14 @@ module Para
             dom_identifier: dom_identifier
           }
         end
+
+        def allow_empty_variant
+          @allow_empty_variant ||= options.fetch(:allow_empty_variant, true)
+        end
+
+        def ensure_empty_variant_if_needed
+          object.variants.build if object.variants.empty? && allow_empty_variant
+        end
       end
     end
   end

data/lib/stall.rb

@@ -7,7 +7,16 @@ require 'simple_form'
 require 'country_select'
 require 'cocoon'
 require 'deep_merge/rails_compat'
+require 'friendly_id'
 require 'para'
+require 'ransack'
+
+require 'devise'
+require 'omniauth'
+require 'omniauth-facebook'
+require 'omniauth-google-oauth2'
+
+require 'ext/ransack'
 
 require 'stall/rails/routing_mapper'
 require 'stall/rails/currency_helper'
@@ -28,6 +37,11 @@ module Stall
   autoload :DefaultCurrencyManager
   autoload :ReferenceManager
   autoload :TotalPricesManager
+  autoload :ProductFilters
+  autoload :OmniauthProvider
+
+  autoload :ProductsSearch
+  autoload :ProductsBreadcrumbs
 
   autoload :Checkout
   autoload :Shipping

data/lib/stall/addressable.rb

@@ -28,7 +28,7 @@ module Stall
     end
 
     def billing_address?
-      billing_address.persisted? && billing_address.billing?
+      billing_address.try(:persisted?) && billing_address.billing?
     end
 
     # Allow shipping address to fall back to billing address when not filled
@@ -38,7 +38,7 @@ module Stall
     end
 
     def shipping_address?
-      shipping_address.persisted? && shipping_address.billing?
+      shipping_address.try(:persisted?) && shipping_address.shipping?
     end
   end
 end

data/lib/stall/addresses/copy_source_to_target.rb

@@ -17,10 +17,14 @@ module Stall
       # Update or create target address with source attributes
       #
       def copy_address(type)
-        address = target.send(:"#{ type }_address") || target.send(:"build_#{ type }_address")
+        address = if target.send(:"#{ type }_address?")
+          target.send(:"#{ type }_address")
+        else
+          target.send(:"build_#{ type }_address")
+        end
 
-        if (source_address = source.send(:"#{ type }_address"))
-          attributes = duplicate_attributes(source_address)
+        if source.send(:"#{ type }_address?")
+          attributes = duplicate_attributes(source.send(:"#{ type }_address"))
           address.assign_attributes(attributes)
         else
           address.try(:mark_for_destruction)

data/lib/stall/addresses/prefill_target_from_source.rb

@@ -9,8 +9,10 @@ module Stall
       private
 
       def prefill_address(type)
-        if source.send("#{ type }_address") && !target.send("#{ type }_address")
-          attributes = duplicate_attributes(source.send("#{ type }_address"))
+        source_address = source.send("#{ type }_address")
+
+        if source_address && !target.send("#{ type }_address")
+          attributes = duplicate_attributes(source_address)
           target.send("build_#{ type }_address", attributes)
         elsif !target.send("#{ type }_address")
           target.send("build_#{ type }_address")

data/lib/stall/cart_helper.rb

@@ -19,11 +19,11 @@ module Stall
     end
 
     def current_customer
-      @current_customer ||= if stall_user_signed_in?
-        if (customer = current_stall_user.customer)
+      @current_customer ||= if user_signed_in?
+        if (customer = current_user.customer)
           customer
         else
-          current_stall_user.create_customer(email: current_stall_user.email)
+          current_user.create_customer(email: current_user.email)
         end
       end
     end

data/lib/stall/carts_cleaner.rb

@@ -22,7 +22,7 @@ module Stall
       carts = cart_model.empty.older_than(Stall.config.empty_carts_expires_after.ago)
 
       log "Cleaning #{ carts.count } empty carts ..."
-      carts.delete_all
+      carts.destroy_all
       log "Done."
     end
 
@@ -32,7 +32,7 @@ module Stall
     #
     # Note : The given cart model should implement the `.unpaid` method
     def clean_aborted_carts
-      carts = cart_model.aborted(before: Stall.config.aborted_carts_expires_after.ago)
+      carts = cart_model.aborted
 
       log "Cleaning #{ carts.count } aborted carts ..."
       carts.destroy_all

data/lib/stall/checkout/informations_checkout_step.rb

@@ -107,7 +107,7 @@ module Stall
 
         # Remove user from customer to avoid automatic validation of the user
         # if no user should be saved with the customer
-        unless stall_user_signed_in? || cart.customer.try(:user).try(:persisted?) ||
+        unless user_signed_in? || cart.customer.try(:user).try(:persisted?) ||
           !cart.customer
         then
           cart.customer.user = nil
@@ -120,7 +120,7 @@ module Stall
       def prepare_addresses_attributes
         unless use_another_address_for_billing?
           cart_params.delete(:billing_address_attributes)
-          cart.billing_address.try(:mark_for_destruction)
+          cart.billing_address.try(:mark_for_destruction) if cart.billing_address?
         end
       end