stall 0.2.0 → 0.3.1

data/lib/stall/adjustable.rb

@@ -0,0 +1,20 @@
+module Stall
+  module Adjustable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :adjustments, dependent: :destroy, inverse_of: :cart
+      accepts_nested_attributes_for :adjustments
+    end
+
+    private
+
+    def items
+      super.tap do |items|
+        adjustments.each do |adjustment|
+          items << adjustment
+        end
+      end
+    end
+  end
+end

data/lib/stall/archived_paid_cart_helper.rb

@@ -0,0 +1,36 @@
+module Stall
+  module ArchivedPaidCartHelper
+    def archived_paid_cart
+      RequestStore.store[archived_paid_cart_key] ||= load_archived_paid_cart
+    end
+
+    def archived_paid_cart?
+      !!archived_paid_cart
+    end
+
+    def archive_paid_cart_cookie(identifier)
+      cookies.delete(cart_key(identifier))
+      store_cart_cookie_for(current_cart.identifier, current_cart, namespace: :paid)
+    end
+
+    def archivable_cart?(cart)
+      !cart.active? && cart.token != archived_paid_cart_token
+    end
+
+    private
+
+    def load_archived_paid_cart
+      if (cart_token = archived_paid_cart_token)
+        ProductList.find_by_token(archived_paid_cart_token)
+      end
+    end
+
+    def archived_paid_cart_key
+      cart_key(current_cart_key, namespace: :paid)
+    end
+
+    def archived_paid_cart_token
+      cookies.encrypted[archived_paid_cart_key]
+    end
+  end
+end

data/lib/stall/cart_helper.rb

@@ -46,11 +46,19 @@ module Stall
     end
 
     def prepare_cart(cart)
-      cart.tap do |cart|
+      cart.tap do
         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
+        #
+        # 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 cart.customer && I18n.locale.in?(I18n.available_locales)
+          cart.customer.locale = I18n.locale
+        end
+
+        Stall.config.service_for(:product_list_staleness_handling).new(cart).call
 
         # Only update locale change for existing carts. New carts don't need
         # to be saved, avoiding each robot or simple visitors to create a
@@ -78,8 +86,8 @@ module Stall
       cookies.delete(cart_key(identifier))
     end
 
-    def cart_key(identifier = current_cart_key)
-      ['stall', 'cart', identifier.to_s].join('.')
+    def cart_key(identifier = current_cart_key, namespace: nil)
+      ['stall', 'cart', namespace, identifier.to_s].compact.join('.')
     end
 
     def cart_class
@@ -87,13 +95,13 @@ module Stall
     end
 
     def store_cart_to_cookies
-      if current_cart.persisted?
+      if current_cart.persisted? && current_cart.active?
         store_cart_cookie_for(current_cart.identifier, current_cart)
       end
     end
 
-    def store_cart_cookie_for(identifier, cart)
-      cookies.encrypted.permanent[cart_key(identifier)] = cart.token
+    def store_cart_cookie_for(identifier, cart, namespace: nil)
+      cookies.encrypted.permanent[cart_key(identifier, namespace: namespace)] = cart.token
     end
   end
 end

data/lib/stall/checkout/informations_checkout_step.rb

@@ -28,10 +28,10 @@ module Stall
 
       def process
         prepare_user_attributes
+        prepare_addresses_attributes
         cart.assign_attributes(cart_params)
-        process_addresses
 
-        return unless valid?
+        return false unless valid?
 
         cart.save.tap do |valid|
           assign_addresses_to_customer!
@@ -41,22 +41,45 @@ module Stall
 
       private
 
-      def cart_params
+      # To easily add permitted parameters, use the following method in your
+      # subclass :
+      #
+      #   def cart_params
+      #     super(customer_attributes: [nested: :attribute])
+      #   end
+      #
+      # Note : If you want to remove permitted parameters, you need to rewrite
+      # the full permissions nested array
+      #
+      def cart_params(*attributes)
         @cart_params ||= params.require(:cart).permit(
-          :use_another_address_for_billing, :terms,
-          :payment_method_id, :shipping_method_id,
-          customer_attributes: [
-            :email, user_attributes: [
-              :password, :password_confirmation
-            ]
-          ],
-          address_ownerships_attributes: [
-            :id, :shipping, :billing,
-            address_attributes: [
-              :id, :civility, :first_name, :last_name, :address,
-              :address_details, :country, :zip, :city, :phone
-            ]
-          ]
+          *merge_arrays(
+            [
+              :use_another_address_for_billing, :terms,
+              :payment_method_id, :shipping_method_id,
+              customer_attributes: [
+                :id, :email, user_attributes: [
+                  :password, :password_confirmation
+                ]
+              ],
+              shipping_address_attributes: [
+                :id, :civility, :first_name, :last_name, :address,
+                :address_details, :country, :zip, :city, :phone, :state
+              ],
+              billing_address_attributes: [
+                :id, :civility, :first_name, :last_name, :address,
+                :address_details, :country, :zip, :city, :phone, :state,
+                :_destroy
+              ],
+              shipment_attributes: [
+                :id, :shipping_method_id
+              ],
+              payment_attributes: [
+                :id, :payment_method_id
+              ]
+            ],
+            attributes
+          )
         )
       end
 
@@ -64,23 +87,6 @@ module Stall
         cart.build_customer unless cart.customer
       end
 
-      def ensure_address(type)
-        ownership = cart.address_ownership_for(type) || cart.address_ownerships.build(type => true)
-        ownership.address || ownership.build_address
-      end
-
-      def ensure_billing_address
-        return ensure_address(:billing) unless cart_params[:use_another_address_for_billing] == '0'
-
-        # If the form was submitted and we merged both shipping and billing
-        # addresses together, we must separate them back to present them to
-        # the user form, avoiding to render errors in a form that the user
-        # didn't even see before
-        ownership = cart.address_ownership_for(:billing)
-        ownership.billing = false if ownership.shipping
-        ensure_address(:billing)
-      end
-
       def ensure_shipment
         cart.build_shipment unless cart.shipment
       end
@@ -108,23 +114,14 @@ module Stall
         end
       end
 
-      # Merges shipping and billing addresses into one address when the visitor
-      # has chosen to use the shipping address for both.
+      # If the billing address should be set to the same as the filled shipping
+      # address, we remove the billing address parameters
       #
-      def process_addresses
-        return if use_another_address_for_billing?
-
-        shipping_ownership = cart.address_ownership_for(:shipping)
-        billing_ownership = cart.address_ownership_for(:billing)
-
-        return if billing_ownership == shipping_ownership
-
-        # If the user choosed to receive his order by shipping and that he
-        # choosed not to fill a billing address, we remove the billing address
-        # hidden form that was submitted in the step, and make the shipping
-        # address be used as billing address too
-        cart.address_ownerships.destroy(billing_ownership) if billing_ownership
-        cart.mark_address_ownership_as_billing(shipping_ownership) if shipping_ownership
+      def prepare_addresses_attributes
+        unless use_another_address_for_billing?
+          cart_params.delete(:billing_address_attributes)
+          cart.billing_address.try(:mark_for_destruction)
+        end
       end
 
       # Assigns the shipping fees to the cart based on the selected shipping

data/lib/stall/checkout/payment_return_checkout_step.rb

@@ -2,9 +2,12 @@ module Stall
   module Checkout
     class PaymentReturnCheckoutStep < Stall::Checkout::Step
       include Stall::CartHelper
+      include Stall::ArchivedPaidCartHelper
 
       def prepare
-        remove_cart_from_cookies(cart.identifier)
+        if archivable_cart?(cart)
+          archive_paid_cart_cookie(cart.identifier)
+        end
       end
 
       # When we access this step, the cart is "inactive", since it is paid, so

data/lib/stall/checkout/step.rb

@@ -33,8 +33,9 @@ module Stall
         false
       end
 
-      def is?(key)
-        identifier == key
+      def is?(other)
+        step_identifier = (Step === other ? other.identifier : other.to_sym)
+        identifier == step_identifier
       end
 
       def identifier
@@ -61,7 +62,7 @@ module Stall
       #
       def valid?
         cart.validate
-        run_step_validations!(clear:  false)
+        run_step_validations!(clear: false)
 
         cart.errors.empty?
       end
@@ -75,6 +76,26 @@ module Stall
 
       private
 
+      def cart_params(*attributes)
+        @cart_params ||= if params.key?(:cart)
+          params.require(:cart).permit(attributes)
+        else
+          {}
+        end
+      end
+
+      # Allows overriding the nested array of permitted parameters to add other
+      # params at a given path. Rails default behavior doesn't allow merging
+      # nested arrays, neither top-level arrays.
+      #
+      # Note : We use the `deep_merge` gem for the nested arrays merging.
+      #
+      def merge_arrays(defaults, overrides)
+        defaults_hash = defaults.extract_options!
+        overrides_hash = overrides.extract_options!
+        (defaults + overrides) << defaults_hash.deeper_merge!(overrides_hash)
+      end
+
       def run_step_validations!(clear: true)
         if (validations = self.class.validations)
           validations.new(cart, self, clear: clear).validate

data/lib/stall/checkout/step_form.rb

@@ -5,14 +5,14 @@ module Stall
 
       class_attribute :nested_forms
 
-      attr_reader :object, :step, :clear_cart_errors_before_validation
+      attr_reader :object, :step, :clear_cart_errors
 
       delegate :errors, to: :object
 
       def initialize(object, step, clear: true)
         @object = object
         @step = step
-        @clear_cart_errors_before_validation = clear
+        @clear_cart_errors = clear
       end
 
       # Runs form and nested forms validations and returns wether they all
@@ -23,7 +23,7 @@ module Stall
       # form constructor, aggregating both validation sources' errors
       #
       def validate
-        errors.clear if clear_cart_errors_before_validation
+        errors.clear if clear_cart_errors
         run_validations!
         validate_nested_forms
         !errors.any?
@@ -72,8 +72,14 @@ module Stall
 
         # Run all validations on all nested forms and ensure they're all valid
         nested_forms.map do |name, form|
-          if object.respond_to?(name) && (resource = object.send(name))
-            Array.wrap(resource).map { |m| form.new(m, step).validate }.all?
+          if object.respond_to?(name) && (resource = object.send(name)) &&
+            !(resource.respond_to?(:marked_for_destruction?) && resource.marked_for_destruction?)
+          then
+            valid = Array.wrap(resource).map { |m| form.new(m, step, clear: @clear_cart_errors).validate }.all?
+            # Bubble up nested errors
+            errors.add(name, :invalid) unless valid
+
+            valid
           else
             # Nested validations shouldn't be run on undefined relations
             true

data/lib/stall/checkout/wizard.rb

@@ -57,8 +57,13 @@ module Stall
         step_index && step_index >= steps_count - 1
       end
 
-      def step_complete?(step_identifier)
-        steps.index(cart.state) > steps.index(step_identifier.to_sym)
+      def steps
+        @steps ||= self.class.steps
+      end
+
+      def step_complete?(step)
+        step_identifier = (Step === step ? step.identifier : step.to_sym)
+        steps.index(cart.state) > steps.index(step_identifier)
       end
 
       def steps_count
@@ -87,10 +92,6 @@ module Stall
 
       private
 
-      def steps
-        @steps ||= self.class.steps
-      end
-
       def step_name_for(index)
         steps[index]
       end

data/lib/stall/config.rb

@@ -57,6 +57,8 @@ module Stall
     # Configure the terms of service page path
     param :terms_path, 'about:blank'
 
+    param :convert_cart_remainder_to_credit_note, false
+
     def shipping
       @shipping ||= Stall::Shipping::Config.new
     end
@@ -99,5 +101,12 @@ module Stall
     def default_user_model
       default_user_model_name.try(:constantize)
     end
+
+    def default_currency_as_money
+      raw_default_currency && Money::Currency.new(raw_default_currency)
+    end
+
+    alias_method :raw_default_currency, :default_currency
+    alias_method :default_currency, :default_currency_as_money
   end
 end

data/lib/stall/default_currency_manager.rb

@@ -0,0 +1,27 @@
+module Stall
+  module DefaultCurrencyManager
+    extend ActiveSupport::Concern
+
+    included do
+      after_initialize :ensure_currency
+
+      scope :for_currency, ->(currency) {
+        where(table_name => { currency: currency.to_s })
+      }
+    end
+
+    def currency
+      if (currency = read_attribute(:currency).presence)
+        Money::Currency.new(currency)
+      else
+        self.currency = Stall.config.default_currency
+      end
+    end
+
+    private
+
+    def ensure_currency
+      self.currency ||= Stall.config.default_currency
+    end
+  end
+end

data/lib/stall/engine.rb

@@ -4,10 +4,12 @@ module Stall
       Money.default_currency = Stall.config.default_currency
     end
 
+    initializer 'stall.set_money_gem_infinite_precision' do
+      Money.infinite_precision = true
+    end
+
     initializer 'stall.add_routing_mapper_extension' do
-      ActiveSupport.on_load(:action_controller) do
-        ActionDispatch::Routing::Mapper.send(:include, Stall::RoutingMapper)
-      end
+      ActionDispatch::Routing::Mapper.send(:include, Stall::RoutingMapper)
     end
 
     initializer 'stall.override_actionview_number_helpers' do
@@ -19,6 +21,7 @@ module Stall
     initializer 'stall.include_cart_helper' do
       ActiveSupport.on_load(:action_controller) do
         include Stall::CartHelper
+        include Stall::ArchivedPaidCartHelper
       end
     end
 
@@ -30,6 +33,10 @@ module Stall
       end
     end
 
+    initializer 'stall.require_manual_payment_gateway' do
+      require 'stall/payments/manual_payment_gateway'
+    end
+
     initializer 'stall.ensure_payment_method_for_all_gateways' do
       Stall::Payments.gateways.each_key do |name|
         PaymentMethod.where(identifier: name).first_or_create do |method|
@@ -38,6 +45,10 @@ module Stall
       end
     end
 
+    initializer 'stall.add_stall_plugin_to_para_config' do
+      Para.config.plugins += [:stall]
+    end
+
     # Development : Configure rails generators to only generate the target
     # files and not try to generate useless complementary files
     #