stall 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c1c5916425f5f689fed5cb2167bc48e6046ea6
-  data.tar.gz: 31301c3457145a56633b53d3b44c12a49ebd03db
+  metadata.gz: ac018d181d2997364eeca462e80758d50ab4c9e2
+  data.tar.gz: 4e3396a2466fab227f83d9d201a237e22147acc3
 SHA512:
-  metadata.gz: 125ee1c9e7804ebd54017e364dde2e578a729dd18e9b0283f6d3b1ee71b34e861177febbf509b7387c430b54fae86ed093911f16ab150554ec84148d126cd332
-  data.tar.gz: 2d1e7e7b43e0bc1b1f22710c00f652231529e8e2205613acdf22b0acbff30c371f95fd88e436c093451d35a5186941eed0d189458044e155f133e49381eed391
+  metadata.gz: c612280b92d9cbff047f8e7e0adf1f8dcc8abea245f7cd4cbf37170a68261c0d732f53266c11ba666fbf103c3b3998f267ce970fbb553b40880f88a2e52ee21e
+  data.tar.gz: b35431b6aa8856a8b3dc21686dff0346d0b724ec443176f044d022e0495563584a7e6d8ff537b227be52f91aed929b9e23bbacfa85ff7fb1c827024d7749cb51

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

@@ -1,4 +1,4 @@
-class VariantSelectInput extends Vertebra.View
+class Stall.VariantSelectInput extends Vertebra.View
   events:
     'change [data-variant-select-property]': 'onInputChanged'
 
@@ -57,6 +57,7 @@ class VariantSelectInput extends Vertebra.View
     price = if variant then variant.price else @originalPrice
     @$priceTarget.html(price)
 
-$(document).on 'page:change turbolinks:load', ->
+
+Stall.onDomReady ->
   $('[data-variant-select-input]').each (i, el) ->
-    new VariantSelectInput(el: el)
+    new Stall.VariantSelectInput(el: el)

data/app/assets/javascripts/stall.coffee

@@ -4,7 +4,9 @@
 #= require_self
 #
 #= require stall/add-to-cart-form
-#= require stall/cart-form
+#= require stall/add-to-wish-list-button
+#= require stall/add-product-to-wish-list-button
+#= require stall/product-list-form
 #= require stall/addresses-fields
 #= require stall/remote-sign-in-form
 #= require stall/products-filters

data/app/assets/javascripts/stall/add-product-to-wish-list-button.coffee

