invoicing_payments_processing 1.1.41 → 1.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b262508f5bb5461883af0c385256bc6011ed4aa
-  data.tar.gz: f57520e8d02e50ecdd5638d5392680223bb0e77c
+  metadata.gz: 47ac3657106765a3007b2e0c911f2d6a5cd18ce5
+  data.tar.gz: c1bc83fe3b6f7d73131bf19927fa99f8087b9768
 SHA512:
-  metadata.gz: be69442d3cb147180d5a373f3bf1a71e81221de43957440df516751e954a1cdcd859da86685b8e76ab95fada8f63cd43044fec24dbc469b0c2daf33c866353b4
-  data.tar.gz: 9c6ee401ce0094ba5c08f8476a65e10f3720ac0350dcf43cd627f78e0b326897b2cd9c8c8d1d3f283e0a0ce81c9e3f89edc5199467f5e04ca92982a86f9b6802
+  metadata.gz: bf3dbb3323b05a383925f958f20a6402ed4f5ccc17de7d96ffccdac5066149f92a26c6da1357d7769dcadf87a0f1d56f1aad04b3e3664155f68b378e6bc76f08
+  data.tar.gz: cc0474ff9ac7f199036f20161a781a092396dc1deccfadba46f8b181073a9be3f5b1bcfb534a3e7d82442c78352bf403a37b5e5616d726cbbc4efad30d4d3beb

data/lib/bufferpaypalnotification.rb

@@ -236,9 +236,9 @@ module BlackStack
     def self.process(params)
       DB.transaction do
         # verifico que no existe ya una notificacion
-puts
-puts 
-puts "params2:#{params.to_s}:."
+#puts
+#puts 
+#puts "params2:#{params.to_s}:."
         b = BlackStack::BufferPayPalNotification.where(:id=>params['id']).first
         if b.nil?
           # proceso la notificacion
@@ -302,7 +302,7 @@ puts "params2:#{params.to_s}:."
     
           # marco la factura como pagada
           # registro contable - bookkeeping
-          i.getPaidb.create_time) if i.canBePaid?
+          i.getPaid(b.create_time) if i.canBePaid?
     
           # crea una factura para el periodo siguiente (dia, semana, mes, anio)
           j = BlackStack::Invoice.new()

data/lib/invoice.rb

@@ -316,9 +316,9 @@ module BlackStack
       self.status = BlackStack::Invoice::STATUS_PAID
       self.delete_time = nil
       if self.previous.nil? # si es la primer factura de una suscripcion, o no es una suscripcion
-        diff = payment_time - self.billing_period_from 
+        diff = payment_time.to_time - self.billing_period_from.to_time
         self.billing_period_from = payment_time
-        self.billing_period_to += diff
+        self.billing_period_to = self.billing_period_to.to_time + diff
       end
       self.save
 			# expiracion de creditos de la factura anterior

data/lib/movement.rb

@@ -15,38 +15,55 @@ 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.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 "Adjustement"
+      elsif (t==MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+        return "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)
+      elsif (t==MOVEMENT_TYPE_ADD_BONUS)
         return "orange"
-      elsif (self.type==MOVEMENT_TYPE_REASSIGN_BALANCE)
+      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 "green"
+      elsif (t==MOVEMENT_TYPE_REFUND_ADJUSTMENT)
+        return "green"
       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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.41
+  version: 1.1.46
 platform: ruby
 authors:
 - Leandro Daniel Sardi