effective_orders 6.29.7 → 6.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9beef9eeb047dc515cda23db8001b8a816e44f8f2ff440ef804a6135ea3a843b
-  data.tar.gz: f621cbae970ea961847e258519c508fae2a28f55f8a6f4f14249636ce9b26d4b
+  metadata.gz: ce25152bf55dd31ec39535b7855658a0c76ba81a4fed1c04f9f182dab38e4d43
+  data.tar.gz: 50c406f4b4cd84931e2f8d0dc50399504351deeab35e8f8fee9f8806c93c17d6
 SHA512:
-  metadata.gz: b3ab2700a219c1a26ba49c7cc16e007b2678b45da7496080ab6fa3c7ce267ced4f42874dcf74026f0c93f6cabf5725ab65720a2fceb2987083f5a42ab617082f
-  data.tar.gz: 050c6e81ba740942b39f64d20af131aa845be1b6a7ad7edfef13dc0146cbbfedbd9af19b67dbd1b7d90c40ce2037c60ff463016b9ef7566b407bdc5191cf9265
+  metadata.gz: 9752f2d15e3d705de3dca42682a3cf4b3f051d5fdedb58a408bd915c8c1633175f42da167f9bdc6c2529de8900b521f4cc4168e3cfc1f2315fef2f0124286d78
+  data.tar.gz: 8e9593a3a0500b1503077b8ad19dd81f6b286114124484c6b4a0e630eeb43db7907a490c6ec5b0390c1d1121ab9d90ead606ae5e32233b65ff3906142d6036f0

data/app/models/effective/order.rb

@@ -77,7 +77,9 @@ module Effective
       note_to_buyer     :text   # From admin to buyer
       note_internal     :text   # Internal admin only
 
-      billing_name      :string   # name of buyer
+      billing_name       :string   # name of buyer
+      billing_first_name :string
+      billing_last_name  :string
       email             :string   # same as user.email
       cc                :string   # can be set by admin
 
@@ -429,6 +431,19 @@ module Effective
       [to_s, billing_name.presence, email.presence, total_to_s].compact.join(' - ')
     end
 
+    def qb_online_customer_display_name
+      return billing_name if billing_first_name.blank? || billing_last_name.blank?
+
+      case EffectiveOrders.qb_online_customer_display_name_format
+      when :first_last
+        "#{billing_first_name} #{billing_last_name}"
+      when :last_first
+        "#{billing_last_name}, #{billing_first_name}"
+      else
+        raise("invalid qb_online_customer_display_name_format: #{EffectiveOrders.qb_online_customer_display_name_format}")
+      end
+    end
+
     def label
       if refund? && purchased?
         'Refund'
@@ -472,14 +487,6 @@ module Effective
       end
     end
 
-    def billing_first_name
-      billing_name.to_s.split(' ').first
-    end
-
-    def billing_last_name
-      Array(billing_name.to_s.split(' ')[1..-1]).join(' ')
-    end
-
     def in_progress?
       pending? || confirmed? || deferred?
     end
@@ -752,6 +759,7 @@ module Effective
     # We support two different Quickbooks synchronization gems: effective_qb_sync and effective_qb_online
     def sync_quickbooks!(skip:)
       if EffectiveOrders.qb_online?
+        skip ||= (EffectiveOrders.qb_online_sync_free_orders? if free?)
         skip ? EffectiveQbOnline.skip_order!(self) : EffectiveQbOnline.sync_order!(self)
       end
 
@@ -927,6 +935,8 @@ module Effective
       if refund?
         EffectiveOrders.send_email(:refund_notification_to_admin, self) if EffectiveOrders.send_refund_notification_to_admin
       end
+
+      true
     end
 
     def send_payment_request?
@@ -939,6 +949,7 @@ module Effective
 
       EffectiveOrders.send_email(:order_email, self, payment_request: true)
       EffectiveOrders.send_email(:order_email_to_admin, self, payment_request: true) if EffectiveOrders.send_payment_request_to_admin
+      true
     end
 
     # Admin datatable action
@@ -947,6 +958,7 @@ module Effective
 
       EffectiveOrders.send_email(:order_email, self)
       EffectiveOrders.send_email(:order_email_to_admin, self) if EffectiveOrders.send_order_receipt_to_admin
+      true
     end
 
     def send_event_registrants_cancelled_email!
@@ -1084,7 +1096,13 @@ module Effective
 
     # Organization first
     def assign_billing_name
-      self.billing_name = billing_address.try(:full_name).presence || organization.to_s.presence || user.to_s.presence
+      owner = (organization || user)
+
+      assign_attributes(
+        billing_name: owner.to_s.presence,
+        billing_first_name: owner.try(:first_name).presence, 
+        billing_last_name: owner.try(:last_name).presence
+      )
     end
 
     # User first

data/config/effective_orders.rb

@@ -19,10 +19,13 @@ EffectiveOrders.setup do |config|
   # config.organization_enabled = false
   # config.organization_class_name = 'Example::Organization'
 
-  # Synchronize with Quickbooks
+  # Effective Quickbooks Synchronization
   config.use_effective_qb_sync = false
   config.use_effective_qb_online = false
 
+  config.qb_online_sync_free_orders = true
+  config.qb_online_customer_display_name_format = :first_last
+
   # Display the item name field on the orders#new screen
   config.use_item_names = true
 
@@ -56,7 +59,7 @@ EffectiveOrders.setup do |config|
   # Will be applied to all orders based off the after-tax total.
   # Use 2.4 for 2.4% or nil for none
   config.credit_card_surcharge_percent = nil
-  config.credit_card_surcharge_qb_item_name = 'Credit Card Surcharge'
+  config.credit_card_surcharge_qb_item_name = nil # 'Credit Card Surcharge'
 
   # Minimum Charge
   # Prevent orders less than this value from being purchased

data/db/migrate/101_create_effective_orders.rb

@@ -23,6 +23,8 @@ class CreateEffectiveOrders < ActiveRecord::Migration[6.0]
       t.text      :note_internal
 
       t.string    :billing_name
+      t.string    :billing_first_name
+      t.string    :billing_last_name
       t.string    :email
       t.string    :cc
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.29.7'.freeze
+  VERSION = '6.30.1'.freeze
 end

data/lib/effective_orders.rb

@@ -42,7 +42,10 @@ module EffectiveOrders
       :send_subscription_trialing, :send_subscription_trial_expired,
       :send_refund_notification_to_admin,
 
-      # Quickbooks Online Sync Errors
+      # Quickbooks Online
+      :qb_online_sync_free_orders, :qb_online_customer_display_name_format,
+
+      # Quickbooks Online Error Emails
       :send_qb_online_sync_error, :qb_online_sync_error_recipients,
 
       # Features
@@ -223,6 +226,10 @@ module EffectiveOrders
     use_effective_qb_online && defined?(EffectiveQbOnline)
   end
 
+  def self.qb_online_sync_free_orders?
+    qb_online_sync_free_orders != false
+  end
+
   def self.use_item_names?
     use_item_names != false
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.29.7
+  version: 6.30.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-08 00:00:00.000000000 Z
+date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails