invoicing_payments_processing 1.1.52 → 1.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a041204eaed01ab7a77e725d80a2097b8483304c
-  data.tar.gz: 8fb9df52feccc39824f57a4275541f8d40fe300f
+  metadata.gz: ffa569d58e22432b0ad9f214a6e83faef4f424c0
+  data.tar.gz: 2dc2ab0fc91b4b7350985678eefb3865bbba9e2c
 SHA512:
-  metadata.gz: 429e8b18fcea87ba90503ce9080cce97dc26e9814ea3302fdf4aa20d5f1aa2a5839f76b20178d3e876ce2d40e994adba1f8a5b636a3bb088514d7149258a28f6
-  data.tar.gz: 2b1f92d1d307dba79c5db11f15a78fc99c1e457bba6b32d2fcb86db569ff20c6d5aae493753d027897b2a8babd1cf70dfa2e9178feccb89962cfb094e1f10c33
+  metadata.gz: fdd78f088152e5373a9eff70f66d7ab5629dd290349e84e8d9aa7c91ebb0ad3530ab2c97efda541ad0c56de463b932f05fa9f3f9f6f2231009779fe83ac940b7
+  data.tar.gz: 20252301b10406afce4d398ebf1e5bcd9965b985b84afcbd5be6b98519661ad97d7e42bdf9aeebbefa66845babd6197e56f3b4102aa94d66904329beae5acb5f

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.invoice.split(".").last.to_s}' " +
+              "WHERE b.invoice='#{b.invoice}' " +
               "ORDER BY i.create_time DESC "
             ].first
             if row.nil?

data/lib/invoice.rb

@@ -246,7 +246,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.52
+  version: 1.1.58
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket