invoicing_payments_processing 1.1.29 → 1.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f79b2b37439a781dd15dbe9407f09907f890773
-  data.tar.gz: 1c99bbda030268957826baaf318a30ff3fafde7e
+  metadata.gz: 3f6d8cf264ed1fc60388ab5c360b3cfbb8fb9bbb
+  data.tar.gz: 7809b0efc41be10f4db464c4a37860abd6ebba02
 SHA512:
-  metadata.gz: 4c43270e3ed5d5c63729935fbb609f209ead4420b24bfb02d5b3d282d2ce68844d8b60e8eca3a0a28a08379b329ac4027b028f2426045f057c37d3b7140088ce
-  data.tar.gz: 5d4315da2fdd53ccc55149cae0e5da568ca375f055b1dba014319095179171411e81908f779b535b653c191c08e0a51bcf4c1387c0f3c8b961326a794d570157
+  metadata.gz: ed2466965d78a825e7f4d991f62a8a57a61775d59f6fffc2dc0bffe53204312e676059607668463a6b6a558a52c68b4a3859e49587ea1c343ee8f41943d5323c
+  data.tar.gz: ba1ef476b3106b96f6957c02e85421f719dc1b224fae248d144b1f282841e3c5fe5a05534c9aece1ac84fcba7ab7613b662cd31811e497ff77ae7b840bab130c

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|
@@ -246,6 +253,15 @@ module BlackStack
     def canBePaid?
       self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID
     end
+
+    # retorna true si el estado de la factura sea NULL o UNPAID
+    def canBeDeleted?
+      if self.paypal_subscription.nil?
+        return self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID
+      else # !self.paypal_subscription.nil?
+        return (self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID) && !self.paypal_subscription.active
+      end # if self.paypal_subscription.nil?
+    end
   
     # actualiza el registro en la tabla invoice segun los parametros. 
     # en este caso la factura se genera antes del pago.
@@ -298,6 +314,7 @@ module BlackStack
       end
       # marco la factura como pagada
       self.status = BlackStack::Invoice::STATUS_PAID
+      self.delete_time = nil
       self.save
 			# expiracion de creditos de la factura anterior
 			i = self.previous
@@ -325,19 +342,21 @@ module BlackStack
 				# registro el pago
         BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Invoice Payment", payment_time, item.id).save()
 				# agrego los bonos de este plan
-				plan[:bonus_plans].each { |h|
-					plan_bonus = BlackStack::InvoicingPaymentsProcessing.plan_descriptor(h[:item_number])
-					raise "bonus plan not found" if plan_bonus.nil?					
-					bonus = BlackStack::InvoiceItem.new
-					bonus.id = guid()
-					bonus.id_invoice = self.id
-					bonus.product_code = plan_bonus[:product_code]
-					bonus.unit_price = 0
-					bonus.units = plan_bonus[:credits] * item.number_of_packages # agrego los creditos del bono, multiplicado por la cantiad de paquetes 
-					bonus.amount = 0
-					bonus.item_number = plan_bonus[:item_number]
-					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, 'Payment Bonus', payment_time, item.id).save()
-				}
+				if !plan[:bonus_plans].nil?
+  				plan[:bonus_plans].each { |h|
+  					plan_bonus = BlackStack::InvoicingPaymentsProcessing.plan_descriptor(h[:item_number])
+  					raise "bonus plan not found" if plan_bonus.nil?					
+  					bonus = BlackStack::InvoiceItem.new
+  					bonus.id = guid()
+  					bonus.id_invoice = self.id
+  					bonus.product_code = plan_bonus[:product_code]
+  					bonus.unit_price = 0
+  					bonus.units = plan_bonus[:credits] * item.number_of_packages # agrego los creditos del bono, multiplicado por la cantiad de paquetes 
+  					bonus.amount = 0
+  					bonus.item_number = plan_bonus[:item_number]
+  					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, 'Payment Bonus', payment_time, item.id).save()
+  				}
+        end # if !plan[:bonus_plans].nil?
         #
         DB.disconnect
         GC.start
@@ -401,25 +420,34 @@ module BlackStack
       # le seteo la fecha de hoy
       self.billing_period_from = now()
 #puts
-#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
-      if h[:trial_fee] != nil && prev1.nil? && !self.disabled_for_trial_ssm
+      elsif 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'
@@ -524,7 +552,7 @@ module BlackStack
 			self.id_previous_invoice = i.id
       self.subscr_id = i.subscr_id 
       self.disabled_for_add_remove_items = true
-      
+
       i.items.each { |t| 
         self.add_item(t.item_number, t.number_of_packages)
         #

metadata

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