stall 0.3.3 → 0.3.4

data/app/views/stall/wish_list_line_items/_add_error.html.haml

@@ -0,0 +1,17 @@
+.modal.danger.fade{ role: 'dialog', tabindex: '-1', data: { :'line-item' => @line_item.as_json(only: [:name, :quantity, :eot_price, :price, :vat_rate]) } }
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', :'aria-label' => 'Close', data: { dismiss:  'modal' } }
+          %span{ :'aria-hidden' => 'true' }
+            ×
+        %h4.modal-title
+          = t('stall.line_items.add_error.title')
+
+      .modal-body
+        %p.text-danger
+          = t('stall.line_items.add_error.description')
+
+      .modal-footer
+        %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
+          = t('stall.shared.close')

data/app/views/stall/wish_list_line_items/_added.html.haml

@@ -0,0 +1,19 @@
+.modal.fade{ role: 'dialog', tabindex: '-1', data: { :'wish-list' => { token: @product_list.token, :'total-quantity' => @product_list.total_quantity } } }
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', :'aria-label' => 'Close', data: { dismiss:  'modal' } }
+          %span{ :'aria-hidden' => 'true' }
+            ×
+        %h4.modal-title
+          = t('stall.wish_list_line_items.added.title')
+
+      .modal-body
+        = @line_item.name
+
+      .modal-footer
+        %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
+          = t('stall.wish_list_line_items.added.continue_shopping')
+
+        = link_to wish_list_path(@product_list), class: 'btn btn-primary', rel: 'nofollow' do
+          = t('stall.wish_lists.actions.view_wish_list')

data/app/views/stall/wish_list_line_items/_button.html.haml

@@ -0,0 +1,3 @@
+%button.btn.btn-default.add-to-wish-list-btn{ type: 'button', data: { :'add-to-wish-list' => true, title: title, url: url, included: included, :'product-id' => product.id, :'variant-id' => variant.try(:id), :'popover-content' => popover_content } }
+  = fa_icon (included ? 'heart' : 'heart-o'), data: { :'wish-list-icon' => true }
+  = fa_icon 'spinner spin', class: 'hidden', data: { :'wish-list-loading-spinner' => true }

data/app/views/stall/wish_list_line_items/_form.html.haml

