stall 0.2.0 → 0.3.1

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

@@ -0,0 +1,59 @@
+class VariantsMatrix.Variant extends Vertebra.View
+  events:
+    'change [data-variants-matrix-variant-enabled]': 'onEnabledStateChanged'
+
+  initialize: (options = {}) ->
+    @combination = options.combination
+    @persisted = @$el?.data('variant-id')
+    @input = options.input
+
+  renderTo: ($container) ->
+    $variant = $(@input.nestedFieldsManager.render())
+    $variant.appendTo($container)
+    @setElement($variant)
+    @$el.simpleForm()
+    @fillProperties()
+
+  fillProperties: ->
+    for propertyValue in @propertyValues()
+      $propertyValue = @$("[data-variants-matrix-variant-property='#{ propertyValue.propertyId }']")
+      $propertyValue.find('[data-property-name]').html(propertyValue.name)
+      $propertyValue.find('[data-property-value-id]').val(propertyValue.id)
+      $propertyValue.removeClass('hidden')
+
+  remove: ->
+    if @persisted
+      @$el.hide(0)
+      @setDestroyed(true)
+    else
+      @$el.remove()
+      @trigger('destroy', this)
+
+  show: ->
+    @$el.show(0)
+    @setDestroyed(false)
+
+  matches: (combination) ->
+    VariantsMatrix.objectsAreEqual(@combination, combination)
+
+  propertyValues: ->
+    @_propertyValues ?= for key, value of @combination when @combination.hasOwnProperty(key)
+      @buildPropertyValueFor(key, value)
+
+  buildPropertyValueFor: (key, value) ->
+    id: value.id
+    name: value.name
+    type: key
+    propertyId: value.propertyId
+
+  setEnabledState: (state) ->
+    @$('[data-variants-matrix-variant-enabled]')
+      .prop('checked', state)
+      .trigger('change')
+
+  onEnabledStateChanged: (e) ->
+    checked = @$('[data-variants-matrix-variant-enabled]').prop('checked')
+    @$el.toggleClass('disabled')
+
+  setDestroyed: (state) ->
+    @$el.find('[data-variant-remove]').val(if state then 'true' else 'false')

data/app/assets/javascripts/stall.coffee

@@ -6,6 +6,7 @@
 #= require stall/addresses-fields
 #= require stall/remote-sign-in-form
 
+
 @Stall =
   onDomReady: (callback) ->
     event = if window.Turbolinks && window.Turbolinks.supported

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

@@ -1,10 +1,18 @@
 class Stall.AddToCartForm extends Vertebra.View
   @create = ($el) ->
-    unless (instance = $el.data('stall.add-to-cart-form'))
-      instance = new Stall.AddToCartForm(el: $el)
-      $el.data('stall.add-to-cart-form', instance)
+    unless (form = $el.data('stall.add-to-cart-form'))
+      form = new Stall.AddToCartForm(el: $el)
+      $el.data('stall.add-to-cart-form', form)
 
-    instance.sendRequest()
+    form
+
+  @validate = ($el) ->
+    form = Stall.AddToCartForm.create($el)
+    form.validate()
+
+  @sendRequest = ($el) ->
+    form = Stall.AddToCartForm.create($el)
+    form.sendRequest()
 
   events:
     'ajax:success': 'onSuccess'
@@ -17,7 +25,9 @@ class Stall.AddToCartForm extends Vertebra.View
     @errorMessages = @$el.data('error-messages')
 
   sendRequest: ->
-    return false unless @validate(submit: true) and !@errors.length
+    unless (v = @validate(submit: true)) and (e = !@errors.length)
+      console.log 'sendRequest', v, e
+      return false
     @setLoading(true)
     true
 
@@ -27,42 +37,54 @@ class Stall.AddToCartForm extends Vertebra.View
   validate: (options = {})->
     @checkErrors()
     @refreshErrorsDisplay(options)
+    !@errors.length
 
   checkErrors: ->
     @errors = []
-    @errors.push('choose') unless @$('[name$="[sellable_id]"]').val()
-    @errors.push('quantity') unless @$('[name$="[quantity]"]').val()
+    @errors.push('choose') unless @sellableChosen()
+    @errors.push('quantity') unless @quantityFilled()
+
+  sellableChosen: ->
+    !!@$('[name$="[sellable_id]"]').val()
+
+  quantityFilled: ->
+    quantity = parseInt(@$('[name$="[quantity]"]').val(), 10)
+    quantity > 0
 
   onComplete: ->
     @setLoading(false)
 
   onSuccess: (e, resp) ->
     @$modal = $(resp).appendTo('body').modal()
-    @updateTotalQuantityCounter()
-
-  updateTotalQuantityCounter: ->
-    quantity = @$modal.data('cart-total-quantity')
+    @updateWidget()
 
-    if ($counter = $('[data-cart-quantity-counter]')).length
-      $counter.text(quantity)
+  updateWidget: ->
+    if ($widget = $('[data-cart-widget]'))
+      $widget.replaceWith(@$modal.data('cart-widget-markup'))
+    else if ($counter = $('[data-cart-quantity-counter]')).length
+      $counter.text(@$modal.data('cart-total-quantity'))
 
   # Displays errors in a tooltip on the form submit button, listing different
   # errors and disabling the submit button
   refreshErrorsDisplay: (options = {}) ->
-    buttonIsTooltip = @$button.data('bs.tooltip')
-
-    if @errors.length
-      messages = (@errorMessages[error] for error in @errors)
-      message = messages.join('<br>')
-      @$button.attr(title: message)
-      @$button.tooltip() unless buttonIsTooltip
-      # Force tooltip display if the user just submitted the form
-      @$button.tooltip('show') if options.submit
-      @$button.prop('disabled', true)
-    else
-      @$button.attr(title: '')
-      @$button.tooltip('destroy') if buttonIsTooltip
-      @$button.prop('disabled', false)
+    @clearErrorMessages()
+    @displayErrorMessages(options) if @errors.length
+
+  displayErrorMessages: (options) ->
+    messages = (@errorMessages[error] for error in @errors)
+    message = messages.join('<br>')
+    @$button.attr('data-original-title': message)
+    @$button.tooltip(html: true)
+    @$button.tooltip('enable')
+    # Force tooltip display if the user just submitted the form
+    @$button.tooltip('show') if options.submit
+    @$button.prop('disabled', true)
+
+  clearErrorMessages: ->
+    @$button.attr(title: '')
+    @$button.tooltip('disable') if @$button.data('bs.tooltip')
+    @$button.prop('disabled', false)
+
 
   setLoading: (loading) ->
     state = if loading then 'loading' else 'reset'
@@ -70,5 +92,8 @@ class Stall.AddToCartForm extends Vertebra.View
 
 
 Stall.onDomReady ->
+  $('[data-add-to-cart-form]').each (i, el) ->
+    Stall.AddToCartForm.validate($(el))
+
   $('body').on 'ajax:beforeSend', '[data-add-to-cart-form]', (e) ->
-    Stall.AddToCartForm.create($(e.currentTarget))
+    Stall.AddToCartForm.sendRequest($(e.currentTarget))

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

@@ -14,10 +14,15 @@ class Stall.CartForm extends Vertebra.View
     @$el.submit()
 
   updateSuccess: (e, resp) ->
-    $form = $(resp).find('[data-cart-form]')
+    @updateCartFormWith(resp)
+
+  updateCartFormWith: (markup) =>
+    $form = $(markup).find('[data-cart-form]')
     @$el.html($form.html())
     @clean()
 
+
 Stall.onDomReady ->
   if ($cartForm = $('[data-cart-form]')).length
-    new Stall.CartForm(el: $cartForm)
+    cartForm = new Stall.CartForm(el: $cartForm)
+    $cartForm.data('stall.cart-form', cartForm)

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

@@ -0,0 +1,28 @@
+.variants-matrix-variant-row
+  &.disabled
+    text-decoration: line-through
+    opacity: 0.5
+
+.variants-matrix-properties-select
+  > .help-block
+    margin: 0 0 10px
+
+  > .dropdown
+    margin-bottom: 15px
+
+.variants-matrix-property-selector
+  padding: 5px
+
+.variants-matrix-property-selector-label
+  display: block
+  padding: 5px
+
+.form-group.variants_matrix
+  padding-right: 0
+
+  > .col-sm-9
+    width: 100%
+    float: none
+    padding-top: 0
+    padding-bottom: 0
+    margin-bottom: -1px

data/app/controllers/para/stall/admin/carts_controller.rb

@@ -0,0 +1,27 @@
+module Para
+  module Stall
+    module Admin
+      class CartsController < ::Para::Admin::CrudResourcesController
+        def index
+          # Default to only showing paid carts
+          params[:q] ||= {}
+          params[:q][:payment_paid_at_null] ||= 0
+
+          super
+
+          # Only show filled carts, forget empty ones that just wait to be
+          # cleaned up by the rake task
+          @resources = @resources.filled
+        end
+
+        private
+
+        def shipment_params
+          params.require(:shipment).permit(
+            :carrier, :tracking_code, :point_of_sale_id
+          )
+        end
+      end
+    end
+  end
+end

data/app/controllers/stall/cart_credits_controller.rb

@@ -0,0 +1,27 @@
+module Stall
+  class CartCreditsController < Stall::ApplicationController
+    before_action :load_cart
+
+    def update
+      credit_usage_service.call
+      redirect_to params[:_return_to]
+    end
+
+    def destroy
+      credit_usage_service.clean_credit_note_adjustments!
+      redirect_to params[:_return_to]
+    end
+
+    private
+
+    def load_cart
+      @cart = ProductList.find_by_token(params[:cart_id]) || current_cart
+    end
+
+    def credit_usage_service
+      @credit_usage_service ||= Stall.config.service_for(:credit_usage).new(
+        @cart, amount: params[:amount]
+      )
+    end
+  end
+end

data/app/controllers/stall/carts_controller.rb

@@ -8,7 +8,7 @@ module Stall
 
     def update
       respond_to do |format|
-        service = Stall::CartUpdateService.new(@cart, cart_params)
+        service = Stall.config.service_for(:cart_update).new(@cart, cart_params)
 
         if service.call
           format.html.xhr do

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

@@ -42,24 +42,20 @@ module Stall
 
       def load_cart
         @cart = current_cart
+
+        unless @cart.checkoutable?
+          if archived_paid_cart?
+            @cart = archived_paid_cart
+          else
+            redirect_from_uncheckoutable_cart!
+          end
+        end
       end
 
       def find_cart(identifier, ensure_active_cart = true)
         super(identifier, false)
       end
 
-      def ensure_cart_checkoutable
-        unless @cart.active? || @step.allow_inactive_carts?
-          remove_cart_from_cookies(@cart.identifier)
-          @cart = @cart.class.new
-        end
-
-        unless @cart.checkoutable?
-          flash[:error] = t('stall.checkout.shared.not_checkoutable')
-          redirect_to_referrer_or_root
-        end
-      end
-
       def load_step
         @wizard = @cart.wizard.new(@cart)
 
@@ -79,6 +75,20 @@ module Stall
         end
       end
 
+      def ensure_cart_checkoutable
+        unless @cart.active? || @step.allow_inactive_carts?
+          remove_cart_from_cookies(@cart.identifier)
+          @cart = @cart.class.new
+        end
+
+        redirect_from_uncheckoutable_cart! unless @cart.checkoutable?
+      end
+
+      def redirect_from_uncheckoutable_cart!
+        flash[:error] = t('stall.checkout.shared.not_checkoutable')
+        redirect_to_referrer_or_root
+      end
+
       def redirect_to_referrer_or_root
         referrer = URI.parse(request.referrer).path if request.referrer
 

data/app/controllers/stall/checkouts_controller.rb

@@ -6,6 +6,7 @@ module Stall
 
     def show
       @cart.reset_state!
+      Stall.config.service_for(:cart_update).new(@cart).refresh_associated_services!
       redirect_to step_path
     end
 

data/app/controllers/stall/line_items_controller.rb

@@ -6,6 +6,7 @@ module Stall
       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'
       else
         @line_item = service.line_item

data/app/controllers/stall/payments_controller.rb

@@ -2,10 +2,25 @@ module Stall
   class PaymentsController < Stall::ApplicationController
     skip_before_action :verify_authenticity_token, only: [:notify]
 
+    # Avoid user-requested payment notifications to remove the cart from cookies
+    # as soon as it is paid
+    skip_after_action  :store_cart_to_cookies
+
     def notify
       service = Stall.config.service_for(:payment_notification).new(params[:gateway], request)
       service.call
-      render service.rendering_options
+
+      # TODO : This is not the cleanest solution but an API change here would
+      #        imply to rewrite most of the existing gateways.
+      #
+      #        This should be done as soon as we can to avoid keeping this
+      #        dirty fix for too long
+      #
+      if (redirect_location = service.rendering_options[:redirect_location])
+        redirect_to redirect_location
+      else
+        render service.rendering_options
+      end
     end
   end
 end

data/app/helpers/stall/credit_notes_helper.rb

@@ -0,0 +1,25 @@
+module Stall
+  module CreditNotesHelper
+    def available_customer_credit_for?(cart)
+      cart.customer.try(:credit?, cart.currency) || credit_used_for?(cart)
+    end
+
+    def maximum_credit_usage_for(cart)
+      credit_usage_service_for(cart).amount.to_d
+    end
+
+    def current_customer_credit_for(cart)
+      credit_usage_service_for(cart).credit
+    end
+
+    def credit_used_for?(cart)
+      credit_usage_service_for(cart).credit_used?
+    end
+
+    private
+
+    def credit_usage_service_for(cart)
+      Stall.config.service_for(:credit_usage).new(cart)
+    end
+  end
+end

data/app/helpers/stall/customers_helper.rb

@@ -5,7 +5,9 @@ module Stall
     end
 
     def current_stall_user
-      send(Stall.config.default_user_helper_method)
+      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

data/app/models/billing_address.rb

@@ -0,0 +1,2 @@
+class BillingAddress < Address
+end

data/app/models/cart_credit_note_adjustment.rb

@@ -0,0 +1,3 @@
+class CartCreditNoteAdjustment < Adjustment
+  include Stall::Models::CartCreditNoteAdjustment
+end