effective_orders 5.2.14 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae0df61fdb7c2803f9995ae38a41bcc827bd99d454d3675b7584ffe04b5500af
-  data.tar.gz: 0b5bb484fa7dde9ea40562bf36376e43ec006a0e7b56ed73495a660970e23180
+  metadata.gz: 0d6adca64d53290d7772a9c7a5c6840575eade0813edfb8065a8cb2950d6e078
+  data.tar.gz: 31c4fbd7b2aadb0479199494027fbb493caf4fe53e75aa2e8604e245e9d125b0
 SHA512:
-  metadata.gz: 8957ad6317f7a94de506f9e3ab55ea1df775ce589c744e3c49dd65929df2a63221930622c01163ba5b88292b8c5b34652e32d3025cefd0c4e56281e6ebb6bc5d
-  data.tar.gz: b05fc9a89f5ddd375dd0569a6b6e92b0ea06669a83e540e77730ace9983a3cfd47065785bcc4d9beb5a840452c295511dada7e132933cbbbe61f597dd5f095f1
+  metadata.gz: 1bcedc55d631c5fa39a5680d9dccd6e7abe0b5e67119187abbdf51df0290476ebbc06550cf7fefa8a6309474b2a35127436b03fe51726a491aa5b487c62fc34d
+  data.tar.gz: 8ca3dd2b2fa412f3a933a054cfbcba264bb120101ae5955ae50b9305f64bcf31548374ab9ce001f9f6a5d17652e2b08ac0b7641dd3e130e045a1ad5ed4ba2756

data/app/models/effective/order.rb

@@ -333,8 +333,12 @@ module Effective
         else payment_card.to_s
       end unless payment_provider == 'free'
 
+      last4 = if payment[:active_card] && payment[:active_card].include?('**** **** ****')
+        payment[:active_card][15,4]
+      end
+
       # stripe, moneris, moneris_checkout
-      last4 = (payment[:active_card] || payment['f4l4'] || payment['first6last4']).to_s.last(4)
+      last4 ||= (payment['f4l4'] || payment['first6last4']).to_s.last(4)
 
       [card, '-', last4].compact.join(' ')
     end
@@ -472,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
@@ -502,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/app/models/effective/order_item.rb

@@ -68,7 +68,7 @@ module Effective
     # first or build
     def qb_item_name
       raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
-      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
+      (qb_order_item || build_qb_order_item(name: purchasable&.qb_item_name)).name
     end
 
   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.14'.freeze
+  VERSION = '5.3.0'.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.14
+  version: 5.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails