solidus_mp 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98311a30487ce46ab6c068e28f4b7cf5874c8635f393d931d98796b0755a74cc
-  data.tar.gz: 5a86d4a580f33dcfd37cb4c5a6ee1e762618fb0c8527b80df6ced2f8a185d48e
+  metadata.gz: d914f60f118cbe299729a75b093004c8ae369e45dcb8bdd9a8a9b3e3a32ee534
+  data.tar.gz: ec0f3475cfb1077bfebfd7db60a192c9ad8f4ef577a3f19970b4ce54fd978fac
 SHA512:
-  metadata.gz: 04b6d07ee9538a2ccb43a20d78d63633dd63972dc078a87f475da0e8523c9f3fa0aad8938b3549d9905f0dddfe10063bfb3e1688a939963736f240521eb00e2f
-  data.tar.gz: 6fbde1e5c38ced49261a77c7d1f23de10d69e225bd834dbc2deedf1b7b70c5f0d668fbecb7e161b8b243a404e64e5bf0d50b499666145915d0d06de35e691b82
+  metadata.gz: c9bc1695e9528fe3d22ad3699a13f5427fa9b8d6ba4ae71d9db01613047fb176aeb67ce56ea993d6d9a9acad338c73a19dc90c4066102bfef5c2071b54e3bcf5
+  data.tar.gz: dd4411061a19f070d61914f965fd6337867b47f802b7702ee8cd440f1caf2fa4a973adea21f907dac6e87e730be6cff3ef7aa5ad864960cdd1047336c15c2cba

data/app/models/solidus_mp/mp_pix.rb

@@ -1,6 +1,5 @@
 module SolidusMp
   class MpPix < Spree::PaymentMethod
-
     preference :public_key, :string
     preference :access_token, :string
     preference :callback_url, :string
@@ -37,15 +36,43 @@ module SolidusMp
 
     def create_mp_payment payment
       MpApi.configuration.access_token = preferences[:access_token]
-      identification_type = payment.source.tax_id.length > 14 ? "CNPJ" : "CPF"
-      MpApi::Payment.new(payer_email: payment.source.email, payer_identification_type: identification_type, payment_method: "pix", payer_identification_number: payment.source.tax_id, amount: payment.amount.to_f, statement_descriptor: payment.source.statement_descriptor, description: payment.source.description, items: payment.source.items).create
+      identification_type = (payment.source.tax_id.length > 14) ? "CNPJ" : "CPF"
+      mp_payment = MpApi::Payment.new(
+        payer_email: payment.source.email,
+        payer_identification_type: identification_type,
+        payment_method: "pix",
+        payer_identification_number: payment.source.tax_id,
+        amount: payment.amount.to_f,
+        statement_descriptor: payment.source.statement_descriptor,
+        description: payment.source.description,
+        items: payment.source.items
+      ).create
+      payment.response_code = mp_payment.id
+      payment.source.assign_attributes(
+        external_id: mp_payment.id,
+        qr_code: mp_payment.qr_code,
+        qr_code_base64: mp_payment.qr_code_base_64,
+        status: mp_payment.status,
+        error_message: mp_payment.internal_error
+      )
+      payment.log_entries.new(parsed_payment_response_details_with_fallback: failure_response(mp_payment.internal_error)) if mp_payment.internal_error
+      mp_payment
     end
 
     def cancel_payment payment
+      return false unless payment && payment.source.external_id
+      MpApi.configuration.access_token = preferences[:access_token]
+      mp_payment = MpApi::Payment.find_by_id(payment.source.external_id)
+      return false if mp_payment.pix_paid?
+      mp_payment.invalidate_pix!
+      true
+    end
+
+    def find_payment external_id
       MpApi.configuration.access_token = preferences[:access_token]
-      MpApi::Payment.find_by_id(payment.source.external_id).update(status: "cancelled")
+      MpApi::Payment.find_by_id(external_id)
     end
-    
+
     def authorize(money, source, options = {})
       purchase(money, source, options)
     end
@@ -64,15 +91,11 @@ module SolidusMp
     def should_skip_processing?(source)
       MpApi.configuration.access_token = preferences[:access_token]
       mp_payment = MpApi::Payment.find_by_id(source.external_id)
-      if mp_payment.status == "approved"
-        false
-      else
-        true
-      end
+      !(mp_payment.status == "approved")
     end
 
     def partial_name
-      'mercado_pago_pix'
+      "mercado_pago_pix"
     end
 
     def successful_response message, transaction_id
@@ -90,6 +113,5 @@ module SolidusMp
         message
       )
     end
-
   end
 end

data/app/models/solidus_mp/pix_payment_source.rb

@@ -1,9 +1,7 @@
 module SolidusMp
-
   class PixPaymentSource < Spree::PaymentSource
-
     def actions
-      %w(capture void credit)
+      %w[capture void credit]
     end
 
     def can_capture?(payment)
@@ -19,9 +17,15 @@ module SolidusMp
     end
 
     def usable?
-      status == "pending"
+      status == "pending" && external_id.present? && expiration_date&.future?
     end
 
-  end
+    def expired?
+      expiration_date.past?
+    end
 
+    def retrieve_from_api
+      payment_method.find_payment(external_id)
+    end
+  end
 end

data/db/migrate/20241113191603_add_expiration_date_and_amount_on_pix_payment_source.rb

@@ -0,0 +1,6 @@
+class AddExpirationDateAndAmountOnPixPaymentSource < ActiveRecord::Migration[7.1]
+  def change
+    add_column :solidus_mp_pix_payment_sources, :expiration_date, :datetime
+    add_column :solidus_mp_pix_payment_sources, :amount, :decimal, precision: 10, scale: 2
+  end
+end

data/lib/solidus_mp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMp
-  VERSION = '1.1.3'
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_mp
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - caio
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -122,6 +122,7 @@ files:
 - db/migrate/20240715124647_create_solidus_mp_customers.rb
 - db/migrate/20240715125709_create_solidus_mp_cards.rb
 - db/migrate/20240715131005_add_saved_card_column_to_card_source.rb
+- db/migrate/20241113191603_add_expiration_date_and_amount_on_pix_payment_source.rb
 - lib/generators/solidus_mp/install/install_generator.rb
 - lib/generators/solidus_mp/install/templates/app/javascript/controllers/credit_card_controller.js
 - lib/generators/solidus_mp/install/templates/app/javascript/controllers/three_ds_controller.js
@@ -148,7 +149,7 @@ metadata:
   homepage_uri: https://github.com/CaioGarcia1/solidus_mp
   source_code_uri: https://github.com/CaioGarcia1/solidus_mp
   changelog_uri: https://github.com/CaioGarcia1/solidus_mp
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -166,8 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.5.10
+signing_key:
 specification_version: 4
 summary: ''
 test_files: