stall 0.3.3 → 0.3.4

data/app/models/stall/models/line_item.rb

@@ -29,6 +29,7 @@ module Stall
 
         before_validation :restore_valid_quantity
         before_validation :refresh_total_prices
+        before_validation :refresh_weight
 
         scope :ordered, -> { order(created_at: :asc) }
       end
@@ -43,6 +44,14 @@ module Stall
         product_list.try(:currency) || Money.default_currency
       end
 
+      def weight
+        read_store_attribute(:data, :weight).presence || Stall.config.default_product_weight
+      end
+
+      def total_weight
+        weight * quantity
+      end
+
       private
 
       # TODO : Stocks availibility handling
@@ -61,6 +70,10 @@ module Stall
           restore_quantity!
         end
       end
+
+      def refresh_weight
+        self.weight = sellable.weight if sellable.respond_to?(:weight)
+      end
     end
   end
 end

data/app/models/stall/models/product.rb

@@ -43,7 +43,7 @@ module Stall
       end
 
       def vat_rate
-        Stall.config.vat_rate
+        read_attribute(:vat_rate).presence || Stall.config.vat_rate
       end
 
       def price

data/app/models/stall/models/product_list.rb

@@ -67,6 +67,10 @@ module Stall
         line_items.map(&:quantity).compact.sum
       end
 
+      def total_weight
+        line_items.map(&:total_weight).sum
+      end
+
       def wizard
         @wizard ||= self.class.wizard
       end

data/app/models/stall/models/variant.rb

@@ -32,6 +32,10 @@ module Stall
         @currency ||= Money::Currency.new(Stall.config.default_currency)
       end
 
+      def weight
+        read_attribute(:weight).presence || product.try(:weight)
+      end
+
       private
 
       def refresh_name

data/app/models/stall/models/wish_list.rb

@@ -0,0 +1,18 @@
+module Stall
+  module Models
+    module WishList
+      extend ActiveSupport::Concern
+
+      def includes_product?(product)
+        line_item_for_product(product).present?
+      end
+
+      def line_item_for_product(product)
+        line_items.find do |line_item|
+          line_item.sellable_type == 'Variant' &&
+            product.variant_ids.include?(line_item.sellable_id)
+        end
+      end
+    end
+  end
+end

data/app/models/wish_list.rb

@@ -0,0 +1,3 @@
+class WishList < ProductList
+  include Stall::Models::WishList
+end

data/app/services/stall/add_to_cart_service.rb

@@ -1,18 +1,11 @@
 module Stall
-  class AddToCartService < Stall::BaseService
-    attr_reader :cart, :params
-
-    def initialize(cart, params)
-      @cart = cart
-      @params = params
-    end
+  class AddToCartService < Stall::AddToProductListService
+    alias_method :cart, :product_list
 
     def call
       return false unless line_item_valid?
 
-      unless assemble_identical_line_items
-        cart.line_items << line_item
-      end
+      cart.line_items << line_item unless assemble_identical_line_items
 
       cart.save.tap do |saved|
         return false unless saved
@@ -32,46 +25,10 @@ module Stall
       stock_service.on_hand?(line_item)
     end
 
-    def line_item
-      @line_item ||= sellable.to_line_item.tap do |line_item|
-        line_item.quantity = line_item_params[:quantity]
-      end
-    end
-
     private
 
-    def assemble_identical_line_items
-      # Find an existing line item which is like our new one
-      existing_line_item = cart.line_items.find do |li|
-        line_item.like?(li)
-      end
-
-      # If we found one, we assemble both line items into the old one, to avoid
-      # duplicating the same sellables in the product list
-      if existing_line_item
-        existing_line_item.quantity += line_item.quantity
-        @line_item = existing_line_item
-      else
-        false
-      end
-    end
-
-    def sellable
-      @sellable ||= sellable_class.find(line_item_params[:sellable_id])
-    end
-
-    def sellable_class
-      @sellable_class ||= line_item_params[:sellable_type].camelize.constantize
-    end
-
     def shipping_fee_service
-      @shipping_fee_service ||= Stall::ShippingFeeCalculatorService.new(cart)
-    end
-
-    def line_item_params
-      @line_item_params ||= params.require(:line_item).permit(
-        :sellable_type, :sellable_id, :quantity
-      )
+      @shipping_fee_service ||= Stall.config.service_for(:shipping_fee_calculator).new(cart)
     end
   end
 end

data/app/services/stall/add_to_product_list_service.rb

@@ -0,0 +1,63 @@
+module Stall
+  class AddToProductListService < Stall::BaseService
+    attr_reader :product_list, :params
+
+    def initialize(product_list, params)
+      @product_list = product_list
+      @params = params
+    end
+
+    def call
+      fail NotImplementedError,
+           'Override #call in Stall::AddToProductListService subclasses'
+    end
+
+    def line_item
+      @line_item ||= sellable.to_line_item.tap do |line_item|
+        line_item.quantity = quantity
+      end
+    end
+
+    def line_item_params?
+      line_item_params.any?
+    end
+
+    private
+
+    def assemble_identical_line_items
+      # Find an existing line item which is like our new one
+      existing_line_item = product_list.line_items.find do |li|
+        line_item.like?(li)
+      end
+
+      # If we found one, we assemble both line items into the old one, to avoid
+      # duplicating the same sellables in the product list
+      if existing_line_item
+        existing_line_item.quantity += line_item.quantity
+        @line_item = existing_line_item
+      else
+        false
+      end
+    end
+
+    def sellable
+      @sellable ||= sellable_class.find(line_item_params[:sellable_id])
+    end
+
+    def sellable_class
+      @sellable_class ||= line_item_params[:sellable_type].camelize.constantize
+    end
+
+    def quantity
+      @quantity ||= line_item_params[:quantity]
+    end
+
+    def line_item_params
+      @line_item_params ||= params.require(:line_item).permit(
+        :sellable_type, :sellable_id, :quantity
+      )
+    rescue ActionController::ParameterMissing
+      {}
+    end
+  end
+end

data/app/services/stall/add_to_wish_list_service.rb

@@ -0,0 +1,17 @@
+module Stall
+  class AddToWishListService < Stall::AddToProductListService
+    alias_method :wish_list, :product_list
+
+    def call
+      return false unless line_item.valid?
+      wish_list.line_items << line_item unless assemble_identical_line_items
+      wish_list.save
+    end
+
+    def add(variant)
+      @sellable = variant
+      @quantity = 1
+      call
+    end
+  end
+end

data/app/services/stall/available_stocks_service.rb

@@ -2,7 +2,7 @@ module Stall
   class AvailableStocksService < Stall::BaseService
     def on_hand?(line_item)
       if Stall.config.manage_inventory
-        line_item.variant.stock >= line_item.quantity
+        line_item.sellable.stock >= line_item.quantity
       else
         true
       end

data/app/services/stall/shipping_fee_calculator_service.rb

@@ -9,24 +9,37 @@ module Stall
     def call
       return unless cart.shipment && cart.shipment.shipping_method
 
-      calculator_identifier = cart.shipment.shipping_method.identifier
-      calculator_class = Stall::Shipping::Calculator.for(calculator_identifier)
+      update_price_for(cart.shipment, calculator) if calculator
+    end
+
+    def available?
+      cart.line_items.length > 0 &&
+        cart.try(:shipping_address) &&
+          cart.try(:shipment).try(:shipping_method)
+    end
 
-      if calculator_class
-        calculator = calculator_class.new(cart, cart.shipment.shipping_method)
+    private
 
-        cart.shipment.update_attributes(
+    def update_price_for(shipment, calculator)
+      if calculator.price
+        shipment.update_attributes(
           price: calculator.price,
           eot_price: calculator.eot_price,
           vat_rate: calculator.vat_rate
         )
+      else
+        shipment.errors.add(:price, :unavailable)
       end
     end
 
-    def available?
-      cart.line_items.length > 0 &&
-      cart.try(:shipping_address) &&
-      cart.try(:shipment).try(:shipping_method)
+    def calculator
+      @calculator ||= calculator_class && calculator_class.new(cart, cart.shipment.shipping_method)
+    end
+
+    def calculator_class
+      @calculator_class ||= Stall::Shipping::Calculator.for(
+        cart.shipment.shipping_method.identifier
+      ) if cart.shipment.try(:shipping_method)
     end
   end
 end

data/app/views/admin/products/_form.html.haml

@@ -8,6 +8,8 @@
       = form.input :product_category, as: :selectize, collection: Para.components.product_categories.resources.leaves
       = form.input :manufacturer, as: :selectize
 
+      = form.input :vat_rate, hint: t('para.stall.products.vat_rate_hint', rate: number_to_percentage(Stall.config.vat_rate), precision: 2).html_safe
+
       = form.input :suggested_products, as: :selectize
 
     = tabs.tab :images, icon: 'picture-o' do
@@ -20,4 +22,7 @@
     = tabs.tab :variants, icon: 'list' do
       = form.input :variants, as: :variants_matrix
 
+    = tabs.tab :shipping, icon: 'truck' do
+      = form.input :weight, hint: t('para.stall.products.weight_hint').html_safe
+
     = form.actions

data/app/views/checkout/steps/_informations.html.haml

@@ -25,7 +25,7 @@
       = form.input :terms, label: false do
         = form.check_box :terms, id: 'terms-checkbox'
         = form.label :terms, t('stall.checkout.informations.accept_the')
-        = link_to Stall.config.terms_path, target: '_blank' do
+        = link_to Stall.config.terms_path, target: '_blank', rel: 'nofollow' do
           = form.object.class.human_attribute_name(:terms)
 
       %button.btn.btn-primary.btn-lg.btn-block{ type: 'submit' }

data/app/views/stall/addresses/_fields.html.haml

@@ -1,10 +1,10 @@
 .addresses-fields{ data: { :'addresses-fields' => true } }
   %fieldset{ data: { :'address-form' => :shipping } }
-    = form.fields_for :shipping_address do |address_form|
+    = form.fields_for :shipping_address, form.object.shipping_address(force_actual_address: true) do |address_form|
       = render partial: 'stall/addresses/nested_fields', locals: { form: address_form }
 
-  = form.input :use_another_address_for_billing, as: :boolean, input_html: { checked: (params[:use_another_address_for_billing] || form.object.billing_address?), data: { :'use-another-address-for-billing' => true } }
+  = form.input :use_another_address_for_billing, as: :boolean, input_html: { checked: (params[:use_another_address_for_billing] == '1' || form.object.billing_address?), data: { :'use-another-address-for-billing' => true } }
 
-  %fieldset{ class: ('hidden' unless params[:use_another_address_for_billing] == '1'), data: { :'address-form' => :billing } }
-    = form.fields_for :billing_address do |address_form|
+  %fieldset{ class: ('hidden' unless params[:use_another_address_for_billing] == '1' || form.object.billing_address?), data: { :'address-form' => :billing } }
+    = form.fields_for :billing_address, form.object.billing_address(force_actual_address: true) do |address_form|
       = render partial: 'stall/addresses/nested_fields', locals: { form: address_form }

data/app/views/stall/{line_items → cart_line_items}/_added.html.haml

@@ -1,4 +1,4 @@
-.modal.fade{ role: 'dialog', tabindex: '-1', data: { :'cart' => { token: current_cart.token, :'total-quantity' => current_cart.total_quantity, :'widget-markup' => @widget_partial } } }
+.modal.fade{ role: 'dialog', tabindex: '-1', data: { :'cart' => { token: @product_list.token, :'total-quantity' => @product_list.total_quantity, :'widget-markup' => @widget_partial } } }
   .modal-dialog
     .modal-content
       .modal-header
@@ -19,5 +19,5 @@
         %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
           = t('stall.line_items.added.continue_shopping')
 
-        = link_to cart_path(@cart), class: 'btn btn-primary' do
+        = link_to cart_path(@product_list), class: 'btn btn-primary', rel: 'nofollow' do
           = t('stall.carts.actions.view_cart')

data/app/views/stall/{line_items → cart_line_items}/_form.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for line_item, as: :line_item, url: cart_line_items_path(cart), remote: true, data: { :'add-to-cart-form' => true, :'error-messages' => { choose: t('stall.line_items.errors.choose'), quantity: t('stall.line_items.errors.quantity') } } do |form|
   = form.hidden_field :sellable_type, value: 'Variant'
-  = form.input_field :sellable, as: :variant_select, product: @product
+  = form.input_field :sellable, as: :variant_select, product: product
 
   .input-group
     = form.input_field :quantity, spinner: false, value: 1, class: 'form-group', data: { :'quantity-field' => true }

data/app/views/stall/carts/_widget.html.haml

@@ -24,5 +24,5 @@
             = number_to_currency(cart.total_price)
         %tr
           %td{ colspan: 2 }
-            = link_to cart_path(cart), class: 'btn btn-primary btn-block' do
+            = link_to cart_path(cart), class: 'btn btn-primary btn-block', rel: 'nofollow' do
               = t('stall.carts.actions.view_cart')

data/app/views/stall/carts/show.html.haml

@@ -1,5 +1,5 @@
-.cart-recap{ data: { :'cart-recap' => true } }
-  = simple_form_for @cart, url: cart_path(@cart), as: :cart, remote: true, data: { :'cart-form' => true } do |form|
+.cart-recap{ data: { :'product-list-recap' => true } }
+  = simple_form_for @cart, url: cart_path(@cart), as: :cart, remote: true, data: { :'product-list-form' => true } do |form|
     %table.table.table-striped
       %thead
         %tr
@@ -56,10 +56,10 @@
           %td
 
     .form-actions
-      %button.btn.btn-default{ type: 'submit', data: { :'cart-update-button' => true } }
+      %button.btn.btn-default{ type: 'submit', data: { :'product-list-update-button' => true } }
         = t('stall.carts.recap.update')
 
-      = link_to checkout_path(current_cart.identifier), class: 'btn btn-primary' do
+      = link_to checkout_path(current_cart.identifier), class: 'btn btn-primary', rel: 'nofollow' do
         = t('stall.carts.recap.validate')
 
 

data/app/views/stall/curated_product_lists/show.html.haml

@@ -5,4 +5,4 @@
     = render partial: 'stall/products/filters', locals: { search: @search, products: @filterable_products }
 
   .col-md-8
-    = render partial: 'stall/products/list', locals: { products: @products }
+    = render partial: 'stall/products/list', locals: { products: @products, parent: @curated_product_list }

data/app/views/stall/customers/_fields.html.haml

@@ -26,7 +26,7 @@
             %legend.omniauth-sign-up= t('stall.checkout.sign_in.omniauth_sign_up')
 
             - Stall.config.omniauth_providers.each do |provider|
-              = link_to user_omniauth_redirect_path(provider.name, _redirect_to: request.path), class: 'btn btn-default' do
+              = link_to user_omniauth_redirect_path(provider.name, _redirect_to: request.path), class: 'btn btn-default', rel: 'nofollow' do
                 = fa_icon provider.icon
                 = t('stall.omniauth.sign_in_with', provider: provider.display_name)
 

data/app/views/stall/customers/_sign_in.html.haml

@@ -2,7 +2,7 @@
   .panel-heading
     %i.fa.fa-user
     = t('stall.checkout.sign_in.already_have_an_account')
-    = link_to '#sign-in-form', data: { toggle: 'collapse' } do
+    = link_to '#sign-in-form', data: { toggle: 'collapse' }, rel: 'nofollow' do
       = t('stall.checkout.sign_in.click_to_sign_in')
 
   #sign-in-form.panel-body.collapse{ data: { :'sign-in-form' => true } }
@@ -27,6 +27,6 @@
         %legend.omniauth-sign-in= t('stall.checkout.sign_in.omniauth_sign_in')
 
         - Stall.config.omniauth_providers.each do |provider|
-          = link_to user_omniauth_redirect_path(provider.name, _redirect_to: request.path), class: 'btn btn-default' do
+          = link_to user_omniauth_redirect_path(provider.name, _redirect_to: request.path), class: 'btn btn-default', rel: 'nofollow' do
             = fa_icon provider.icon
             = t('stall.omniauth.sign_in_with', provider: provider.display_name)

data/app/views/stall/products/_list.html.haml

@@ -1,3 +1,5 @@
+- unless defined?(parent) then parent = nil; end
+
 .products-list
   .row
     - products.each do |product|

data/app/views/stall/products/_product.html.haml

@@ -1,4 +1,5 @@
-= link_to product_path(product), class: 'product' do
+= link_to product_path(product), class: 'product', data: { :'product-id' => product.id } do
   %span.product-name= product.name
   = image_tag product.image.url(:thumb), class: 'img-responsive'
   = number_to_currency(product.price)
+  = add_to_wish_list_button(product)