invoicing_payments_processing 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1420b9edf46fb1b4e92f6d43b28a2544d0dc6cb9
-  data.tar.gz: f9280d1bae724cd557ffa4af2e156f3ff83dc2fb
+  metadata.gz: 151f5edd003ddd2e88cedc7222761de649a78202
+  data.tar.gz: 7b1345402c7424ec9c7b9dd9350c5d4a8438cdb8
 SHA512:
-  metadata.gz: 9e8a27a63d3f7e41ee6d6609ce5eb161e97c787bf021ac79c89d3c2afabc10d0deb5331580f5776acc04064c62cdf6961ec1dd5156bed034b229f79958701f1c
-  data.tar.gz: b31408e6e7f5a1c0ddffdc757de682f4751c9944215b9c8eac31eccba4117c3703b97e40afc9433531cd37cb01e2f30b8f52963cd0752a8fd59ef0c1de807c68
+  metadata.gz: 568e022a591e4272e4f6ab92928a16a901f7dc6eaf6d186ad223c4fb34a0a3f10feec25442b032f196166b0251ac78de5070435dcae34c5537990c98907a1970
+  data.tar.gz: f734ddee71a72789691e231d6e79aae60d5bc4aa30da2f9b2d4e93e5e5747b4ecc7ad44f0e809db9b6f5eaaec86b637440f0fc9751fd3a74421ee864624d2e54

data/lib/bufferpaypalnotification.rb

@@ -43,13 +43,19 @@ module BlackStack
     def get_client()
       # obtengo el cliente que machea con este perfil
       c = nil
-      if (c == nil)
+      if c.nil?
+        if self.invoice.guid?
+          i = BlackStack::Invoice.where(:id=>self.invoice).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
-      if (c == nil)
+      if c.nil?
         c = BlackStack::Client.where(:paypal_email=>self.payer_email).first
         if (c == nil)
           u = User.where(:email=>self.payer_email).first
@@ -58,13 +64,13 @@ module BlackStack
           end
         end
       end
-      if (c == nil)
+      if c.nil?
         s = BlackStack::PayPalSubscription.where(:payer_email=>self.payer_email).first
         if (s!=nil)
           c = s.client
         end
       end
-      if (c == nil)
+      if c.nil?
         # obtengo el cliente - poco elegante
         q = 
         "SELECT TOP 1 i.id_client AS cid " +
@@ -363,6 +369,19 @@ module BlackStack
               raise 'Invoice already exists.'
             end
             
+            # obtengo la ultima factura pagada, vinculada a un IPN con el mismo codigo invoice
+            row = DB[
+              "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}' " +
+              "ORDER BY i.create_time DESC "
+            ].first
+            if row.nil?
+              raise 'Previous Paid Invoice not found.'
+            end
+            k = BlackStack::Invoice.where(:id=>row[:id]).first
+            
             # creo la factura por el reembolso
             i = BlackStack::Invoice.new()
             i.id = guid()
@@ -378,7 +397,7 @@ module BlackStack
             i.save()
             
             # parseo el reeembolso - creo el registro contable
-            i.setup_refund(payment_gross, iid)
+            i.setup_refund(payment_gross, k.id)
   
           end
         else

data/lib/movement.rb

@@ -99,17 +99,16 @@ module BlackStack
       end
       
       # calculo cuantos creditos tiene este cliente
-      x = 0.to_f - BlackStack::Balance.new(m.client.id, p[:code]).credits.to_f
+      #x = 0.to_f - BlackStack::Balance.new(m.client.id, p[:code]).credits.to_f
+      # calculo los creditos de este movimiento que voy a cancelar
+      x = 0.to_f - m.credits.to_f
 
-      # calculo el credito adquirido luego de este movimiento que voy a cancelar
+      # calculo el credito consumido luego de este movimiento que voy a cancelar
       y = m.client.movements.select { |o| 
-        (
-          o.type == BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT || 
-          o.type == BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS
-        ) &&
+        o.credits.to_f > 0 &&
         o.product_code.upcase == p[:code].upcase && 
         o.create_time > m.create_time 
-      }.inject(0) { |sum, o| sum.to_f + (0.to_f - o.credits.to_f) }.to_f
+      }.inject(0) { |sum, o| sum.to_f + o.credits.to_f }.to_f
 
       # calculo el # de creditos no usados de este movimiento que ha expirado
       z = x-y>0 ? x-y : 0 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket