effective_orders 5.1.0 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31540d5d07a5c2afc891284cd037d88d25ea6aba9db57073a53b5dd60c952a11
-  data.tar.gz: 502ad51ce45452ff307292de9d2f16c934a7e1a0aca7c62376272b1f3ede07b0
+  metadata.gz: 8a084a1145beb50dc672efd5506bb81e497553d73e945195f2f31ea567bbc757
+  data.tar.gz: 2743bac90f7d5f5ff4b2985b97a7404040f875fc12414e308bd188023307512c
 SHA512:
-  metadata.gz: 7541296d5ee6f6d52dc2edf94938f28734bf8da046612c46b0de23ee51fcd70c2eb80a32dd53534d16ffd3a9de72a923de9fffa709c4b96651ccf49fe7779b9b
-  data.tar.gz: 7be888605850e6dda6b952bf6ba9cceb575577b3d18ded8c118c8028890715bf41c8d8ded387de1bd5378c38207329af61709d071f2a80eec528ce6c7e701164
+  metadata.gz: 2ee2c0d212855b3a7883c9ac4194b2b9b796668cdadd57778e23afdfe774fcd07f503f96b0812242bb2e0aa9f872c6a354fa2dd0d10275fc78b3787d9a09a65b
+  data.tar.gz: 2d6ae464bd99a12bfd0e3226d8a1bdb20fa04c4e7b015d185f0432c8be5a92644840a3e9a93b9f437102f5dc03ae9dcc6faa7d7589582235b55609bef976cbe9

data/app/controllers/admin/orders_controller.rb

@@ -11,7 +11,7 @@ module Admin
 
     submit :save, 'Continue', redirect: :index
     submit :save, 'Add New', redirect: -> { effective_orders.new_admin_order_path(user_id: resource.user&.to_param) }
-    submit :save, 'Duplicate', redirect: -> { effective_posts.new_admin_post_path(duplicate_id: resource.id) }
+    submit :save, 'Duplicate', redirect: -> { effective_orders.new_admin_order_path(duplicate_id: resource.to_param) }
     submit :save, 'Checkout', redirect: -> { effective_orders.checkout_admin_order_path(resource) }
 
     def create

data/app/models/effective/order.rb

@@ -118,12 +118,6 @@ module Effective
       end
     end
 
-    with_options if: -> { confirmed? && !skip_buyer_validations? } do
-      if EffectiveOrders.terms_and_conditions
-        validates :terms_and_conditions, presence: true
-      end
-    end
-
     # When Purchased
     with_options if: -> { purchased? } do
       validates :purchased_at, presence: true
@@ -231,7 +225,6 @@ module Effective
       retval.size == 1 ? retval.first : retval
     end
 
-
     def update_prices!
       raise('already purchased') if purchased?
       raise('must be pending or confirmed') unless pending? || confirmed?

data/app/models/effective/tax_rate_calculator.rb

@@ -30,8 +30,13 @@ module Effective
     end
 
     def tax_rate
-      country = country_code || (order.billing_address.country_code if order.billing_address.present?)
-      state = state_code || (order.billing_address.state_code if order.billing_address.present?)
+      country = country_code
+      country ||= order.billing_address.country_code if order.billing_address.present?
+      country ||= order.user.billing_address.country_code if order.user.respond_to?(:billing_address) && order.user.billing_address.present?
+
+      state = state_code
+      state ||= order.billing_address.state_code if order.billing_address.present?
+      state ||= order.user.billing_address.state_code if order.user.respond_to?(:billing_address) && order.user.billing_address.present?
 
       rate = RATES[country]
       return rate if rate.kind_of?(Numeric)

data/app/views/admin/orders/_form.html.haml

@@ -8,7 +8,7 @@
     = f.email_cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
     %h2 Order Items
-    = f.has_many :order_items do |fc|
+    = f.has_many :order_items, remove: f.object.new_record? do |fc|
       = render 'order_item_fields', f: fc
 
     %hr

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.1.0'.freeze
+  VERSION = '5.1.4'.freeze
 end

data/lib/effective_orders.rb

@@ -107,7 +107,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.0
+  version: 5.1.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails