invoicing_payments_processing 1.1.34 → 1.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6d8cf264ed1fc60388ab5c360b3cfbb8fb9bbb
-  data.tar.gz: 7809b0efc41be10f4db464c4a37860abd6ebba02
+  metadata.gz: 80d3ca746b1107a72f4c17d306270b5f6fe93824
+  data.tar.gz: a4ad5aa3f8dbf0afe51cd032c327dd4782d319e3
 SHA512:
-  metadata.gz: ed2466965d78a825e7f4d991f62a8a57a61775d59f6fffc2dc0bffe53204312e676059607668463a6b6a558a52c68b4a3859e49587ea1c343ee8f41943d5323c
-  data.tar.gz: ba1ef476b3106b96f6957c02e85421f719dc1b224fae248d144b1f282841e3c5fe5a05534c9aece1ac84fcba7ab7613b662cd31811e497ff77ae7b840bab130c
+  metadata.gz: bf0f15d5ad94dad4dc66466d74211847b66103b79c2fb974ca54c51bd8f12a7837b84de6a42399ffbf928d866f2faf08814d731ae649389db96cf3aabd33cd37
+  data.tar.gz: 297e7a2c8d260d1122d95877ac53a4ded685fc4b0339acabb3b6daea869419ffbea7fe049e35594b9a3a03eb3d84a0d397d15c5bd8534e506260caf7a0c5f54e

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

@@ -211,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
@@ -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
-      if 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)
+      elsif (t==MOVEMENT_TYPE_CANCELATION)
         return "Service"
-      elsif (self.type==MOVEMENT_TYPE_EXPIRATION)
+      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.34
+  version: 1.1.44
 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