invoicing_payments_processing 1.1.36 → 1.1.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 965a8f6366881eb0e4bc2bfc47bc1afe2ce09e11
-  data.tar.gz: a9b9c23cfed343171d9e815574cb56659e652bf4
+  metadata.gz: 96b6b82545bec9e8ad6436566f423590c675896b
+  data.tar.gz: 14c8e6fd2576d65d28d3bb47a464374140ed2b28
 SHA512:
-  metadata.gz: 261a8ac7175609664b8580f69259a96e39cc8f495ed448ed6dcc4d8e1ad8e87e7f9f297e1b4ff461b21c0d95ea92a9f958b39199977ff9c73c11a0448a08ae9a
-  data.tar.gz: aee9ab4c785dcc5072b008ed1547debd27763a5283b6088dc7013f9f92649cc7856a79cd1be54446e92115dfc333e91e09bc0635e2634172c7143f180e879170
+  metadata.gz: 7d9d89e381365acb4bcde6021370f8486c3ede55d82821b8d4af7ded903bee26c008a7515cc2793dbd8a7c4f750921918f5964860d76e702ca49e033e163a58c
+  data.tar.gz: 15048cf0e56f42e72eeab5ba7a6f6ec75f40f6c3fbe8631d983eb496918e92ce27986094a488ed1e0a0e9de668c5439ed523340dfce7be03d48082f14f9fb538

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

@@ -212,7 +212,7 @@ module BlackStack
         
         values[:a3] = 0
         self.items.each { |i|
-          if ( !trial2 && trial1 && i.units!=i.plan_descriptor[:trial_credits] ) || ( trial2 && trial1 && i.units!=i.plan_descriptor[:trial2_credits] )
+          if trial1 && i.units!=i.plan_descriptor[:trial_credits]
             raise 'Cannot order more than 1 package and trial in the same invoice'
           elsif trial1
             values[:a3] += i.plan_descriptor[:fee].to_f
@@ -315,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.to_time - self.billing_period_from.to_time
+        self.billing_period_from = payment_time
+        self.billing_period_to = self.billing_period_to.to_time + diff
+      end
       self.save
 			# expiracion de creditos de la factura anterior
 			i = self.previous
@@ -421,33 +426,24 @@ module BlackStack
       self.billing_period_from = now()
 #puts
 #puts  
-      # si el plan tiene un segundo trial, y
-      # es la primer factura, entonces:
-      # => se trata del segundo pago por segundo trial
-      if h[:trial2_fee] != nil && prev1.nil?
-#puts 'b'
-        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 segundo trial, y
-      # es la segunda factura, entonces:
-      # => se trata del segundo pago por segundo trial
-      elsif h[:trial2_fee] != nil && !prev1.nil? && prev2.nil?
-#puts 'b'
-        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 primer trial, y
       # es la primer factura, entonces:
       # => se trata del primer pago por trial
-      elsif h[:trial_fee] != nil && prev1.nil? && !self.disabled_for_trial_ssm
+      if h[:trial_fee] != nil && prev1.nil? && !self.disabled_for_trial_ssm
 #puts 'a'
         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
+      elsif h[:trial2_fee] != nil && !prev1.nil? && prev2.nil?
+#puts 'b'
+        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'

data/lib/movement.rb

@@ -15,20 +15,25 @@ module BlackStack
 		MOVEMENT_TYPE_ADJUSTMENT = 6 # it can be recalculated
 		MOVEMENT_TYPE_REFUND_ADJUSTMENT = 7 # it cannot be recalculated
   
-    def typeName()
-      if (self.type==MOVEMENT_TYPE_ADD_PAYMENT)
+    def self.typeName(t)
+      if (t==MOVEMENT_TYPE_ADD_PAYMENT)
         return "Payment"
-      elsif (self.type==MOVEMENT_TYPE_ADD_BONUS)
+      elsif (t==MOVEMENT_TYPE_ADD_BONUS)
         return "Bonus"
-      elsif (self.type==MOVEMENT_TYPE_REASSIGN_BALANCE)
+      elsif (t==MOVEMENT_TYPE_REASSIGN_BALANCE)
         return "Reassignation"
-      elsif (self.type==MOVEMENT_TYPE_REFUND_BALANCE)
+      elsif (t==MOVEMENT_TYPE_REFUND_BALANCE)
         return "Refund"
-      elsif (self.type==MOVEMENT_TYPE_CANCELATION)
-        return "Service"
-      elsif (self.type==MOVEMENT_TYPE_EXPIRATION)
+      elsif (t==MOVEMENT_TYPE_CANCELATION)
+        return "Consumption"
+      elsif (t==MOVEMENT_TYPE_EXPIRATION)
         return "Expiration"
       end
+      '(unknown)'
+    end
+
+    def typeName()
+      BlackStack::Movement::typeName(self.type)
     end
   
     def typeColorName()

metadata

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