effective_orders 6.19.4 → 6.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac540563873add27dbdaae886f216f3c20e0abe562476d7736e7c8ff73c04b2
-  data.tar.gz: 562b4bd4ecb4204e44f8910e4f633932ab172c3a377f2662beaefdd733e4e505
+  metadata.gz: 513c8a72e878c9dc57f3feb8193de60341a3d6ff69a9e46edf235de143e91e0d
+  data.tar.gz: 880e590304b082be4cb04f4318770cb631a9ef382b9827fff41905a2b91bfa28
 SHA512:
-  metadata.gz: c6e7dca80311b8aa229dbba54979ff85319035d2ee7b61c7b65d7cff7502207d7a882a82921011f4680ba337d39e6d84cf4cbe8bb9137df2fe844c2fa9edcb13
-  data.tar.gz: 35e988323e5dd995719e34ad8b8a0976f32185c31fa82001604fb077b9801f7d933a40b9bcd50c9193607bb1c83dee1fceae26c5267506ba2d980cbad7861d1a
+  metadata.gz: d51b4ea5de0a9916f9bda4dfb0b183da10b288fea73aef2cb80d4d8c494019c048be543d8b2f24babef91e239d1ed4ba237a3dfdf14038b2e11e9af4ec80b1b3
+  data.tar.gz: 17fcaea9ffc48cff3988450b9d74eff84641bf63dfb1395a4ba090affc56c69f41dafacae411e53950f954cca293e6b83f65cfc2987c66aa40fc92cd8deacef3

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

@@ -13,7 +13,8 @@
 
     .col= pf.price_field :price
 
-    .col
-      .mt-4= qb_item_name_field(pf)
+    - if EffectiveOrders.use_item_names?
+      .col
+        .mt-4= qb_item_name_field(pf)
 
     .col= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'

data/app/views/effective/acts_as_purchasable/_fields.html.haml

@@ -1,3 +1,6 @@
 = form.price_field :price
-= qb_item_name_field(form)
+
+- if EffectiveOrders.use_item_names?
+  = qb_item_name_field(form)
+
 = form.check_box :tax_exempt, label: "Yes, this #{etd(form.object)} is tax exempt"

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

@@ -23,6 +23,9 @@ EffectiveOrders.setup do |config|
   config.use_effective_qb_sync = false
   config.use_effective_qb_online = false
 
+  # Display the item name field on the orders#new screen
+  config.use_item_names = true
+
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false
   config.collect_note_required = false
@@ -43,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.4'.freeze
+  VERSION = '6.19.6'.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,
+      :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,
@@ -212,6 +214,14 @@ module EffectiveOrders
     use_effective_qb_online && defined?(EffectiveQbOnline)
   end
 
+  def self.use_item_names?
+    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.4
+  version: 6.19.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails