invoicing_payments_processing 1.1.56 → 1.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf8d14ab09274cca1347069880dd42704276aa6
-  data.tar.gz: fe4f4472a6e138fc6d5763bf1f3d10cfa5dfffa4
+  metadata.gz: 4274c11ebe44a85852da2cd471b1d2ccbd088266
+  data.tar.gz: b6b303e495c9ada9185cb9abc26d270debc6487f
 SHA512:
-  metadata.gz: 0cf1c203a98b89cb889b6f3b81cda659a72ff25eef71b1c00797f7233bfff1908d119dde2bf3bf656395db258de309a96824b1eef205482f5ce7239a67f7a510
-  data.tar.gz: beb36ff2205f605672c8905362feff35c42642f2390c12c95959a9a84bd0da3a698109928f32c0882e1f63b12420ba387e6f3fb3ad3fd6954afb8abf3db0eb66
+  metadata.gz: c144e34feb9b8ae90c4514a27e3fe9d042d1a50ca3ecd7577307e26dd8858c7689cf7dd8d647b8cf28193d33f51d7da8bcf057ffb29a0c9fb336de50dea5cab3
+  data.tar.gz: 187387a945ab22e3e38b1f35a5884b10bcddb50ba5b218b1730dce093ab67b751cb014b887c77bbd66b567515e3ac81390cd3bf6d65a4606994a5300a0862c9d

data/lib/balance.rb

@@ -9,14 +9,14 @@ module BlackStack
   		self.calculate()
   	end
   	
-    def calculate()
-      if !self.up_time.nil?
+    def calculate(use_stat_balance=true)
+      if !self.up_time.nil? || !use_stat_balance
         q = 
         "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
         "from movement with (nolock) " +
         "where id_client='#{self.client.id}' " +
         "and product_code='#{self.product_code}' " +
-  			"and create_time < '#{self.up_time.to_time.to_sql}' "
+  			"and create_time <= '#{self.up_time.to_time.to_sql}' "
       else
         q = 
         "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
@@ -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

@@ -8,8 +8,52 @@ module BlackStack
       one_to_many :customplans, :class=>:'BlackStack::CustomPlan', :key=>:id_client
       one_to_many :movements, :class=>:'BlackStack::Movement', :key=>:id_client
 
+      # how many minutes ago should have updated the table stat_balance with the amount and credits of this client, for each product.
+      def stat_balance_delay_minutes
+        row = DB[
+          "SELECT TOP 1 m.id " +
+          "FROM client c WITH (NOLOCK) " +
+          "JOIN movement m WITH (NOLOCK INDEX(IX_movement__id_client__create_time_desc)) ON ( c.id=m.id_client AND m.create_time > ISNULL(c.last_stat_balance_update_time, '1900-01-01') ) " +
+          "WHERE c.id = '#{self.id}' " +
+          "ORDER BY m.create_time DESC "
+        ].first
+        
+        if row.nil?
+          return 0
+        else
+          return DB["SELECT DATEDIFF(MI, m.create_time, GETDATE()) AS n FROM movement m WITH (NOLOCK) WHERE m.id='#{row[:id]}'"].first[:n]
+        end
+      end
+  
+      # update the table stat_balance with the amount and credits of this client, for each product.
+      def update_stat_balance(product_code=nil)
+          c = self
+          product_descriptors = BlackStack::InvoicingPaymentsProcessing::products_descriptor.clone     
+          product_descriptors.select! { |hprod| hprod[:code] == product_code } if !product_code.nil?
+          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) " + 
+              "where m.id_client='#{c.id}' " +
+              "and m.product_code='#{hprod[:code]}' "
+            ].first
+            credits = row[:credits]
+            amount = row[:amount]
+            row = DB["SELECT * FROM stat_balance WHERE id_client='#{c.id}' AND product_code='#{hprod[:code]}'"].first
+            if row.nil?
+              DB.execute("INSERT INTO stat_balance (id_client, product_code, amount, credits) VALUES ('#{c.id}', '#{hprod[:code]}', #{amount.to_s}, #{credits.to_s})")
+            else
+              DB.execute("UPDATE stat_balance SET amount=#{amount.to_s}, credits=#{credits.to_s} WHERE id_client='#{c.id}' AND product_code='#{hprod[:code]}'")
+            end
+            DB.execute("UPDATE client SET last_stat_balance_update_time=GETDATE() WHERE [id]='#{c.id}'")
+          }
+      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
@@ -18,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/invoice.rb

@@ -85,18 +85,7 @@ module BlackStack
     def allowedToAddRemoveItems?
       return (self.status == STATUS_UNPAID || self.status == nil) && (self.disabled_for_add_remove_items == false || self.disabled_for_add_remove_items == nil)
     end
-  
-    # envia un email transaccional con informacion de facturacion, y pasos a seguir despues del pago
-    def notificationSubject()
-      "We Received Your Payment"
-    end
-  
-    # 
-    def notificationBody()
-      "<p>We received your payment for a total of $#{("%.2f" % self.total()).to_s}.</p>" +
-      "<p>You can find your invoice <a href='#{CS_HOME_PAGE}/member/invoice?iid=#{self.id.to_guid}'><b>here</b></a></p>"
-    end
-  
+    
     # 
     def number()
       self.id.to_guid
@@ -246,7 +235,7 @@ module BlackStack
       end
         
       # return url
-      "#{BlackStack::InvoicingPaymentsProcessing::PAYPAL_ORDERS_URL}/cgi-bin/webscr?" + URI.encode_www_form(values)
+      "#{BlackStack::InvoicingPaymentsProcessing::paypal_orders_url}/cgi-bin/webscr?" + URI.encode_www_form(values)
     end
   
     # retorna true si el estado de la factura sea NULL o UNPAID

data/lib/invoicing_payments_processing.rb

@@ -13,10 +13,19 @@ module BlackStack
     
     # static attributes
     @@paypal_business_email = "sardi.leandro.daniel@gmail.com"
+    @@paypal_orders_url = BlackStack::InvoicingPaymentsProcessing::PAYPAL_ORDERS_URL
+    @@paypal_ipn_listener = "#{BlackStack::Pampa::api_url.to_s}/api1.3/accounting/paypal/notify_new_invoice.json"
+
     @@products_descriptor = []
     @@plans_descriptor = []
-
+    
     # getters & setters
+    def self.set_config(h)
+      @@paypal_business_email = h[:paypal_business_email]
+      @@paypal_orders_url = h[:paypal_orders_url]
+      @@paypal_ipn_listener = h[:paypal_ipn_listener]
+    end
+      
     def self.set_paypal_business_email(email)
       @@paypal_business_email = email
     end # def self.set_paypal_business_email
@@ -25,10 +34,14 @@ module BlackStack
       @@paypal_business_email
     end # def self.set_paypal_business_email
 
-    def self.paypal_ipn_listener()
-      "#{BlackStack::Pampa::api_url.to_s}/api1.3/accounting/paypal/notify_new_invoice.json"
+    def self.paypal_orders_url()
+      @@paypal_orders_url
     end
     
+    def self.paypal_ipn_listener()
+      @@paypal_ipn_listener
+    end
+
 
     def self.set_products(h)
       @@products_descriptor = h

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,19 +191,28 @@ 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
 			self.save
 			# 
-			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
+			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
 			#
 			credits = 0.to_i - self.credits.to_i
 			#
 			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.56
+  version: 1.1.62
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket