stall 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3519db9164c6f4fd61e1e56f019ef90c3e6a5d
-  data.tar.gz: 9fad0f1035c6510b67c80865b6284f844e4686ca
+  metadata.gz: d3c1c5916425f5f689fed5cb2167bc48e6046ea6
+  data.tar.gz: 31301c3457145a56633b53d3b44c12a49ebd03db
 SHA512:
-  metadata.gz: 31367405801aa97eca7302b4286ee0d39c46540ba389eff0c43a3a9461123217c0414afa82249d073b3ebef0f143a6f1fbc151a5e63235c0773681eb8e873861
-  data.tar.gz: 8114b8156abd5b6cd53d861d6c952347f01f09c49040c30a67c0c3224fd7c3297e2fa09248ac75d46ef4bacc2db9c14759d01420d84c865ea5971c496afe5df2
+  metadata.gz: 125ee1c9e7804ebd54017e364dde2e578a729dd18e9b0283f6d3b1ee71b34e861177febbf509b7387c430b54fae86ed093911f16ab150554ec84148d126cd332
+  data.tar.gz: 2d1e7e7b43e0bc1b1f22710c00f652231529e8e2205613acdf22b0acbff30c371f95fd88e436c093451d35a5186941eed0d189458044e155f133e49381eed391

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://api.travis-ci.org/rails-stall/stall.svg?branch=master)](http://travis-ci.org/rails-stall/stall)
 [![Test Coverage](https://codeclimate.com/github/rails-stall/stall/badges/coverage.svg)](https://codeclimate.com/github/rails-stall/stall/coverage)
+[![Code Climate](https://codeclimate.com/github/rails-stall/stall/badges/gpa.svg)](https://codeclimate.com/github/rails-stall/stall)
 
 Stall is a flexible e-commerce framework for Rails with some specific concerns
 in mind :
@@ -63,33 +64,26 @@ Here are the mandatory ones :
 
 ### 2. Configuring shop users
 
-The default cart behavior admits that you have a user model, named `User` and
-that you are using [Devise](https://github.com/plataformatec/devise)
-compatible helpers in your controllers (`current_user`).
+Stall uses [Devise](https://github.com/plataformatec/devise) to authenticate
+shop customers through a `User` model.
 
-You can configure those settings by setting the following initializer config
-parameters :
+To add behavior to this model, you can override the model like any other Stall
+model by using the model generator :
 
-- `default_user_model_name`
-- `default_user_helper_method`
-
-Also, the user should include an inverse `:customer` relation targeting the
-Stall's customer model like the following :
-
-```ruby
-has_one :customer, as: :user
+```bash
+rails generate stall:model user
 ```
 
-#### Remove user management
+#### Omniauth
+
+You can easily make customers sign in and up with omniauth. Stall comes with
+Facebook and Google OAuth2 integrations, but other other integrations can be
+easily added.
 
-If you don't want to associate a user account to your customers, you'll need
-to set those variables to `nil` and remove the user creation form in the
-informations checkout step (See
-[Configuring the checkout flow](#4-configuring-the-checkout-flow) and
-[Customizing views](#5-customizing-views) for more informations on how to
-do this).
+To use this feature, just uncomment the `config.omniauth_provider` lines in
+the initializer.
 
-Note that this is untested for now, but should be doable quite easily.
+For more information, please see the initializer comments.
 
 ### 3. Making a model sellable
 

data/app/assets/javascripts/para/stall/inputs/variants-matrix/input.coffee

@@ -3,6 +3,8 @@ class VariantsMatrix.Input extends Vertebra.View
     @$variantsContainer = @$('[data-variants-matrix-variants-container]')
     @$variantsTableHeader = @$('[data-variants-matrix-variants-table-header]')
 
+    @allowEmptyVariant = @$el.is('[data-allow-empty-variant]')
+
     @propertiesSelect = new VariantsMatrix.PropertiesSelect(el: @$('[data-variants-matrix-properties-select]'))
     @listenTo(@propertiesSelect, 'change', @onPropertySelectChanged)
 
@@ -16,6 +18,7 @@ class VariantsMatrix.Input extends Vertebra.View
     @variants = for row in @$('[data-variants-matrix-variant-row]').get()
       combination = @findCombinationForRow(row, existingCombinations)
       variant = new VariantsMatrix.Variant(el: row, combination: combination, input: this)
+      @listenTo(variant, 'applytoall', @onVariantApplyToAll)
       @listenTo(variant, 'destroy', @onVariantDestroyed)
 
       variant
@@ -83,6 +86,7 @@ class VariantsMatrix.Input extends Vertebra.View
     variant = new VariantsMatrix.Variant(combination: combination, input: this)
     variant.renderTo(@$variantsContainer)
     @listenTo(variant, 'destroy', @onVariantDestroyed)
+    @listenTo(variant, 'applytoall', @onVariantApplyToAll)
     @variants.push(variant)
 
     variant
@@ -122,7 +126,10 @@ class VariantsMatrix.Input extends Vertebra.View
       # one for next iterations to use it
       combinations = new_combinations
 
-    combinations
+    if !combinations.length && @allowEmptyVariant then [{}] else combinations
+
+  onVariantApplyToAll: (variant) =>
+    v.copyInputsFrom(variant) for v in @variants when v.cid isnt variant.cid
 
   # Cleanup destroyed variants
   #

data/app/assets/javascripts/para/stall/inputs/variants-matrix/variant.coffee

@@ -1,6 +1,7 @@
 class VariantsMatrix.Variant extends Vertebra.View
   events:
     'change [data-variants-matrix-variant-enabled]': 'onEnabledStateChanged'
+    'click [data-variants-matrix-apply-to-all]': 'onApplyToAllClicked'
 
   initialize: (options = {}) ->
     @combination = options.combination
@@ -57,3 +58,11 @@ class VariantsMatrix.Variant extends Vertebra.View
 
   setDestroyed: (state) ->
     @$el.find('[data-variant-remove]').val(if state then 'true' else 'false')
+
+  onApplyToAllClicked: ->
+    @trigger('applytoall', this)
+
+  copyInputsFrom: (otherVariant) ->
+    @$('input:visible').each (i, el) ->
+      otherValue = otherVariant.$('input:visible').eq(i).val()
+      $(el).val(otherValue)

data/app/assets/javascripts/stall.coffee

@@ -1,11 +1,17 @@
 #= require vertebra
 #= require cocoon
+#
 #= require_self
+#
 #= require stall/add-to-cart-form
 #= require stall/cart-form
 #= require stall/addresses-fields
 #= require stall/remote-sign-in-form
-
+#= require stall/products-filters
+#
+#= require para/stall/inputs/variant-select
+#= require para/lib/turbolinks-forms
+#
 
 @Stall =
   onDomReady: (callback) ->

data/app/assets/javascripts/stall/add-to-cart-form.coffee

@@ -25,9 +25,7 @@ class Stall.AddToCartForm extends Vertebra.View
     @errorMessages = @$el.data('error-messages')
 
   sendRequest: ->
-    unless (v = @validate(submit: true)) and (e = !@errors.length)
-      console.log 'sendRequest', v, e
-      return false
+    return false unless (v = @validate(submit: true)) and (e = !@errors.length)
     @setLoading(true)
     true
 
@@ -85,7 +83,6 @@ class Stall.AddToCartForm extends Vertebra.View
     @$button.tooltip('disable') if @$button.data('bs.tooltip')
     @$button.prop('disabled', false)
 
-
   setLoading: (loading) ->
     state = if loading then 'loading' else 'reset'
     @$button.button(state)

data/app/assets/javascripts/stall/products-filters.coffee

@@ -0,0 +1,29 @@
+class Stall.ProductsFilters extends Vertebra.View
+  events:
+    'change [data-filter-submission="change"]': 'filterChanged'
+    'slideStop [data-filter-submission="slide"]': 'filterChanged'
+    'submit': 'setSubmitted'
+
+  filterChanged: (e) ->
+    @submit()
+
+  submit: ->
+    setTimeout((=> @$el.submit()), 0)
+
+  setSubmitted: (e) ->
+    return e.preventDefault() if @submitted
+    @submitted = true
+
+    $overlay = $('<div/>', class: 'overlay').css(
+      position: 'absolute',
+      width: '100%',
+      height: '100%',
+      background: '#fafafa',
+      zIndex: '100',
+      opacity: '0.4'
+    )
+
+    @$el.prepend($overlay)
+
+Stall.onDomReady ->
+  $('[data-products-filters]').each (i, el) -> new Stall.ProductsFilters(el: el)

data/app/assets/stylesheets/para/stall.sass

@@ -17,6 +17,11 @@
   display: block
   padding: 5px
 
+.variants-matrix-properties-list
+  .list-group-item
+    padding: 10px 0
+    border: none
+
 .form-group.variants_matrix
   padding-right: 0
 

data/app/controllers/stall/checkout/steps_controller.rb

@@ -1,8 +1,6 @@
 module Stall
   module Checkout
-    class StepsController < Stall::ApplicationController
-      include Stall::CheckoutHelper
-
+    class StepsController < Stall::CheckoutBaseController
       skip_before_action :verify_authenticity_token, on: :foreign_update
       before_action :load_cart
       before_action :load_step
@@ -43,6 +41,9 @@ module Stall
       def load_cart
         @cart = current_cart
 
+        # If the cart is not checkoutable, look for a potential cart could have
+        # just been paid and that would be archived it a specific cookie, or
+        # exit from the checkout
         unless @cart.checkoutable?
           if archived_paid_cart?
             @cart = archived_paid_cart
@@ -66,8 +67,8 @@ module Stall
           step.inject(:cookies, cookies)
           step.inject(:request, request)
           step.inject(:flash, flash)
-          step.inject(:stall_user_signed_in?, stall_user_signed_in?)
-          step.inject(:current_stall_user, current_stall_user)
+          step.inject(:user_signed_in?, user_signed_in?)
+          step.inject(:current_user, current_user)
 
           if Stall.config.steps_initialization
             instance_exec(step, &Stall.config.steps_initialization)

data/app/controllers/stall/checkout_base_controller.rb

@@ -0,0 +1,14 @@
+module Stall
+  class CheckoutBaseController < Stall::ApplicationController
+    include CheckoutHelper
+
+    # Use specific checkout layout if needed or default to parent one
+    #
+    def set_stall_layout
+      return false if request.xhr?
+      return Stall.config.checkout_layout if Stall.config.checkout_layout
+
+      super
+    end
+  end
+end

data/app/controllers/stall/checkouts_controller.rb

@@ -1,12 +1,10 @@
 module Stall
-  class CheckoutsController < Stall::ApplicationController
-    include CheckoutHelper
-
+  class CheckoutsController < Stall::CheckoutBaseController
     before_action :load_cart
 
     def show
       @cart.reset_state!
-      Stall.config.service_for(:cart_update).new(@cart).refresh_associated_services!
+      refresh_cart!
       redirect_to step_path
     end
 
@@ -15,5 +13,10 @@ module Stall
     def load_cart
       @cart = current_cart
     end
+
+    def refresh_cart!
+      service = Stall.config.service_for(:cart_update).new(@cart)
+      service.refresh_associated_services!
+    end
   end
 end

data/app/controllers/stall/curated_product_lists_controller.rb

@@ -0,0 +1,10 @@
+module Stall
+  class CuratedProductListsController < Stall::ApplicationController
+    include ProductsSearch
+
+    def show
+      @curated_product_list = CuratedProductList.friendly.find(params[:id])
+      search_products_among(@curated_product_list.products)
+    end
+  end
+end

data/app/controllers/stall/line_items_controller.rb

@@ -1,7 +1,7 @@
 module Stall
   class LineItemsController < Stall::ApplicationController
     def create
-      service = Stall.config.service_for(:add_to_cart).new(cart, line_item_params)
+      service = Stall.config.service_for(:add_to_cart).new(cart, params)
 
       if service.call
         @quantity = params[:line_item][:quantity].to_i
@@ -16,10 +16,6 @@ module Stall
 
     private
 
-    def line_item_params
-      params.require(:line_item).permit(:sellable_type, :sellable_id, :quantity)
-    end
-
     def cart
       @cart ||= ProductList.find_by_token(params[:cart_id]) || current_cart
     end

data/app/controllers/stall/manufacturers_controller.rb

@@ -0,0 +1,12 @@
+module Stall
+  class ManufacturersController < Stall::ApplicationController
+    include ProductsSearch
+
+    def show
+      @manufacturer = Manufacturer.friendly.find(params[:id])
+      search_products_among(@manufacturer.products)
+
+      add_breadcrumb(@manufacturer)
+    end
+  end
+end

data/app/controllers/stall/omniauth_callbacks_controller.rb

@@ -0,0 +1,49 @@
+module Stall
+  class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+    include Stall::OmniauthHelper
+
+    # Pre-authorize request to store the redirect path, allowing users to get
+    # back to the checkout wether the authentication is successful or not.
+    #
+    def redirect
+      session['omniauth.after_sign_in_redirect_path'] = params[:_redirect_to] if params[:_redirect_to]
+      redirect_to user_omniauth_authorize_path_for(params[:provider])
+    end
+
+    def facebook
+      authenticate_user_from_oauth_callback!
+    end
+
+    def google_oauth2
+      authenticate_user_from_oauth_callback!
+    end
+
+    private
+
+    def authenticate_user_from_oauth_callback!
+      user = Stall.config.service_for(:omniauth_user_authentication).new(auth.info.email, auth).call
+      sign_in_and_redirect(user, event: :authentication)
+      set_flash_message(:notice, :success, kind: auth.provider.humanize) if is_navigational_format?
+    end
+
+    def auth
+      @auth ||= request.env['omniauth.auth']
+    end
+
+    def after_omniauth_failure_path_for(scope)
+      redirect_path || new_session_path(scope)
+    end
+
+    def after_sign_in_path_for(scope)
+      redirect_path || stored_location_for(scope) || root_path
+    end
+
+    def after_sign_up_path_for(scope)
+      redirect_path || stored_location_for(scope) || root_path
+    end
+
+    def redirect_path
+      session.delete('omniauth.after_sign_in_redirect_path')
+    end
+  end
+end

data/app/controllers/stall/product_categories_controller.rb

@@ -0,0 +1,13 @@
+module Stall
+  class ProductCategoriesController < Stall::ApplicationController
+    include ProductsSearch
+    include ProductsBreadcrumbs
+
+    def show
+      @product_category = ProductCategory.friendly.find(params[:id])
+      search_products_among(@product_category.all_child_products)
+
+      add_product_category_breadcrumbs(@product_category)
+    end
+  end
+end

data/app/controllers/stall/products_breadcrumbs.rb

@@ -0,0 +1,16 @@
+module Stall
+  module ProductsBreadcrumbs
+    private
+
+    def add_product_breadcrumbs
+      add_product_category_breadcrumbs(@product.product_category)
+      add_breadcrumb(@product)
+    end
+
+    def add_product_category_breadcrumbs(product_category)
+      product_category.self_and_ancestors.reverse.each do |category|
+        add_breadcrumb category
+      end if product_category
+    end
+  end
+end

data/app/controllers/stall/products_controller.rb

@@ -0,0 +1,20 @@
+module Stall
+  class ProductsController < Stall::ApplicationController
+    include ProductsSearch
+    include ProductsBreadcrumbs
+
+    def index
+      search_products_among(Product.all)
+
+      add_breadcrumb :products
+    end
+
+    def show
+      @product = Product.friendly.includes(
+        variants: [variant_property_values: [property_value: :property]]
+      ).find(params[:id])
+
+      add_product_breadcrumbs
+    end
+  end
+end

data/app/controllers/stall/products_search.rb

@@ -0,0 +1,11 @@
+module Stall
+  module ProductsSearch
+    private
+
+    def search_products_among(products)
+      @filterable_products = products
+      @search = Stall.config.service_for(:products_search).new(@filterable_products, params)
+      @products = @search.records.page(params[:page])
+    end
+  end
+end

data/app/helpers/stall/customers_helper.rb

@@ -1,15 +1,5 @@
 module Stall
   module CustomersHelper
-    def stall_user_signed_in?
-      !!current_stall_user
-    end
-
-    def current_stall_user
-      if (method = Stall.config.default_user_helper_method) && respond_to?(method, true)
-        send(Stall.config.default_user_helper_method)
-      end
-    end
-
     # Copy e-mail error messages from user to customer, allowing them to be
     # displayed in customer e-mail input to the visitor
     #