stall 0.3.2 → 0.3.3

data/app/views/para/stall/inputs/shipping_notes/sent.html.haml

@@ -0,0 +1,11 @@
+= modal id: "shipment-modal-#{ @cart.id }", fade: false do |modal|
+  = modal.header do
+    = t('para.stall.shipping_note.sent')
+
+  = modal.body do
+    %p= t('para.stall.shipping_note.sent_description').html_safe
+
+  = modal.footer do
+    %button.btn.btn-default{ type: 'button', data: { dismiss: 'modal' } }
+      = t('stall.shared.close')
+

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

@@ -19,7 +19,7 @@
           %td= t('stall.carts.recap.subtotal')
           %td= number_to_currency(cart.subtotal)
 
-      - if cart.shipment.try(:persisted?)
+      - if cart.shipment.try(:persisted?) && cart.shipment.shipping_method
         %tr
           %td
             = t('stall.carts.recap.total_shipment_price')

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

@@ -1,4 +1,4 @@
-- if stall_user_signed_in? && available_customer_credit_for?(cart) && !cart.paid?
+- if user_signed_in? && available_customer_credit_for?(cart) && !cart.paid?
   = simple_form_for cart, url: cart_credit_path(cart), method: (credit_used_for?(@cart) ? :delete : :patch), html: { class: 'cart-credit-form', data: { :'cart-credit-form' => true } } do |form|
     = hidden_field_tag :_return_to, request.fullpath
 

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

@@ -0,0 +1,8 @@
+%h1= @curated_product_list.name
+
+.row
+  .col-md-4
+    = render partial: 'stall/products/filters', locals: { search: @search, products: @filterable_products }
+
+  .col-md-8
+    = render partial: 'stall/products/list', locals: { products: @products }

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

@@ -1,10 +1,10 @@
 -# When stall a user is signed in, a customer autoatically exist and is assigned
 -# to the cart, by default, we notify the visitor that he's signed in and will
 -# order with that account, making customer and user related fields unnecessary
-- if stall_user_signed_in?
+- if user_signed_in?
   .alert.alert-info
     %i.fa.fa-info-circle
-    = t('stall.checkout.informations.signed_in_as', email: current_stall_user.email)
+    = t('stall.checkout.informations.signed_in_as', email: current_user.email)
 
 - else
   -# The `#with_errors_from_user` helper ensures that user e-mail errors, like
@@ -14,9 +14,21 @@
 
   = form.fields_for :customer do |customer_form|
     = customer_form.fields_for :user, customer_form.object.user_or_default do |user_form|
-      %fieldset.collapse{ class: ('in' if params[:create_account] == '1'), data: { :'user-fields' => true } }
-        = user_form.input :password
-        = user_form.input :password_confirmation
+      .collapse{ class: ('in' if params[:create_account] == '1'), data: { :'user-fields' => true } }
+        %fieldset
+          %legend.password-sign-up= t('stall.checkout.sign_in.password_sign_up')
+
+          = user_form.input :password
+          = user_form.input :password_confirmation
+
+        - if Stall.config.omniauth_providers.any?
+          %fieldset
+            %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
+                = fa_icon provider.icon
+                = t('stall.omniauth.sign_in_with', provider: provider.display_name)
 
   %p.help-block
     %label

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

@@ -6,15 +6,27 @@
       = t('stall.checkout.sign_in.click_to_sign_in')
 
   #sign-in-form.panel-body.collapse{ data: { :'sign-in-form' => true } }
-    %p.help-block
-      = t('stall.checkout.sign_in.sign_in_instructions', label: t('stall.checkout.sign_in.button_label'))
+    %fieldset
+      %legend.email-sign-in= t('stall.checkout.sign_in.email_sign_in')
 
-    = simple_form_for resource, as: resource_name, url: session_path(resource_name), remote: true, html: { data: { :'stall-remote-sign-in-form' => true } } do |form|
-      .row
-        .col-md-6
-          = form.input :email
-        .col-md-6
-          = form.input :password
+      %p.help-block
+        = t('stall.checkout.sign_in.sign_in_instructions', label: t('stall.checkout.sign_in.button_label'))
 
-      %button.btn.btn-primary{ type: 'submit', autocomplete: 'off', data: { :'sign-in-submit-btn' => true, :'loading-text' => t('stall.shared.sending') } }
-        = t('stall.checkout.sign_in.button_label')
+      = simple_form_for resource, as: resource_name, url: session_path(resource_name), remote: true, html: { data: { :'stall-remote-sign-in-form' => true } } do |form|
+        .row
+          .col-md-6
+            = form.input :email
+          .col-md-6
+            = form.input :password
+
+        %button.btn.btn-primary{ type: 'submit', autocomplete: 'off', data: { :'sign-in-submit-btn' => true, :'loading-text' => t('stall.shared.sending') } }
+          = t('stall.checkout.sign_in.button_label')
+
+    - if Stall.config.omniauth_providers.any?
+      %fieldset
+        %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
+            = fa_icon provider.icon
+            = t('stall.omniauth.sign_in_with', provider: provider.display_name)

data/app/views/stall/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
-  = form.hidden_field :sellable_id
+  = form.hidden_field :sellable_type, value: 'Variant'
+  = 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 }
@@ -9,4 +9,3 @@
       %button.btn.btn-primary{ type: 'submit', autocomplete: 'off', data: { :'loading-text' => t('stall.shared.sending') } }
         %i.fa.fa-shopping-cart
         = t('stall.line_items.form.add_to_cart')
-

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

@@ -0,0 +1,8 @@
+%h1= @manufacturer.name
+
+.row
+  .col-md-4
+    = render partial: 'stall/products/filters', locals: { search: @search, products: @filterable_products }
+
+  .col-md-8
+    = render partial: 'stall/products/list', locals: { products: @products }

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

@@ -0,0 +1,8 @@
+%h1= @product_category.name
+
+.row
+  .col-md-4
+    = render partial: 'stall/products/filters', locals: { search: @search, products: @filterable_products }
+
+  .col-md-8
+    = render partial: 'stall/products/list', locals: { products: @products }

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

@@ -0,0 +1,4 @@
+.products-filters
+  = search_form_for search.form, url: request.path, as: :search, builder: SimpleForm::FormBuilder, html: { class: 'products-filters-form', data: { :'products-filters' => true } } do |form|
+    - product_filters_for(products).each do |filter|
+      = render filter.rendering_options(locals: { form: form })

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

@@ -0,0 +1,7 @@
+.products-list
+  .row
+    - products.each do |product|
+      .col-md-3
+        = render partial: 'stall/products/product', locals: { product: product }
+
+  = paginate(products)

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

@@ -0,0 +1,4 @@
+= link_to product_path(product), class: 'product' do
+  %span.product-name= product.name
+  = image_tag product.image.url(:thumb), class: 'img-responsive'
+  = number_to_currency(product.price)

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

@@ -0,0 +1,13 @@
+.row.product-details
+  .col-md-12
+    %ul.nav.nav-tabs{ data: { tabs: 'tabs' } }
+      - product_details.each_with_index do |tab, index|
+        %li{ class: "#{'active' if index == 0}"  }
+          = link_to tab.name, "##{tab.id}", data: { toggle: 'tab' }
+
+    .tab-content
+      - product_details.each_with_index do |tab, index|
+        .tab-pane{ id: "#{tab.id}", class: "#{'active' if index == 0}" }
+          = tab.content&.html_safe
+
+

data/app/views/stall/products/filters/_category_filter.html.haml

@@ -0,0 +1,2 @@
+.filter{ data: { :'filter' => filter.name, :'filter-submission' => 'change' } }
+  = form.input filter.param, as: :check_boxes, collection: filter.collection, label: filter.label, required: false

data/app/views/stall/products/filters/_manufacturer_filter.html.haml

@@ -0,0 +1,2 @@
+.filter{ data: { :'filter' => filter.name, :'filter-submission' => 'change' } }
+  = form.input filter.param, as: :check_boxes, collection: filter.collection, label: filter.label, required: false

data/app/views/stall/products/filters/_price_filter.html.haml

@@ -0,0 +1,2 @@
+.filter{ data: { :'filter' => 'price', :'filter-submission' => 'slide' } }
+  = form.input filter.param, as: :slider, label: filter.label, required: false, min: filter.min, max: filter.max, values: [filter.min, filter.max], range: true, input_html: { data: { :'slider-ticks' => filter.ticks, :'slider-ticks-labels' => filter.ticks } }

data/app/views/stall/products/filters/_property_filter.html.haml

@@ -0,0 +1,2 @@
+.filter{ data: { :'filter' => 'property', :'filter-name' => filter.name, :'filter-submission' => 'change' } }
+  = form.input filter.param, as: :check_boxes, collection: filter.collection, label: filter.label, required: false

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

@@ -0,0 +1,8 @@
+%h1= t('stall.products.index.title')
+
+.row
+  .col-md-4
+    = render partial: 'stall/products/filters', locals: { search: @search, products: @filterable_products }
+
+  .col-md-8
+    = render partial: 'stall/products/list', locals: { products: @products }

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

@@ -0,0 +1,26 @@
+.product-page
+  .col-md-4
+    .product-images
+      = image_tag @product.image.url(:show), class: 'img-responsive'
+
+  .col-md-8
+    %h1.product-title= @product.name
+
+    = displayed_price_for_variants(@product.variants)
+
+    = add_to_cart_form_for(@product)
+
+    .description
+      = @product.description.try(:html_safe)
+
+    - if @product.product_details.length > 0
+      = render 'stall/products/product_details', product_details: @product.product_details
+
+    - if @product.suggested_products.length > 0
+      .related.products
+        %h2
+          = t('stall.products.suggested_products.title')
+
+        .products.row
+          - @product.suggested_products.each do |suggested_product|
+            = render partial: 'stall/products/product', locals: { product: suggested_product }

data/config/locales/stall.fr.yml

@@ -1,6 +1,10 @@
 fr:
   para:
     stall:
+      cart:
+        filters:
+          paid_after: Payé après le
+          paid_before: Payé avant le
       variants_matrix:
         enabled: "Publier ?"
         price: "Prix"
@@ -8,6 +12,7 @@ fr:
         choose_properties_to_build_variants: |
           Choisissez les propriétés ainsi que les valeurs dont vous disposez
           pour créer automatiquement les déclinaisons de votre produit.
+        apply_to_all: "Appliquer à toutes les déclinaisons"
 
       variant_select:
         property_placeholder: "Choisissez une option ..."
@@ -35,6 +40,21 @@ fr:
         payment: "Paiement"
         line_items: "Produits"
 
+      product:
+        informations: "Informations"
+        images: "Images"
+        descriptions: "Descriptions"
+        variants: "Déclinaisons"
+
+  components:
+    section:
+      products: "Catalogue"
+    component:
+      products: "Produits"
+      product_categories: "Catégories de produits"
+      properties: "Propriétés de produit"
+      manufacturers: "Fabricants"
+
   stall:
     shared:
       cancel: "Annuler"
@@ -42,6 +62,18 @@ fr:
       send: "Envoyer"
       sending: "Envoi en cours ..."
 
+    products:
+      index:
+        title: "Notre catalogue"
+      suggester_products:
+        title: "Vous pourriez aussi aimer ..."
+      prices:
+        from: "À partir de %{price}"
+      filters:
+        category_filter: "Catégorie"
+        manufacturer_filter: "Fabricant"
+        price_filter: "Prix"
+
     carts:
       actions:
         view_cart: "Voir mon panier"
@@ -93,11 +125,17 @@ fr:
       sign_in:
         already_have_an_account: "J'ai déjà un compte :"
         click_to_sign_in: "Cliquez-ici pour vous connecter"
+
         sign_in_instructions: |
           Renseigez dans les champs suivant vos identifiants de connexion puis
           cliquez sur le bouton "%{label}"
         button_label: "Me connecter"
 
+        email_sign_in: "Connexion par e-mail"
+        omniauth_sign_in: "ou"
+        password_sign_up: "Renseigner un mot de passe"
+        omniauth_sign_up: "ou"
+
       payment:
         title: "Paiement"
         error: |
@@ -173,6 +211,9 @@ fr:
         order_paid_email:
           subject: "Une nouvelle commande a été passée sur le site - %{ref}"
 
+    omniauth:
+      sign_in_with: "%{provider}"
+
   activerecord:
     enums:
       cart:
@@ -190,19 +231,51 @@ fr:
           paid: "Payé"
 
     models:
-      line_item: "Produit"
-      customer: "Client"
-      address: "Adresse"
-      cart: "Panier"
-      shipment: "Livraison"
-      payment: "Paiement"
-      product: "Produit"
-      product_category: "Catégorie"
-      variant: "Déclinaison"
-      product_detail: "Bloc de description"
-      manufacturer: "Fabricant"
+      line_item:
+        one: "Produit"
+        other: "Produits"
+      customer:
+        one: "Client"
+        other: "Clients"
+      address:
+        one: "Adresse"
+        other: "Adresses"
+      cart:
+        one: "Panier"
+        other: "Paniers"
+      shipment:
+        one: "Livraison"
+        other: "Livraisons"
+      payment:
+        one: "Paiement"
+        other: "Paiements"
+      product:
+        one: "Produit"
+        other: "Produits"
+      product_category:
+        one: "Catégorie"
+        other: "Catégories"
+      variant:
+        one: "Déclinaison"
+        other: "Déclinaisons"
+      product_detail:
+        one: "Bloc de description"
+        other: "Blocs de description"
+      manufacturer:
+        one: "Fabricant"
+        other: "Fabricants"
+      curated_product_list:
+        one: "Curated list"
+        other: "Curated lists"
+      curated_list_product:
+        one: "Produit de curated list"
+        other: "Produits de curated list"
 
     attributes:
+      curated_product_list:
+        curated_list_products: Produits
+      curated_list_product:
+        product: Produit
       line_item:
         sellable: "Produit source"
         name: "Nom du produit"
@@ -268,10 +341,21 @@ fr:
         product_category: "Catégorie de produit"
         name: "Nom du produit"
         slug: "Fragment d'URL"
+        images: Images du produit
         description: "Description du produit"
         properties: "Propriétés"
         variants: "Déclinaisons"
         product_details: "Blocs de description produit"
+        manufacturer: "Fabricant"
+        suggested_products: "Produits suggérés"
+        price: "Prix"
+      product_category:
+        name: "Nom"
+        slug: "Fragment d'URL"
+        position: "Position"
+        parent: "Catégorie parente"
+        children: "Catégories enfant"
+        products: "Produits"
       product_detail:
         name: "Titre"
         content: "Contenu"
@@ -279,6 +363,8 @@ fr:
         name: "Nom du fabricant"
         logo: "Logo"
         products: "Produits"
+      image:
+        file: Image
 
   simple_form:
     placeholders:

data/db/migrate/20170221094450_add_slug_to_stall_manufacturers.rb

@@ -0,0 +1,5 @@
+class AddSlugToStallManufacturers < ActiveRecord::Migration
+  def change
+    add_column :stall_manufacturers, :slug, :text
+  end
+end

data/db/migrate/20170303122616_create_stall_product_suggestions.rb

@@ -0,0 +1,13 @@
+class CreateStallProductSuggestions < ActiveRecord::Migration
+  def change
+    create_table :stall_product_suggestions do |t|
+      t.references :product, index: true
+      t.references :suggestion, index: true
+
+      t.timestamps null: false
+    end
+
+    add_foreign_key :stall_product_suggestions, :stall_products, column: :product_id
+    add_foreign_key :stall_product_suggestions, :stall_products, column: :suggestion_id
+  end
+end

data/db/migrate/20170303151939_add_position_to_stall_manufacturers.rb

@@ -0,0 +1,5 @@
+class AddPositionToStallManufacturers < ActiveRecord::Migration
+  def change
+    add_column :stall_manufacturers, :position, :integer, default: 0
+  end
+end

data/db/migrate/20170308162740_create_stall_curated_product_lists.rb

@@ -0,0 +1,10 @@
+class CreateStallCuratedProductLists < ActiveRecord::Migration
+  def change
+    create_table :stall_curated_product_lists do |t|
+      t.string :name
+      t.string :slug
+
+      t.timestamps null: false
+    end
+  end
+end