invoicing_payments_processing 1.1.42 → 1.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e99d9449019c41677d5240d9a75a4168b7bb07a
-  data.tar.gz: 196f3334037f74d2e7bacd0840e494836e36ab75
+  metadata.gz: f3f824917a87ee4d35bcc8033c4cf6697d9aaef5
+  data.tar.gz: d07e483979caf36ea1b09a7c947dbd56eca8f8be
 SHA512:
-  metadata.gz: 55f30ded4f49409106d514b75857d27e4495ac5db0397372c14be7c7aeccec2f27c0e495d37674b83d938c05879439cb3ab948d496ac129bdb281e4d109da970
-  data.tar.gz: 71328dd57a681c5d2aa9e9fd4b43e5c83fef1d35e43f5e03d27491700b7e2da19104d7275b6f12061a70addbe863248281fb0f6e57e11c7a9636b5b2512fca34
+  metadata.gz: aca60368b308f9f06cc8b5ca4e72f257db428b709652f8112cc404a07609b7bb07e704ce02caf66b1ba29659dab19616d32e80648338d0ffa45e85400ace6777
+  data.tar.gz: 7a281e9f26c5111adae3c82ed3424a82e2d6b8287e409ec1d2809fadb219ab58c2d888eaf0ef7925595f4167e2c283a43c8f25255986dc82ae9348c0bcbf4f46

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

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,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 "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.42
+  version: 1.1.47
 platform: ruby
 authors:
 - Leandro Daniel Sardi