effective_orders 5.1.17 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa911b81a28b5ad8ba481ed1703a6836962c8e7f518aa32867c4cb7ab0d69ea4
-  data.tar.gz: 4057277fcb79978c3f683bfdbabec721ae11d9f4672e4b083633772b6eef63bc
+  metadata.gz: b71f36aac1ec66c0744301209933bc4f642137519bf720a904f5b845f9970dff
+  data.tar.gz: 1aa4ccb644014cf6d3e1aa4913dc75e475f2b69c67332f8c3a6e07c6612f9259
 SHA512:
-  metadata.gz: 4cc8f8c2f82922a70241ed058cfc9f77bd501d18ef5f04728a7a894ec12877910027c86b24bdeb272227fea33c2c8615fc8e2b848289d49c51393a918baab2e5
-  data.tar.gz: 42f600c039c5d304e11856fcfa609ce6c99a2a43de0453f095b3f5d6f23657bf7a22f1146fe43fe9d87cface7bbabf3ec2d5164bb9d3fe7a0defb22be7553852
+  metadata.gz: 720181b8b9446f583bb12c19dbb181fd9d31e7615cdccecaf4d6b10bcedbd10217ca1a8af85dca01974274a1f989901fb5aacc8825b2f48993b39ab6ea22f992
+  data.tar.gz: 857d43e8ffec647adf71a12088eee4800c364f687bb45a154b75df486c6759ffd4b10c462243f82f7a2907c12e902ffbf099134a8e7cfa76d68124105dd88e72

data/README.md

