invoicing_payments_processing 1.1.51 → 1.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624069067ef76f9401f22e552151eb438e6d82f9
-  data.tar.gz: 3d628ef7f38ef8d9a0810295393df5673ebcb2d4
+  metadata.gz: bbf8d14ab09274cca1347069880dd42704276aa6
+  data.tar.gz: fe4f4472a6e138fc6d5763bf1f3d10cfa5dfffa4
 SHA512:
-  metadata.gz: dc95fb5484a6809daa6df41676dcae565378f4f8cdaf1db0de386a954b0cc5484c458f34205583230120fbfa131fb4a28181383987b89e76ea86bf36a610fbed
-  data.tar.gz: f446b933246ea93c568826197ea3c3f00dc7dc176817cc125e4948038b12e967ec52c783eb95a0418d092a245aaf146daa89d2f3615572fbb389bd90d27600e5
+  metadata.gz: 0cf1c203a98b89cb889b6f3b81cda659a72ff25eef71b1c00797f7233bfff1908d119dde2bf3bf656395db258de309a96824b1eef205482f5ce7239a67f7a510
+  data.tar.gz: beb36ff2205f605672c8905362feff35c42642f2390c12c95959a9a84bd0da3a698109928f32c0882e1f63b12420ba387e6f3fb3ad3fd6954afb8abf3db0eb66

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

@@ -48,19 +48,21 @@ puts "self.invoice:#{self.invoice.to_s}:."
       # obtengo el cliente que machea con este perfil
       c = nil
       if c.nil?
-puts 'a'
         if self.invoice.guid?
-puts 'b'
           i = BlackStack::Invoice.where(:id=>self.invoice).first
           c = i.client if !i.nil? 
         end
       end
       if c.nil?
-puts 'c'
+        iid = self.invoice.split(".").last.to_s
+        if iid.guid?
+          i = BlackStack::Invoice.where(:id=>iid).first
+          c = i.client if !i.nil? 
+        end
+      end
+      if c.nil?
         cid = self.invoice.split(".").first.to_s
-puts "c:#{cid}:."
         if cid.guid?
-puts 'd'
           c = BlackStack::Client.where(:id=>cid).first
         end
       end
@@ -353,7 +355,7 @@ puts 'd'
             s.save
             
             # obtengo la factura que se creo con esta suscripcion
-            i = BlackStack::Invoice.where(:id=>b.invoice).first
+            i = BlackStack::Invoice.where(:id=>b.invoice.split(".").last.to_s).first
             
             # vinculo esta suscripcion a la factura que la genero, y a todas las facturas siguientes
             i.set_subscription(s)

metadata

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