invoicing_payments_processing 1.1.31 → 1.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c8cdb3f2b07357df4ed4d7e53b42f3d13ccce9
-  data.tar.gz: 60242afcacd6a836b87324255b0a39af9cad79e7
+  metadata.gz: 8b262508f5bb5461883af0c385256bc6011ed4aa
+  data.tar.gz: f57520e8d02e50ecdd5638d5392680223bb0e77c
 SHA512:
-  metadata.gz: 9c0951c13e1665cb9c5b5e16a5fa1024667fcd2178701d7c9f8ab8ab620a95837b45f5a8375c283eeb36dff9f240159deac6a5864d0be3ab75f6fbae0f2d4133
-  data.tar.gz: 6cb8ab4e9a8332c7d934a3629e673a0869a62076a03dc2177987e1eec1e515a56f981b1cfdac44e33efc5c50c98f4b5b8fb67dd868dd2057f4e1c6e83e331503
+  metadata.gz: be69442d3cb147180d5a373f3bf1a71e81221de43957440df516751e954a1cdcd859da86685b8e76ab95fada8f63cd43044fec24dbc469b0c2daf33c866353b4
+  data.tar.gz: 9c6ee401ce0094ba5c08f8476a65e10f3720ac0350dcf43cd627f78e0b326897b2cd9c8c8d1d3f283e0a0ce81c9e3f89edc5199467f5e04ca92982a86f9b6802

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.getPaidb.create_time) if i.canBePaid?
     
           # crea una factura para el periodo siguiente (dia, semana, mes, anio)
           j = BlackStack::Invoice.new()

data/lib/invoice.rb

@@ -10,10 +10,16 @@ module BlackStack
   
     many_to_one :buffer_paypal_notification, :class=>:'BlackStack::BufferPayPalNotification', :key=>:id_buffer_paypal_notification
     many_to_one :client, :class=>:'BlackStack::Client', :key=>:id_client
-    many_to_one :paypal_subscription, :class=>:'BlackStack::PayPalSubscription', :key=>:id_paypal_subscription
+    #many_to_one :paypal_subscription, :class=>:'BlackStack::PayPalSubscription', :key=>:id_paypal_subscription
 		many_to_one :previous, :class=>:'BlackStack::Invoice', :key=>:id_previous_invoice
     one_to_many :items, :class=>:'BlackStack::InvoiceItem', :key=>:id_invoice
   
+    def paypal_subscription
+      return nil if self.subscr_id.nil?
+      return nil if self.subscr_id.to_s.size == 0
+      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
     def self.compatibility?(h, i)
       return false if h[:type]!=i[:type]
@@ -60,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|
@@ -204,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
@@ -308,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
@@ -413,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
@@ -422,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
@@ -431,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.31
+  version: 1.1.41
 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