invoicing_payments_processing 1.1.16 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cafb07fe19bdb27a26ac16c923fef00bcccbcb
-  data.tar.gz: 5783e53592afe0d64c66fe1f3318b4720adb3b88
+  metadata.gz: 2ba80e4b1b4e72baf07ccb19207e125930eadf71
+  data.tar.gz: 2df78c09cd1e6b9a467454ab886c484336c57391
 SHA512:
-  metadata.gz: 361eff4012d019b0e815febf653fc8c477207f291005648ca575c2e23a821fdd909ddc39cd44c467db7edda2218fb237acda98b6596599ca2195349da2d38be9
-  data.tar.gz: 25b95340499226f9fa6d46d7cf7b3e64f2a577a6d5427274fd1f557038213ba3d80a05444264ec7941f0641b8cada48354b21f945eaae1922001efc15c180177
+  metadata.gz: 119752cad89e007e3a124144e0f27af20be2669867311a36c863227897c1b80108d2938e368aee0fd7f44b5816db05cc0f1aecfd31621997757a470e5c3b40f7
+  data.tar.gz: 9e1bc580c20e46a192b1e549325f77a2bd1da9b059e4908bea40a62476f11ec4fb293f2241784c3b1803832d89a6443e6f5dd2e53807cd59f01e741286445cbb

data/lib/balance.rb

@@ -1,10 +1,11 @@
 module BlackStack
   class Balance
-  	attr_accessor :client, :product_code, :amount, :credits
+  	attr_accessor :client, :product_code, :amount, :credits, :up_time
   
-  	def initialize(id_client, product_code)
+  	def initialize(id_client, product_code, up_time=nil)
   		self.client = BlackStack::Client.where(:id => id_client).first
   		self.product_code = product_code
+			self.up_time = up_time
   		self.calculate()
   	end
   	
@@ -14,6 +15,9 @@ module BlackStack
       "from movement with (nolock index(IX_movement__id_client__product_code)) " +
       "where id_client='#{self.client.id}' " +
       "and product_code='#{self.product_code}' "
+
+			q += "and create_time < '#{self.up_time.to_sql}' " if !self.up_time.nil?
+
       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

@@ -68,11 +68,11 @@ module BlackStack
       end
 
       # crea un registro en la tabla movment, reduciendo la cantidad de creditos con saldo importe 0, para el producto indicado en product_code. 
-      def adjustment(product_code, adjustment_amount=0, adjustment_credits=0, description=nil, type=BlackStack::Movement::MOVEMENT_TYPE_ADJUSTMENT)
+      def adjustment(product_code, adjustment_amount=0, adjustment_credits=0, description=nil, type=BlackStack::Movement::MOVEMENT_TYPE_ADJUSTMENT, registraton_time=nil)
 				adjust = BlackStack::Movement.new
 				adjust.id = guid()
 				adjust.id_client = self.id
-				adjust.create_time = now()
+				adjust.create_time = registraton_time.nil? ? now() : registraton_time
 				adjust.type = type
 				adjust.description = description.nil? ? 'Adjustment' : description
 				adjust.paypal1_amount = 0
@@ -110,18 +110,18 @@ module BlackStack
 						o.amount = x
 						o.profits_amount = -x
 						o.save
-
-						# if there is negative credits
-						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
-						sleep(2) # delay to ensure the time of the bonus movement will be later than the time of the consumption movement
-						if total_credits < 0
-							self.adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded.')
-						end
-
 					end
 					amount_paid += 0.to_f - o.amount.to_f
 					credits_paid += 0.to_i - o.credits.to_i
+
+					# if there is negative credits
+					total_credits = credits_paid
+					total_amount = amount_paid
+					if total_credits < 0
+						self.adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded.', BlackStack::Movement::MOVEMENT_TYPE_ADJUSTMENT, o.create_time)
+						amount_paid = 0.to_f
+						credits_paid = 0.to_i
+					end
 				}
 			end 
 		

data/lib/invoice.rb

@@ -294,7 +294,7 @@ module BlackStack
 					# 
 					BlackStack::Movement.where(:id_invoice_item => item.id).all { |mov|
 						# 
-						mov.expire if mov.expiration_on_next_payment == true
+						mov.expire(self.billing_period_from) if mov.expiration_on_next_payment == true
 						#
 						DB.disconnect
 						GC.start

data/lib/movement.rb

@@ -153,15 +153,15 @@ module BlackStack
 		end
 
 		# credits expiration
-		def expire()
+		def expire(registraton_time=nil)
 			credits_consumed = self.credits_consumed
 			# 
 			self.expiration_start_time = now()
 			self.expiration_tries = self.expiration_tries.to_i + 1
 			self.save
 			# 
-			total_credits = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code).credits.to_f
-			total_amount = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code).amount.to_f
+			total_credits = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code, registraton_time).credits.to_f
+			total_amount = 0.to_f - BlackStack::Balance.new(self.client.id, self.product_code, registraton_time).amount.to_f
 			#
 			credits = 0.to_i - self.credits.to_i
 			#
@@ -171,7 +171,7 @@ module BlackStack
 			exp = BlackStack::Movement.new
 			exp.id = guid()
 			exp.id_client = self.client.id
-			exp.create_time = now()
+			exp.create_time = registraton_time.nil? ? now() : registraton_time
 			exp.type = BlackStack::Movement::MOVEMENT_TYPE_EXPIRATION
 			exp.id_user_creator = self.id_user_creator
 			exp.description = 'Expiration Because Allocation is Renewed'

metadata

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