invoicing_payments_processing 1.1.33 → 1.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5243e3335e6493c1a4ce19769c46730729576904
-  data.tar.gz: 068bb5e32c323da931510da9c205606a8778e645
+  metadata.gz: 3f6d8cf264ed1fc60388ab5c360b3cfbb8fb9bbb
+  data.tar.gz: 7809b0efc41be10f4db464c4a37860abd6ebba02
 SHA512:
-  metadata.gz: 5310182c911009e0e22aae4f5ceaacce08472298b9c4126953ba0831850a60cb161b6979b85d29e890b8da028620b71b657a2abbaf6e4656b901f85d8208f2a3
-  data.tar.gz: 2b86a7c418f70faa014d76e3025423b680c011eed88bb29c0176c1e0402fe67b647d83c5cdd20a77ee0a2e9a493ec48690da965c35c543eddd854af4bc26a572
+  metadata.gz: ed2466965d78a825e7f4d991f62a8a57a61775d59f6fffc2dc0bffe53204312e676059607668463a6b6a558a52c68b4a3859e49587ea1c343ee8f41943d5323c
+  data.tar.gz: ba1ef476b3106b96f6957c02e85421f719dc1b224fae248d144b1f282841e3c5fe5a05534c9aece1ac84fcba7ab7613b662cd31811e497ff77ae7b840bab130c

data/lib/invoice.rb

@@ -420,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'

metadata

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