invoicing_payments_processing 1.1.61 → 1.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7019008952c4a101402f3437fb2c7e72a64987f
-  data.tar.gz: 32eb0417161011cec4032e3f72aaf4f8d2f0d75e
+  metadata.gz: 4274c11ebe44a85852da2cd471b1d2ccbd088266
+  data.tar.gz: b6b303e495c9ada9185cb9abc26d270debc6487f
 SHA512:
-  metadata.gz: 161824735dffd0670ca5d5d838121788ab3e1b36fc651cbfd401f0cbcf182c26cf6bb436dd131c5a31f787c5c507a8fa11b1ab7b35c6513da505af9c437c91f9
-  data.tar.gz: 1a40cfdd633075be2a2ccd1da1d3b047b16b8b582fcb1b03116de1b6e529336d6ce7afb3ca7bd5bfefd20064e10b9dfcebda6b1b163ca1a0c8706bab214eb840
+  metadata.gz: c144e34feb9b8ae90c4514a27e3fe9d042d1a50ca3ecd7577307e26dd8858c7689cf7dd8d647b8cf28193d33f51d7da8bcf057ffb29a0c9fb336de50dea5cab3
+  data.tar.gz: 187387a945ab22e3e38b1f35a5884b10bcddb50ba5b218b1730dce093ab67b751cb014b887c77bbd66b567515e3ac81390cd3bf6d65a4606994a5300a0862c9d

data/lib/balance.rb

@@ -24,7 +24,7 @@ module BlackStack
         "where x.id_client='#{self.client.id}' " +
         "and x.product_code='#{self.product_code}' "
       end
-      
+#puts "Balance.calculate:q:#{q}:."
       row = DB[q].first
       self.amount = row[:amount].to_f
       self.credits = row[:credits].to_f

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -51,7 +51,9 @@ module BlackStack
       end
 
       # crea/actualiza un registro en la tabla movment, reduciendo la cantidad de creditos y saldo que tiene el cliente, para el producto indicado en product_code. 
-      def consume(product_code, number_of_credits=1, description=nil)
+      def consume(product_code, number_of_credits=1, description=nil, datetime=nil)
+				dt = datetime.nil? ? now() : datetime.to_time.to_sql
+				
 				# create the consumtion
 				total_credits = 0.to_f - BlackStack::Balance.new(self.id, product_code).credits.to_f
 				total_amount = 0.to_f - BlackStack::Balance.new(self.id, product_code).amount.to_f
@@ -60,7 +62,7 @@ module BlackStack
 				cons = BlackStack::Movement.new
 				cons.id = guid()
 				cons.id_client = self.id
-				cons.create_time = now()
+				cons.create_time = dt
 				cons.type = BlackStack::Movement::MOVEMENT_TYPE_CANCELATION
 				cons.description = description.nil? ? 'Consumption' : description
 				cons.paypal1_amount = 0

data/lib/movement.rb

@@ -121,7 +121,12 @@ module BlackStack
 
 		# Returns the number of credits assigned in the movement that have been consumed.
 		# The movment must be a payment or a bonus
-		def credits_consumed()
+		#
+		# registraton_time: consider only movements before this time. If it is nil, this method will consider all the movements.
+		# 
+		def credits_consumed(registraton_time=nil)
+      # le agrego 365 dias a la fecha actual, para abarcar todas las fechas ocurridas hasta hoy seguro
+      registraton_time = (Time.now() + 365*24*60*60).to_time if registraton_time.nil? 
 			# the movment must be a payment or a bonus
 			raise 'Movement must be either a payment or a bonus' if self.type != MOVEMENT_TYPE_ADD_PAYMENT && self.type != MOVEMENT_TYPE_ADD_BONUS
 #puts
@@ -131,7 +136,8 @@ module BlackStack
 			self.client.movements.select { |o| 
 				(o.type == MOVEMENT_TYPE_ADD_PAYMENT || o.type == MOVEMENT_TYPE_ADD_BONUS) &&
         o.credits.to_f < 0 &&
-        o.product_code.upcase == self.product_code.upcase
+        o.product_code.upcase == self.product_code.upcase &&
+        o.create_time.to_time <= registraton_time.to_time
       }.sort_by { |o| o.create_time }.each { |o|
 				paid += (0.to_f - o.credits.to_f)
 				break if o.id.to_guid == self.id.to_guid
@@ -140,7 +146,8 @@ module BlackStack
       # calculo los credito para este producto, desde el primer dia; incluyendo cosumo, expiraciones, ajustes.
       consumed = self.client.movements.select { |o| 
         o.credits.to_f > 0 &&
-        o.product_code.upcase == self.product_code.upcase
+        o.product_code.upcase == self.product_code.upcase &&
+        o.create_time.to_time <= registraton_time.to_time
       }.inject(0) { |sum, o| sum.to_f + o.credits.to_f }.to_f
 #puts "consumed:#{consumed.to_s}:."			
       # calculo los creditos de este movimiento que voy a cancelar
@@ -184,7 +191,10 @@ module BlackStack
 
 		# credits expiration
 		def expire(registraton_time=nil, desc='Expiration Because Allocation is Renewed')
-			credits_consumed = self.credits_consumed
+#puts
+#puts "registraton_time:#{registraton_time.to_s}:."
+			credits_consumed = self.credits_consumed(registraton_time)
+#puts "credits_consumed:#{credits_consumed.to_s}:."
 			# 
 			self.expiration_start_time = now()
 			self.expiration_tries = self.expiration_tries.to_i + 1
@@ -192,6 +202,8 @@ module BlackStack
 			# 
 			balance = BlackStack::Balance.new(self.client.id, self.product_code, registraton_time)
 			balance.calculate(false)
+#puts "balance.credits.to_s:#{balance.credits.to_s}:."
+#puts "balance.amount.to_s:#{balance.amount.to_s}:."
 			total_credits = 0.to_f - balance.credits.to_f
 			total_amount = 0.to_f - balance.amount.to_f
 			#
@@ -199,6 +211,8 @@ module BlackStack
 			#
 			credits_to_expire = credits - credits_consumed.to_i #- (0.to_f - self.credits.to_f)).to_i
 			amount_to_expire = total_credits.to_f == 0 ? 0 : credits_to_expire.to_f * ( total_amount.to_f / total_credits.to_f )
+#puts "credits_to_expire.to_s:#{credits_to_expire.to_s}:."
+#puts "amount_to_expire.to_s:#{amount_to_expire.to_s}:."
 			#
 			exp = BlackStack::Movement.new
 			exp.id = guid()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.61
+  version: 1.1.62
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket