invoicing_payments_processing 1.1.50 → 1.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1d5cea3030eeebca8abd0f7cded9898a4a08dd5
-  data.tar.gz: cd33004f6351894488bed5230a70f563f4056a93
+  metadata.gz: 1294cf94b7e332d6ef0444b22134b388188e647e
+  data.tar.gz: 6351ac02e50156091d71ad80a3d3966247900d6d
 SHA512:
-  metadata.gz: e031aa9fef8a49e27578d6f8394935a99b65ba3ee7493e181390dd1351c00eab3f7688ccb11453a4de830fbae625b26ff08c1f48044f0d3190a3e669136f60bc
-  data.tar.gz: 60a4e90521009931f1f71123c424b696fceb3aec9bcaf7078bd9a8791b0586739c7caafcc17261421963e76ef2284d2914053b700f5dd529360e17704ff8aa00
+  metadata.gz: e0d92dba76c788bc2bd44012d55df5939290b06eb6559954dd11dcd6901dc30945a781215db9bd3e1b95b6e9b785b7012f72dbde057c2a555cf34f1b8a4c8c63
+  data.tar.gz: c69783fc4a9433009feaaa33feefc279e9c1e4acae1cb2ca70efb18c566d3780c7b43f6c0f341a3821671bdc17ce63e857d0fc7d556b930245abe4eb7801c618

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

@@ -41,6 +41,10 @@ module BlackStack
     # 3) haciendo coincidir el campo payer_email de alguna suscripcion existente con el BlackStack::BufferPayPalNotification.payer_email
     # 3) haciendo coincidir el primer guid en el codigo de invoice, con el id del cliente
     def get_client()
+puts
+puts "BlackStack::BufferPayPalNotification::get_client"
+puts 'debug info:'
+puts "self.invoice:#{self.invoice.to_s}:."
       # obtengo el cliente que machea con este perfil
       c = nil
       if c.nil?
@@ -49,12 +53,24 @@ module BlackStack
           c = i.client if !i.nil? 
         end
       end
+      if c.nil?
+        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
         if cid.guid?
           c = BlackStack::Client.where(:id=>cid).first
         end
       end
+=begin
+# deprecated: debe obtenerse la factura (invoice), y de ahi el cliente,
+# => porque un mismo cuente puede usar su cuenta paypal en varias cuantas 
+# => de usuario.
+#  
       if c.nil?
         c = BlackStack::Client.where(:paypal_email=>self.payer_email).first
         if (c == nil)
@@ -83,6 +99,7 @@ module BlackStack
           c = BlackStack::Client.where(:id=>row[:cid]).first
         end
       end
+=end
       c
     end
   
@@ -338,7 +355,7 @@ module BlackStack
             s.save
             
             # obtengo la factura que se creo con esta suscripcion
-            i = BlackStack::Invoice.where(:id=>b.item_number).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.50
+  version: 1.1.55
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket