invoicing_payments_processing 1.1.65 → 1.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c823ecb08c6b06064463c50e00f8a392d31db4
-  data.tar.gz: 019aad76d9430a5e5ca28a960de182dd03956e3a
+  metadata.gz: 03f105a212299b603c5141bf1d86ade1acca82fa
+  data.tar.gz: 43ddbb50a0fcbee4d4ae106a24d8696011924413
 SHA512:
-  metadata.gz: c82e69dc914a4ccf5a84dcaa55ebedb065aef47405bb99b83c9546f6ced35d95b12fe88c0efc608a49c4c721225555282952baa2126b0a1d55df47b912bcfafa
-  data.tar.gz: ec65bbcc0118e99f08299bea1e71b3a663bbd91068a02c2cd14b87db5e91c7ae6de0db5ce9fe7b4dfcbf45c0265dc916ee27958601126ad031623d499035a94b
+  metadata.gz: 1b6ffbe7aa139fe61da64f82afc6655ea19d2212d66045b9d3f64ac3ea7eab39db713380f19edcbb02acb85ac5e1ffc185c2274b8743a0be0c807d8867a90c56
+  data.tar.gz: 90f23ff431761cbf2717c52970168a8856c67cd925a8d52fedd20561eed9495e0ca5eea15816ae5cec6d7be00c98389c4517d49ed5aeb982f85f5b21dad94f5f

data/lib/movement.rb

@@ -137,22 +137,23 @@ module BlackStack
 			# the movment must be a payment or a bonus
 			raise 'Movement must be either a payment or a bonus' if self.type != MOVEMENT_TYPE_ADD_PAYMENT && self.type != MOVEMENT_TYPE_ADD_BONUS
 #puts
+#puts "id:#{self.id.to_guid}:."
 #puts "product_code:#{self.product_code}:."
-
 			# itero los pagos y bonos hechos por este mismo producto, desde el primer dia hasta este movimiento.
 =begin
-			paid = 0
+			paid1 = 0
 			self.client.movements.select { |o| 
 				(o.type == MOVEMENT_TYPE_ADD_PAYMENT || o.type == MOVEMENT_TYPE_ADD_BONUS) &&
         o.credits.to_f < 0 &&
         o.product_code.upcase == self.product_code.upcase &&
         o.create_time.to_time < registraton_time.to_time
       }.sort_by { |o| o.create_time }.each { |o|
-				paid += (0.to_f - o.credits.to_f)
+				paid1 += (0.to_f - o.credits.to_f)
 				break if o.id.to_guid == self.id.to_guid
 			}
+#puts "paid1:#{paid1.to_s}:."
 =end
-      paid = 0 - DB[
+      q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
         "from movement m with (nolock) " +
         "where isnull(m.type, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}) in (#{BlackStack::Movement::MOVEMENT_TYPE_ADD_PAYMENT.to_s}, #{BlackStack::Movement::MOVEMENT_TYPE_ADD_BONUS.to_s}) " +
@@ -160,27 +161,29 @@ module BlackStack
         "and isnull(m.credits,0) < 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
         "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " +
-        "and m.id <> '#{self.id.to_guid}' "
-      ].first[:n]
+        "and m.create_time <= (select m2.create_time from movement m2 with (nolock) where m2.id='#{self.id.to_guid}') "
+      paid = 0 - DB[q].first[:n]
+#puts "q:#{q.to_s}:."
 #puts "paid:#{paid.to_s}:."
-
 =begin
       # calculo los credito para este producto, desde el primer dia; incluyendo cosumo, expiraciones, ajustes.
-      consumed = self.client.movements.select { |o| 
+      consumed1 = self.client.movements.select { |o| 
         o.credits.to_f > 0 &&
         o.product_code.upcase == self.product_code.upcase &&
         o.create_time.to_time < registraton_time.to_time
       }.inject(0) { |sum, o| sum.to_f + o.credits.to_f }.to_f
+#puts "consumed1:#{consumed1.to_s}:."     
 =end
-      consumed = DB[
+      q = 
         "select ISNULL(SUM(ISNULL(m.credits,0)),0) AS n " +
         "from movement m with (nolock) " +
         "where m.id_client='#{self.client.id.to_guid}' " +
         "and isnull(m.credits,0) > 0 " +
         "and upper(isnull(m.product_code, '')) = '#{self.product_code.upcase}' " +
-        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " +
-        "and m.id <> '#{self.id.to_guid}' "
-      ].first[:n]
+        "and m.create_time < '#{registraton_time.to_time.strftime('%Y-%m-%d')}' " #+
+#        "and m.id <> '#{self.id.to_guid}' "
+      consumed = DB[q].first[:n]
+#puts "q:#{q.to_s}:."
 #puts "consumed:#{consumed.to_s}:."     
 
       # calculo los creditos de este movimiento que voy a cancelar

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: invoicing_payments_processing
 version: !ruby/object:Gem::Version
-  version: 1.1.65
+  version: 1.1.66
 platform: ruby
 authors:
 - Leandro Daniel Sardi