stall 0.3.3 → 0.3.4

data/lib/stall/sellable.rb

@@ -13,7 +13,7 @@ module Stall
         name: (try(:name) || try(:title)),
         unit_price: try(:price),
         unit_eot_price: eot_price,
-        vat_rate: vat_rate,
+        vat_rate: vat_rate
       )
     end
 

data/lib/stall/shipping/calculator.rb

@@ -33,7 +33,7 @@ module Stall
       end
 
       def eot_price
-        price / (1 + (vat_rate / 100.0))
+        price / (1 + (vat_rate / 100.0)) if price
       end
 
       def vat_rate

data/lib/stall/shipping/country_weight_table_calculator.rb

@@ -8,7 +8,8 @@ module Stall
       end
 
       def price
-        total_weight = cart.total_weight
+        # Convert weight from grams to kilograms.
+        total_weight = (cart.total_weight / 1000.0)
 
         # Browse the data hash to find a suitable country code for the cart's
         # total weight
@@ -58,7 +59,7 @@ module Stall
 
             csv.each do |row|
               max_weight = row.first.to_f
-              price = BigDecimal.new(row[index])
+              price = BigDecimal.new(row[index]) if row[index]
               hash[country_code][max_weight] = price
             end
           end

data/lib/stall/version.rb

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

data/lib/stall/wish_list_helper.rb

@@ -0,0 +1,93 @@
+module Stall
+  module WishListHelper
+    extend ActiveSupport::Concern
+
+    included do
+      if respond_to?(:helper_method)
+        helper_method :current_wish_list
+      end
+
+      if respond_to?(:after_action)
+        after_action :store_wish_list_to_cookies
+      end
+    end
+
+    def current_wish_list
+      RequestStore.store[wish_list_key] ||= load_current_wish_list
+    end
+
+    protected
+
+    def current_wish_list_key
+      params[:wish_list_key].try(:to_sym) || :default
+    end
+
+    def load_current_wish_list(identifier = current_wish_list_key)
+      if (wish_list = find_wish_list(identifier))
+        return prepare_wish_list(wish_list)
+      end
+
+      # If no token was stored or the token does not exist anymore, create a
+      # new wish_list and store the new token
+      #
+      prepare_wish_list(wish_list_class.new(identifier: identifier))
+    end
+
+    def prepare_wish_list(wish_list)
+      wish_list.tap do
+        wish_list.customer = current_customer if current_customer
+        # Keep track of potential customer locale switching to allow e-mailing
+        # him in his last used locale
+        #
+        # Only applicable if the locale is an available locale to avoid strange
+        # issues with some URL locale management systems that could set the
+        # `assets` prefix as a locale, for instance.
+        if wish_list.customer && I18n.locale.in?(I18n.available_locales)
+          wish_list.customer.locale = I18n.locale
+        end
+
+        # Only update locale change for existing wish_lists. New wish_lists don't need
+        # to be saved, avoiding each robot or simple visitors to create a
+        # wish_list on large shops.
+        wish_list.save unless wish_list.new_record?
+      end
+    end
+
+    def find_wish_list(identifier, ensure_active_wish_list = true)
+      if (wish_list_token = cookies.encrypted[wish_list_key(identifier)])
+        if (current_wish_list = ProductList.find_by_token(wish_list_token)) &&
+           (!ensure_active_wish_list || current_wish_list.active?)
+        then
+          return current_wish_list
+        else
+          # Remove any wish_list that can't be fetched, either because it's already
+          # paid, or because it was cleaned out
+          remove_wish_list_from_cookies(identifier)
+          nil
+        end
+      end
+    end
+
+    def remove_wish_list_from_cookies(identifier = current_wish_list_key)
+      cookies.delete(wish_list_key(identifier))
+    end
+
+    def wish_list_key(identifier = current_wish_list_key, namespace: nil)
+      ['stall', 'wish_list', namespace, identifier.to_s].compact.join('.')
+    end
+
+    def wish_list_class
+      WishList
+    end
+
+    def store_wish_list_to_cookies
+      if current_wish_list.persisted? && current_wish_list.active?
+        store_wish_list_cookie_for(current_wish_list.identifier, current_wish_list)
+      end
+    end
+
+    def store_wish_list_cookie_for(identifier, wish_list, namespace: nil)
+      cookies.encrypted.permanent[wish_list_key(identifier, namespace: namespace)] = wish_list.token
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stall
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - vala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -413,9 +413,11 @@ files:
 - app/assets/javascripts/para/stall/inputs/variants-matrix/properties_select.coffee
 - app/assets/javascripts/para/stall/inputs/variants-matrix/variant.coffee
 - app/assets/javascripts/stall.coffee
+- app/assets/javascripts/stall/add-product-to-wish-list-button.coffee
 - app/assets/javascripts/stall/add-to-cart-form.coffee
+- app/assets/javascripts/stall/add-to-wish-list-button.coffee
 - app/assets/javascripts/stall/addresses-fields.coffee
-- app/assets/javascripts/stall/cart-form.coffee
+- app/assets/javascripts/stall/product-list-form.coffee
 - app/assets/javascripts/stall/products-filters.coffee
 - app/assets/javascripts/stall/remote-sign-in-form.coffee
 - app/assets/stylesheets/para/stall.sass
@@ -425,6 +427,7 @@ files:
 - app/controllers/para/stall/admin/shipping_notes_controller.rb
 - app/controllers/stall/application_controller.rb
 - app/controllers/stall/cart_credits_controller.rb
+- app/controllers/stall/cart_line_items_controller.rb
 - app/controllers/stall/carts_controller.rb
 - app/controllers/stall/checkout/steps_controller.rb
 - app/controllers/stall/checkout_base_controller.rb
@@ -438,7 +441,10 @@ files:
 - app/controllers/stall/products_breadcrumbs.rb
 - app/controllers/stall/products_controller.rb
 - app/controllers/stall/products_search.rb
+- app/controllers/stall/wish_list_line_items_controller.rb
+- app/controllers/stall/wish_lists_controller.rb
 - app/helpers/stall/add_to_cart_helper.rb
+- app/helpers/stall/add_to_wish_list_helper.rb
 - app/helpers/stall/application_helper.rb
 - app/helpers/stall/checkout_helper.rb
 - app/helpers/stall/credit_notes_helper.rb
@@ -447,6 +453,7 @@ files:
 - app/helpers/stall/payments_helper.rb
 - app/helpers/stall/prices_helper.rb
 - app/helpers/stall/products_filters_helper.rb
+- app/helpers/stall/products_helper.rb
 - app/mailers/stall/admin_mailer.rb
 - app/mailers/stall/base_mailer.rb
 - app/mailers/stall/customer_mailer.rb
@@ -507,11 +514,15 @@ files:
 - app/models/stall/models/user_omniauth_account.rb
 - app/models/stall/models/variant.rb
 - app/models/stall/models/variant_property_value.rb
+- app/models/stall/models/wish_list.rb
 - app/models/user.rb
 - app/models/user_omniauth_account.rb
 - app/models/variant.rb
 - app/models/variant_property_value.rb
+- app/models/wish_list.rb
 - app/services/stall/add_to_cart_service.rb
+- app/services/stall/add_to_product_list_service.rb
+- app/services/stall/add_to_wish_list_service.rb
 - app/services/stall/available_stocks_service.rb
 - app/services/stall/base_service.rb
 - app/services/stall/cart_credit_note_creation_service.rb
@@ -556,6 +567,9 @@ files:
 - app/views/stall/addresses/_fields.html.haml
 - app/views/stall/addresses/_nested_fields.html.haml
 - app/views/stall/admin_mailer/order_paid_email.html.haml
+- app/views/stall/cart_line_items/_add_error.html.haml
+- app/views/stall/cart_line_items/_added.html.haml
+- app/views/stall/cart_line_items/_form.html.haml
 - app/views/stall/carts/_cart.html.haml
 - app/views/stall/carts/_widget.html.haml
 - app/views/stall/carts/show.html.haml
@@ -567,9 +581,6 @@ files:
 - app/views/stall/customer_mailer/order_shipped_email.html.haml
 - app/views/stall/customers/_fields.html.haml
 - app/views/stall/customers/_sign_in.html.haml
-- app/views/stall/line_items/_add_error.html.haml
-- app/views/stall/line_items/_added.html.haml
-- app/views/stall/line_items/_form.html.haml
 - app/views/stall/manufacturers/show.html.haml
 - app/views/stall/payments/_fields.html.haml
 - app/views/stall/payments/manual_payment_gateway/_form.html.haml
@@ -588,6 +599,11 @@ files:
 - app/views/stall/shared/mailers/_cart.html.haml
 - app/views/stall/shared/mailers/_shipping_note.html.haml
 - app/views/stall/shipments/_fields.html.haml
+- app/views/stall/wish_list_line_items/_add_error.html.haml
+- app/views/stall/wish_list_line_items/_added.html.haml
+- app/views/stall/wish_list_line_items/_button.html.haml
+- app/views/stall/wish_list_line_items/_form.html.haml
+- app/views/stall/wish_lists/show.html.haml
 - config/locales/stall.en.yml
 - config/locales/stall.fr.yml
 - db/migrate/20151103154313_create_stall_line_items.rb
@@ -638,6 +654,9 @@ files:
 - db/migrate/20170321104203_create_stall_images.rb
 - db/migrate/20170321112248_remove_image_attachment_to_stall_products.rb
 - db/migrate/20170411134756_add_stock_to_stall_variants.rb
+- db/migrate/20170425085606_add_weight_to_stall_products_and_variants.rb
+- db/migrate/20170426163450_add_vat_rate_to_stall_products.rb
+- db/migrate/20170522062334_change_variants_weight_default_to_nil.rb
 - lib/ext/ransack.rb
 - lib/generators/stall/checkout/step/step_generator.rb
 - lib/generators/stall/checkout/step/templates/step.html.haml.erb
@@ -713,6 +732,7 @@ files:
 - lib/stall/utils.rb
 - lib/stall/utils/config_dsl.rb
 - lib/stall/version.rb
+- lib/stall/wish_list_helper.rb
 - lib/tasks/stall_tasks.rake
 homepage: https://github.com/glyph-fr/stall
 licenses:

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

@@ -1,28 +0,0 @@
-class Stall.CartForm extends Vertebra.View
-  events:
-    'change [data-quantity-field]': 'formUpdated'
-    'cocoon:after-remove': 'formUpdated'
-    'ajax:success': 'updateSuccess'
-
-  initialize: ->
-    @clean()
-
-  clean: ->
-    @$('[data-cart-update-button]').hide(0)
-
-  formUpdated: (e) ->
-    @$el.submit()
-
-  updateSuccess: (e, resp) ->
-    @updateCartFormWith(resp)
-
-  updateCartFormWith: (markup) =>
-    $form = $(markup).find('[data-cart-form]')
-    @$el.html($form.html())
-    @clean()
-
-
-Stall.onDomReady ->
-  if ($cartForm = $('[data-cart-form]')).length
-    cartForm = new Stall.CartForm(el: $cartForm)
-    $cartForm.data('stall.cart-form', cartForm)