@@ -0,0 +1,99 @@
+class Stall.AddProductToWishListButton extends Vertebra.View
+  events:
+    'click': 'onButtonClicked'
+
+  onButtonClicked: ->
+    if @$el.is('[data-included]') then @remove() else @add()
+
+  add: ->
+    @setLoading(true)
+
+    data =
+      product_id: @$el.data('product-id')
+
+    $.post(@$el.data('url'), data).then(@onResponse)
+
+  remove: ->
+    @setLoading(true)
+
+    data =
+      _method: 'delete'
+
+    $.post(@$el.data('url'), data).then(@onResponse)
+
+  onResponse: (resp) =>
+    @popover?.destroy()
+    @setLoading(false)
+    @setNewElement($(resp))
+
+  setNewElement: ($el) ->
+    @$el.tooltip('hide')
+    @$el.replaceWith($el)
+    @setElement($el)
+    # Open popover if provided
+    if (content = $el.data('popover-content')) then @openPopover(content)
+
+  openPopover: (content) ->
+    @popover = new Stall.WishListFormPopover(content: content)
+    @popover.renderTo(@$el)
+    @listenTo(@popover, 'send', => @setLoading(true))
+    @listenTo(@popover, 'added', @onResponse)
+
+  setLoading: (state) ->
+    @popover?.hide()
+    @$el.toggleClass('loading', state)
+    @$('[data-wish-list-icon]').toggleClass('hidden', state)
+    @$('[data-wish-list-loading-spinner]').toggleClass('hidden', !state)
+
+class Stall.WishListFormPopover extends Vertebra.View
+  events:
+    'ajax:beforeSend [data-add-to-wish-list-form]': 'onBeforeSend'
+    'ajax:success [data-add-to-wish-list-form]': 'onItemAdded'
+    'click [data-cancel-button]': 'onCancelClicked'
+
+  initialize: (options = {}) ->
+    @content = options.content
+
+  renderTo: ($parent) ->
+    $parent.popover
+      title: false
+      content: @content
+      html: true
+      trigger: 'manual'
+      placement: 'auto'
+      container: 'body'
+
+    @popover = $parent.data('bs.popover')
+    @popover.show()
+
+    @setElement(@popover.$tip)
+    @initializeForm()
+
+  initializeForm: ->
+    @$('[data-variant-select-input]').each (i, el) ->
+      new Stall.VariantSelectInput(el: el)
+
+  hide: ->
+    @popover?.hide()
+
+  onBeforeSend: ->
+    @trigger('send')
+
+  onItemAdded: (e, resp) ->
+    @trigger('added', resp)
+
+  onCancelClicked: ->
+    console.log 'onCancelClicked', this
+    @destroy()
+
+  destroy: ->
+    return if @destroyed
+    @popover.destroy()
+    @popover = null
+    super()
+    @destroyed = true
+
+
+Stall.onDomReady ->
+  $('[data-add-to-wish-list="product"]').each (i, el) ->
+    new Stall.AddProductToWishListButton(el: el)

data/app/assets/javascripts/stall/add-to-wish-list-button.coffee

@@ -0,0 +1,17 @@
+class Stall.AddToWishListButton extends Vertebra.View
+  events:
+    'click': 'add'
+
+  initialize: ->
+    @url = @$el.data('url')
+
+  add: ->
+    data = @$el.closest('form').serialize()
+    $.post(@url, data).then(@onResponse)
+
+  onResponse: (resp) =>
+    $(resp).modal()
+
+Stall.onDomReady ->
+  $('[data-add-to-wish-list="line-item-form"]').each (i, el) ->
+    new Stall.AddToWishListButton(el: el)

data/app/assets/javascripts/stall/product-list-form.coffee

@@ -0,0 +1,31 @@
+class Stall.ProductListForm extends Vertebra.View
+  events:
+    'change [data-quantity-field]': 'formUpdated'
+    'cocoon:after-remove': 'formUpdated'
+    'ajax:success': 'updateSuccess'
+
+  initialize: ->
+    @clean()
+
+  clean: ->
+    @$('[data-product-list-update-button]').hide(0)
+    # Backwards compatibility with app overriden cart forms
+    @$('[data-cart-update-button]').hide(0)
+
+  formUpdated: (e) ->
+    @$el.submit()
+
+  updateSuccess: (e, resp) ->
+    @updateProductListFormWith(resp)
+
+  updateProductListFormWith: (markup) =>
+    $form = $(markup).find('[data-product-list-form], [data-cart-form]')
+    @$el.html($form.html())
+    @clean()
+
+
+Stall.onDomReady ->
+  # Backwards compatibility with app overriden cart forms
+  if ($product_listForm = $('[data-product-list-form], [data-cart-form]')).length
+    product_listForm = new Stall.ProductListForm(el: $product_listForm)
+    $product_listForm.data('stall.product-list-form', product_listForm)

data/app/controllers/stall/cart_line_items_controller.rb

@@ -0,0 +1,21 @@
+module Stall
+  class CartLineItemsController < Stall::LineItemsController
+    def create
+      super do |success|
+        if success
+          @widget_partial = render_to_string(partial: 'stall/carts/widget', locals: { cart: product_list })
+        end
+      end
+    end
+
+    private
+
+    def product_list
+      @product_list ||= ProductList.find_by_token(params[:cart_id]) || current_cart
+    end
+
+    def service
+      @service ||= Stall.config.service_for(:add_to_cart).new(product_list, params)
+    end
+  end
+end

data/app/controllers/stall/curated_product_lists_controller.rb

@@ -5,6 +5,12 @@ module Stall
     def show
       @curated_product_list = CuratedProductList.friendly.find(params[:id])
       search_products_among(@curated_product_list.products)
+
+      # Also select curated list product positions to allow distinct call to
+      # work when ordering results by position
+      @products = @products.select('stall_products.*, stall_curated_list_products.position')
+
+      add_breadcrumb(@curated_product_list)
     end
   end
 end

data/app/controllers/stall/line_items_controller.rb

@@ -1,23 +1,30 @@
 module Stall
   class LineItemsController < Stall::ApplicationController
     def create
-      service = Stall.config.service_for(:add_to_cart).new(cart, params)
-
       if service.call
         @quantity = params[:line_item][:quantity].to_i
         @line_item = service.line_item
-        @widget_partial = render_to_string(partial: 'stall/carts/widget', locals: { cart: cart })
-        render partial: 'added'
+        # Allow subclasses to hook into successful product list add
+        yield(true) if block_given?
+        # We do not render if the yield bock already has done it
+        render partial: 'added' unless response_body
       else
         @line_item = service.line_item
-        render partial: 'add_error'
+        # Allow subclasses to hook into failed product list add
+        yield(false) if block_given?
+        # We do not render if the yield bock already has done it
+        render partial: 'add_error' unless response_body
       end
     end
 
     private
 
-    def cart
-      @cart ||= ProductList.find_by_token(params[:cart_id]) || current_cart
+    def product_list
+      fail NotImplementedError, 'Override #product_list in subclass'
+    end
+
+    def service
+      fail NotImplementedError, 'Override #service in subclass'
     end
   end
 end

data/app/controllers/stall/products_breadcrumbs.rb

@@ -3,7 +3,14 @@ module Stall
     private
 
     def add_product_breadcrumbs
-      add_product_category_breadcrumbs(@product.product_category)
+      if @curated_product_list
+        add_breadcrumb(@curated_product_list)
+      elsif @manufacturer
+        add_breadcrumb(@manufacturer)
+      else
+        add_product_category_breadcrumbs(@product.product_category)
+      end
+
       add_breadcrumb(@product)
     end
 

data/app/controllers/stall/products_controller.rb

@@ -3,6 +3,8 @@ module Stall
     include ProductsSearch
     include ProductsBreadcrumbs
 
+    before_action :load_parent_data
+
     def index
       search_products_among(Product.all)
 
@@ -16,5 +18,15 @@ module Stall
 
       add_product_breadcrumbs
     end
+
+    private
+
+    def load_parent_data
+      if params[:curated_product_list_id]
+        @curated_product_list = CuratedProductList.find(params[:curated_product_list_id])
+      elsif params[:manufacturer_id]
+        @manufacturer = Manufacturer.find(params[:manufacturer_id])
+      end
+    end
   end
 end

data/app/controllers/stall/wish_list_line_items_controller.rb

@@ -0,0 +1,52 @@
+module Stall
+  class WishListLineItemsController < Stall::LineItemsController
+    include Stall::AddToWishListHelper
+
+    def create
+      if !service.line_item_params? && (product_id = params[:product_id]).present?
+        product = Product.find(product_id)
+
+        if product.variants.length > 1
+          form = render_to_string(
+            partial: 'stall/wish_list_line_items/form', locals: {
+              wish_list: product_list, line_item: LineItem.new, product: product
+            }
+          )
+
+          add_to_wish_list_button(product, {
+            wish_list: product_list, popover_content: form
+          })
+        else
+          service.add(product.variants.first)
+          add_to_wish_list_button(product, wish_list: product_list)
+        end
+      else
+        super do |valid|
+          if (product = @line_item.sellable.try(:product))
+            add_to_wish_list_button(product, wish_list: product_list)
+          end
+        end
+      end
+    end
+
+    def destroy
+      line_item = product_list.line_items.find(params[:id])
+      product = line_item.sellable.try(:product)
+      product_list.line_items.destroy(line_item)
+
+      if product
+        add_to_wish_list_button(product, wish_list: product_list)
+      end
+    end
+
+    private
+
+    def product_list
+      @product_list ||= ProductList.find_by_token(params[:cart_id]) || current_wish_list
+    end
+
+    def service
+      @service ||= Stall.config.service_for(:add_to_wish_list).new(product_list, params)
+    end
+  end
+end

data/app/controllers/stall/wish_lists_controller.rb

@@ -0,0 +1,7 @@
+module Stall
+  class WishListsController < Stall::ApplicationController
+    def show
+      @wish_list = current_customer.wish_lists.find_by_token(params[:id])
+    end
+  end
+end

data/app/helpers/stall/add_to_cart_helper.rb

@@ -1,9 +1,10 @@
 module Stall
   module AddToCartHelper
     def add_to_cart_form_for(sellable, cart: nil)
-      render partial: 'stall/line_items/form', locals: {
+      render partial: 'stall/cart_line_items/form', locals: {
         cart: (cart || current_cart),
-        line_item: LineItem.new(sellable: sellable)
+        line_item: LineItem.new(sellable: sellable),
+        product: sellable
       }
     end
   end

data/app/helpers/stall/add_to_wish_list_helper.rb

@@ -0,0 +1,30 @@
+module Stall
+  module AddToWishListHelper
+    def add_to_wish_list_button(product, variant: nil, wish_list: current_wish_list, popover_content: nil)
+      included = wish_list.includes_product?(product)
+
+      url = if included
+        line_item = wish_list.line_item_for_product(product)
+        wish_list_line_item_path(current_wish_list, line_item)
+      else
+        wish_list_line_items_path(current_wish_list)
+      end
+
+      title = if included
+        t('stall.wish_list_line_items.form.remove')
+      else
+        t('stall.wish_list_line_items.form.add')
+      end
+
+      render partial: 'stall/wish_list_line_items/button', locals: {
+        product: product,
+        variant: variant,
+        cart: wish_list,
+        included: included,
+        url: url,
+        title: title,
+        popover_content: popover_content
+      }
+    end
+  end
+end

data/app/helpers/stall/products_helper.rb

@@ -0,0 +1,13 @@
+module Stall
+  module ProductsHelper
+    def product_path(*args)
+      if @curated_product_list
+        curated_product_list_product_path(@curated_product_list, *args)
+      elsif @manufacturer
+        manufacturer_product_path(@manufacturer, *args)
+      else
+        Rails.application.routes.url_helpers.product_path(*args)
+      end
+    end
+  end
+end

data/app/models/stall/models/cart.rb

@@ -12,12 +12,6 @@ module Stall
         attr_accessor :terms
       end
 
-      def total_weight
-        line_items.reduce(0) do |total, line_item|
-          total + (line_item.weight || Stall.config.default_product_weight)
-        end
-      end
-
       def active?
         !paid?
       end

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

@@ -14,12 +14,21 @@ module Stall
         before_validation :ensure_user_email
 
         has_many :product_lists, dependent: :destroy
+        has_many :wish_lists, class_name: 'WishList'
         has_many :credit_notes, dependent: :destroy
         has_many :carts, dependent: :nullify
 
         validates :email, presence: true,
                           format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\W]+\z/ }
 
+        def name
+          if billing_address && (billing_address.first_name.present? || billing_address.last_name.present?)
+            [billing_address.last_name, billing_address.first_name].join(' ')
+          else
+            email
+          end
+        end
+
         def user_or_default
           user || build_user
         end