invoicing_payments_processing 1.1.76 → 1.1.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15795c2dcf86474b4a28da71ed08482eefb1217d
-  data.tar.gz: 4fa03daa0f4eb341555906e8010bcdb9f1ffb2cd
+  metadata.gz: e09a21bacef2cf167afd383956f5e60118528b1c
+  data.tar.gz: f326089a00630e7eb3e91c4f06272c154794fa81
 SHA512:
-  metadata.gz: e31dd0464a73e8c4fb87f46a3ccd7eeb150cd65daa1aaf33a152d8555416cc08f745ecd873e0bc6ace58aeaf1e39ebe69a2e3f7e22396d110aa114af4de8cede
-  data.tar.gz: 59bee9aa4925d1d31509b95da66cf57a951ece92c3d1469d806ffa34e478c6eea8626c14cd9e247eaa8dfeb83a0b346e72c04918c80f6a67feaee3b06e7457ec
+  metadata.gz: 4631bac0fcc2b95a5babc0c65cadfea9efbd291c3ecaf56e03a58562c418e153e5c4163e6a49bb076b58f1d6610795c63768f0d29595b362f3982870694438d0
+  data.tar.gz: c8eb03127d5d5c9544bb6d9479dcec76b0d6a801aeea8a5217b64db6e82ee4a9b5058d4984b9a48e4c5480492b3165f791b0449d89c0588c878eecc5202437dd

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            

data/lib/movement.rb

@@ -155,7 +155,7 @@ module BlackStack
 =end
       q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
-        "from movement m with (nolock) " +
+        "from movement m with (nolock index(IX_movement__type__id_client__product_code__create_time_desc__credits_desc)) " +
         "where isnull(m.type, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}) in (#{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS.to_s}) " +
         "and m.id_client='#{self.client.id.to_guid}' " +
         "and isnull(m.credits,0) < 0 " +
@@ -176,7 +176,7 @@ module BlackStack
 =end
       q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
-        "from movement m with (nolock) " +
+        "from movement m with (nolock index(IX_movement__type__id_client__product_code__create_time_desc__credits_asc)) " +
         "where m.id_client='#{self.client.id.to_guid}' " +
         "and isnull(m.credits,0) > 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.76
+  version: 1.1.80
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket