invoicing_payments_processing 1.1.73 → 1.1.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2d4dcef8b18e6ad8329f6c6419517d166cdc7a
-  data.tar.gz: e13f60bf6ed648ed17a7eabea208c2ba26d460f2
+  metadata.gz: 3bc4d1525e38dde0ee2bbd75d5d9e0998b8428bb
+  data.tar.gz: e4ced70f73f3cfd8e567d76cd46571ca74f99609
 SHA512:
-  metadata.gz: 76e337872274c80b927ed5607dc236c1b3b1fb6373e407afe0cc0b9cbef06416db183effa05738af599500aaa86dbb9f005df5b06b8c8deb86f1c0c4f9fa005d
-  data.tar.gz: 3dd4c9279bbdd930e723de9f297b33099f6acd0075cc6baac9d95450493cad7f15b0d7f8cdb3206557fccb416a7dd17ee995d7f922ff1d5fef8808560e074ffe
+  metadata.gz: 974ae0f07fc60ef3a79aac1ba71ef318fd6243159bb11e2c94a0a4ead79ec0093473b7144dc65c1856da48231b35576596634723e4ddd57fdaf69374768bac28
+  data.tar.gz: 579d1efbe81561d8c93f7a2f5f6408e934e767422fbfacadb6954a34c5057dbb8f6c4efc3cae15f332f3f8b3effcca487251f2e5532b909cd0b98dc7e697cd13

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -62,8 +62,8 @@ module BlackStack
           product_descriptors.each { |hprod|
             row = DB[
               "select isnull(sum(isnull(m.credits,0)),0) as credits, isnull(sum(isnull(m.amount,0)),0) as amount " +
-  #            "from movement m with (nolock index(IX_movement__id_client__product_code)) " + 
-              "from movement m with (nolock) " + 
+              "from movement m with (nolock index(IX_movement__id_client__product_code)) " + 
+              #"from movement m with (nolock) " + 
               "where m.id_client='#{c.id}' " +
               "and m.product_code='#{hprod[:code]}' "
             ].first
@@ -347,7 +347,8 @@ module BlackStack
         end
         
         q +=
-        "WHERE i.id_client='#{self.id}' "
+        "WHERE i.id_client='#{self.id}' " +
+        "AND i.delete_time IS NULL "
         
         return !DB[q].first.nil?
       end

data/lib/invoice.rb

@@ -201,7 +201,15 @@ module BlackStack
         
         values[:a3] = 0
         self.items.each { |i|
-          if trial1 && i.units!=i.plan_descriptor[:trial_credits]
+puts
+puts
+puts "i.id.to_s:#{i.id.to_s}:."
+puts "i.id_invoice.to_s:#{i.id_invoice.to_s}:."
+puts "i.units.to_i.to_s:#{i.units.to_i.to_s}:."
+puts "i.plan_descriptor[:trial_credits].to_i.to_s:#{i.plan_descriptor[:trial_credits].to_i.to_s}:."
+puts
+puts
+          if trial1 && i.units.to_i!=i.plan_descriptor[:trial_credits].to_i
             raise 'Cannot order more than 1 package and trial in the same invoice'
           elsif trial1
             values[:a3] += i.plan_descriptor[:fee].to_f
@@ -317,7 +325,7 @@ module BlackStack
 					# 
 					BlackStack::Movement.where(:id_invoice_item => item.id).all { |mov|
 						# 
-						mov.expire(self.billing_period_from, "Expiration of <a href='/member/record?rid=#{mov.id.to_guid}'>record:#{mov.id.to_guid}</a> because subscription renewal.") if mov.expiration_on_next_payment == true
+						mov.expire(self.billing_period_from, "Expiration of <a href='/settings/record?rid=#{mov.id.to_guid}'>record:#{mov.id.to_guid}</a> because subscription renewal.") if mov.expiration_on_next_payment == true
 						#
 						DB.disconnect
 						GC.start
@@ -334,7 +342,7 @@ module BlackStack
 				# obtengo descriptor del producto
 				prod = BlackStack::InvoicingPaymentsProcessing.product_descriptor(plan[:product_code])
 				# registro el pago
-        BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Payment of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
+        BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Payment of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
 				# agrego los bonos de este plan
 				if !plan[:bonus_plans].nil?
   				plan[:bonus_plans].each { |h|
@@ -348,7 +356,7 @@ module BlackStack
   					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, "Bonus from the <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
+  					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, "Bonus from the <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
   				}
         end # if !plan[:bonus_plans].nil?
         #
@@ -615,11 +623,11 @@ module BlackStack
           item1.save()
           # hago el reembolso de este item
           # si el balance quedo en negativo, entonces aplico otro ajuste
-          BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Full Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+          BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Full Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
 					net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, u.product_code.to_s).amount.to_f
 					net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, u.product_code.to_s).credits.to_f
 					if net_amount <= 0 && net_credits < 0
-						adjust = self.client.adjustment(u.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+						adjust = self.client.adjustment(u.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
 						adjust.id_invoice_item = item1.id
 						adjust.save			
 					end # if net_amount < 0
@@ -640,11 +648,11 @@ module BlackStack
               item2.detail = 'Bonus Refund'
               item2.description = j[:description].to_s
               item2.save()
-              BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+              BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
               net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
               net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
               if net_amount <= 0 && net_credits < 0
-                adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+                adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
                 adjust.id_invoice_item = item1.id
                 adjust.save     
               end # if net_amount < 0            
@@ -676,11 +684,11 @@ module BlackStack
         item1.detail = t.detail.to_s
         item1.description = t.description.to_s
         item1.save()
-        BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Partial Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()
+        BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Partial Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()
 				# agrego un ajuste por el redondeo a una cantidad entera de creditos
 				if float_units.to_f != units.to_f
 					adjustment_amount = unit_price.to_f * (units.to_f - float_units.to_f)
-					adjust = self.client.adjustment(t.product_code.to_s, adjustment_amount, 0, "Adjustment for Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", BlackStack::Movement::MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+					adjust = self.client.adjustment(t.product_code.to_s, adjustment_amount, 0, "Adjustment for Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", BlackStack::Movement::MOVEMENT_TYPE_REFUND_ADJUSTMENT)
 					adjust.id_invoice_item = item1.id
 					adjust.save
 				end
@@ -688,7 +696,7 @@ module BlackStack
 				net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, t.product_code.to_s).amount.to_f
 				net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, t.product_code.to_s).credits.to_f
 				if net_amount < 0 && net_credits < 0
-					adjust = self.client.adjustment(t.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+					adjust = self.client.adjustment(t.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
 					adjust.id_invoice_item = item1.id
 					adjust.save			
 				end # if net_amount < 0
@@ -714,11 +722,11 @@ module BlackStack
             item2.detail = 'Bonus Refund'
             item2.description = j[:description].to_s
             item2.save()
-            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
             net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
             net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
             if net_amount <= 0 && net_credits < 0
-              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/settings/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
               adjust.id_invoice_item = item1.id
               adjust.save     
             end # if net_amount < 0            

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.73
+  version: 1.1.79
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket
@@ -96,20 +96,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.24
 description: 'THIS GEM IS STILL IN DEVELOPMENT STAGE. Find documentation here: https://github.com/leandrosardi/invoicing_payments_processing.'
 email: leandro.sardi@expandedventure.com
 executables: []