spree_paypal_checkout 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ea623a18b515a57ba0e47e4fd37d5d3955ec2ec442e0326e6056886170c983
-  data.tar.gz: a84039bdefd5d9d87f7808cff367b479c99955258a2d6e77d4a1e1369eada89b
+  metadata.gz: e93096fd5f88baa021c6d077b03ec743036f7193f00410cee544c3c2662ab559
+  data.tar.gz: 354f5e005d1aabcab8709de1bef7f4298986bf3dbcbbb6089d096ede2f77bde3
 SHA512:
-  metadata.gz: 5b50dad9a0f25df4a1578d0a7fff3ed36867464b57a4ae8c527ac836da0bc1d11fb3748b9c9f3b06421b0a86fe0dc82559badc7458b384c77c1b99da2d4670d0
-  data.tar.gz: d2f820a70e8a65a7f80f86cb73e5a4f56d370dd81279ba85493f1296ebc2313202c345c7c009090dc3582daaa4813245573201d49b2b0cc5fdb1e85a29672b98
+  metadata.gz: 7df72e3c2201e90ae60a61ab37c30b84d00b074743ef63be0f6eb90ac60b454ff2dac778fb20a44730a56d5464ee42b6660e22cbb146ad85d3b3f7937d706776
+  data.tar.gz: a9552304abcfdf6ffd8899514c81efab45c90506cf6541f3004e96c4c212bffa08e08d3ed2118791ee3dff01c85894456f644e22a170773bcab9faf79cc6e714

data/app/javascript/spree_paypal_checkout/controllers/checkout_paypal_controller.js

@@ -1,6 +1,6 @@
 import { Controller } from '@hotwired/stimulus'
-import showFlashMessage from 'spree/storefront/helpers/show_flash_message'
 import { post, put } from '@rails/request.js'
+import showFlashMessage from 'spree/storefront/helpers/show_flash_message'
 
 export default class extends Controller {
   static values = {
@@ -16,21 +16,35 @@ export default class extends Controller {
   }
 
   connect() {
-    this.initPayPal();
-
     this.submitTarget = document.querySelector('#checkout-payment-submit')
     this.billingAddressCheckbox = document.querySelector('#order_use_shipping')
     this.billingAddressForm = document.querySelector('form.edit_order')
 
     // hide submit button
     this.submitTarget.style.display = 'none'
+
+    try {
+      this.initPayPal();
+    } catch (error) {
+      console.error('Failed to initialize PayPal:', error);
+      this.showPayPalError();
+    }
   }
 
   disconnect() {
     this.submitTarget.style.display = 'block'
   }
 
+  showPayPalError() {
+    showFlashMessage('Failed to load PayPal. Please contact support or try a different payment method.', 'error');
+  }
+
   initPayPal() {
+    // Check if PayPal SDK is loaded
+    if (typeof window.paypal === 'undefined') {
+      throw new Error('PayPal SDK not loaded');
+    }
+
     const paypalButtons = window.paypal.Buttons({
       style: {
         shape: "rect",
@@ -68,7 +82,7 @@ export default class extends Controller {
           return String(orderId);
         } else {
           console.error('Failed to create PayPal order:', response.error);
-          showFlashMessage('error', `Sorry, your transaction could not be processed...<br><br>${response.error}`);
+          showFlashMessage(`Sorry, your transaction could not be processed...<br><br>${response.error}`, 'error');
           throw new Error(response.error || 'Failed to create PayPal order');
         }
       },
@@ -83,17 +97,21 @@ export default class extends Controller {
         );
 
         if (response.ok) {
-          window.location.href = this.returnUrlValue; 
+          window.location.href = this.returnUrlValue;
         } else {
           console.error('Failed to capture PayPal order:', response.error);
-          showFlashMessage('error', `Sorry, your transaction could not be processed...<br><br>${response.error}`);
+          showFlashMessage(`Sorry, your transaction could not be processed...<br><br>${response.error}`, 'error');
         }
       },
       onError: (err) => {
-        showFlashMessage('error', `Your transaction was cancelled...<br><br>${err}`);
+        showFlashMessage(`Your transaction was cancelled...<br><br>${err}`, 'error');
       }
     });
 
-    paypalButtons.render(this.element);
+    // Render PayPal buttons - catch any rendering errors
+    paypalButtons.render(this.element).catch((error) => {
+      console.error('PayPal buttons render failed:', error);
+      this.showPayPalError();
+    });
   }
-}
+};

data/app/models/spree_paypal_checkout/gateway.rb

@@ -2,6 +2,10 @@ module SpreePaypalCheckout
   class Gateway < ::Spree::Gateway
     include PaypalServerSdk
 
+    GatewayResponse = Struct.new(:success, :message, :params, :authorization) do
+      alias_method :success?, :success
+    end
+
     #
     # Preferences
     #
@@ -114,8 +118,15 @@ module SpreePaypalCheckout
       end
     end
 
-    def void(authorization, source, gateway_options = {})
-      raise 'Not implemented'
+    def void(authorization, _source, gateway_options = {})
+      protect_from_error do
+        response = client.payments.void_payment({
+          'authorization_id' => authorization,
+          'prefer' => 'return=representation'
+        })
+
+        success(authorization, response.data.as_json)
+      end
     end
 
     def credit(amount_in_cents, _payment_source, paypal_payment_id, gateway_options = {})
@@ -140,7 +151,27 @@ module SpreePaypalCheckout
     end
 
     def cancel(authorization, payment = nil)
-      raise 'Not implemented'
+      protect_from_error do
+        if payment&.completed?
+          amount = payment.credit_allowed
+          return success(authorization, {}) if amount.zero?
+
+          refund = payment.refunds.create!(
+            amount: amount,
+            reason: Spree::RefundReason.order_canceled_reason,
+            refunder_id: payment.order.canceler_id
+          )
+
+          success(payment.response_code, refund.response.params)
+        else
+          response = client.payments.void_payment({
+            'authorization_id' => authorization,
+            'prefer' => 'return=representation'
+          })
+
+          success(authorization, response.data.as_json)
+        end
+      end
     end
 
     private
@@ -166,20 +197,11 @@ module SpreePaypalCheckout
     end
 
     def success(authorization, response)
-      ActiveMerchant::Billing::Response.new(
-        true,
-        'Transaction successful',
-        response,
-        authorization: authorization
-      )
+      GatewayResponse.new(true, 'Transaction successful', response, authorization)
     end
 
     def failure(message, response = {})
-      ActiveMerchant::Billing::Response.new(
-        false,
-        message,
-        response
-      )
+      GatewayResponse.new(false, message, response, nil)
     end
   end
 end

data/app/views/spree/admin/payments/source_forms/_spree_paypal_checkout.html.erb

@@ -0,0 +1,7 @@
+<% if previous_cards.any? %>
+  <%= render 'spree/admin/payments/source_forms/previous_cards', previous_cards: previous_cards, f: f %>
+<% else %>
+  <span class="text-gray-600">
+    <%= Spree.t(:no_payment_sources_available, default: 'No saved PayPal accounts available.') %>
+  </span>
+<% end %>

data/app/views/spree_paypal_checkout/_head.html.erb

@@ -4,6 +4,7 @@
     src="https://www.paypal.com/sdk/js?client-id=<%= current_store.paypal_checkout_gateway.preferred_client_id %>&currency=<%= current_currency %>&components=buttons&enable-funding=paylater&disable-funding=venmo,card,p24"
     data-sdk-integration-source="developer-studio"
     defer
+    data-turbo-eval="false"
   ></script>
 
   <%= javascript_import_module_tag 'application-spree-paypal-checkout' %>

data/lib/spree_paypal_checkout/version.rb

@@ -1,5 +1,5 @@
 module SpreePaypalCheckout
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.0'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_paypal_checkout
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -135,6 +135,7 @@ files:
 - app/services/spree_paypal_checkout/create_source.rb
 - app/views/spree/admin/payment_methods/configuration_guides/_spree_paypal_checkout.html.erb
 - app/views/spree/admin/payment_methods/descriptions/_spree_paypal_checkout.html.erb
+- app/views/spree/admin/payments/source_forms/_spree_paypal_checkout.html.erb
 - app/views/spree/checkout/payment/_spree_paypal_checkout.html.erb
 - app/views/spree/payment_sources/_paypal_checkout.html.erb
 - app/views/spree_paypal_checkout/_head.html.erb
@@ -154,9 +155,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_paypal_checkout/issues
-  changelog_uri: https://github.com/spree/spree_paypal_checkout/releases/tag/v0.5.5
+  changelog_uri: https://github.com/spree/spree_paypal_checkout/releases/tag/v0.6.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_paypal_checkout/tree/v0.5.5
+  source_code_uri: https://github.com/spree/spree_paypal_checkout/tree/v0.6.0
 rdoc_options: []
 require_paths:
 - lib