@@ -0,0 +1,12 @@
+= simple_form_for line_item, as: :line_item, url: wish_list_line_items_path(wish_list), remote: true, data: { :'add-to-wish-list-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.hidden_field :quantity, value: 1
+
+  %button.btn.btn-primary{ type: 'submit', autocomplete: 'off', data: { :'loading-text' => t('stall.shared.sending') } }
+    = fa_icon 'heart-o'
+    = t('stall.wish_list_line_items.form.add')
+
+  %button.btn.btn-danger{ type: 'button', data: { :'cancel-button' => true } }
+    = fa_icon 'times'
+    = t('stall.shared.cancel')

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

@@ -0,0 +1,21 @@
+.wish-list-recap{ data: { :'product-list-recap' => true } }
+  = simple_form_for @wish_list, url: wish_list_path(@wish_list), as: :wish_list, remote: true, data: { :'product-list-form' => true } do |form|
+    %table.table.table-striped
+      %thead
+        %tr
+          %th= LineItem.human_attribute_name(:name)
+          %th= LineItem.human_attribute_name(:unit_price)
+          %th
+
+      %tbody
+        = form.fields_for :line_items do |line_item_fields|
+          %tr.line-item-row{ data: { :'line-item-id' => line_item_fields.object.id } }
+            %td= line_item_fields.object.name
+            %td= line_item_fields.object.unit_price
+            %td= link_to_remove_association '×'.html_safe, line_item_fields, wrapper_class: 'line-item-row'
+
+    .form-actions
+      %button.btn.btn-default{ type: 'submit', data: { :'product-list-update-button' => true } }
+        = t('stall.wish_lists.recap.update')
+
+

data/config/locales/stall.fr.yml

@@ -5,6 +5,7 @@ fr:
         filters:
           paid_after: Payé après le
           paid_before: Payé avant le
+
       variants_matrix:
         enabled: "Publier ?"
         price: "Prix"
@@ -31,6 +32,10 @@ fr:
         sent: "Notification envoyée !"
         sent_description: "Le client a bien été notifié de l'expédition de sa commande. "
 
+      products:
+        weight_hint: "Indiquez le poids du produit <b>en grammes</b>"
+        vat_rate_hint: "Taux de TVA en %. <b>%{rate} si vide.</b>"
+
   forms:
     tabs:
       cart:
@@ -45,15 +50,18 @@ fr:
         images: "Images"
         descriptions: "Descriptions"
         variants: "Déclinaisons"
+        shipping: "Livraison"
 
   components:
     section:
       products: "Catalogue"
+      selling: "Vente"
     component:
       products: "Produits"
       product_categories: "Catégories de produits"
       properties: "Propriétés de produit"
       manufacturers: "Fabricants"
+      carts: "Commandes / Paniers"
 
   stall:
     shared:
@@ -99,6 +107,10 @@ fr:
         validate: "Passer la commande"
         paid_at: "Payée le %{at}"
 
+    wish_lists:
+      actions:
+        view_wish_list: "Voir ma liste"
+
     line_items:
       form:
         add_to_cart: "Ajouter au panier"
@@ -112,6 +124,14 @@ fr:
         choose: "Merci de choisir un produit afin de l'ajouter au panier"
         quantity: "Merci de choisir une quantité à ajouter au panier"
 
+    wish_list_line_items:
+      form:
+        add: "Ajouter à ma Wish list"
+        remove: "Retirer de ma Wish list"
+      added:
+        title: "Votre produit a bien été ajouté à votre Wish list"
+        continue_shopping: "Continuer ma visite"
+
     checkout:
       shared:
         not_checkoutable: "Le panier a expiré, celui-ci a probablement déjà été payé."
@@ -349,6 +369,12 @@ fr:
         manufacturer: "Fabricant"
         suggested_products: "Produits suggérés"
         price: "Prix"
+        vat_rate: "Taux de TVA"
+        weight: "Poids du produit"
+      variant:
+        price: "Prix"
+        stock: "Quantité en stock"
+        weight: "Poids"
       product_category:
         name: "Nom"
         slug: "Fragment d'URL"

data/db/migrate/20170425085606_add_weight_to_stall_products_and_variants.rb

@@ -0,0 +1,6 @@
+class AddWeightToStallProductsAndVariants < ActiveRecord::Migration
+  def change
+    add_column :stall_products, :weight, :integer, default: 0
+    add_column :stall_variants, :weight, :integer, default: 0
+  end
+end

data/db/migrate/20170426163450_add_vat_rate_to_stall_products.rb

@@ -0,0 +1,5 @@
+class AddVatRateToStallProducts < ActiveRecord::Migration
+  def change
+    add_column :stall_products, :vat_rate, :decimal, precision: 4, scale: 2
+  end
+end

data/db/migrate/20170522062334_change_variants_weight_default_to_nil.rb

@@ -0,0 +1,11 @@
+class ChangeVariantsWeightDefaultToNil < ActiveRecord::Migration
+  def up
+    change_column_default :stall_variants, :weight, nil
+
+    Variant.where(weight: 0).find_each { |v| v.update(weight: nil) }
+  end
+
+  def down
+    change_column_default :stall_variants, :weight, 0
+  end
+end

data/lib/generators/stall/install/templates/initializer.rb

@@ -33,6 +33,24 @@ Stall.configure do |config|
   #
   # config.prices_precision = 2
 
+  # Override the controllers used in stall's default routing.
+  #
+  # This allows to extend or replace default controller behaviors by providing
+  # a route-compatible controller name with the right key
+  #
+  # Please read the routes source to see which controllers your can override
+  # with this config :
+  #
+  #   https://github.com/rails-stall/stall/blob/master/lib/stall/routes.rb
+  #
+  # Note : If you define controllers here that inherit from stall controllers,
+  #        to extend their behavior, please fill the `config.default_layout`
+  #        config to avoid layout issues, or define the `#set_stall_layout`
+  #        in your controllers, returing the layout name to render, or set
+  #        the `.layout` macro in your controller.
+  #
+  # config.controllers = { products: 'products' }
+
   # User omniauth providers that will be allowed for customers to authenticate
   # with.
   #

data/lib/stall.rb

@@ -50,6 +50,7 @@ module Stall
   autoload :Routes
   autoload :CartHelper
   autoload :ArchivedPaidCartHelper
+  autoload :WishListHelper
   autoload :Config
   autoload :Utils
 

data/lib/stall/addressable.rb

@@ -22,23 +22,54 @@ module Stall
     end
 
     # Allow billing address to fall back to shipping address when not filled
-    def billing_address
-      association(:billing_address).load_target ||
+    def billing_address(force_actual_address: false)
+      if (billing_address = association(:billing_address).load_target)
+        billing_address
+      elsif !@_force_actual_address_association && !force_actual_address
         association(:shipping_address).load_target
+      end
     end
 
     def billing_address?
       billing_address.try(:persisted?) && billing_address.billing?
     end
 
+    def billing_address_attributes=(attributes)
+      with_actual_address_associations do
+        assign_nested_attributes_for_one_to_one_association(:billing_address, attributes)
+      end
+    end
+
     # Allow shipping address to fall back to billing address when not filled
-    def shipping_address
-      association(:shipping_address).load_target ||
+    def shipping_address(force_actual_address: false)
+      if (shipping_address = association(:shipping_address).load_target)
+        shipping_address
+      elsif !@_force_actual_address_association && !force_actual_address
         association(:billing_address).load_target
+      end
     end
 
     def shipping_address?
       shipping_address.try(:persisted?) && shipping_address.shipping?
     end
+
+    def shipping_address_attributes=(attributes)
+      with_actual_address_associations do
+        assign_nested_attributes_for_one_to_one_association(:shipping_address, attributes)
+      end
+    end
+
+    # Allow forcing actual address associations to be retrieved, thus disabling
+    # addresses fallback for the duration of the block.
+    #
+    # This is used for nested attributes assignation which calls the
+    # associations reader directly, which happen to merge addresses when
+    # both billing and shipping addresses are assigned at the same time.
+    #
+    def with_actual_address_associations
+      @_force_actual_address_association = true
+      yield
+      @_force_actual_address_association = false
+    end
   end
 end

data/lib/stall/addresses/copy_source_to_target.rb

@@ -17,17 +17,21 @@ module Stall
       # Update or create target address with source attributes
       #
       def copy_address(type)
-        address = if target.send(:"#{ type }_address?")
-          target.send(:"#{ type }_address")
-        else
-          target.send(:"build_#{ type }_address")
-        end
+        source.with_actual_address_associations do
+          target.with_actual_address_associations do
+            address = if target.send(:"#{ type }_address?")
+              target.send(:"#{ type }_address")
+            else
+              target.send(:"build_#{ type }_address")
+            end
 
-        if source.send(:"#{ type }_address?")
-          attributes = duplicate_attributes(source.send(:"#{ type }_address"))
-          address.assign_attributes(attributes)
-        else
-          address.try(:mark_for_destruction)
+            if source.send(:"#{ type }_address?")
+              attributes = duplicate_attributes(source.send(:"#{ type }_address"))
+              address.assign_attributes(attributes)
+            else
+              address.try(:mark_for_destruction)
+            end
+          end
         end
       end
     end

data/lib/stall/addresses/prefill_target_from_source.rb

@@ -9,13 +9,17 @@ module Stall
       private
 
       def prefill_address(type)
-        source_address = source.send("#{ type }_address")
+        source.with_actual_address_associations do
+          target.with_actual_address_associations do
+            source_address = source.send("#{ type }_address")
 
-        if source_address && !target.send("#{ type }_address")
-          attributes = duplicate_attributes(source_address)
-          target.send("build_#{ type }_address", attributes)
-        elsif !target.send("#{ type }_address")
-          target.send("build_#{ type }_address")
+            if source_address && !target.send("#{ type }_address?")
+              attributes = duplicate_attributes(source_address)
+              target.send("build_#{ type }_address", attributes)
+            elsif !target.send("#{ type }_address?")
+              target.send("build_#{ type }_address")
+            end
+          end
         end
       end
     end

data/lib/stall/config.rb

@@ -21,6 +21,10 @@ module Stall
     # Default prices precision for rounding
     param :prices_precision, 2
 
+    # Controller overrides to allow extending or replacing default controllers
+    # behaviors
+    param :controllers, {}.with_indifferent_access
+
     # User omniauth providers
     param :devise_for_user_config, { controllers: { omniauth_callbacks: 'stall/omniauth_callbacks' } }
 

data/lib/stall/engine.rb

@@ -21,6 +21,7 @@ module Stall
     config.to_prepare do
       ::ApplicationController.send(:include, Stall::CartHelper)
       ::ApplicationController.send(:include, Stall::ArchivedPaidCartHelper)
+      ::ApplicationController.send(:include, Stall::WishListHelper)
     end
 
     initializer 'stall.ensure_shipping_method_for_all_calculators' do

data/lib/stall/routes.rb

@@ -7,6 +7,8 @@ module Stall
     end
 
     def draw(mount_location)
+      routes = self
+
       router.instance_eval do
         devise_for :users, Stall.config.devise_for_user_config
 
@@ -14,33 +16,43 @@ module Stall
           get '/users/omniauth/:provider/redirect' => 'stall/omniauth_callbacks#redirect', as: :user_omniauth_redirect
         end
 
-        scope mount_location, module: :stall do
-          resources :products, only: [:index], as: :products
+        scope mount_location do
+          resources :products, only: [:index], as: :products, controller: routes.controller_for(:products)
 
           constraints ProductExistsConstraint.new do
-            resources :products, path: '/', only: [:show]
+            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 CuratedProductListExistsConstraint.new do
-            resources :curated_product_lists, path: '/', only: [:show]
+            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
 
-          constraints ProductCategoryExistsConstraint.new do
-            resources :product_categories, path: '/', only: [:show]
+          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
 
-          resources :manufacturers, only: [:show]
+          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 :carts do
-            resources :line_items
-            resource :credit, controller: 'cart_credits', only: [:update, :destroy]
+          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' => 'checkouts#show', as: :checkout
+          get 'checkout/:cart_key' => "#{routes.controller_for(:checkouts)}#show", as: :checkout
 
-          scope 'checkout', module: 'checkout', as: :checkout do
+          scope 'checkout', as: :checkout do
             scope '(:cart_key)' do
-              resource :step, only: [:show, :update] 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
@@ -51,9 +63,8 @@ module Stall
             end
           end
 
-
           scope '/:gateway' do
-            resource :payment, only: [] do
+            resource :payment, only: [], controller: routes.controller_for(:payments) do
               member do
                 match 'notify', action: 'notify', via: [:get, :post]
               end
@@ -63,10 +74,8 @@ module Stall
       end
     end
 
-    class CuratedProductListExistsConstraint
-      def matches?(request)
-        CuratedProductList.exists?(slug: request.params[:id])
-      end
+    def controller_for(key)
+      Stall.config.controllers[key] || "stall/#{key}"
     end
 
     class ProductExistsConstraint
@@ -80,5 +89,19 @@ module Stall
         ProductCategory.exists?(slug: request.params[:id])
       end
     end
+
+    class CuratedProductListExistsConstraint
+      def matches?(request)
+        id = request.params[:curated_product_list_id] || request.params[:id]
+        CuratedProductList.exists?(slug: id)
+      end
+    end
+
+    class ManufacturerExistsConstraint
+      def matches?(request)
+        id = request.params[:manufacturer_id] || request.params[:id]
+        Manufacturer.exists?(slug: id)
+      end
+    end
   end
 end