effective_orders 5.2.16 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39960e8a8f551838180f27b80909a6aaeab1b2188ed64940dc3fe35a97a44a7
-  data.tar.gz: 7910cdfe509ba84be703aad6bc452bfd53e9b8760027cc17e1bac280b9d373ac
+  metadata.gz: dc662c2add95d46295f9dcbf498836481de48d6df528594fbee1e5b1ca333a7e
+  data.tar.gz: e6a8beebda502e2bc9ef9d787bfffe349528af236d8dce3716d4f194c98fa733
 SHA512:
-  metadata.gz: 87a550796efef35f0175625db99570302027b6f091cb5fdea1510b3a3d4c7691c26c947e6a0e6e4dc95b11bc683fc333fa3590605b5313b527df64186b77c26a
-  data.tar.gz: 1b73bd83140864c0fbb70ee9bbbe684f5e36abdeb2ecb68cd10ba4bbebc7cc4c83d34673760c2e2fc15484d678b651b563293881ee0449eb5f09eb72639d20f0
+  metadata.gz: 3a70337f484b993930a530493e1fdf162e1e9374e8af7821293e4d3763acd9cfb262330a8515b340709ae2d8cb65d539e370225578c98c52dcffbf642330be13
+  data.tar.gz: d0f956661942c784d9f8c976f964dfa56ab7b80dd9021ab4e2845e1d79c727b9b3b63a4fdad9b515a1ae44378d7145bf165bf24041cefc0fb589d52e481a1f8a

data/app/datatables/admin/effective_orders_datatable.rb

@@ -82,7 +82,10 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
 
     actions_col partial: 'admin/orders/datatable_actions', partial_as: :order
 
-    aggregate :total
+    unless attributes[:total] == false
+      aggregate :total
+    end
+
   end
 
   collection do

data/app/models/effective/order.rb

@@ -476,8 +476,14 @@ module Effective
       false
     end
 
+    # Call this as a way to skip over non consequential orders
+    # And mark some purchasables purchased
+    def mark_as_purchased!
+      purchase!(skip_buyer_validations: true, email: false, skip_quickbooks: true)
+    end
+
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
-    def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false)
+    def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false, skip_quickbooks: false)
       # Assign attributes
       self.state = EffectiveOrders::PURCHASED
       self.skip_buyer_validations = skip_buyer_validations
@@ -506,6 +512,20 @@ module Effective
       end
 
       send_order_receipts! if email
+      after_commit { sync_quickbooks!(skip: skip_quickbooks) }
+
+      true
+    end
+
+    # We support two different Quickbooks synchronization gems: effective_qb_sync and effective_qb_online
+    def sync_quickbooks!(skip:)
+      if EffectiveOrders.qb_online?
+        skip ? EffectiveQbOnline.skip_order!(self) : EffectiveQbOnline.sync_order!(self)
+      end
+
+      if EffectiveOrders.qb_sync?
+        skip ? EffectiveQbSync.skip_order!(self) : true # Nothing to do
+      end
 
       true
     end

data/config/effective_orders.rb

@@ -25,6 +25,7 @@ EffectiveOrders.setup do |config|
 
   # Synchronize with Quickbooks
   config.use_effective_qb_sync = false
+  config.use_effective_qb_online = false
 
   # If set, the orders#new screen will render effective/orders/_order_note_fields to capture any Note info
   config.collect_note = false

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.2.16'.freeze
+  VERSION = '5.3.1'.freeze
 end

data/lib/effective_orders.rb

@@ -35,7 +35,7 @@ module EffectiveOrders
       :customers_table_name, :subscriptions_table_name, :products_table_name,
       :layout, :mailer_class_name, :mailer,
       :orders_collection_scope, :order_tax_rate_method,
-      :obfuscate_order_ids, :use_effective_qb_sync,
+      :obfuscate_order_ids, :use_effective_qb_sync, :use_effective_qb_online,
       :billing_address, :shipping_address,
       :collect_note, :collect_note_required, :collect_note_message,
       :terms_and_conditions, :terms_and_conditions_label, :minimum_charge,
@@ -136,6 +136,14 @@ module EffectiveOrders
     [('cheque' if cheque?), ('phone' if phone?)].compact
   end
 
+  def self.qb_sync?
+    use_effective_qb_sync && defined?(EffectiveQbSync)
+  end
+
+  def self.qb_online?
+    use_effective_qb_online && defined?(EffectiveQbOnline)
+  end
+
   def self.mailer_klass
     name = mailer_class_name.presence || 'Effective::OrdersMailer'
     name.safe_constantize || raise("unable to constantize mailer class. check config.mailer_class_name")
@@ -229,4 +237,9 @@ module EffectiveOrders
 
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
+
+  def self.gem_path
+    __dir__.chomp('/lib')
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.2.16
+  version: 5.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails