invoicing_payments_processing 1.1.27 → 1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d97ab4f8d1bbf4504ea494d1f4f0654c6dedac5
-  data.tar.gz: d2aa430675b74c58792d858b9446b961152a31dd
+  metadata.gz: 9f79b2b37439a781dd15dbe9407f09907f890773
+  data.tar.gz: 1c99bbda030268957826baaf318a30ff3fafde7e
 SHA512:
-  metadata.gz: a19f653d1435378092a77cb576f8f92b21cf5f5fe68e03b349f16ae547ff93efe379de7d7cd4bd1509b3717cbe9d3d26a4cedba96b5a9e2e81fb1a671bb8f47f
-  data.tar.gz: 9e6823c86dc08d36a8f629fd18eb605a105df7e8ad87603c40c6a199c448ca872daaa2725656376d0c594246af1872e95e21726f6620fbfaec4a5a029d1f8a49
+  metadata.gz: 4c43270e3ed5d5c63729935fbb609f209ead4420b24bfb02d5b3d282d2ce68844d8b60e8eca3a0a28a08379b329ac4027b028f2426045f057c37d3b7140088ce
+  data.tar.gz: 5d4315da2fdd53ccc55149cae0e5da568ca375f055b1dba014319095179171411e81908f779b535b653c191c08e0a51bcf4c1387c0f3c8b961326a794d570157

data/lib/invoice.rb

@@ -400,11 +400,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 +421,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

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.29
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket