invoicing_payments_processing 1.1.1 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2495e0d2257ff3cec7862dad5c29aa0ef6f374e
-  data.tar.gz: 684caeb185db9734c8c0977ebceed61b88d3465a
+  metadata.gz: b2298e3b97644c58f77f1bcd072ef70c9d463cd8
+  data.tar.gz: f62b410eae86e45eba4ea590161646c8813519a6
 SHA512:
-  metadata.gz: 89f4f7b34728ae6b95871ee58baf22dee4cf83827797cad575beab80ad46f4808f89be79b845006421e9c31ec51d29e388e8cb60efda0a4e403e67c606ca8559
-  data.tar.gz: b42b1696f7a099a713545ab2b2075dbf0f782336a3218a94f3c3312249e71c6cca4e7952eb6219737d809865be6740f723cef6c351d45be836b491a9637abcb8
+  metadata.gz: aaf6c4b4dd7757ae41975b855340c475538cc2dfa14bc33eaebbb2ae0cc8e1a8f7e48d5aa10a9b0bcb321084ad384954cb2f221db9805eb0889daa99118de1d1
+  data.tar.gz: 35a72098421599217e33bb54b80f35e474cf40819890b6557d786d8750497fd9c6e392cfb5c5dbed1c40a984f875ac9e79d319829ab69a68bdecb11344267c23

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 " +
@@ -230,8 +236,8 @@ module BlackStack
     def self.process(params)
       DB.transaction do
         # verifico que no existe ya una notificacion
-        b = BlackStack::BufferPayPalNotification.where(:id=>params[:id]).first
-        if (b==nil)
+        b = BlackStack::BufferPayPalNotification.where(:id=>params['id']).first
+        if b.nil?
           # proceso la notificacion
           b = BlackStack::BufferPayPalNotification.create(params)
           # inserto la notificacion en la base de datos
@@ -246,7 +252,7 @@ module BlackStack
     
         # varifico que el cliente exista
         c = b.get_client
-        if (c == nil)
+        if c.nil?
           raise "Client not found (payer_email=#{b.payer_email.to_s})."
         end
   
@@ -260,12 +266,12 @@ module BlackStack
           # reviso si la factura ya estaba creada.
           # la primer factura se por adelantado cuando el cliente hace signup, y antes de que se suscriba a paypal, y se le pone un ID igual a primer GUID del campo invoice del IPN
           i = BlackStack::Invoice.where(:id=>iid, :status=>BlackStack::Invoice::STATUS_UNPAID).order(:billing_period_from).first
-          if (i == nil)
+          if i.nil?
             i = BlackStack::Invoice.where(:id=>iid, :status=>nil).order(:billing_period_from).first
           end
           
           # de la segunda factura en adelante, se generan con un ID diferente, pero se le guarda a subscr_id para identificar cuado llegue el pago de esa factura
-          if (i == nil)
+          if i.nil?
             # busco una factura en estado UNPAID que este vinculada a esta suscripcion
             q =
             "SELECT TOP 1 i.id AS iid " + 
@@ -331,10 +337,10 @@ module BlackStack
           #b.txn_type == BlackStack::BufferPayPalNotification::TXN_TYPE_SUBSCRIPTION_SUSPEND ||           # estos IPN traen el campo subscr_id en blanco
           #b.txn_type == BlackStack::BufferPayPalNotification::TXN_TYPE_SUBSCRIPTION_SUSPEND_DUE_MAX_FAILURES   # estos IPN traen el campo subscr_id en blanco
         )
-          s = BlackStack::PayPalSubscription.load(b)
-          if s == nil
+          s = BlackStack::PayPalSubscription.load(b.to_hash)
+          if s.nil?
             # mensaje de error
-            raise 'Subscription Not Found.'
+            raise "Subscription (#{b.subscr_id}) Not Found."
           else
             # registro la suscripcion en la base de datos
             s.active = false
@@ -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/invoice.rb

@@ -536,7 +536,7 @@ module BlackStack
       matched_items = i.items.select { |o| o.amount.to_f == -payment_gross.to_f }
       
       if total < -payment_gross
-        raise "The refund is higher than the invoice amount"
+        raise "The refund is higher than the invoice amount (invoice #{id_invoice}, #{total.to_s}, #{payment_gross.to_s})"
 
       # Si el monto del reembolso es igual al total de la factura, se hace un reembolso total de todos los items. Y termina la funcion.
       # Si el monto de la factura es distinto al moneto del reembolso, entonces se levanta una excepcion.

data/lib/paypalsubscription.rb

@@ -25,7 +25,7 @@ module BlackStack
         s.last_name = params['last_name'].to_s
         s.residence_country = params['residence_country'].to_s
         s.mc_currency = params['mc_currency'].to_s
-        s.item_name = params['item_name'].to_s
+        #s.item_name = params['item_name'].to_s
         s.amount1 = params['amount1'].to_s
         s.business = params['business'].to_s
         s.amount3 = params['amount3'].to_s
@@ -39,7 +39,7 @@ module BlackStack
         s.payer_id = params['payer_id'].to_s
         s.invoice = params['invoice'].to_s
         s.reattempt = params['reattempt'].to_s
-        s.item_number = params['item_number'].to_s
+        #s.item_number = params['item_number'].to_s
         s.subscr_date = params['subscr_date'].to_s
         s.charset = params['charset'].to_s
         s.notify_version = params['notify_version'].to_s
@@ -69,7 +69,7 @@ module BlackStack
       ret['last_name'] = self.last_name 
       ret['residence_country'] = self.residence_country 
       ret['mc_currency'] = self.mc_currency
-      ret['item_name'] = self.item_name
+      #ret['item_name'] = self.item_name
       ret['amount1'] = self.amount1
       ret['business'] = self.business 
       ret['amount3'] = self.amount3 
@@ -83,7 +83,7 @@ module BlackStack
       ret['payer_id'] = self.payer_id
       ret['invoice'] = self.invoice 
       ret['reattempt'] = self.reattempt 
-      ret['item_number'] = self.item_number 
+      #ret['item_number'] = self.item_number 
       ret['subscr_date'] = self.subscr_date 
       ret['charset'] = self.charset
       ret['notify_version'] = self.notify_version 

metadata

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