spree-paypal_platform 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963337c6ac7e3f41915fa04edad216c40f021ae69957c16c60a6d503596b9d5f
-  data.tar.gz: fab2c096c3f02d758cf1e90d1019e06184601fb74d9176ea0b52e8ce3a6f52ed
+  metadata.gz: 3b451e198e6215856080bd410bfdcec699ad02835c638a02d7a33ee933f21f27
+  data.tar.gz: 183989e5effcb3cc16461b8f7e0401a284d630d546e6304aa8d65730f3bce7be
 SHA512:
-  metadata.gz: b003f28202908c38acf93ab895835bae013d893da184c451df9e2b3ca98ee70d8c8c8dcf4f7497abe1dc62cf00760414a607a036282d4af9675111ac8b73ba40
-  data.tar.gz: 605032f390401d9aaf2de1a33d54a6555ddb6b56c274c594836889a36eeb4bcd21d9299a4342398b7b012b53f812806bf73ac7710b24916a8b8d9de4dc82973c
+  metadata.gz: 6a6c113d998c9538d07ebd9a6b483a37f1c26fa3502257dfa2855c94990ab307d8889a32f132cea4e29a0064812b9cbff221ae665ae0c06c9f101454cb5605b0
+  data.tar.gz: 2dd052e117e6aff4facf62c72f63a0f00bedb7f0b7a466db880d49b48efba99bc058d9c3f1022a4cdbd71f552d73117edb0dd4ef7bfe9e1a14a53361d1ff6759

data/CHANGELOG.md

@@ -1,51 +1,25 @@
 # Changelog
 
-All notable changes to this project are documented in this file.
+## 5.1.3
 
-## 5.1.1
-
-One migration: create `spree_paypal_platform_orders`. Removed the leftover
-checkout-table / STI rewrite / rename migrations from 5.1.0.
-
-## 5.1.0
-
-Full internal rename to `Spree::PaypalPlatform`.
+Remove the unused `apple_pay_domain` preference. Domain registration is
+in the PayPal dashboard, not this field.
 
-- Require path is `spree/paypal_platform`. There is no `spree/paypal_checkout`
-  require and no `Spree::PaypalCheckout` constant.
-- Engine name, table prefix, payment-session STI, admin partials, and
-  `method_type` are all `spree_paypal_platform`.
-- Migration renames `spree_paypal_checkout_orders` →
-  `spree_paypal_platform_orders` and rewrites remaining STI type strings.
-- Install generator: `bin/rails g spree:paypal_platform:install`.
+## 5.1.2
 
-## 5.0.1
+- Completing a session GETs the PayPal order first and skips capture when
+  it is already `COMPLETED` (Apple Pay `confirmOrder`).
+- `CreateSource` accepts an empty `payment_source.paypal` hash from the
+  create-order echo so checkout can finish after PayPal has taken payment.
 
-Published name is **`spree-paypal_platform`**. RubyGems rejected
-`spree-paypal_platform` as too similar to the official
-`spree_paypal_platform`. Require path and constants are unchanged
-(`spree/paypal_platform` → `Spree::PaypalPlatform`).
-
-## 5.0.0
-
-First Aypex release. Intended published name `spree-paypal_platform` was
-never accepted by RubyGems; see 5.0.1.
-
-### Audit follow-up
+## 5.1.1
 
-- Do not log PayPal request bodies; client logging is WARN without bodies/headers.
-- Webhook verify now checks HTTP status and is specced for signed and unsigned paths.
-- `#authorize` raises `NotImplementedError`.
-- `#void` / `#credit` / `#cancel` specs restored; `CaptureOrder` no longer uses the `money` gem.
-- Unique index on `spree_paypal_platform_orders.paypal_id`.
-- Payment sources share `#display_payment_info`; OAuth/token HTTP responses must be 2xx.
+First release.
 
-- Port of the `aypex-io/spree_paypal_platform` `tongkat-fitness` fork into
-  `Spree::PaypalPlatform`, published as `spree-paypal_platform`.
-- Store API v3 payment sessions only. No `/api/v2/storefront/paypal_orders`.
-- Official `paypal-server-sdk` `~> 2.3`.
-- Apple Pay and Card Fields recorded as payment sources on the same gateway.
-- Keeps the VAT `AMOUNT_MISMATCH` guard (additional tax only) and
-  `SET_PROVIDED_ADDRESS` storefront-owned shipping.
-- STI alias + rewrite migration for hosts coming from
-  `SpreePaypalCheckout::Gateway`.
+- `Spree::PaypalPlatform::Gateway` for Spree 5.6+
+- PayPal wallet, Apple Pay, and Card Fields on one payment method
+- Store API v3 payment sessions
+- `SET_PROVIDED_ADDRESS` so the storefront owns shipping
+- VAT-safe amount breakdown (`additional_tax_total` only)
+- Official `paypal-server-sdk` `~> 2.3`
+- One migration: create `spree_paypal_platform_orders`

data/README.md

@@ -49,7 +49,6 @@ Then add a **PayPal** payment method in admin and set:
 | `webhook_secret` | PayPal webhook ID (used as the verify-webhook `webhook_id`) |
 | `test_mode` | Sandbox vs live |
 | `enable_apple_pay` | Advertise Apple Pay to headless storefronts (default on) |
-| `apple_pay_domain` | Domain registered with PayPal for Apple Pay |
 
 Webhook URL is the standard Spree v3 payments webhook:
 

data/app/models/spree/paypal_platform/gateway/payment_sessions.rb

@@ -89,11 +89,15 @@ module Spree
         #
         def complete_payment_session(payment_session:, **_unused)
           paypal_order_id = payment_session.external_id
-
-          response = client.orders.capture_order({
-                                                   'id' => paypal_order_id,
-                                                   'prefer' => 'return=representation'
-                                                 })
+          lookup = { 'id' => paypal_order_id, 'prefer' => 'return=representation' }
+
+          fetched = client.orders.get_order(lookup)
+          response =
+            if fetched.data.status == 'COMPLETED'
+              fetched
+            else
+              client.orders.capture_order(lookup)
+            end
 
           payment_session.update!(external_data: response.data.as_json)
 

data/app/models/spree/paypal_platform/gateway.rb

@@ -23,7 +23,6 @@ module Spree
       preference :webhook_secret, :string
       preference :test_mode, :boolean, default: true
       preference :enable_apple_pay, :boolean, default: true
-      preference :apple_pay_domain, :string
 
       validates :preferred_client_id, :preferred_client_secret, presence: true
 

data/app/services/spree/paypal_platform/create_source.rb

@@ -27,7 +27,7 @@ module Spree
       # @raise [ArgumentError] when the payload has no known wallet key
       #
       def call
-        if paypal_payment_source[:paypal].present?
+        if paypal_payment_source.key?(:paypal)
           create_paypal_source
         elsif paypal_payment_source[:apple_pay].present?
           create_apple_pay_source
@@ -43,10 +43,11 @@ module Spree
       attr_reader :gateway, :user, :paypal_payment_source, :order
 
       def create_paypal_source
-        wallet = paypal_payment_source[:paypal]
+        wallet = paypal_payment_source[:paypal] || {}
+        profile_id = wallet[:account_id].presence || "paypal-#{order&.number || 'guest'}"
         source = PaymentSources::Paypal.find_or_initialize_by(
           payment_method: gateway,
-          gateway_payment_profile_id: wallet[:account_id]
+          gateway_payment_profile_id: profile_id
         )
         source.update!(
           user: user,

data/app/views/spree/admin/payment_methods/configuration_guides/_spree_paypal_platform.html.erb

@@ -11,6 +11,6 @@
     <strong>Apple Pay</strong> is a funding source of this same PayPal method, not a second payment method.
     Register every storefront domain that will show the Apple Pay button in the
     <%= external_link_to 'PayPal Apple Pay domain registration', 'https://developer.paypal.com/docs/checkout/apm/apple-pay/', class: 'alert-link' %>
-    dashboard, then set <em>Apple pay domain</em> below. The button only renders in Safari over HTTPS.
+    dashboard. The button only renders in Safari over HTTPS.
   </p>
 </div>

data/lib/spree/paypal_platform/version.rb

@@ -3,6 +3,6 @@
 module Spree
   module PaypalPlatform
     # Major version tracks Spree's major version: 5.x supports Spree 5.x.
-    VERSION = '5.1.1'
+    VERSION = '5.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree-paypal_platform
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.3
 platform: ruby
 authors:
 - Aypex