invoicing_payments_processing 1.1.65 → 1.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c823ecb08c6b06064463c50e00f8a392d31db4
-  data.tar.gz: 019aad76d9430a5e5ca28a960de182dd03956e3a
+  metadata.gz: f05d882295f7b20a1fb839c214ee3ea4b6d188f4
+  data.tar.gz: 624b138f5198234726a5fbe6f1c435269906d8bf
 SHA512:
-  metadata.gz: c82e69dc914a4ccf5a84dcaa55ebedb065aef47405bb99b83c9546f6ced35d95b12fe88c0efc608a49c4c721225555282952baa2126b0a1d55df47b912bcfafa
-  data.tar.gz: ec65bbcc0118e99f08299bea1e71b3a663bbd91068a02c2cd14b87db5e91c7ae6de0db5ce9fe7b4dfcbf45c0265dc916ee27958601126ad031623d499035a94b
+  metadata.gz: ae17e1103cf879ae064712f5dba900548e1fed506c716975113cd4987d58dd4fb2f71f668d70292cc2f528c2631456e443455f74c3a334cb98e52089e953dedd
+  data.tar.gz: 8d6ccf3797a3988488e7a2d3a826ce45e04465c8090a256a51fc33f51b11ddde2a314c13b87c1b5717b9ea6300b63b47ce86a7acc7ce461f38ef1fa0d327ef77

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/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
   

data/lib/movement.rb

@@ -137,22 +137,23 @@ module BlackStack
 			# the movment must be a payment or a bonus
 			raise 'Movement must be either a payment or a bonus' if self.type != MOVEMENT_TYPE_ADD_PAYMENT && self.type != MOVEMENT_TYPE_ADD_BONUS
 #puts
+#puts "id:#{self.id.to_guid}:."
 #puts "product_code:#{self.product_code}:."
-
 			# itero los pagos y bonos hechos por este mismo producto, desde el primer dia hasta este movimiento.
 =begin
-			paid = 0
+			paid1 = 0
 			self.client.movements.select { |o| 
 				(o.type == MOVEMENT_TYPE_ADD_PAYMENT || o.type == MOVEMENT_TYPE_ADD_BONUS) &&
         o.credits.to_f < 0 &&
         o.product_code.upcase == self.product_code.upcase &&
         o.create_time.to_time < registraton_time.to_time
       }.sort_by { |o| o.create_time }.each { |o|
-				paid += (0.to_f - o.credits.to_f)
+				paid1 += (0.to_f - o.credits.to_f)
 				break if o.id.to_guid == self.id.to_guid
 			}
+#puts "paid1:#{paid1.to_s}:."
 =end
-      paid = 0 - DB[
+      q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
         "from movement m with (nolock) " +
         "where isnull(m.type, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}) in (#{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS.to_s}) " +
@@ -160,27 +161,29 @@ module BlackStack
         "and isnull(m.credits,0) < 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
         "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " +
-        "and m.id <> '#{self.id.to_guid}' "
-      ].first[:n]
+        "and m.create_time <= (select m2.create_time from movement m2 with (nolock) where m2.id='#{self.id.to_guid}') "
+      paid = 0 - DB[q].first[:n]
+#puts "q:#{q.to_s}:."
 #puts "paid:#{paid.to_s}:."
-
 =begin
       # calculo los credito para este producto, desde el primer dia; incluyendo cosumo, expiraciones, ajustes.
-      consumed = self.client.movements.select { |o| 
+      consumed1 = self.client.movements.select { |o| 
         o.credits.to_f > 0 &&
         o.product_code.upcase == self.product_code.upcase &&
         o.create_time.to_time < registraton_time.to_time
       }.inject(0) { |sum, o| sum.to_f + o.credits.to_f }.to_f
+#puts "consumed1:#{consumed1.to_s}:."     
 =end
-      consumed = DB[
+      q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
         "from movement m with (nolock) " +
         "where m.id_client='#{self.client.id.to_guid}' " +
         "and isnull(m.credits,0) > 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
-        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " +
-        "and m.id <> '#{self.id.to_guid}' "
-      ].first[:n]
+        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " #+
+#        "and m.id <> '#{self.id.to_guid}' "
+      consumed = DB[q].first[:n]
+#puts "q:#{q.to_s}:."
 #puts "consumed:#{consumed.to_s}:."     
 
       # calculo los creditos de este movimiento que voy a cancelar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.65
+  version: 1.1.70
 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