invoicing_payments_processing 1.1.20 → 1.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ebbf923439f8f516edcd98efc8f51baf0560b47
-  data.tar.gz: fa76d9b89823901681c0488879fc0a6023c8b40c
+  metadata.gz: 767d1959445a933872a088246a96ce835a7aa1c1
+  data.tar.gz: a6d3dc28e802706eb1360daf4c5c16940e6a49c7
 SHA512:
-  metadata.gz: 1ad3c562d56f170ce688bb4e6dd23dbfbdb8df2e89fcb3fe61fb057703778e084d5a96223a2c2aa2e6510a4208ce0d292077fadee91a5004a16a05e11d5e8519
-  data.tar.gz: 718322b854e9fe1ecd512a8a557940c5930c19de3968472eebcda3dea30746a3ad67286f8953c58f88bf1c5214f882a53cb7c994f7e2507ea6375fa994ad5597
+  metadata.gz: 5ce9bd86e5bc541e6887b48c86c1086b854b0640a3e106881241a4285d0b660251c6987d9157ad803b60b865924fa65417a876f789bba45cb6475f190831011b
+  data.tar.gz: 06758180d0eaa6004a541fe5eb89a13b9590357acdbe1ccb45b3d198f9cfb097002ff664420dca02594672eb53133fa4d84746d6879769e83f6d0be9085d211e

data/lib/bufferpaypalnotification.rb

@@ -331,6 +331,12 @@ module BlackStack
             s.id_client = c.id
             s.active = true
             s.save
+            
+            # obtengo la factura que se creo con esta suscripcion
+            i = BlackStack::Invoice.where(:id=>b.item_number).first
+            
+            # vinculo esta suscripcion a la factura que la genero, y a todas las facturas siguientes
+            i.set_subscription(s)
           end
           
         elsif (
@@ -384,22 +390,7 @@ module BlackStack
             k = BlackStack::Invoice.where(:id=>row[:id]).first
             
             # creo la factura por el reembolso
-            i = BlackStack::Invoice.new()
-            i.id = guid()
-            i.id_client = c.id
-            i.create_time = now()
-            i.disabled_for_trial_ssm = c.disabled_for_trial_ssm
-            i.id_buffer_paypal_notification = b.id
-            i.status = BlackStack::Invoice::STATUS_REFUNDED
-            i.billing_period_from = b.create_time
-            i.billing_period_to = b.create_time
-            i.paypal_url = nil
-            i.disabled_for_add_remove_items = true
-            i.save()
-            
-            # parseo el reeembolso - creo el registro contable
-            i.setup_refund(payment_gross, k.id)
-  
+            k.refund(payment_gross)  
           end
         else
           # unknown

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -162,13 +162,65 @@ module BlackStack
         if from_time > to_time
           raise "From time must be earlier than To time"
         end
-        if to_time.prev_year > from_time
-          raise "There time frame cannot be longer than 1 year."
-        end
+        #if to_time.prev_year > from_time
+        #  raise "The time frame cannot be longer than 1 year."
+        #end
         to_time += 1
-        ds = BlackStack::Movement.where(:id_client => self.id, :product_code=>product_code) if !product_code.nil?
-        ds = BlackStack::Movement.where(:id_client => self.id) if product_code.nil?
-        ds.where("create_time >= ? and create_time <= ?", from_time, to_time)
+=begin
+      :id => movement.id,
+      :id_client => movement.id_client,
+      :product_code => movement.product_code,
+      :create_time => movement.create_time,
+      :type => movement.type.to_i,
+      :description => movement.description,
+      :paypal1_amount => movement.paypal1_amount.to_f,
+      :bonus_amount => movement.bonus_amount.to_f,
+      :amount => movement.amount.to_f,
+      :credits => movement.credits.to_f,
+      :profits_amount => movement.profits_amount.to_f,
+      :expiration_time => movement.expiration_time,
+      :expiration_description => movement.expiration_time.nil? ? '-' : ((movement.expiration_time - Time.now()).to_f / 60.to_f).to_i.to_time_spent 
+=end  
+        q =
+        "SELECT " +
+        " m.id_client, " +
+        " YEAR(m.create_time) AS creation_year, " + 
+        " MONTH(m.create_time) AS creation_month, " + 
+        " DAY(m.create_time) AS creation_day, " +
+        " YEAR(m.expiration_time) AS expiration_year, " + 
+        " MONTH(m.expiration_time) AS expiration_month, " + 
+        " DAY(m.expiration_time) AS expiration_day, " +
+        " m.type, " +
+        " m.product_code, " +
+        " CAST(m.description AS VARCHAR(500)) AS description, " +
+        " CAST(m.expiration_description AS VARCHAR(500)) AS expiration_description, " +
+        " SUM(ISNULL(m.paypal1_amount,0)) AS paypal1_amount, " + 
+        " SUM(ISNULL(m.bonus_amount,0)) AS bonus_amount, " + 
+        " SUM(ISNULL(m.amount,0)) AS amount, " + 
+        " SUM(ISNULL(m.credits,0)) AS credits, " + 
+        " SUM(ISNULL(m.profits_amount,0)) AS profits_amount " + 
+        "FROM movement m WITH (NOLOCK) " +
+        "WHERE m.id_client = '#{self.id}' "
+        
+        q += "AND m.product_code = '#{product_code}' " if !product_code.nil?
+        
+        q +=
+        "AND create_time >= '#{from_time.to_sql}' " +
+        "AND create_time <= '#{to_time.to_sql}' " +
+        "GROUP BY " +
+        " m.id_client, " + 
+        " YEAR(m.create_time), " + 
+        " MONTH(m.create_time), " + 
+        " DAY(m.create_time), " +
+        " YEAR(m.expiration_time), " + 
+        " MONTH(m.expiration_time), " + 
+        " DAY(m.expiration_time), " +
+        " m.type, " +
+        " m.product_code, " +
+        " CAST(m.description AS VARCHAR(500)), " +
+        " CAST(m.expiration_description AS VARCHAR(500)) "
+
+        DB[q].all
       end
 
       # 

data/lib/invoice.rb

@@ -10,10 +10,16 @@ module BlackStack
   
     many_to_one :buffer_paypal_notification, :class=>:'BlackStack::BufferPayPalNotification', :key=>:id_buffer_paypal_notification
     many_to_one :client, :class=>:'BlackStack::Client', :key=>:id_client
-    many_to_one :paypal_subscription, :class=>:'BlackStack::PayPalSubscription', :key=>:id_paypal_subscription
+    #many_to_one :paypal_subscription, :class=>:'BlackStack::PayPalSubscription', :key=>:id_paypal_subscription
 		many_to_one :previous, :class=>:'BlackStack::Invoice', :key=>:id_previous_invoice
     one_to_many :items, :class=>:'BlackStack::InvoiceItem', :key=>:id_invoice
   
+    def paypal_subscription
+      return nil if self.subscr_id.nil?
+      return nil if self.subscr_id.to_s.size == 0
+      return BlackStack::PayPalSubscription.where(:code=>self.subscr_id.to_s).first
+    end
+  
     # compara 2 planes, y retorna TRUE si ambos pueden coexistir en una misma facutra, con un mismo enlace de PayPal
     def self.compatibility?(h, i)
       return false if h[:type]!=i[:type]
@@ -56,7 +62,19 @@ module BlackStack
         raise "Unknown Invoice Status (#{status.to_s})"
       end
     end
-  
+
+    #
+    def set_subscription(s)
+      self.subscr_id = s.subscr_id
+      self.save
+      # aplico la mismam modificacion a todas las factuas que le siguieron a esta
+      BlackStack::Invoice.where(:id_previous_invoice=>self.id).all { |j|
+        j.set_subscription(s)
+        DB.disconnect
+        GC.start
+      }
+    end
+
     # 
     def deserve_trial?
       return self.disabled_for_trial_ssm == false || self.disabled_for_trial_ssm == nil
@@ -234,6 +252,15 @@ module BlackStack
     def canBePaid?
       self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID
     end
+
+    # retorna true si el estado de la factura sea NULL o UNPAID
+    def canBeDeleted?
+      if self.paypal_subscription.nil?
+        return self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID
+      else # !self.paypal_subscription.nil?
+        return (self.status == nil || self.status == BlackStack::Invoice::STATUS_UNPAID) && !self.paypal_subscription.active
+      end # if self.paypal_subscription.nil?
+    end
   
     # actualiza el registro en la tabla invoice segun los parametros. 
     # en este caso la factura se genera antes del pago.
@@ -286,6 +313,7 @@ module BlackStack
       end
       # marco la factura como pagada
       self.status = BlackStack::Invoice::STATUS_PAID
+      self.delete_time = nil
       self.save
 			# expiracion de creditos de la factura anterior
 			i = self.previous
@@ -313,19 +341,21 @@ module BlackStack
 				# registro el pago
         BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Invoice Payment", payment_time, item.id).save()
 				# agrego los bonos de este plan
-				plan[:bonus_plans].each { |h|
-					plan_bonus = BlackStack::InvoicingPaymentsProcessing.plan_descriptor(h[:item_number])
-					raise "bonus plan not found" if plan_bonus.nil?					
-					bonus = BlackStack::InvoiceItem.new
-					bonus.id = guid()
-					bonus.id_invoice = self.id
-					bonus.product_code = plan_bonus[:product_code]
-					bonus.unit_price = 0
-					bonus.units = plan_bonus[:credits]
-					bonus.amount = 0
-					bonus.item_number = plan_bonus[:item_number]
-					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, 'Payment Bonus', payment_time, item.id).save()
-				}
+				if !plan[:bonus_plans].nil?
+  				plan[:bonus_plans].each { |h|
+  					plan_bonus = BlackStack::InvoicingPaymentsProcessing.plan_descriptor(h[:item_number])
+  					raise "bonus plan not found" if plan_bonus.nil?					
+  					bonus = BlackStack::InvoiceItem.new
+  					bonus.id = guid()
+  					bonus.id_invoice = self.id
+  					bonus.product_code = plan_bonus[:product_code]
+  					bonus.unit_price = 0
+  					bonus.units = plan_bonus[:credits] * item.number_of_packages # agrego los creditos del bono, multiplicado por la cantiad de paquetes 
+  					bonus.amount = 0
+  					bonus.item_number = plan_bonus[:item_number]
+  					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, 'Payment Bonus', payment_time, item.id).save()
+  				}
+        end # if !plan[:bonus_plans].nil?
         #
         DB.disconnect
         GC.start
@@ -371,62 +401,52 @@ module BlackStack
         end
       end
     end
-  
+
     # configura la factura, segun el importe que pagara el cliente, la configuracion del plan en el descriptor h, y si el clietne merece un trial o no 
-    def create_item(item_number, n=1, validate_items_compatibility=true)    
-      #
-      deserve_trial = self.deserve_trial?
-  
-      # busco el primer item de esta factura, si es que existe
-      item0 = self.items.sort_by {|obj| obj.create_time}.first
-  
-      # numero de facturas previas a esta factura
-      subs = BlackStack::PayPalSubscription.where(:subscr_id=>self.subscr_id).first
-      nSubscriptionInvoices = 0 if subs.nil?
-      nSubscriptionInvoices = subs.invoices.count if !subs.nil?
-  
+    def create_item(item_number, n=1, validate_items_compatibility=true)      
+      prev1 = self.previous
+      prev2 = prev1.nil? ? nil : prev1.previous
+
       # encuentro el descriptor del plan
       # el descriptor del plan tambien es necesario para la llamada a paypal_link 
       h = self.client.plans.select { |j| j[:item_number].to_s == item_number.to_s }.first
   
       # mapeo variables
-      c = self.client
       amount = 0.to_f
       unit_price = 0.to_f
       units = 0.to_i
-  
-      # decido si se trata de una suscripcion    
-      isSubscription = false
-      isSubscription = true if h[:type] == "S"
-  
+    
       # le seteo la fecha de hoy
       self.billing_period_from = now()
-  
-      # si es una suscripcion, y
+#puts
+#puts
       # si el plan tiene un primer trial, y
-      # es primer pago de esta suscripcion, entonces:
-      # => se trata del primer pago por trial de esta suscripcion
-      if (isSubscription && h[:trial_fee] != nil && deserve_trial)
+      # es la primer factura, entonces:
+      # => se trata del primer pago por trial
+      if h[:trial_fee] != nil && prev1.nil? && !self.disabled_for_trial_ssm
+#puts 'a'
         units = h[:trial_credits].to_i
         unit_price = h[:trial_fee].to_f / h[:trial_credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:trial_period].to_s}, +#{h[:trial_units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
   
-      # si es una suscripcion, y
       # si el plan tiene un segundo trial, y
-      # es segundo pago de esta suscripcion, entonces:
-      # => se trata del segundo pago por trial de esta suscripcion
-      elsif (isSubscription && h[:trial2_fee] != nil && nSubscriptionInvoices == 1)
+      # es la segunda factura, entonces:
+      # => se trata del segundo pago por segundo trial
+      elsif h[:trial2_fee] != nil && !prev1.nil? && prev2.nil?
+#puts 'b'
         units = h[:trial2_credits].to_i
         unit_price = h[:trial2_fee].to_f / h[:trial2_credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:trial2_period].to_s}, +#{h[:trial2_units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
   
       # si el plan tiene un fee, y
-      elsif (isSubscription && h[:fee].to_f != nil)
+      elsif h[:fee].to_f != nil && h[:type] == BlackStack::InvoicingPaymentsProcessing::BasePlan::PAYMENT_SUBSCRIPTION
+#puts 'c'
         units = n.to_i * h[:credits].to_i
         unit_price = h[:fee].to_f / h[:credits].to_f
         billing_period_to = DB["SELECT DATEADD(#{h[:period].to_s}, +#{h[:units].to_s}, '#{self.billing_period_from.to_s}') AS [now]"].map(:now)[0].to_s
   
-      elsif (!isSubscription && h[:fee].to_f != nil)
+      elsif h[:fee].to_f != nil && h[:type] == BlackStack::InvoicingPaymentsProcessing::BasePlan::PAYMENT_PAY_AS_YOU_GO
+#puts 'd'
         units = n.to_i * h[:credits].to_i
         unit_price = h[:fee].to_f / h[:credits].to_f
         billing_period_to = billing_period_from
@@ -435,7 +455,8 @@ module BlackStack
         raise "Plan is specified wrong"
                 
       end
-  
+
+
       #
       amount = units.to_f * unit_price.to_f
   
@@ -521,9 +542,9 @@ module BlackStack
 			self.id_previous_invoice = i.id
       self.subscr_id = i.subscr_id 
       self.disabled_for_add_remove_items = true
-      
+
       i.items.each { |t| 
-        self.add_item(t.item_number)
+        self.add_item(t.item_number, t.number_of_packages)
         #
         DB.disconnect
         GC.start 
@@ -657,6 +678,28 @@ module BlackStack
       DB.disconnect
       GC.start
     end # def setup_refund
-    
+
+    def refund(amount)
+      c = self.client
+      # creo la factura por el reembolso
+      j = BlackStack::Invoice.new()
+      j.id = guid()
+      j.id_client = c.id
+      j.create_time = now()
+      j.disabled_for_trial_ssm = c.disabled_for_trial_ssm
+      j.id_buffer_paypal_notification = nil
+      j.status = BlackStack::Invoice::STATUS_REFUNDED
+      j.billing_period_from = self.billing_period_from
+      j.billing_period_to = self.billing_period_to
+      j.paypal_url = nil
+      j.disabled_for_add_remove_items = true
+      j.subscr_id = self.subscr_id
+      j.id_previous_invoice = self.id
+      j.save()
+            
+      # parseo el reeembolso - creo el registro contable
+      j.setup_refund(amount, self.id)
+    end # refund
+
   end # class Invoice
 end # module BlackStack 

data/lib/invoiceitem.rb

@@ -7,5 +7,15 @@ module BlackStack
       BlackStack::InvoicingPaymentsProcessing::plan_descriptor(self.item_number)
     end
 
+    # Returns the number of plans ordered in this item 
+    def number_of_packages()
+      plan = BlackStack::InvoicingPaymentsProcessing.plan_descriptor(self.item_number)
+      if self.amount.to_f == plan[:trial_fee].to_f || self.amount.to_f == plan[:trial2_fee].to_f
+        return 1.to_i 
+      else
+        return (self.units.to_f / plan[:credits].to_f).to_i
+      end
+    end
+
   end # class LocalInvoiceItem
 end # module BlackStack

data/lib/paypalsubscription.rb

@@ -116,7 +116,7 @@ module BlackStack
         DB[
         "SELECT DISTINCT i.id " +
         "FROM invoice i WITH (NOLOCK) " + 
-        "JOIN buffer_paypal_notification b WITH (NOLOCK) ON (b.id=i.id_buffer_paypal_notification AND b.subscr_id='#{self.subscr_id.to_s}') "
+        "WHERE i.subscr_id='#{self.subscr_id.to_s}' "
         ].all { |row|
           a << BlackStack::Invoice.where(:id=>row[:id]).first
           # release resources 

metadata

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