effective_orders 6.19.5 → 6.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746dd5ee2144955c3aab3c11981e71972860cf759f149ce5f65d1a34cf151998
-  data.tar.gz: 97f67c034986af44dd68d626dec51dc30f85c03c21a002d8504051e60993ee33
+  metadata.gz: 61c7744d975158314e5a8aae78d2b52b4ff6e5a4831183a0f2a40263289f8cb5
+  data.tar.gz: dc0fc3c30d79d8f24a9fef4eee5e2ee6eb74dae923135e4322f94b362efa4d30
 SHA512:
-  metadata.gz: 014db5a1ca6536d3a3e6dfdd050b30fdca4477ba3f320e7a0a05162f81a2b2bcb9019e60ae951f700c67bf193a7d8ee9a0eacf1cb9209ea306a8be7dc349e253
-  data.tar.gz: a4e6f6cdf0af9ff2df925bcecc1601b6b0d41c88d8ddd03de7c75e6cbd732243498dc472859003be022e9f9f412efec841ee8dda6e50d682fca69ae7e80fe3cd
+  metadata.gz: 57cbc4ca5b87d853028a3565da0ee861fb5017f4c5c453ce36f4185cbf9f22c5b42c8cc2109a17aad3ee20d2104a43e8fb635050a587adfa2d6c4ac52adee87a
+  data.tar.gz: 89b5deb6aebee4e5c5bee096538ac1fb516e7b08ca815eea891dba7ccff8caf20c7383de5c2fae21839feb3dbb3e92b068c96aab1d38e384cdd4e5455d9b41e4

data/app/datatables/effective_orders_datatable.rb

@@ -61,9 +61,8 @@ class EffectiveOrdersDatatable < Effective::Datatable
     col(:surcharge_percent, visible: false) { |order| rate_to_percentage(order.surcharge_percent) }
 
     if EffectiveOrders.delayed?
-      col :delayed_payment
-      col :delayed_payment_date
-      col :delayed_payment_intent
+      col :delayed_payment, visible: false
+      col :delayed_payment_date, label: "Payment date"
     end
 
     col :total, as: :price

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

@@ -32,7 +32,7 @@
       - elsif order.tax_rate.present? && order.surcharge_percent.to_f > 0.0
         %tr
           %th
-          %td.tax Tax (#{rate_to_percentage(order.tax_rate)})
+          %td.tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
 
         %tr.single-line
@@ -52,7 +52,7 @@
 
         %tr
           %th
-          %td.surcharge-tax Tax (#{rate_to_percentage(order.tax_rate)}) on Credit Card Processing Fee
+          %td.surcharge-tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)}) on Credit Card Processing Fee
           %td.price.surcharge-tax-price= price_to_currency(order.surcharge_tax)
 
         %tr.double-line
@@ -63,7 +63,7 @@
       - elsif order.tax_rate.present? && !(order.surcharge_percent.to_f > 0.0)
         %tr
           %th
-          %td.tax Tax (#{rate_to_percentage(order.tax_rate)})
+          %td.tax #{EffectiveOrders.tax_label} (#{rate_to_percentage(order.tax_rate)})
           %td.price.tax-price= price_to_currency(order.tax)
 
         %tr.single-line

data/config/effective_orders.rb

@@ -46,6 +46,9 @@ EffectiveOrders.setup do |config|
   # An order must have a tax rate (even if the value is 0) to be purchased
   config.order_tax_rate_method = Proc.new { |order| Effective::TaxRateCalculator.new(order: order).tax_rate }
 
+  # The tax label displayed on orders
+  config.tax_label = "Tax"
+
   # Credit Card Surcharge
   # Will be applied to all orders based off the after-tax total.
   # Use 2.4 for 2.4% or nil for none

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.19.5'.freeze
+  VERSION = '6.19.7'.freeze
 end

data/lib/effective_orders.rb

@@ -19,7 +19,9 @@ module EffectiveOrders
       :customers_table_name, :subscriptions_table_name, :products_table_name, :item_names_table_name,
       :layout,
       :orders_collection_scope, :order_tax_rate_method,
-      :obfuscate_order_ids, :use_effective_qb_sync, :use_effective_qb_online, :use_item_names,
+      :obfuscate_order_ids, :use_item_names,
+      :use_effective_qb_sync, :use_effective_qb_online, 
+      :tax_label,
       :billing_address, :shipping_address,
       :collect_note, :collect_note_required, :collect_note_message,
       :terms_and_conditions, :terms_and_conditions_label, :minimum_charge,
@@ -216,6 +218,10 @@ module EffectiveOrders
     use_item_names != false
   end
 
+  def self.tax_label
+    config[:tax_label].presence || "Tax"
+  end
+
   def self.quickbooks?
     use_effective_qb_sync || use_effective_qb_online
   end

metadata

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