solidus_mp_dois 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a88c410be92fd087e73fde1a2fb7096b113511d72c916d6762db0f19357e7de
-  data.tar.gz: ed1c805037ecf79773882b8b6ff4ad53c03405247e03917863ba410779eb38b2
+  metadata.gz: 44927e2980c46be7c5cdc7d57931c6e9300d46370f903d265ac906b16c04c094
+  data.tar.gz: 28533f9624bdfc9225f2cc8131445886fa6bbf5865580d4db7f652b8c5ea8fb9
 SHA512:
-  metadata.gz: 11042a45ea47e512b75b289a70d7c31725d328a6b92b1c26b6bae65d8b8def845c45a10da9b99554847f6a03308edaf6105c62b0a03ad53105d192fb7b83357c
-  data.tar.gz: c321ae9dc96de73f30badfa2f4d5c7db6e2893db5929c2aae2747180d6b90a4eafdae12c1af1ad3fd492be4453eb3b2d24f633f5c492a394f6861182d2edeaa1
+  metadata.gz: 7294f4d3c0d25d3c1e82feebe64853a6c520a97c767b7bebd88128aef7be987b4c78594040c16e188d7707e41797776670e91e97fce3e65773804ff10ec0cff0
+  data.tar.gz: 9c3d71ee5ad8ab90e6bd9757402f2d8d96b7803614e6a3360601152cceb3f967baa524c35dd915632a900b9387a54700034182b9bfff4b1552312c7a0cde34b6

data/app/models/solidus_mp_dois/mp_card.rb

@@ -42,22 +42,28 @@ module SolidusMpDois
       payment
     end
 
-    def purchase(payment)
-      return unless payment.source&.external_id
+    def purchase(money, source, options = {})
+      mp_payment = source.retrieve_from_api
       10.times do
-        mp_payment = find_payment(payment.source.external_id)
         break if ["approved", "rejected"].include? mp_payment.status
+        mp_payment = source.retrieve_from_api
+      end
+      sync(source.payments.sole, mp_payment)
+      if mp_payment.status == "approved"
+        source.update(status: "approved")
+        successful_response("Pagamento aprovado", status: source.status, internal_detail: source.internal_details)
+      else
+        failure_response(internal_error(source.internal_details), status: source.status, internal_detail: source.internal_details)
       end
-      mp_payment = find_payment(payment.source.external_id)
-      sync(payment, mp_payment)
     end
 
     def cancel!(payment)
       external_id = payment.source&.external_id
       return unless external_id
       sleep(1)
-      purchase
-      return unless ["checkout", "pending"].include? payment.state
+      mp_payment = find_payment(external_id)
+      sync(payment, mp_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)
@@ -171,6 +177,7 @@ module SolidusMpDois
         last_four_digits: mp_payment.card.last_four_digits
       )
       payment.order.update(email: payment.source.email)
+      payment.update(response_code: mp_payment.id)
       sync(payment, mp_payment)
     end
 
@@ -182,7 +189,7 @@ module SolidusMpDois
         approve_payment(payment, paid_amount)
       elsif mp_payment.status == "approved"
         raise "Payment paid with value less than the created - #{mp_payment.id}"
-      elsif (mp_payment.status == "pending" && mp_payment.status_detail == "pending_challenge")
+      elsif mp_payment.status == "pending" && mp_payment.status_detail == "pending_challenge"
         pend_payment(payment)
       else
         invalid_payment(payment)
@@ -198,6 +205,7 @@ module SolidusMpDois
     end
 
     def invalid_payment payment
+      return false unless ["checkout", "pending"].include? payment.state
       if payment.checkout?
         payment.invalidate!
       else
@@ -211,8 +219,7 @@ module SolidusMpDois
     end
 
     def pend_payment payment
-      payment.pend! unless payment.pending?
-      payment.source.update!(status: payment.state)
+      payment.source.update!(status: "pending")
       error_message = "Pagamento aguardando 3ds"
       handle_payment_error(payment, error_message:)
     end
@@ -245,7 +252,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
@@ -272,6 +280,5 @@ module SolidusMpDois
         full_message
       )
     end
-
   end
 end

data/app/models/solidus_mp_dois/mp_pix.rb

@@ -49,24 +49,29 @@ module SolidusMpDois
       payment
     end
 
-    def purchase(payment)
-      return unless payment.source&.external_id
-      10.times do
-        mp_payment = find_payment(payment.source.external_id)
-        break if ["approved", "rejected"].include? mp_payment.status
+    def purchase(money, source, options = {})
+      mp_payment = source.retrieve_from_api
+      sync(source.payments.sole, mp_payment)
+      if mp_payment.status == "approved"
+        source.update(status: "approved")
+        successful_response("Pagamento aprovado", status: source.status, internal_detail: source.internal_details)
+      else
+        failure_response(internal_error(source.internal_details), status: source.status, internal_detail: source.internal_details)
       end
-      mp_payment = find_payment(payment.source.external_id)
-      sync(payment, mp_payment)
     end
 
     def pix_paid? payment
-      purchase(payment)
+      mp_payment = find_payment(payment.source.external_id)
+      sync(payment, mp_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?
+      mp_payment = find_payment(payment.source.external_id)
+      sync(payment, mp_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 +93,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
@@ -105,6 +111,7 @@ module SolidusMpDois
         qr_code_base64: mp_payment.point_of_interaction.transaction_data.qr_code_base64,
         ticket_url: mp_payment.point_of_interaction.transaction_data.ticket_url
       )
+      payment.update(response_code: mp_payment.id)
       sync(payment, mp_payment)
     end
 
@@ -124,15 +131,15 @@ module SolidusMpDois
     end
 
     def approve_payment payment
-      payment.complete!
+      payment.complete
       payment_source = payment.source
       payment_source.update!(status: payment.state)
-      response = successful_response("Pagamento aprovado", status: payment_source.status, internal_details: payment_source.internal_details)
+      response = successful_response("Pagamento aprovado", status: payment_source.status, internal_detail: payment_source.internal_details)
       payment.log_entries.create(parsed_payment_response_details_with_fallback: response)
     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
@@ -146,14 +153,14 @@ module SolidusMpDois
     end
 
     def pend_payment payment
-      payment.pend! unless payment.pending?
       payment.source.update!(status: payment.state)
       error_message = "Aguardando pagamento"
       handle_payment_error(payment, error_message:)
     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.1.0
 platform: ruby
 authors:
 - Todas Essas Coisas