effective_orders 5.1.14 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea7a1a4554f56dd9230c6d1f4c4c00ae6884fb3d61508c1c437464a9106065b
-  data.tar.gz: 846428fc00eae462dbf46f128b777ec32d22ed8f47415d0b411de9922a39dee6
+  metadata.gz: 79d6c5b375a23ec257f7b5d357ee38bd63ccc050b9909bff1b8b125e8b7115d5
+  data.tar.gz: bdca1e23836d7fde14bf5de938ce4803327f0396310061188217384605544e76
 SHA512:
-  metadata.gz: f6bcd2880d585a48f68785e62f0b44e52627b68d42e1764ec642bccef8de36810314876bd26b9a24ca0216c2609fb8b8c11649d8c0b63f605f341dcf90c04444
-  data.tar.gz: cf6eced1338c660b98d2e75eca61b645899fcc6888772cef8c4184d07296ef7e3a684a8ed22c2a19231eb42d737305e0da1fcb74357a13138a8eb52f68d1813a
+  metadata.gz: '09bf234893689bd3f569f8d9eb8ba2b627b82eaf1370edbc7b130b23df40d2f588394fb5da52a3dd9e8c0ce8a671e5cc66c2ec074ff6c06672a4c931563092c5'
+  data.tar.gz: f6e1a19c93b81d872c7e6992833f02a59012778a5a7ba4f8510ffbd69e9df7b5c8669c1bec2aba48e39817a1623d2cf1c6aae6c718a02816ec7c226ced406c6e

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/controllers/effective/providers/free.rb

@@ -20,8 +20,7 @@ module Effective
           payment: 'free order. no payment required.',
           provider: 'free',
           card: 'none',
-          purchased_url: free_params[:purchased_url],
-          email: false
+          purchased_url: free_params[:purchased_url]
         )
       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
@@ -68,8 +66,8 @@ module Effective
     before_validation { assign_order_totals }
     before_validation { assign_billing_name }
     before_validation { assign_email }
-    before_validation { assign_last_address }
     before_validation { assign_user_address }
+    before_validation { assign_last_address }
 
     before_validation(if: -> { confirmed_checkout }) do
       assign_attributes(state: EffectiveOrders::CONFIRMED) if pending?
@@ -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) }
@@ -388,15 +390,20 @@ module Effective
     end
 
     def send_order_receipt_to_admin?
-      EffectiveOrders.mailer[:send_order_receipt_to_admin] && !free?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      EffectiveOrders.mailer[:send_order_receipt_to_admin]
     end
 
     def send_order_receipt_to_buyer?
-      EffectiveOrders.mailer[:send_order_receipt_to_buyer] && !free?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      EffectiveOrders.mailer[:send_order_receipt_to_buyer]
     end
 
     def send_payment_request_to_buyer?
-      EffectiveResources.truthy?(send_payment_request_to_buyer) && !free? && !refund?
+      return false if free? && !EffectiveOrders.mailer[:send_order_receipts_when_free]
+      return false if refund?
+
+      EffectiveResources.truthy?(send_payment_request_to_buyer)
     end
 
     def send_mark_as_paid_email_to_buyer?

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/_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
@@ -95,6 +94,7 @@ EffectiveOrders.setup do |config|
     send_payment_request_to_buyer: true,
     send_pending_order_invoice_to_buyer: true,
     send_order_receipts_when_mark_as_paid: false,
+    send_order_receipts_when_free: false,
 
     send_subscription_event_to_admin: true,
     send_subscription_created: true,

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.14'.freeze
+  VERSION = '5.2.0'.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,
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.1.14
+  version: 5.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails