invoicing_payments_processing 1.1.43 → 1.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140493643f70cd83e346ae581dc3a8008f32d000
-  data.tar.gz: 80ea68be7f8cf7bacdbb937513a1a6c958b2e3c7
+  metadata.gz: f4e47e64797dda88bd7b65fe1a51b7c6ad5deb71
+  data.tar.gz: df21c11687542c76574d1e0c838232415af5ef34
 SHA512:
-  metadata.gz: 54a7d6e151c012c5b9ce42e40cf4522f9f3f90d375b10781aafbb4e2e377f466cc16fed06dee1df74ff2b87c24a2f1c6547fb3204dded209926fd26bfb7db392
-  data.tar.gz: 0f192df5ad0552d02daf1151dd73a802ec34507a9eb79fe50f3a79fb09f217839c5293ac6ed027ae241af36478686178f2a8058f610ed301b9e88d163d6886bb
+  metadata.gz: c032c751ad2c959c876afe5de690913a9435da9050c17ceca83ddcddf49857938b1805047788b9c8c0a536ef06beefedbfb21ae779b44cc80c67f05372b66ca2
+  data.tar.gz: 76541dcf86cf8bd60fdc61622504f3fd2e672f45f2e7c1b00a94620537f5f95442fafb61154586835d1692983a17f920a9ff9c096c648426640626cfe26b2dc4

data/lib/extend_client_by_invoicing_payments_processing.rb

@@ -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.', 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,12 +624,12 @@ 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()        
+          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()        
 					# si el balance quedo en negativo, entonces aplico otro ajuste
 					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')
+						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
@@ -659,11 +659,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,7 +671,7 @@ 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

data/lib/movement.rb

@@ -15,38 +15,68 @@ module BlackStack
 		MOVEMENT_TYPE_ADJUSTMENT = 6 # it can be recalculated
 		MOVEMENT_TYPE_REFUND_ADJUSTMENT = 7 # it cannot be recalculated
   
-    def typeName()
-      if (self.type==MOVEMENT_TYPE_ADD_PAYMENT)
+    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"
-      elsif (self.type==MOVEMENT_TYPE_ADD_BONUS)
+      elsif (t==MOVEMENT_TYPE_ADD_BONUS)
         return "Bonus"
-      elsif (self.type==MOVEMENT_TYPE_REASSIGN_BALANCE)
+      elsif (t==MOVEMENT_TYPE_REASSIGN_BALANCE)
         return "Reassignation"
-      elsif (self.type==MOVEMENT_TYPE_REFUND_BALANCE)
+      elsif (t==MOVEMENT_TYPE_REFUND_BALANCE)
         return "Refund"
-      elsif (self.type==MOVEMENT_TYPE_CANCELATION)
-        return "Service"
-      elsif (self.type==MOVEMENT_TYPE_EXPIRATION)
+      elsif (t==MOVEMENT_TYPE_CANCELATION)
+        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
+
+    def typeName()
+      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.43
+  version: 1.1.48
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket