invoicing_payments_processing 1.1.45 → 1.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96b6b82545bec9e8ad6436566f423590c675896b
-  data.tar.gz: 14c8e6fd2576d65d28d3bb47a464374140ed2b28
+  metadata.gz: d1d5cea3030eeebca8abd0f7cded9898a4a08dd5
+  data.tar.gz: cd33004f6351894488bed5230a70f563f4056a93
 SHA512:
-  metadata.gz: 7d9d89e381365acb4bcde6021370f8486c3ede55d82821b8d4af7ded903bee26c008a7515cc2793dbd8a7c4f750921918f5964860d76e702ca49e033e163a58c
-  data.tar.gz: 15048cf0e56f42e72eeab5ba7a6f6ec75f40f6c3fbe8631d983eb496918e92ce27986094a488ed1e0a0e9de668c5439ed523340dfce7be03d48082f14f9fb538
+  metadata.gz: e031aa9fef8a49e27578d6f8394935a99b65ba3ee7493e181390dd1351c00eab3f7688ccb11453a4de830fbae625b26ff08c1f48044f0d3190a3e669136f60bc
+  data.tar.gz: 60a4e90521009931f1f71123c424b696fceb3aec9bcaf7078bd9a8791b0586739c7caafcc17261421963e76ef2284d2914053b700f5dd529360e17704ff8aa00

data/lib/bufferpaypalnotification.rb

@@ -316,10 +316,12 @@ module BlackStack
           j.next(i)
           
           # creo el milestone con todo el credito pendiente que tiene esta subscripcion
+=begin
+# deprecated  
           buff_payment = i.buffer_paypal_notification
           buff_signup = BlackStack::BufferPayPalNotification.where(:txn_type=>"subscr_signup", :subscr_id=>buff_payment.subscr_id).first
           subs = buff_signup == nil ? nil : BlackStack::PayPalSubscription.where(:id_buffer_paypal_notification => buff_signup.id).first
-              
+=end
         elsif (b.txn_type == BlackStack::BufferPayPalNotification::TXN_TYPE_SUBSCRIPTION_SIGNUP)
           # crear un registro en la tabla paypal_subscriptions
           if BlackStack::PayPalSubscription.load(b.to_hash) != nil

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -35,7 +35,7 @@ module BlackStack
 				total_amount = 0.to_f - BlackStack::Balance.new(self.id, product_code).amount.to_f
 				sleep(2) # delay to ensure the time of the bonus movement will be later than the time of the consumption movement
 				if total_credits < 0
-					self.adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded.')
+					self.adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded (1).')
 				end
 				# recaculate amounts in both consumptions and expirations - CANCELADO - Se debe hacer offline
 				#self.recalculate(product_code) 
@@ -97,7 +97,7 @@ module BlackStack
 
 				self.movements.select { |o| 
 					o.product_code.upcase == product_code.upcase
-				}.sort_by { |o| o.create_time }.each { |o|
+				}.sort_by { |o| [o.create_time, o.type] }.each { |o| # se ordena por o.create_time, pero tmabien por o.type para procesar primero los pagos y bonos
 					#if o.credits.to_f < 0 # payment or bonus
 #					if o.credits.to_f > 0 && ( o.type==BlackStack::Movement::MOVEMENT_TYPE_CANCELATION || o.type==BlackStack::Movement::MOVEMENT_TYPE_EXPIRATION ) # consumption or expiration
 					# consumption or expiration or bonus
@@ -118,7 +118,7 @@ module BlackStack
 					total_credits = credits_paid
 					total_amount = amount_paid
 					if total_credits < 0
-						self.adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded.', BlackStack::Movement::MOVEMENT_TYPE_ADJUSTMENT, o.create_time)
+						self. adjustment(product_code, total_amount, total_credits, 'Adjustment Because Quota Has Been Exceeded (2).', BlackStack::Movement::MOVEMENT_TYPE_ADJUSTMENT, o.create_time)
 						amount_paid = 0.to_f
 						credits_paid = 0.to_i
 					end

data/lib/invoice.rb

@@ -328,7 +328,7 @@ module BlackStack
 					# 
 					BlackStack::Movement.where(:id_invoice_item => item.id).all { |mov|
 						# 
-						mov.expire(self.billing_period_from) if mov.expiration_on_next_payment == true
+						mov.expire(self.billing_period_from, "Expiration of <a href='/member/record?rid=#{mov.id.to_guid}'>record:#{mov.id.to_guid}</a> because subscription renewal.") if mov.expiration_on_next_payment == true
 						#
 						DB.disconnect
 						GC.start
@@ -345,7 +345,7 @@ module BlackStack
 				# obtengo descriptor del producto
 				prod = BlackStack::InvoicingPaymentsProcessing.product_descriptor(plan[:product_code])
 				# registro el pago
-        BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Invoice Payment", payment_time, item.id).save()
+        BlackStack::Movement.new().parse(item, BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT, "Payment of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
 				# agrego los bonos de este plan
 				if !plan[:bonus_plans].nil?
   				plan[:bonus_plans].each { |h|
@@ -359,7 +359,7 @@ module BlackStack
   					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()
+  					BlackStack::Movement.new().parse(bonus, BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS, "Bonus from the <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", payment_time, item.id).save()
   				}
         end # if !plan[:bonus_plans].nil?
         #
@@ -624,21 +624,47 @@ module BlackStack
           item1.detail = u.detail.to_s
           item1.description = u.description.to_s
           item1.save()
-          BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, 'Full Refund').save()        
-					# si el balance quedo en negativo, entonces aplico otro ajuste
+          # hago el reembolso de este item
+          # si el balance quedo en negativo, entonces aplico otro ajuste
+          BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Full Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
 					net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, u.product_code.to_s).amount.to_f
 					net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, u.product_code.to_s).credits.to_f
-					if net_amount < 0 && net_credits < 0
-						adjust = self.client.adjustment(u.product_code.to_s, net_amount, net_credits, 'Adjustment for Negative Balance after Refund')
+					if net_amount <= 0 && net_credits < 0
+						adjust = self.client.adjustment(u.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
 						adjust.id_invoice_item = item1.id
 						adjust.save			
 					end # if net_amount < 0
+          # hago el reembolso de cada bono de este item
+          # si el balance quedo en negativo, entonces aplico otro ajuste
+          h[:bonus_plans].each { |bonus|
+            i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
+            j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
+            item2 = BlackStack::InvoiceItem.new()
+            item2.id = guid()
+            item2.id_invoice = self.id
+            item2.unit_price = 0
+            item2.units = -i[:credits]
+            item2.amount = 0
+            item2.product_code = i[:product_code].to_s
+            item2.item_number = i[:item_number].to_s
+            item2.detail = 'Bonus Refund'
+            item2.description = j[:description].to_s
+            item2.save()
+            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+            net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
+            net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
+            if net_amount <= 0 && net_credits < 0
+              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+              adjust.id_invoice_item = item1.id
+              adjust.save     
+            end # if net_amount < 0            
+          }
           # release resources
           DB.disconnect
           GC.start
         } # i.items.each { |u|
       # reembolso parcial de una factura con un unico item
-      elsif i.items.size == 1
+      elsif i.items.size == 1 # and we know that: total < -payment_gross, so it is a partial refund
         t = i.items.first
 				# 
         amount = -payment_gross.to_f
@@ -659,11 +685,11 @@ module BlackStack
         item1.detail = t.detail.to_s
         item1.description = t.description.to_s
         item1.save()
-        BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, 'Partial Refund').save()
+        BlackStack::Movement.new().parse(item1, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Partial Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()
 				# agrego un ajuste por el redondeo a una cantidad entera de creditos
 				if float_units.to_f != units.to_f
 					adjustment_amount = unit_price.to_f * (units.to_f - float_units.to_f)
-					adjust = self.client.adjustment(t.product_code.to_s, adjustment_amount, 0, 'Adjustment for Partial Refund', BlackStack::Movement::MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+					adjust = self.client.adjustment(t.product_code.to_s, adjustment_amount, 0, "Adjustment for Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.", BlackStack::Movement::MOVEMENT_TYPE_REFUND_ADJUSTMENT)
 					adjust.id_invoice_item = item1.id
 					adjust.save
 				end
@@ -671,13 +697,43 @@ module BlackStack
 				net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, t.product_code.to_s).amount.to_f
 				net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, t.product_code.to_s).credits.to_f
 				if net_amount < 0 && net_credits < 0
-					adjust = self.client.adjustment(t.product_code.to_s, net_amount, net_credits, 'Adjustment for Negative Balance')
+					adjust = self.client.adjustment(t.product_code.to_s, net_amount, net_credits, "Adjustment for Negative Balance After Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
 					adjust.id_invoice_item = item1.id
 					adjust.save			
 				end # if net_amount < 0
+				
 				# recalculo todos los consumos y expiraciones - CANCELADO - Debe hacerse offline
-				# self.client.recalculate(t.product_code.to_s)
-      else
+				# => self.client.recalculate(t.product_code.to_s)
+				
+        # si el cliente se quedo sin saldo luego del reembolso parcial 
+        if net_amount <= 0
+          # hago el reembolso de cada bono de este item
+          # si el balance quedo en negativo, entonces aplico otro ajuste
+          h[:bonus_plans].each { |bonus|
+            i = BlackStack::InvoicingPaymentsProcessing::plans_descriptor.select { |obj| obj[:item_number] == bonus[:item_number] }.first
+            j = BlackStack::InvoicingPaymentsProcessing::products_descriptor.select { |obj| obj[:code] == i[:product_code] }.first
+            item2 = BlackStack::InvoiceItem.new()
+            item2.id = guid()
+            item2.id_invoice = self.id
+            item2.unit_price = 0
+            item2.units = -i[:credits]
+            item2.amount = 0
+            item2.product_code = i[:product_code].to_s
+            item2.item_number = i[:item_number].to_s
+            item2.detail = 'Bonus Refund'
+            item2.description = j[:description].to_s
+            item2.save()
+            BlackStack::Movement.new().parse(item2, BlackStack::Movement::MOVEMENT_TYPE_REFUND_BALANCE, "Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.").save()        
+            net_amount = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).amount.to_f
+            net_credits = 0.to_f - BlackStack::Balance.new(self.client.id, i[:product_code].to_s).credits.to_f
+            if net_amount <= 0 && net_credits < 0
+              adjust = self.client.adjustment(i[:product_code].to_s, net_amount, net_credits, "Adjustment for Negative Balance After Bonus Refund of <a href='/member/invoice?iid=#{self.id.to_guid}'>invoice:#{self.id.to_guid}</a>.")
+              adjust.id_invoice_item = item1.id
+              adjust.save     
+            end # if net_amount < 0            
+          }
+        end
+      else # we know that: i.items.size > 1 && total < -payment_gross
         raise "Refund amount is not matching with the invoice total (#{total.to_s}) and the invoice has more than 1 item."
       end
       # release resources

data/lib/movement.rb

@@ -15,6 +15,19 @@ module BlackStack
 		MOVEMENT_TYPE_ADJUSTMENT = 6 # it can be recalculated
 		MOVEMENT_TYPE_REFUND_ADJUSTMENT = 7 # it cannot be recalculated
   
+    def self.types()
+      [
+        MOVEMENT_TYPE_ADD_PAYMENT,
+        MOVEMENT_TYPE_ADD_BONUS,
+        MOVEMENT_TYPE_REASSIGN_BALANCE,
+        MOVEMENT_TYPE_REFUND_BALANCE,
+        MOVEMENT_TYPE_CANCELATION,
+        MOVEMENT_TYPE_EXPIRATION,
+        MOVEMENT_TYPE_ADJUSTMENT,
+        MOVEMENT_TYPE_REFUND_ADJUSTMENT
+      ]
+    end
+  
     def self.typeName(t)
       if (t==MOVEMENT_TYPE_ADD_PAYMENT)
         return "Payment"
@@ -28,6 +41,10 @@ module BlackStack
         return "Consumption"
       elsif (t==MOVEMENT_TYPE_EXPIRATION)
         return "Expiration"
+      elsif (t==MOVEMENT_TYPE_ADJUSTMENT)
+        return "Credit Adjustement"
+      elsif (t==MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+        return "Refund Adjustement"
       end
       '(unknown)'
     end
@@ -36,22 +53,30 @@ module BlackStack
       BlackStack::Movement::typeName(self.type)
     end
   
-    def typeColorName()
-      if (self.type==MOVEMENT_TYPE_ADD_PAYMENT)
+    def self.typeColorName(t)
+      if (t==MOVEMENT_TYPE_ADD_PAYMENT)
         return "green"
-      elsif (self.type==MOVEMENT_TYPE_ADD_BONUS)
-        return "orange"
-      elsif (self.type==MOVEMENT_TYPE_REASSIGN_BALANCE)
+      elsif (t==MOVEMENT_TYPE_ADD_BONUS)
+        return "green"
+      elsif (t==MOVEMENT_TYPE_REASSIGN_BALANCE)
         return "black"
-      elsif (self.type==MOVEMENT_TYPE_REFUND_BALANCE)
+      elsif (t==MOVEMENT_TYPE_REFUND_BALANCE)
         return "red"
-      elsif (self.type==MOVEMENT_TYPE_CANCELATION)
+      elsif (t==MOVEMENT_TYPE_CANCELATION)
         return "blue"
-      elsif (self.type==MOVEMENT_TYPE_EXPIRATION)
+      elsif (t==MOVEMENT_TYPE_EXPIRATION)
         return "blue"
+      elsif (t==MOVEMENT_TYPE_ADJUSTMENT)
+        return "orange"
+      elsif (t==MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+        return "orange"
       end
     end
-    
+
+    def typeName()
+      BlackStack::Movement::typeColorName(self.type)
+    end
+
     # actualiza el registro con los valores del item de una factura
     # type may be either MOVEMENT_TYPE_ADD_PAYMENT or MOVEMENT_TYPE_ADD_BONUS or MOVEMENT_TYPE_REFUND_BALANCE, but not other value
     def parse(item, type=MOVEMENT_TYPE_ADD_PAYMENT, description='n/a', payment_time=nil, id_item=nil)

metadata

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