invoicing_payments_processing 1.1.27 → 1.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d97ab4f8d1bbf4504ea494d1f4f0654c6dedac5
-  data.tar.gz: d2aa430675b74c58792d858b9446b961152a31dd
+  metadata.gz: 5243e3335e6493c1a4ce19769c46730729576904
+  data.tar.gz: 068bb5e32c323da931510da9c205606a8778e645
 SHA512:
-  metadata.gz: a19f653d1435378092a77cb576f8f92b21cf5f5fe68e03b349f16ae547ff93efe379de7d7cd4bd1509b3717cbe9d3d26a4cedba96b5a9e2e81fb1a671bb8f47f
-  data.tar.gz: 9e6823c86dc08d36a8f629fd18eb605a105df7e8ad87603c40c6a199c448ca872daaa2725656376d0c594246af1872e95e21726f6620fbfaec4a5a029d1f8a49
+  metadata.gz: 5310182c911009e0e22aae4f5ceaacce08472298b9c4126953ba0831850a60cb161b6979b85d29e890b8da028620b71b657a2abbaf6e4656b901f85d8208f2a3
+  data.tar.gz: 2b86a7c418f70faa014d76e3025423b680c011eed88bb29c0176c1e0402fe67b647d83c5cdd20a77ee0a2e9a493ec48690da965c35c543eddd854af4bc26a572

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
@@ -400,11 +419,12 @@ module BlackStack
     
       # le seteo la fecha de hoy
       self.billing_period_from = now()
-  
+#puts
+#puts
       # 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?
+      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
@@ -420,13 +440,13 @@ module BlackStack
         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 && !prev1.nil? && !prev2.nil?
+      elsif h[:fee].to_f != nil && h[:type] == BlackStack::InvoicingPaymentsProcessing::BasePlan::PAYMENT_SUBSCRIPTION
 #puts 'c'
         units = n.to_i * h[:credits].to_i
         unit_price = h[:fee].to_f / h[:credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:period].to_s}, +#{h[:units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
   
-      elsif (!isSubscription && h[:fee].to_f != nil)
+      elsif h[:fee].to_f != nil && h[:type] == BlackStack::InvoicingPaymentsProcessing::BasePlan::PAYMENT_PAY_AS_YOU_GO
 #puts 'd'
         units = n.to_i * h[:credits].to_i
         unit_price = h[:fee].to_f / h[:credits].to_f
@@ -523,7 +543,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.27
+  version: 1.1.33
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket