effective_orders 5.1.1 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78aa25d8f77169e21e2f05886c47479ac2f64d8de4657510b2723ab9d4246fbd
-  data.tar.gz: 22f9fd8d7747c3975952fe6edfc6e221fe567ec0b287e619ba3afd861dcc2bfb
+  metadata.gz: 70fd6793f180e1b0106c700cef6aacc0363cf7b2e3c76389e53db1301e6bac4e
+  data.tar.gz: 9fca2375abb56fd3052d2c098324f0dd6eb3d675772700f8ee792a12e54b39a6
 SHA512:
-  metadata.gz: 7c3d9e1dcc47b3f982be6bc41abbafde4ceae73b682704f0916b941aa06248d431b52420d472592e850919e518bc12b835be04fdee5292d9d72396ebe9b053fe
-  data.tar.gz: 7ff135bb56772c9fdf3edf6d59dc4ef7e0dfade542b1db022b09db49fc2b9b7e9f7333ae5e705390b4b0f27a03127fb743c9ffb471b29dd74e4a6a3da75917d0
+  metadata.gz: 5c33291651b6c2e6789040feca6573827a2f61f64b1b6553692ebfc4b45382949f0814b5257bfa7fc3d65d461b8a36bf01051565acf06474638a9f9771268d4b
+  data.tar.gz: 51155ef9663bc5912b70c7c9be2232a55aa4d7565eeaf19eca83eea7f216b1d809d998259f347a2fc643755215792c323e3b7e8eb4ffd6c5b2f733899f407604

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

@@ -225,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

@@ -24,14 +24,21 @@ module Effective
       @order = order
       @country_code = country_code
       @state_code = state_code
-
-      raise 'expected an order, or a country and state code' unless (order || country_code)
-      raise 'expected an order OR a country and state code. Not both.' if (order && country_code)
     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
+      state = state_code
+
+      if order.present? && order.billing_address.present?
+        country ||= order.billing_address.country_code
+        state ||= order.billing_address.state_code
+      end
+
+      if order.present? && order.user.respond_to?(:billing_address) && order.user.billing_address.present?
+        country ||= order.user.billing_address.country_code
+        state ||= order.user.billing_address.state_code
+      end
 
       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.1'.freeze
+  VERSION = '5.1.5'.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.1
+  version: 5.1.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails