stall 0.1.3 → 0.2.0

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

@@ -0,0 +1,32 @@
+-# 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?
+  .alert.alert-info
+    %i.fa.fa-info-circle
+    = t('stall.checkout.informations.signed_in_as', email: current_stall_user.email)
+
+- else
+  -# The `#with_errors_from_user` helper ensures that user e-mail errors, like
+  -# format or uniqueness, are actually bubbled up to the customer e-mail field.
+  = form.fields_for :customer, with_errors_from_user(form.object.customer) do |customer_form|
+    = customer_form.input :email
+
+  = 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
+
+  %p.help-block
+    %label
+      -# This field allows the step to determine wether an account should be
+      -# created or not while creating the customer, allowing it to clean
+      -# user related fields if it's not needed.
+      -#
+      -# The `autocomplete="off"` clears the Firefox cache that autofills the
+      -# checked attribute and breaks the unerlying basic bootstrap collapse
+      -# behavior
+      = check_box_tag :create_account, '1', (params[:create_account] == '1'), class: 'collapsed', autocomplete: 'off', data: { target: '[data-user-fields]', toggle: 'collapse' }
+      = t('stall.checkout.informations.create_an_account')
+%hr

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

@@ -0,0 +1,20 @@
+.panel.panel-info
+  .panel-heading
+    %i.fa.fa-user
+    = t('stall.checkout.sign_in.already_have_an_account')
+    = link_to '#sign-in-form', data: { toggle: 'collapse' } do
+      = 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'))
+
+    = 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')

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

@@ -1,4 +1,4 @@
-= simple_form_for line_item, as: :line_item, url: cart_line_items_path(cart), remote: true, data: { :'add-to-cart-form' => true } do |form|
+= 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
 
@@ -6,7 +6,7 @@
     = form.input_field :quantity, spinner: false, value: 1, class: 'form-group', data: { :'quantity-field' => true }
 
     %span.input-group-btn
-      %button.btn.btn-primary{ type: 'submit', style: 'font-size: 12px' }
+      %button.btn.btn-primary{ type: 'submit', data: { :'loading-text' => t('stall.shared.sending') } }
         %i.fa.fa-shopping-cart
         = t('stall.line_items.form.add_to_cart')
 

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

@@ -0,0 +1,2 @@
+= form.fields_for :payment do |payment_fields|
+  = payment_fields.association :payment_method, as: :radio_buttons, collection: PaymentMethod.active.ordered

data/app/views/stall/shared/mailers/_cart.html.haml

@@ -78,37 +78,39 @@
       %td
         %table
           %tbody
-            %tr
-              %td{ colspan: 2 }
-                %strong= Cart.human_attribute_name(:payment)
+            - if cart.payment && cart.payment.payment_method
+              %tr
+                %td{ colspan: 2 }
+                  %strong= Cart.human_attribute_name(:payment)
 
-            %tr
-              %td
-                = Payment.human_attribute_name(:payment_method)
-              %td
-                = cart.payment.payment_method.name
+              %tr
+                %td
+                  = Payment.human_attribute_name(:payment_method)
+                %td
+                  = cart.payment.payment_method.name
 
-            %tr
-              %td
-                = Payment.human_attribute_name(:state)
-              %td
-                - if cart.payment.paid?
-                  = t("stall.carts.recap.paid_at", at: cart.payment.paid_at)
-                - else
-                  = t("activerecord.enums.payment.state.#{ cart.payment.state }")
+              %tr
+                %td
+                  = Payment.human_attribute_name(:state)
+                %td
+                  - if cart.payment.paid?
+                    = t("stall.carts.recap.paid_at", at: cart.payment.paid_at)
+                  - else
+                    = t("activerecord.enums.payment.state.#{ cart.payment.state }")
 
-            %tr
-              %td{ colspan: 2 }
-                %strong= Cart.human_attribute_name(:shipment)
+            - if cart.shipment && cart.shipment.shipping_method
+              %tr
+                %td{ colspan: 2 }
+                  %strong= Cart.human_attribute_name(:shipment)
 
-            %tr
-              %td
-                = Shipment.human_attribute_name(:shipping_method)
-              %td
-                = cart.shipment.shipping_method.name
+              %tr
+                %td
+                  = Shipment.human_attribute_name(:shipping_method)
+                %td
+                  = cart.shipment.shipping_method.name
 
-            %tr
-              %td
-                = Shipment.human_attribute_name(:state)
-              %td
-                = t("activerecord.enums.payment.state.#{ cart.shipment.state }")
+              %tr
+                %td
+                  = Shipment.human_attribute_name(:state)
+                %td
+                  = t("activerecord.enums.payment.state.#{ cart.shipment.state }")

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

@@ -0,0 +1,2 @@
+= form.fields_for :shipment do |shipment_fields|
+  = shipment_fields.association :shipping_method, as: :radio_buttons

data/config/locales/stall.fr.yml

@@ -2,14 +2,17 @@ fr:
   stall:
     shared:
       close: "Fermer"
+      sending: "Envoi en cours ..."
 
     carts:
       formats:
         name: "Commande n°%{ref}"
+
       flashes:
         update:
           success: "Votre panier a bien été mis à jour."
           error: "Votre panier n'a pu être mis à jour, merci de vérifier les champs."
+
       recap:
         order_ref: "Commande n°%{ref}"
         ordered_at: "Passée le %{at}"
@@ -32,20 +35,28 @@ fr:
       add_error:
         title: "Votre produit n'a pu être ajouté"
         description: "Merci de vérifier que vous avez bien rempli la quantité avant d'ajouter le produit au panier."
+      errors:
+        choose: "Merci de choisir un produit afin de l'ajouter au panier"
+        quantity: "Merci de choisir une quantité à ajouter au panier"
 
     checkout:
       shared:
-        not_checkoutable: "Aucun produit dans le panier, impossible de passer la commande."
+        not_checkoutable: "Le panier a expiré, celui-ci a probablement déjà été payé."
       informations:
         title: "Vos informations"
-        validate: "Valider mes adresses"
+        validate: "Valider la commande et passer au paiement"
         error: "Vos informations n'ont pu être enregistrées, merci de vérifier les champs"
-      shipping_method:
-        title: "Mode de livraison"
-        validate: "Valider mon mode de livraison"
-      payment_method:
-        title: "Mode de paiement"
-        validate: "Valider mon mode de paiement"
+        signed_in_as: "Vous êtes actuellement connectés en tant que %{email}"
+        create_an_account: "Me créer un compte"
+        accept_the: "J'accepte les "
+      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"
+
       payment:
         title: "Paiement"
         error: |
@@ -91,6 +102,7 @@ fr:
         state:
           pending: "En attente"
           shipped: "Payé"
+
     models:
       line_item: "Produit"
       customer: "Client"
@@ -98,6 +110,7 @@ fr:
       cart: "Panier"
       shipment: "Livraison"
       payment: "Paiement"
+
     attributes:
       line_item:
         sellable: "Produit source"
@@ -129,6 +142,7 @@ fr:
         customer: "Client"
         created_at: "Date"
         line_items: "Produits"
+        use_another_address_for_billing: "Utiliser une autre adresse pour la facturation"
       cart:
         state: "Étape du panier"
         total_price: "Montant total"
@@ -136,6 +150,7 @@ fr:
         shipment: "Livraison"
         shipping_address: "Adresse de livraison"
         billing_address: "Adresse de facturation"
+        terms: "Conditions générales de vente"
       shipment:
         price: "Prix"
         eot_price: "Prix HT"
@@ -149,3 +164,15 @@ fr:
         paid_at: "Payé le"
         transaction_id: "Numéro de transaction"
         state: "État"
+
+  simple_form:
+    placeholders:
+      address:
+        first_name: "Votre prénom"
+        last_name: "Votre nom"
+        address: "Numéro et rue"
+        address_details: "Autres informations : bâtiment, escalier, interphone etc."
+        country: "Votre pays"
+        zip: "Votre code postal"
+        city: "Votre ville"
+        phone: "Votre numéro de téléphone (portable / fixe)"

data/lib/generators/stall/checkout/step/templates/step.rb.erb

@@ -24,4 +24,13 @@ class <%= class_name %> < Stall::Checkout::Step
   # def skip?
   #   false
   # end
+
+  private
+
+  # Process `params` here, defaults to assigning the cart with `cart_params`
+  # (params[:cart]) to the cart, running the step validations
+  #
+  def cart_params
+    params.require(:cart).permit({})
+  end
 end

data/lib/generators/stall/checkout/wizard/templates/wizard.rb.erb

@@ -1,3 +1,3 @@
 class <%= class_name %> < Stall::Checkout::Wizard
-  steps :informations, :shipping_method, :payment_method, :payment, :payment_return
+  steps :informations, :payment, :payment_return
 end

data/lib/generators/stall/install/install_generator.rb

@@ -13,5 +13,11 @@ module Stall
     def copy_default_checkout_wizard
       generate 'stall:checkout:wizard', 'default'
     end
+
+    def mount_engine_in_routes
+      say "Mounting Stall engine in routes"
+      gsub_file 'config/routes.rb', /mount_stall.+\n/, ''
+      route "mount_stall '/'"
+    end
   end
 end

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

@@ -56,7 +56,7 @@ Stall.configure do |config|
   # that you create your line items, carts and orders with the right currency
   # set.
   #
-  # param :default_currency, 'EUR'
+  # config.default_currency = 'EUR'
 
   # Default app domain use for building URLs in payment gateway forms and in
   # e-mails.
@@ -75,6 +75,15 @@ Stall.configure do |config|
   # A default one is generated on stall's installation and can be found in your
   # app at : lib/default_checkout_wizard.rb
   #
+  # Note :
+  #
+  #   If you do not autoload files in your app's lib folder, please require your
+  #   checkout wizard with the following command here
+  #
+  #     require 'default_checkout_wizard'
+  #
+  #
+  #
   # config.default_checkout_wizard = 'DefaultCheckoutWizard'
 
   # Default line items weight when added to cart and no weight is found on

data/lib/generators/stall/view/view_generator.rb

@@ -0,0 +1,38 @@
+module Stall
+  class ViewGenerator < ::Rails::Generators::Base
+    class ViewNotFound < StandardError; end
+
+    VIEWS_DIR = File.expand_path('../../../../../app/views', __FILE__)
+    source_root VIEWS_DIR
+
+    argument :file_paths, type: :array, required: true
+
+    def copy_view_template
+      paths = file_paths.map do |file_path|
+        source_path = source_path_for(file_path)
+        raise ViewNotFound, "Could not find any stall view for #{ file_path }" unless File.exist?(source_path)
+        target_path = "app/views/#{ file_path_with_ext_for(file_path) }"
+
+        [source_path, target_path]
+      end
+
+      paths.each do |source_path, target_path|
+        template(source_path, target_path)
+      end
+    end
+
+    private
+
+    def source_path_for(file_path)
+      File.join(VIEWS_DIR, file_path_with_ext_for(file_path))
+    end
+
+    def file_path_with_ext_for(file_path)
+      if file_path.match(/\.html\.haml\z/)
+        file_path
+      else
+        "#{ file_path }.html.haml"
+      end
+    end
+  end
+end

data/lib/stall/addressable.rb

@@ -11,6 +11,8 @@ module Stall
 
       has_many :addresses, through: :address_ownerships
       accepts_nested_attributes_for :address_ownerships, allow_destroy: true
+
+      attr_accessor :use_another_address_for_billing
     end
 
     def address_ownership_for(type)

data/lib/stall/addresses/copier_base.rb

@@ -0,0 +1,24 @@
+module Stall
+  module Addresses
+    class CopierBase
+      attr_reader :source, :target
+
+      def initialize(source, target)
+        @source = source
+        @target = target
+      end
+
+      def copy
+        fail NotImplementedError
+      end
+
+      private
+
+      def duplicate_attributes(model)
+        model.attributes.dup.tap do |attributes|
+          attributes.delete('id')
+        end
+      end
+    end
+  end
+end

data/lib/stall/addresses/copy_source_to_target.rb

@@ -0,0 +1,45 @@
+# Allows copying
+module Stall
+  module Addresses
+    class CopySourceToTarget < Stall::Addresses::CopierBase
+      def copy!
+        copy
+        target.save!
+      end
+
+      def copy
+        copy_shipping_address
+        copy_billing_address
+      end
+
+      private
+
+      def copy_shipping_address
+        # Update or create target's shipping address with source's shipping
+        # address attributes
+        if target.shipping_address
+          target.shipping_address.assign_attributes(duplicate_attributes(source.shipping_address))
+        else
+          target.build_shipping_address(duplicate_attributes(source.shipping_address))
+        end
+      end
+
+      def copy_billing_address
+        # If the source uses the same address for shipping and billing, we
+        # reproduce this behavior ont the target
+        if source.shipping_address == source.billing_address
+          shipping_ownership = target.address_ownership_for(:shipping)
+          target.mark_address_ownership_as_billing(shipping_ownership)
+        # If the source has a separate billing address, we update or create the
+        # target's billing address with the source's one attributes
+        else
+          if target.billing_address
+            target.billing_address.assign_attributes(duplicate_attributes(source.billing_address))
+          else
+            target.build_billing_address(duplicate_attributes(source.billing_address))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/stall/addresses/prefill_target_from_source.rb

@@ -0,0 +1,29 @@
+module Stall
+  module Addresses
+    class PrefillTargetFromSource < Stall::Addresses::CopierBase
+      def copy
+        prefill_shipping_address
+        prefill_billing_address
+      end
+
+      private
+
+      def prefill_shipping_address
+        if source.shipping_address && !target.shipping_address
+          target.build_shipping_address(duplicate_attributes(source.shipping_address))
+        elsif !target.shipping_address
+          target.build_shipping_address
+        end
+      end
+
+      def prefill_billing_address
+        if source.billing_address && !target.billing_address
+          target.build_billing_address(duplicate_attributes(source.billing_address))
+        elsif !target.billing_address || target.billing_address == target.shipping_address
+          target.address_ownership_for(:shipping).billing = false
+          target.build_billing_address
+        end
+      end
+    end
+  end
+end

data/lib/stall/addresses.rb

@@ -0,0 +1,9 @@
+module Stall
+  module Addresses
+    extend ActiveSupport::Autoload
+
+    autoload :CopierBase
+    autoload :CopySourceToTarget
+    autoload :PrefillTargetFromSource
+  end
+end

data/lib/stall/cart_helper.rb

@@ -3,8 +3,10 @@ module Stall
     extend ActiveSupport::Concern
 
     included do
+      include Stall::CustomersHelper
+
       if respond_to?(:helper_method)
-        helper_method :current_cart, :current_cart_key
+        helper_method :current_cart, :current_cart_key, :current_customer
       end
 
       if respond_to?(:after_action)
@@ -16,6 +18,16 @@ module Stall
       RequestStore.store[cart_key] ||= load_current_cart
     end
 
+    def current_customer
+      @current_customer ||= if stall_user_signed_in?
+        if (customer = current_stall_user.customer)
+          customer
+        else
+          current_stall_user.create_customer(email: current_stall_user.email)
+        end
+      end
+    end
+
     protected
 
     def current_cart_key
@@ -35,6 +47,7 @@ module Stall
 
     def prepare_cart(cart)
       cart.tap do |cart|
+        cart.customer = current_customer if current_customer
         # Keep track of potential customer locale switching to allow e-mailing
         # him in his last used locale
         cart.customer.locale = I18n.locale if cart.customer