invoicing_payments_processing 1.1.66 → 1.1.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f105a212299b603c5141bf1d86ade1acca82fa
-  data.tar.gz: 43ddbb50a0fcbee4d4ae106a24d8696011924413
+  metadata.gz: 03642e6ff05908b903f7101dfb46527d1df67a40
+  data.tar.gz: fe13c8dbb7ef0a4ba3c04d69088f24edb755c15d
 SHA512:
-  metadata.gz: 1b6ffbe7aa139fe61da64f82afc6655ea19d2212d66045b9d3f64ac3ea7eab39db713380f19edcbb02acb85ac5e1ffc185c2274b8743a0be0c807d8867a90c56
-  data.tar.gz: 90f23ff431761cbf2717c52970168a8856c67cd925a8d52fedd20561eed9495e0ca5eea15816ae5cec6d7be00c98389c4517d49ed5aeb982f85f5b21dad94f5f
+  metadata.gz: 832296731ab80f51100056338d3f2a3672e7a63df3b225cf6aeb57b835fe1207ab14fb247ebc5f01a0a1ec2dc09c10b81d65a6e2dbfd285c38c85cdd40a71900
+  data.tar.gz: cad3907f4259afa7b890dc02e1bb2a06cdbfc68060491a597b2fda847940044895dd6c9d43bbcb66b979b11d8597ba7d4c3c7bc7f71c1a7576da801be08bc81a

data/lib/bufferpaypalnotification.rb

@@ -42,27 +42,38 @@ module BlackStack
     # 3) haciendo coincidir el primer guid en el codigo de invoice, con el id del cliente
     def get_client()
 puts
-puts "BlackStack::BufferPayPalNotification::get_client"
-puts 'debug info:'
-puts "self.invoice:#{self.invoice.to_s}:."
+puts "get_client: BlackStack::BufferPayPalNotification::get_client"
+puts "get_client: self.invoice:#{self.invoice.to_s}:."
       # obtengo el cliente que machea con este perfil
       c = nil
       if c.nil?
+puts 'get_client: a'
         if self.invoice.guid?
+puts 'get_client: a1'
+puts "get_client: #{self.invoice.to_s}"
           i = BlackStack::Invoice.where(:id=>self.invoice).first
-          c = i.client if !i.nil? 
+          if !i.nil?
+            c = i.client  
+puts 'get_client: a1a'
+          else
+puts 'get_client: a1b'
+          end
         end
       end
       if c.nil?
+puts 'get_client: b'
         iid = self.invoice.split(".").last.to_s
         if iid.guid?
+puts 'get_client: b1'
           i = BlackStack::Invoice.where(:id=>iid).first
           c = i.client if !i.nil? 
         end
       end
       if c.nil?
+puts 'get_client: c'
         cid = self.invoice.split(".").first.to_s
         if cid.guid?
+puts 'get_client: c1'
           c = BlackStack::Client.where(:id=>cid).first
         end
       end

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -32,11 +32,17 @@ module BlackStack
       end
 
       # how many minutes ago should have updated the table stat_balance with the amount and credits of this client, for each product.
+      # return a positive integer if either:
+      # 1. the client didn't update stats in the last 24 hours, or
+      # 2. the client has a new record in the table movements after its last update in the table stat_balance.
       def stat_balance_delay_minutes
         row = DB[
           "SELECT TOP 1 m.id " +
           "FROM client c WITH (NOLOCK) " +
-          "JOIN movement m WITH (NOLOCK INDEX(IX_movement__id_client__create_time_desc)) ON ( c.id=m.id_client AND m.create_time > ISNULL(c.last_stat_balance_update_time, '1900-01-01') ) " +
+          "JOIN movement m WITH (NOLOCK INDEX(IX_movement__id_client__create_time_desc)) ON ( " +
+          " c.id=m.id_client AND " +
+          " ( m.create_time > ISNULL(c.last_stat_balance_update_time, '1900-01-01') OR ISNULL(c.last_stat_balance_update_time, '1900-01-01') < DATEADD(DD,-1,GETDATE()) ) " +
+          ") " +
           "WHERE c.id = '#{self.id}' " +
           "ORDER BY m.create_time DESC "
         ].first

data/lib/invoice.rb

@@ -625,29 +625,31 @@ module BlackStack
 					end # if net_amount < 0
           # hago el reembolso de cada bono de este item
           # si el balance quedo en negativo, entonces aplico otro ajuste
-          h[:bonus_plans].each { |bonus|
-            i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
-            j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
-            item2 = BlackStack::InvoiceItem.new()
-            item2.id = guid()
-            item2.id_invoice = self.id
-            item2.unit_price = 0
-            item2.units = -i[:credits]
-            item2.amount = 0
-            item2.product_code = i[:product_code].to_s
-            item2.item_number = i[:item_number].to_s
-            item2.detail = 'Bonus Refund'
-            item2.description = j[:description].to_s
-            item2.save()
-            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
-            net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
-            net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
-            if net_amount <= 0 && net_credits < 0
-              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
-              adjust.id_invoice_item = item1.id
-              adjust.save     
-            end # if net_amount < 0            
-          }
+          if !h[:bonus_plans].nil?
+            h[:bonus_plans].each { |bonus|
+              i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
+              j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
+              item2 = BlackStack::InvoiceItem.new()
+              item2.id = guid()
+              item2.id_invoice = self.id
+              item2.unit_price = 0
+              item2.units = -i[:credits]
+              item2.amount = 0
+              item2.product_code = i[:product_code].to_s
+              item2.item_number = i[:item_number].to_s
+              item2.detail = 'Bonus Refund'
+              item2.description = j[:description].to_s
+              item2.save()
+              BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+              net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
+              net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
+              if net_amount <= 0 && net_credits < 0
+                adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+                adjust.id_invoice_item = item1.id
+                adjust.save     
+              end # if net_amount < 0            
+            }
+          end # if !h[:bonus_plans].nil?
           # release resources
           DB.disconnect
           GC.start

data/lib/invoicing_payments_processing.rb

@@ -63,7 +63,7 @@ module BlackStack
 
     def self.plan_descriptor(item_number)
       plan = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |h| h[:item_number].to_s == item_number.to_s }.first
-      raise "Plan not found" if plan.nil?
+      raise "Plan not found (#{item_number.to_s})" if plan.nil?
       plan
     end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.66
+  version: 1.1.71
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket