solidus_mp_dois 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a88c410be92fd087e73fde1a2fb7096b113511d72c916d6762db0f19357e7de
-  data.tar.gz: ed1c805037ecf79773882b8b6ff4ad53c03405247e03917863ba410779eb38b2
+  metadata.gz: 7f944c94fa2dbc985c792ea59bfaf4ab33c3098e9d5748f7c0334471824a05be
+  data.tar.gz: 45b1e92e97fcbb11914329e9656a182bfe1e38b38efb7675b3439c427b567c55
 SHA512:
-  metadata.gz: 11042a45ea47e512b75b289a70d7c31725d328a6b92b1c26b6bae65d8b8def845c45a10da9b99554847f6a03308edaf6105c62b0a03ad53105d192fb7b83357c
-  data.tar.gz: c321ae9dc96de73f30badfa2f4d5c7db6e2893db5929c2aae2747180d6b90a4eafdae12c1af1ad3fd492be4453eb3b2d24f633f5c492a394f6861182d2edeaa1
+  metadata.gz: 3a22b218df37bc0964da1a40658308ee191dc782f69d93d8e0810a46423ea8e2280e767ae6993b984c56d9a9be3a2986e5dc047fc056ce2d380184cfe0e2e84e
+  data.tar.gz: 05f8ddff9d64c36398380d2b181bc93f91a219eed747d9efa52c6c845f6cf842dd871f3887bcb21466efc13baead9600d2ef10cc615ab641e0605c996d36828b

data/app/models/solidus_mp_dois/mp_card.rb

@@ -57,7 +57,7 @@ module SolidusMpDois
       return unless external_id
       sleep(1)
       purchase
-      return unless ["checkout", "pending"].include? payment.state
+      return false unless ["checkout", "pending"].include? payment.state
 
       mp_payment = mp_client.update_payment(payment_id: external_id, status: "cancelled")
       sync(payment, mp_payment)
@@ -198,6 +198,7 @@ module SolidusMpDois
     end
 
     def invalid_payment payment
+      return false unless ["checkout", "pending"].include? payment.state
       if payment.checkout?
         payment.invalidate!
       else
@@ -245,7 +246,8 @@ module SolidusMpDois
     end
 
     def invalidate_valid_payments order
-      order.payments.valid.each do |payment|
+      available_payments = order.payments.where(state: ["checkout", "pending"])
+      available_payments.each do |payment|
         payment.source.void!
       end
     end

data/app/models/solidus_mp_dois/mp_pix.rb

@@ -59,14 +59,16 @@ module SolidusMpDois
       sync(payment, mp_payment)
     end
 
-    def pix_paid? payment
+    def paid? payment
       purchase(payment)
       payment.completed?
     end
 
     def invalidate_payment payment
       external_id = payment.source&.external_id
-      return if external_id.nil? || pix_paid?(payment)
+      return false if external_id.nil?
+      purchase(payment)
+      return false unless ["checkout", "pending"].include? payment.state
       mp_payment = mp_client.update_payment(payment_id: external_id, status: "cancelled")
       sync(payment, mp_payment)
     end
@@ -88,7 +90,8 @@ module SolidusMpDois
     end
 
     def find_existing_payment(order)
-      pix_payments = order.payments.valid.where(source_type: "SolidusMpDois::PixSource")
+      available_payments = order.payments.where(state: ["checkout", "pending"])
+      pix_payments = available_payments.where(source_type: "SolidusMpDois::PixSource")
       raise "More than one valid payment for #{order.number}" if pix_payments.count > 1
       pix_payments.first
     end
@@ -132,7 +135,7 @@ module SolidusMpDois
     end
 
     def invalid_payment payment
-      return if payment.invalid? || payment.failed?
+      return false unless ["checkout", "pending"].include? payment.state
       if payment.checkout?
         payment.invalidate!
       else
@@ -153,7 +156,8 @@ module SolidusMpDois
     end
 
     def invalidate_valid_payments order, existing_payment_id
-      order.payments.valid.where.not(id: existing_payment_id).each do |payment|
+      available_payments = order.payments.where(state: ["checkout", "pending"])
+      available_payments.where.not(id: existing_payment_id).each do |payment|
         payment.source.void!
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_mp_dois
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Todas Essas Coisas