invoicing_payments_processing 1.1.30 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 212a2966346ed12f4de648a737a3ddeaea9b4886
-  data.tar.gz: 891852dc15b535c8eff5bfbdcc1f5b79b3f209b8
+  metadata.gz: 965a8f6366881eb0e4bc2bfc47bc1afe2ce09e11
+  data.tar.gz: a9b9c23cfed343171d9e815574cb56659e652bf4
 SHA512:
-  metadata.gz: 1630c612e2036f822aa5d8540a86a9279f337b93fee1419899cd56c119d165474b765b9c75a52eee8b4b3d94ba4a5e8d1c61ba7c0a7ad9eac02b14d058604781
-  data.tar.gz: 9e26f1b23afa365b8a09aea64d166affab51e9d15cf9e3228fa121072c3869c18a6ac75d9714e5e10c74280cd4cc18b5a106767769393282ef5e1ae6ee94c781
+  metadata.gz: 261a8ac7175609664b8580f69259a96e39cc8f495ed448ed6dcc4d8e1ad8e87e7f9f297e1b4ff461b21c0d95ea92a9f958b39199977ff9c73c11a0448a08ae9a
+  data.tar.gz: aee9ab4c785dcc5072b008ed1547debd27763a5283b6088dc7013f9f92649cc7856a79cd1be54446e92115dfc333e91e09bc0635e2634172c7143f180e879170

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,8 +211,8 @@ 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|         
-          if trial1 && i.units!=i.plan_descriptor[:trial_credits]
+        self.items.each { |i|
+          if ( !trial2 && trial1 && i.units!=i.plan_descriptor[:trial_credits] ) || ( trial2 && trial1 && i.units!=i.plan_descriptor[:trial2_credits] )
             raise 'Cannot order more than 1 package and trial in the same invoice'
           elsif trial1
             values[:a3] += i.plan_descriptor[:fee].to_f
@@ -249,7 +256,11 @@ module BlackStack
 
     # retorna true si el estado de la factura sea NULL o UNPAID
     def canBeDeleted?
-      self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID
+      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. 
@@ -409,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
+      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
-      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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.30
+  version: 1.1.36
 platform: ruby
 authors:
 - Leandro Daniel Sardi