invoicing_payments_processing 1.1.80 → 1.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09a21bacef2cf167afd383956f5e60118528b1c
-  data.tar.gz: f326089a00630e7eb3e91c4f06272c154794fa81
+  metadata.gz: d3c8a07288e91aab43e702ef271aff19c6aea13d
+  data.tar.gz: 25af23560fbbbe4f534dff69f497760e9a96da72
 SHA512:
-  metadata.gz: 4631bac0fcc2b95a5babc0c65cadfea9efbd291c3ecaf56e03a58562c418e153e5c4163e6a49bb076b58f1d6610795c63768f0d29595b362f3982870694438d0
-  data.tar.gz: c8eb03127d5d5c9544bb6d9479dcec76b0d6a801aeea8a5217b64db6e82ee4a9b5058d4984b9a48e4c5480492b3165f791b0449d89c0588c878eecc5202437dd
+  metadata.gz: faeeefe7f6d2421305f39334613c030f42c5bec240249e04886c6392d4e95fc706a95db621284a150eb8b349b383d293790130cea9d8e5aa593bda74c240a7c3
+  data.tar.gz: bef0624e6681b9ceb017f6ce1ee0ba64004bac928a41916a9fbe85291b7367a8f51d1ce27da30f1a3e9a0f75a0d0afa6a3a64ae2020b12a0169cc8d5543ce374

data/lib/balance.rb

@@ -10,24 +10,41 @@ module BlackStack
   	end
   	
     def calculate(use_stat_balance=true)
+      q1 = nil
+      q2 = nil
+
       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) " +
+        q1 = 
+        "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount " +
+        "from movement with (nolock index(IX_movement__id_client__product_code__create_time__amount)) " +
+        "where id_client='#{self.client.id}' " +
+        "and product_code='#{self.product_code}' " +
+  			"and create_time <= '#{self.up_time.to_time.to_sql}' "
+
+        q2 = 
+        "select sum(credits) as credits " +
+        "from movement with (nolock index(IX_movement__id_client__product_code__create_time__credits)) " +
         "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) " +
+        q1 = 
+        "select cast(sum(cast(amount as numeric(18,12))) as numeric(18,6)) as amount " +
+        "from stat_balance x with (nolock index(IX_movement__id_client__product_code__create_time__amount)) " +
+        "where x.id_client='#{self.client.id}' " +
+        "and x.product_code='#{self.product_code}' "
+
+        q2 = 
+        "select sum(credits) as credits " +
+        "from stat_balance x with (nolock index(IX_movement__id_client__product_code__create_time__credits)) " +
         "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
+      row1 = DB[q1].first
+      row2 = DB[q2].first
+      self.amount = row1[:amount].to_f
+      self.credits = row2[:credits].to_f
       # libero recursos
       DB.disconnect
       GC.start

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -60,15 +60,22 @@ module BlackStack
           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]
+            row1 = DB["
+              select isnull(sum(isnull(m.credits,0)),0) as credits  
+              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
+            row2 = DB["
+              select 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 = row1[:credits]
+            amount = row2[: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})")

data/lib/movement.rb

@@ -176,7 +176,7 @@ module BlackStack
 =end
       q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
-        "from movement m with (nolock index(IX_movement__type__id_client__product_code__create_time_desc__credits_asc)) " +
+        "from movement m with (nolock index(IX_movement__id_client__product_code__create_time_desc__credits_asc)) " +
         "where m.id_client='#{self.client.id.to_guid}' " +
         "and isnull(m.credits,0) > 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.80
+  version: 1.1.83
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket