invoicing_payments_processing 1.1.53 → 1.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d01ccb52a62ca320e4f63599f6a47439a2b575f4
-  data.tar.gz: 61eaaf30982a66d6be91a0d428b507a482e1ffde
+  metadata.gz: 18728dea987541ecbbed7da0945b9699d258d626
+  data.tar.gz: 324265ee99c3bd89c570527250b9d5b6b7a805fd
 SHA512:
-  metadata.gz: 6b48123c4a1704235ba27b2b54c22a8e9da3322d9544836edf9ae72acf24d1a17b148153e7d0f407263e8053884f243540b96f4810fab8d18be1d2afc7065450
-  data.tar.gz: 1cf2f01c03a663ee63e747a8733813a1e19fffb515ed6a1b4c0e729e41582af3e9cab4b3945bea5da6adf3b896682639f1f5f6df3ca5c1fc95e09e0d28b054bb
+  metadata.gz: 7d430dad7ca8f9dabc486352d1a169b56ef994bf515784d851b70e0a556baa495b52060d3905affc26c98a0f4ee3e9be0f630c7ba48c0e616a791181fb223116
+  data.tar.gz: 58b118d7c14d2ad05c4025996fc8b56f94e17624d00fe087998b648486e261468e60582c6b8dd85145d8b0f327317f3f9be14b53afeaa040ee951a88a6222152

data/lib/balance.rb

@@ -10,14 +10,21 @@ module BlackStack
   	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?
-
+      if !self.up_time.nil?
+        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/bufferpaypalnotification.rb

@@ -403,7 +403,7 @@ puts "self.invoice:#{self.invoice.to_s}:."
               "SELECT TOP 1 i.id " +
               "FROM buffer_paypal_notification b " +
               "JOIN invoice i ON ( b.id=i.id_buffer_paypal_notification AND i.status=#{BlackStack::Invoice::STATUS_PAID.to_s} ) " +
-              "WHERE b.invoice='#{b.invoice.split(".").last.to_s}' " +
+              "WHERE b.invoice='#{b.invoice}' " +
               "ORDER BY i.create_time DESC "
             ].first
             if row.nil?

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        
+          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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.53
+  version: 1.1.59
 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