invoicing_payments_processing 1.1.54 → 1.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed522b59c5d199f4304b6f8f0a67d53402653d0e
-  data.tar.gz: b0e657864ba63e02298a5b867ca7b01c2093c721
+  metadata.gz: aa3e73d17b05d75e69025d7364460ee6045a46cb
+  data.tar.gz: 2579bdc5324a9288e41fa92c9f2f84048f0c27f2
 SHA512:
-  metadata.gz: 1de7badcf5dc5d5f8065564b57369417a8510086de4f16904cfdd886f83d33ffdc59f26574adf0b352cec4f7b0d402bd46f716a6523799be81df2a9294e9e4f5
-  data.tar.gz: da28758cc4d633a73fb9abf63cfe743a3f5dc4da7c0a633a2831e3c6f433d7ee1df225f70487afe23a0cfc7ecdee10dd475884d1cd8b1c86416287804384212d
+  metadata.gz: e3138f3c9a4721c504eba4376923717cf50af2382204020150d10fc480c3a6e536e6c09d7d56457d999aac9bcecf4b42388f2b686d91b5eb502291a4cbfed494
+  data.tar.gz: e3ef838af52b803608c1349a3e31b682afefb846716570e7fe38ee8070f73f96aaeecbf665b7b8d8641ae405b41859d60ccd43d1624c585ed5d2f6baa50e9074

data/lib/balance.rb

@@ -9,15 +9,22 @@ module BlackStack
   		self.calculate()
   	end
   	
-    def calculate()
-      q = 
-      "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
-      "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?
-
+    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}' "
+      else
+        q = 
+        "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount, sum(credits) as credits " +
+        "from stat_balance x with (nolock) " +
+        "where x.id_client='#{self.client.id}' " +
+        "and x.product_code='#{self.product_code}' "
+      end
+      
       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,6 +8,48 @@ 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)
 				# create the consumtion

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

@@ -190,8 +190,10 @@ module BlackStack
 			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)
+			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
 			#

metadata

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