stall 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac018d181d2997364eeca462e80758d50ab4c9e2
-  data.tar.gz: 4e3396a2466fab227f83d9d201a237e22147acc3
+  metadata.gz: 2ada0574ad0ed8cfa93095644bdf32a04bcb0509
+  data.tar.gz: a14972609cff3c4e91cc431dfcf052a8d32a646d
 SHA512:
-  metadata.gz: c612280b92d9cbff047f8e7e0adf1f8dcc8abea245f7cd4cbf37170a68261c0d732f53266c11ba666fbf103c3b3998f267ce970fbb553b40880f88a2e52ee21e
-  data.tar.gz: b35431b6aa8856a8b3dc21686dff0346d0b724ec443176f044d022e0495563584a7e6d8ff537b227be52f91aed929b9e23bbacfa85ff7fb1c827024d7749cb51
+  metadata.gz: a2d940165c3b6162689bc986170b9d0d43bbb66a4a093db2d36afd82f49119db11d70ecafd28ed44092d1dcaec48f1cc1eca4e1f88f3e9cec0121bb987b683d8
+  data.tar.gz: 6260a59db786d455c54a10dd4806ad19e568bb529f697d8dcf57d1c6675dcff52b4e1d4857a391a6023899528594640cbee24fde91c9a1c1fbe3b21c17597e9f

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

@@ -57,27 +57,42 @@ class VariantsMatrix.Input extends Vertebra.View
 
   refreshAvailableVariants: ->
     combinations = @buildPossibleCombinations()
-    @removeVariantsNotIn(combinations)
-    @createVariantsIn(combinations)
+    removeableVariants = @variantsNotIn(combinations)
+    createdVariants = @createVariantsIn(combinations)
 
-  removeVariantsNotIn: (combinations) ->
+    # Copy default values from removeable variants before they're removed from
+    # the DOM, allowing the Variant#copyInputsFrom method to work
+    @applyDefaultValuesForNewVariants(removeableVariants, createdVariants)
+
+    @removeVariants(removeableVariants)
+
+  variantsNotIn: (combinations) ->
     removeableVariants = []
 
     for variant, index in @variants
-      continue unless variant
+      continue if !variant or variant.isDestroyed
       matches = false
       matches = true for combination in combinations when variant.matches(combination)
       removeableVariants.push(variant) unless matches
 
-    # We remove variants after iterating, avoiding to change array indexes
-    # while we loop through it to match removeable variants
+    removeableVariants
+
+  removeVariants: (removeableVariants) ->
     variant.remove() for variant in removeableVariants
 
   createVariantsIn: (combinations) ->
+    @newVariants = []
+
     for combination in combinations
       existingVariant = @findVariantFor(combination)
-      variant = existingVariant or @createVariantFor(combination)
+      newVariant = false
+
+      unless (variant = existingVariant)
+        variant = @createVariantFor(combination)
+        @newVariants.push(variant)
+
       variant.show()
+      variant
 
   findVariantFor: (combination) ->
     return variant for variant, index in @variants when variant.matches(combination)
@@ -128,6 +143,23 @@ class VariantsMatrix.Input extends Vertebra.View
 
     if !combinations.length && @allowEmptyVariant then [{}] else combinations
 
+  applyDefaultValuesForNewVariants: (removeableVariants, createdVariants) ->
+    existingVariants = if removeableVariants.length >= createdVariants.length
+      removeableVariants
+    else
+      (v for v in createdVariants when !@isNewVariant(v))
+
+    if existingVariants.length >= @newVariants.length
+      v.copyInputsFrom(existingVariants[i]) for v, i in @newVariants
+    else if existingVariants.length
+      v.copyInputsFrom(existingVariants[0]) for v, i in @newVariants
+
+  isNewVariant: (variant) ->
+    for v in @newVariants
+      return true if variant.cid is v.cid
+
+    false
+
   onVariantApplyToAll: (variant) =>
     v.copyInputsFrom(variant) for v in @variants when v.cid isnt variant.cid
 
@@ -137,4 +169,3 @@ class VariantsMatrix.Input extends Vertebra.View
     destroyedVariant.destroy()
     # Remove variant from @variants array
     @variants.splice(index, 1) for variant, index in @variants when variant?.matches(destroyedVariant.combination)
-

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

@@ -12,6 +12,8 @@ class VariantsMatrix.PropertiesSelect extends Vertebra.View
   # field name and the selected property values ids
   #
   getSelectedProperties: ->
+    selectedProperties = []
+
     for el in @$propertySelects.get()
       $field = $(el)
 
@@ -23,7 +25,16 @@ class VariantsMatrix.PropertiesSelect extends Vertebra.View
 
       fieldName = $field.data('variants-matrix-property-select')
       values = @serializeFieldValues($field, propertyId)
-      { id: propertyId, name: fieldName, values: values, active: !!values.length }
+
+      continue unless values?.length
+
+      selectedProperties.push
+        id: propertyId
+        name: fieldName
+        values: values
+        active: !!values.length
+
+    selectedProperties
 
   serializeFieldValues: ($field, propertyId) ->
     for option in $field.find(':selected').get()

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

@@ -6,6 +6,7 @@ class VariantsMatrix.Variant extends Vertebra.View
   initialize: (options = {}) ->
     @combination = options.combination
     @persisted = @$el?.data('variant-id')
+    @isDestroyed = false
     @input = options.input
 
   renderTo: ($container) ->
@@ -16,6 +17,9 @@ class VariantsMatrix.Variant extends Vertebra.View
     @fillProperties()
 
   fillProperties: ->
+    # Reset all properties to hidden
+    @$("[data-variants-matrix-variant-property]").addClass('hidden')
+
     for propertyValue in @propertyValues()
       $propertyValue = @$("[data-variants-matrix-variant-property='#{ propertyValue.propertyId }']")
       $propertyValue.find('[data-property-name]').html(propertyValue.name)
@@ -23,9 +27,10 @@ class VariantsMatrix.Variant extends Vertebra.View
       $propertyValue.removeClass('hidden')
 
   remove: ->
+    @setDestroyed(true)
+
     if @persisted
       @$el.hide(0)
-      @setDestroyed(true)
     else
       @$el.remove()
       @trigger('destroy', this)
@@ -54,15 +59,16 @@ class VariantsMatrix.Variant extends Vertebra.View
 
   onEnabledStateChanged: (e) ->
     checked = @$('[data-variants-matrix-variant-enabled]').prop('checked')
-    @$el.toggleClass('disabled')
+    @$el.toggleClass('disabled', !checked)
 
   setDestroyed: (state) ->
-    @$el.find('[data-variant-remove]').val(if state then 'true' else 'false')
+    @isDestroyed = state
+    @$el.find('[data-variant-remove]').val(if @isDestroyed then 'true' else 'false')
 
   onApplyToAllClicked: ->
     @trigger('applytoall', this)
 
   copyInputsFrom: (otherVariant) ->
-    @$('input:visible').each (i, el) ->
+    @$('input:visible').each (i, el) =>
       otherValue = otherVariant.$('input:visible').eq(i).val()
       $(el).val(otherValue)

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

@@ -83,7 +83,6 @@ class Stall.WishListFormPopover extends Vertebra.View
     @trigger('added', resp)
 
   onCancelClicked: ->
-    console.log 'onCancelClicked', this
     @destroy()
 
   destroy: ->

data/app/services/stall/cart_update_service.rb

@@ -17,7 +17,7 @@ module Stall
     def refresh_associated_services!
       # Recalculate shipping fee if available for calculation to ensure
       # that the fee us always up to date when displayed to the customer
-      shipping_fee_service.call if shipping_fee_service.available?
+      shipping_fee_service.call
 
       # Recalculate the credit usage amount if already used to avoid negative
       # cart totals

data/app/services/stall/shipping_fee_calculator_service.rb

@@ -7,7 +7,7 @@ module Stall
     end
 
     def call
-      return unless cart.shipment && cart.shipment.shipping_method
+      return reset_shipment_price unless available?
 
       update_price_for(cart.shipment, calculator) if calculator
     end
@@ -32,6 +32,12 @@ module Stall
       end
     end
 
+    def reset_shipment_price
+      return unless cart.shipment
+
+      cart.shipment.update_attributes(price: 0, eot_price: 0, vat_rate: 0)
+    end
+
     def calculator
       @calculator ||= calculator_class && calculator_class.new(cart, cart.shipment.shipping_method)
     end

data/app/views/para/admin/resources/_variant_row.html.haml

@@ -5,7 +5,7 @@
 
     %span.checkbox
       %label
-        = form.check_box :published, checked: (form.object.published? || form.object.new_record?), data: { :'variants-matrix-variant-enabled' => true }
+        = form.check_box :published, checked: (form.object.published? || form.object.new_record?), autocomplete: 'off', data: { :'variants-matrix-variant-enabled' => true }
         %i.checkbox-icon
 
   - all_properties.each do |property_config|

data/lib/stall/rails/routing_mapper.rb

@@ -3,8 +3,8 @@
 #
 module Stall
   module RoutingMapper
-    def mount_stall(mount_location)
-      Stall::Routes.new(self).draw(mount_location)
+    def mount_stall(*args)
+      Stall::Routes.new(self).draw(*args)
     end
   end
 end

data/lib/stall/routes.rb

@@ -6,67 +6,87 @@ module Stall
       @router = router
     end
 
-    def draw(mount_location)
+    # This method is called with the options passed to the `mount_stall` routes
+    # helper.
+    #
+    # You can pass it one of the following options to disable parts of the
+    # routing :
+    #
+    #   - { users: false }  =>  Disables built in devise user authentication
+    #   - { products: false } => Disables all products related routing
+    #   - { checkout: false } => Disables all checkout and cart related routing
+    #
+    def draw(mount_location, options = {})
       routes = self
 
+      users = options.fetch(:users, true)
+      products = options.fetch(:products, true)
+      checkout = options.fetch(:checkout, true)
+
       router.instance_eval do
-        devise_for :users, Stall.config.devise_for_user_config
+        if users
+          devise_for :users, Stall.config.devise_for_user_config
 
-        devise_scope :user do
-          get '/users/omniauth/:provider/redirect' => 'stall/omniauth_callbacks#redirect', as: :user_omniauth_redirect
+          devise_scope :user do
+            get '/users/omniauth/:provider/redirect' => 'stall/omniauth_callbacks#redirect', as: :user_omniauth_redirect
+          end
         end
 
         scope mount_location do
-          resources :products, only: [:index], as: :products, controller: routes.controller_for(:products)
+          if products
+            resources :products, only: [:index], as: :products, controller: routes.controller_for(:products)
 
-          constraints ProductExistsConstraint.new do
-            resources :products, path: '/', only: [:show], controller: routes.controller_for(:products)
-          end
+            constraints ProductExistsConstraint.new do
+              resources :products, path: '/', only: [:show], controller: routes.controller_for(:products)
+            end
 
-          constraints ProductCategoryExistsConstraint.new do
-            resources :product_categories, path: '/', only: [:show], controller: routes.controller_for(:product_categories)
-          end
+            constraints ProductCategoryExistsConstraint.new do
+              resources :product_categories, path: '/', only: [:show], controller: routes.controller_for(:product_categories)
+            end
 
-          constraints CuratedProductListExistsConstraint.new do
-            resources :curated_product_lists, path: '/', only: [:show], controller: routes.controller_for(:curated_product_lists) do
-              resources :products, only: [:show], path: '/', controller: routes.controller_for(:products)
+            constraints CuratedProductListExistsConstraint.new do
+              resources :curated_product_lists, path: '/', only: [:show], controller: routes.controller_for(:curated_product_lists) do
+                resources :products, only: [:show], path: '/', controller: routes.controller_for(:products)
+              end
             end
-          end
 
-          constraints ManufacturerExistsConstraint.new do
-            resources :manufacturers, path: '/', only: [:show], controller: routes.controller_for(:manufacturers) do
-              resources :products, only: [:show], path: '/', controller: routes.controller_for(:products)
+            constraints ManufacturerExistsConstraint.new do
+              resources :manufacturers, path: '/', only: [:show], controller: routes.controller_for(:manufacturers) do
+                resources :products, only: [:show], path: '/', controller: routes.controller_for(:products)
+              end
             end
           end
 
-          resources :carts, controller: routes.controller_for(:carts) do
-            resources :line_items, only: [:create], controller: routes.controller_for(:cart_line_items)
-            resource :credit, only: [:update, :destroy], controller: routes.controller_for(:cart_credits)
-          end
+          if checkout
+            resources :carts, controller: routes.controller_for(:carts) do
+              resources :line_items, only: [:create], controller: routes.controller_for(:cart_line_items)
+              resource :credit, only: [:update, :destroy], controller: routes.controller_for(:cart_credits)
+            end
 
-          resources :wish_lists, only: [:show], controller: routes.controller_for(:wish_lists) do
-            resources :line_items, only: [:create, :destroy], controller: routes.controller_for(:wish_list_line_items)
-          end
+            resources :wish_lists, only: [:show], controller: routes.controller_for(:wish_lists) do
+              resources :line_items, only: [:create, :destroy], controller: routes.controller_for(:wish_list_line_items)
+            end
 
-          get 'checkout/:cart_key' => "#{routes.controller_for(:checkouts)}#show", as: :checkout
-
-          scope 'checkout', as: :checkout do
-            scope '(:cart_key)' do
-              resource :step, only: [:show, :update], controller: routes.controller_for(:'checkout/steps') do
-                post '/', action: :update, as: :update
-                get  '/process', action: :update, as: :process
-                # Allow external URLs process steps, allowing some payment
-                # gateways to return the user through a POST request
-                post '/process', action: :foreign_update
-                get 'change/:step', action: :change, as: :change
+            get 'checkout/:cart_key' => "#{routes.controller_for(:checkouts)}#show", as: :checkout
+
+            scope 'checkout', as: :checkout do
+              scope '(:cart_key)' do
+                resource :step, only: [:show, :update], controller: routes.controller_for(:'checkout/steps') do
+                  post '/', action: :update, as: :update
+                  get  '/process', action: :update, as: :process
+                  # Allow external URLs process steps, allowing some payment
+                  # gateways to return the user through a POST request
+                  post '/process', action: :foreign_update
+                  get 'change/:step', action: :change, as: :change
+                end
               end
             end
-          end
 
-          scope '/:gateway' do
-            resource :payment, only: [], controller: routes.controller_for(:payments) do
-              member do
-                match 'notify', action: 'notify', via: [:get, :post]
+            scope '/:gateway' do
+              resource :payment, only: [], controller: routes.controller_for(:payments) do
+                member do
+                  match 'notify', action: 'notify', via: [:get, :post]
+                end
               end
             end
           end

data/lib/stall/version.rb

@@ -1,3 +1,3 @@
 module Stall
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stall
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails