invoicing_payments_processing 1.1.14 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 079660aadfbd7106fcc74787e3d86002375ec4b2
-  data.tar.gz: 281a650e189be44ed7e91ca2bf439e876f014eb8
+  metadata.gz: 9ebbf923439f8f516edcd98efc8f51baf0560b47
+  data.tar.gz: fa76d9b89823901681c0488879fc0a6023c8b40c
 SHA512:
-  metadata.gz: 025fd8f5d7060f21b8bdd2e2d1d087ee57d3ac587c32b8c0aaf03f53fba263da0904b21a00d85d5c6d6fe9c220155783e9541bf2ba5dbf8c49aff3c0e58bea82
-  data.tar.gz: 875037f5c24e6702cfcb8c39bca913d22761e2f1a7ca3d8efe6707edc30a8a8ec0c12e24fdc22da2fb4fa7d1517f5c0463d85aed2744429de5ff77ffa5ecda14
+  metadata.gz: 1ad3c562d56f170ce688bb4e6dd23dbfbdb8df2e89fcb3fe61fb057703778e084d5a96223a2c2aa2e6510a4208ce0d292077fadee91a5004a16a05e11d5e8519
+  data.tar.gz: 718322b854e9fe1ecd512a8a557940c5930c19de3968472eebcda3dea30746a3ad67286f8953c58f88bf1c5214f882a53cb7c994f7e2507ea6375fa994ad5597

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_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
@@ -113,6 +113,15 @@ module BlackStack
 					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

@@ -61,7 +61,7 @@ module BlackStack
       end
       self.id_client = item.invoice.id_client
       self.id_invoice_item = id_item.nil? ? item.id : id_item
-      self.create_time = payment_time #item.invoice.billing_period_from
+      self.create_time = item.invoice.billing_period_from #payment_time
       self.type = type
       if (type != MOVEMENT_TYPE_ADD_BONUS)
         self.paypal1_amount = item.amount.to_f
@@ -153,15 +153,15 @@ module BlackStack
 		end
 
 		# credits expiration
-		def expire()
+		def expire(registraton_time=nil, desc='Expiration Because Allocation is Renewed')
 			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,10 +171,10 @@ 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'
+			exp.description = desc
 			exp.paypal1_amount = 0
 			exp.bonus_amount = 0
 			exp.amount = amount_to_expire

metadata

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