@@ -399,8 +399,6 @@ On the Checkout page (`effective_orders.new_order_path`) a new `Effective::Order
 
 If the configuration options `config.billing_address` and/or `config.shipping_address` options are `true` then the user will be prompted for the appropriate addresses, based on [effective_addresses](https://github.com/code-and-effect/effective_addresses/).
 
-If `config.use_address_full_name` is set to `true` then appropriate form field will be shown and the user will be prompted for the appropriate address full name during the checkout process, based on [effective_addresses](https://github.com/code-and-effect/effective_addresses/).
-
 When the user submits the form on this screen, a POST to `effective_orders.order_path` is made, and the `Effective::Order` object is validated and created.
 
 On this final checkout screen, links to all configured payment providers are displayed, and the user may choose which payment processor should be used to make a payment.

data/app/models/concerns/acts_as_purchasable_parent.rb

@@ -0,0 +1,34 @@
+# Mostly for the callbacks
+
+module ActsAsPurchasableParent
+  extend ActiveSupport::Concern
+
+  module Base
+    def acts_as_purchasable_parent(*options)
+      @acts_as_purchasable_parent = options || []
+      include ::ActsAsPurchasableParent
+    end
+  end
+
+  module ClassMethods
+    def acts_as_purchasable_parent?; true; end
+
+    def before_purchase(&block)
+      send :define_method, :before_purchase do |order| self.instance_exec(order, &block) end
+    end
+
+    def after_purchase(&block)
+      send :define_method, :after_purchase do |order| self.instance_exec(order, &block) end
+    end
+
+    def after_decline(&block)
+      send :define_method, :after_decline do |order| self.instance_exec(order, &block) end
+    end
+  end
+
+  included do
+    has_many :orders, -> { order(:id) }, as: :parent, class_name: 'Effective::Order', dependent: :nullify
+    accepts_nested_attributes_for :orders
+  end
+
+end

data/app/models/concerns/acts_as_subscribable.rb

@@ -24,9 +24,7 @@ module ActsAsSubscribable
       raise :abort unless (subscripter.destroy! rescue false)
     end
 
-    if EffectiveOrders.trial?
-      validates :trialing_until, presence: true
-    end
+    validates :trialing_until, presence: true, if: -> { EffectiveOrders.trial? }
 
     validates :subscription_status, inclusion: { allow_nil: true, in: EffectiveOrders::STATUSES.keys }
 

data/app/models/effective/order.rb

@@ -12,13 +12,11 @@ module Effective
     self.table_name = EffectiveOrders.orders_table_name.to_s
 
     if EffectiveOrders.obfuscate_order_ids
+      raise('unsupported obfuscation with tenant') if defined?(Tenant)
       acts_as_obfuscated format: '###-####-###'
     end
 
-    acts_as_addressable(
-      billing: { singular: true, use_full_name: EffectiveOrders.use_address_full_name },
-      shipping: { singular: true, use_full_name: EffectiveOrders.use_address_full_name }
-    )
+    acts_as_addressable(billing: { singular: true }, shipping: { singular: true })
 
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
     attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
@@ -88,11 +86,14 @@ module Effective
     validates :state, inclusion: { in: EffectiveOrders::STATES.keys }
     validates :subtotal, presence: true
 
-    if EffectiveOrders.minimum_charge.to_i > 0
-      validates :total, presence: true, numericality: {
-        greater_than_or_equal_to: EffectiveOrders.minimum_charge.to_i,
-        message: "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items."
-      }, unless: -> { (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }
+    with_options(if: -> { EffectiveOrders.minimum_charge.to_i > 0 }) do
+      validates :total, presence: true
+
+      validate(unless: -> { (free? && EffectiveOrders.free?) || (refund? && EffectiveOrders.refund?) }) do
+        if total.present? && total < EffectiveOrders.minimum_charge
+          self.errors.add(:total, "must be $#{'%0.2f' % (EffectiveOrders.minimum_charge.to_i / 100.0)} or more. Please add additional items.")
+        end
+      end
     end
 
     validate(if: -> { tax_rate.present? }) do
@@ -106,17 +107,9 @@ module Effective
       validates :tax_rate, presence: { message: "can't be determined based on billing address" }
       validates :tax, presence: true
 
-      if EffectiveOrders.billing_address
-        validates :billing_address, presence: true
-      end
-
-      if EffectiveOrders.shipping_address
-        validates :shipping_address, presence: true
-      end
-
-      if EffectiveOrders.collect_note_required
-        validates :note, presence: true
-      end
+      validates :billing_address, presence: true, if: -> { EffectiveOrders.billing_address }
+      validates :shipping_address, presence: true, if: -> { EffectiveOrders.shipping_address }
+      validates :note, presence: true, if: -> { EffectiveOrders.collect_note_required }
     end
 
     # When Purchased
@@ -124,12 +117,21 @@ module Effective
       validates :purchased_at, presence: true
       validates :payment, presence: true
 
-      validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.payment_providers }
+      validates :payment_provider, presence: true
+
+      validate do
+        self.errors.add(:payment_provider, "unknown payment provider") unless EffectiveOrders.payment_providers.include?(payment_provider)
+      end
+
       validates :payment_card, presence: true
     end
 
     with_options if: -> { deferred? } do
-      validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.deferred_providers }
+      validates :payment_provider, presence: true
+
+      validate do
+        self.errors.add(:payment_provider, "unknown deferred payment provider") unless EffectiveOrders.deferred_providers.include?(payment_provider)
+      end
     end
 
     scope :deep, -> { includes(:addresses, :user, order_items: :purchasable) }
@@ -457,13 +459,16 @@ module Effective
       self.payment = payment_to_h(payment) if self.payment.blank?
 
       begin
-        Effective::Order.transaction do
+        EffectiveResources.transaction do
           run_purchasable_callbacks(:before_purchase)
+
           save!
           update_purchasables_purchased_order!
+
+          run_purchasable_callbacks(:after_purchase)
         end
       rescue => e
-        Effective::Order.transaction do
+        EffectiveResources.transaction do
           save!(validate: false)
           update_purchasables_purchased_order!
         end
@@ -471,7 +476,6 @@ module Effective
         raise(e)
       end
 
-      run_purchasable_callbacks(:after_purchase)
       send_order_receipts! if email
 
       true
@@ -504,9 +508,11 @@ module Effective
         skip_buyer_validations: true
       )
 
-      Effective::Order.transaction do
+      EffectiveResources.transaction do
         begin
+          run_purchasable_callbacks(:before_decline)
           save!(validate: validate)
+          run_purchasable_callbacks(:after_decline)
         rescue => e
           self.state = state_was
 
@@ -517,8 +523,6 @@ module Effective
 
       raise "Failed to decline order: #{error || errors.full_messages.to_sentence}" unless error.nil?
 
-      run_purchasable_callbacks(:after_decline)
-
       true
     end
 
@@ -635,7 +639,15 @@ module Effective
     end
 
     def run_purchasable_callbacks(name)
-      order_items.each { |oi| oi.purchasable.public_send(name, self, oi) if oi.purchasable.respond_to?(name) }
+      order_items.select { |item| item.purchasable.respond_to?(name) }.each do |item|
+        EffectiveResources.transaction(item) { item.purchasable.public_send(name, self, item) }
+      end
+
+      if parent.respond_to?(name)
+        EffectiveResources.transaction(parent) { parent.public_send(name, self) }
+      end
+
+      true
     end
 
     def send_email(email, *args)

data/app/models/effective/subscripter.rb

@@ -11,11 +11,9 @@ module Effective
     validates :subscribable, presence: true, if: -> { stripe_plan_id.present? }
     validates :customer, presence: true
 
-    validates :stripe_plan_id, inclusion: {
-      allow_blank: true,
-      in: EffectiveOrders.stripe_plans.map { |plan| plan[:id] },
-      message: 'unknown plan'
-    }
+    validate(if: -> { stripe_plan_id.present? }) do
+      self.errors.add(:stripe_plan_id, 'unknown plan') unless EffectiveOrders.stripe_plans.map { |plan| plan[:id] }.include?(stripe_plan_id)
+    end
 
     validate(if: -> { stripe_plan_id && plan && plan[:amount] > 0 }) do
       self.errors.add(:stripe_token, 'updated payment card required') if stripe_token.blank? && token_required?

data/app/models/effective/subscription.rb

@@ -47,7 +47,10 @@ module Effective
     validates :subscribable, presence: true
 
     validates :stripe_plan_id, presence: true
-    validates :stripe_plan_id, inclusion: { in: EffectiveOrders.stripe_plans.map { |plan| plan[:id] } }
+
+    validate(if: -> { stripe_plan_id.present? }) do
+      self.errors.add(:stripe_plan_id, 'unknown plan') unless EffectiveOrders.stripe_plans.map { |plan| plan[:id] }.include?(stripe_plan_id)
+    end
 
     validates :stripe_subscription_id, presence: true
 

data/app/views/effective/orders/_checkout_step2.html.haml

@@ -1,6 +1,7 @@
 = render partial: 'effective/orders/order', locals: { order: order }
 
-- if order.persisted? && order.user == current_user
+- # Show this if I'm on the effective orders checkout screen. But not on a rendered order.
+- if order.persisted? && order.user == current_user && request.path.to_s.start_with?(effective_orders.order_path(order))
   .effective-order-change-items
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
 

data/app/views/effective/orders/_order_shipping.html.haml

@@ -9,7 +9,7 @@
     %tbody
       %tr
         %td
-          - if order.billing_address.blank? || !EffectiveOrders.use_address_full_name
+          - if order.billing_address.blank? || order.billing_address.full_name.blank?
             = order.billing_name
             %br
 

data/config/effective_orders.rb

@@ -19,7 +19,6 @@ EffectiveOrders.setup do |config|
   # Require these addresses when creating a new Order.  Works with effective_addresses gem
   config.billing_address = true
   config.shipping_address = false
-  config.use_address_full_name = true
 
   # Use effective_obfuscation gem to change order.id into a seemingly random 10-digit number
   config.obfuscate_order_ids = false

data/lib/effective_orders/engine.rb

@@ -6,6 +6,7 @@ module EffectiveOrders
     initializer 'effective_orders.active_record' do |app|
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.extend(ActsAsPurchasable::Base)
+        ActiveRecord::Base.extend(ActsAsPurchasableParent::Base)
         ActiveRecord::Base.extend(ActsAsSubscribable::Base)
         ActiveRecord::Base.extend(ActsAsSubscribableBuyer::Base)
       end

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.17'.freeze
+  VERSION = '5.2.3'.freeze
 end

data/lib/effective_orders.rb

@@ -36,7 +36,7 @@ module EffectiveOrders
       :layout, :mailer_class_name, :mailer,
       :orders_collection_scope, :order_tax_rate_method,
       :obfuscate_order_ids, :use_effective_qb_sync,
-      :billing_address, :shipping_address, :use_address_full_name,
+      :billing_address, :shipping_address,
       :collect_note, :collect_note_required, :collect_note_message,
       :terms_and_conditions, :terms_and_conditions_label, :minimum_charge,
 
@@ -116,7 +116,7 @@ module EffectiveOrders
 
   # The Effective::Order.payment_provider value must be in this collection
   def self.payment_providers
-    @payment_providers ||= [
+    [
       ('cheque' if cheque?),
       ('credit card' if mark_as_paid?),
       ('free' if free?),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.1.17
+  version: 5.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,6 +215,7 @@ files:
 - app/helpers/effective_subscriptions_helper.rb
 - app/mailers/effective/orders_mailer.rb
 - app/models/concerns/acts_as_purchasable.rb
+- app/models/concerns/acts_as_purchasable_parent.rb
 - app/models/concerns/acts_as_subscribable.rb
 - app/models/concerns/acts_as_subscribable_buyer.rb
 - app/models/effective/cart.rb