invoicing_payments_processing 1.1.32 → 1.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767d1959445a933872a088246a96ce835a7aa1c1
-  data.tar.gz: a6d3dc28e802706eb1360daf4c5c16940e6a49c7
+  metadata.gz: 1e99d9449019c41677d5240d9a75a4168b7bb07a
+  data.tar.gz: 196f3334037f74d2e7bacd0840e494836e36ab75
 SHA512:
-  metadata.gz: 5ce9bd86e5bc541e6887b48c86c1086b854b0640a3e106881241a4285d0b660251c6987d9157ad803b60b865924fa65417a876f789bba45cb6475f190831011b
-  data.tar.gz: 06758180d0eaa6004a541fe5eb89a13b9590357acdbe1ccb45b3d198f9cfb097002ff664420dca02594672eb53133fa4d84746d6879769e83f6d0be9085d211e
+  metadata.gz: 55f30ded4f49409106d514b75857d27e4495ac5db0397372c14be7c7aeccec2f27c0e495d37674b83d938c05879439cb3ab948d496ac129bdb281e4d109da970
+  data.tar.gz: 71328dd57a681c5d2aa9e9fd4b43e5c83fef1d35e43f5e03d27491700b7e2da19104d7275b6f12061a70addbe863248281fb0f6e57e11c7a9636b5b2512fca34

data/lib/bufferpaypalnotification.rb

@@ -236,6 +236,9 @@ module BlackStack
     def self.process(params)
       DB.transaction do
         # verifico que no existe ya una notificacion
+puts
+puts 
+puts "params2:#{params.to_s}:."
         b = BlackStack::BufferPayPalNotification.where(:id=>params['id']).first
         if b.nil?
           # proceso la notificacion
@@ -299,7 +302,7 @@ module BlackStack
     
           # marco la factura como pagada
           # registro contable - bookkeeping
-          i.getPaid() if i.canBePaid?
+          i.getPaid(b.create_time) if i.canBePaid?
     
           # crea una factura para el periodo siguiente (dia, semana, mes, anio)
           j = BlackStack::Invoice.new()

data/lib/invoice.rb

@@ -17,7 +17,7 @@ module BlackStack
     def paypal_subscription
       return nil if self.subscr_id.nil?
       return nil if self.subscr_id.to_s.size == 0
-      return BlackStack::PayPalSubscription.where(:code=>self.subscr_id.to_s).first
+      return BlackStack::PayPalSubscription.where(:subscr_id=>self.subscr_id.to_s).first
     end
   
     # compara 2 planes, y retorna TRUE si ambos pueden coexistir en una misma facutra, con un mismo enlace de PayPal
@@ -66,6 +66,7 @@ module BlackStack
     #
     def set_subscription(s)
       self.subscr_id = s.subscr_id
+      self.delete_time = nil
       self.save
       # aplico la mismam modificacion a todas las factuas que le siguieron a esta
       BlackStack::Invoice.where(:id_previous_invoice=>self.id).all { |j|
@@ -210,7 +211,7 @@ module BlackStack
         trial2 = allow_trials && plan_descriptor[:trial2_fee]!=nil && plan_descriptor[:trial2_period]!=nil && plan_descriptor[:trial2_units]!=nil
         
         values[:a3] = 0
-        self.items.each { |i|         
+        self.items.each { |i|
           if trial1 && i.units!=i.plan_descriptor[:trial_credits]
             raise 'Cannot order more than 1 package and trial in the same invoice'
           elsif trial1
@@ -314,6 +315,11 @@ module BlackStack
       # marco la factura como pagada
       self.status = BlackStack::Invoice::STATUS_PAID
       self.delete_time = nil
+      if self.previous.nil? # si es la primer factura de una suscripcion, o no es una suscripcion
+        diff = payment_time - self.billing_period_from 
+        self.billing_period_from = payment_time
+        self.billing_period_to += diff
+      end
       self.save
 			# expiracion de creditos de la factura anterior
 			i = self.previous
@@ -419,7 +425,7 @@ module BlackStack
       # le seteo la fecha de hoy
       self.billing_period_from = now()
 #puts
-#puts
+#puts  
       # si el plan tiene un primer trial, y
       # es la primer factura, entonces:
       # => se trata del primer pago por trial
@@ -428,7 +434,7 @@ module BlackStack
         units = h[:trial_credits].to_i
         unit_price = h[:trial_fee].to_f / h[:trial_credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:trial_period].to_s}, +#{h[:trial_units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
-  
+
       # si el plan tiene un segundo trial, y
       # es la segunda factura, entonces:
       # => se trata del segundo pago por segundo trial
@@ -437,7 +443,7 @@ module BlackStack
         units = h[:trial2_credits].to_i
         unit_price = h[:trial2_fee].to_f / h[:trial2_credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:trial2_period].to_s}, +#{h[:trial2_units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
-  
+
       # si el plan tiene un fee, y
       elsif h[:fee].to_f != nil && h[:type] == BlackStack::InvoicingPaymentsProcessing::BasePlan::PAYMENT_SUBSCRIPTION
 #puts 'c'

metadata

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