invoicing_payments_processing 1.1.34 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f6d8cf264ed1fc60388ab5c360b3cfbb8fb9bbb
-  data.tar.gz: 7809b0efc41be10f4db464c4a37860abd6ebba02
+  metadata.gz: 965a8f6366881eb0e4bc2bfc47bc1afe2ce09e11
+  data.tar.gz: a9b9c23cfed343171d9e815574cb56659e652bf4
 SHA512:
-  metadata.gz: ed2466965d78a825e7f4d991f62a8a57a61775d59f6fffc2dc0bffe53204312e676059607668463a6b6a558a52c68b4a3859e49587ea1c343ee8f41943d5323c
-  data.tar.gz: ba1ef476b3106b96f6957c02e85421f719dc1b224fae248d144b1f282841e3c5fe5a05534c9aece1ac84fcba7ab7613b662cd31811e497ff77ae7b840bab130c
+  metadata.gz: 261a8ac7175609664b8580f69259a96e39cc8f495ed448ed6dcc4d8e1ad8e87e7f9f297e1b4ff461b21c0d95ea92a9f958b39199977ff9c73c11a0448a08ae9a
+  data.tar.gz: aee9ab4c785dcc5072b008ed1547debd27763a5283b6088dc7013f9f92649cc7856a79cd1be54446e92115dfc333e91e09bc0635e2634172c7143f180e879170

data/lib/invoice.rb

@@ -211,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
@@ -433,7 +433,7 @@ module BlackStack
       # 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?
+      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

metadata

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