invoicing_payments_processing 1.1.67 → 1.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2017f7ce80ba1e39b308c00c9a771c4b310fb753
-  data.tar.gz: f085954e5f6fe93aee0dad9c32ff0f1ad1ca1953
+  metadata.gz: 20c2d6fe3d2345b3468bb8d4903626e2efbde5f6
+  data.tar.gz: 303e1555e77d60b5b8e20c4aa7a7e62c76c271ae
 SHA512:
-  metadata.gz: 8adc9a2686330b4361a774257fad71305957d2a9e6a7a5f082f4d1ede26edaade1475bd0251230e173720e2611b23aa4730db3fe9293ab61714e5e7405532852
-  data.tar.gz: a72f0bb3d39581d8a99bf9a0dcb6d52428cdc021685a60d19c0e0412cd2b85092d0583d3155e6011ca21c4bd1c87e15292d94cede5f4b869fa2757a71bda7e0d
+  metadata.gz: 23dad2e9670797a5ce76978577e92ada0b9c8b41c3fad46c8ad4ffe7a6443011b011b0a1bdf3aaff8e07d874a34cf236fbc5561874d368f8a0ae97a989ad90a0
+  data.tar.gz: 2d272bdea48b9320799a7231ec9598de1fd1c6c11ae839c51a45f4b42a4d6334fd6a034aa266c971f73442f8c505667847352e719d2dbdf0ade234dfb102b4c1

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, '2200-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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.67
+  version: 1.1.72
 platform: ruby
 authors:
 - Leandro Daniel Sardi