spree_paypal_api_checkout 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d5c1380a64e977885a5654cb5ad51252b873d4111ab7afa3502604bf478e58
-  data.tar.gz: 8318b8560107a17f02ee3ced1c2b6b469633fcbbe32ce73008a7528adb833f99
+  metadata.gz: 06d58fd2ed0b683b5f83542c81c695d25ba58e05807ea20db5a3391b5dc58b36
+  data.tar.gz: 5f315cada65b5b7fc6bd0b5d20dfeefbeddea0fc02883119faddbc5eb960cf52
 SHA512:
-  metadata.gz: a1898e5770e862572b17cc976f70f385afa521f8390f3a4c9ffd70bd1c1654b8bcad0c84c9f271ec74f00daaa826887e0482fd44561718c2be5296bf9ec6ca35
-  data.tar.gz: 5e5c22d36c999c412838b78365686a356815ed84fda9d99a88acc3000c34c21fe2ca3ce08e0250a3de2d364f325648444073a1868c462b4194e4ac4d1666e037
+  metadata.gz: 59b562c5c96d4ac8deacf23aa16671364ea01bbef64f467a626a04c047260f7e31d2832e340040bf6e588d8c6f9278d68e61e5c4113c05a133cde94aeb742d27
+  data.tar.gz: b4ee8db0480d09a7bf2dc2be5ede7af6166128a54eed82367a7d95e94327c7b30affe17b67120b95f3c22c701f7ecbbc5166f877b5c0fd73dc3a33e35551fbde

data/README.md

@@ -4,7 +4,7 @@
 
 1. Add this extension to your Gemfile with this line:
         
-        gem 'spree_paypal_api_checkout', '~> 0.0.6'
+        gem 'spree_paypal_api_checkout', '~> 0.0.7'
 
 2. Install the gem using Bundler:
 

data/app/controllers/spree/admin/payments_controller_decorator.rb

@@ -1,5 +1,5 @@
 module Spree::Admin::PaymentsControllerDecorator
-  def paypal_refund
+  def paypal_checkout_refund
     if request.get?
       if @payment.source.state == 'refunded'
         flash[:error] = Spree.t(:already_refunded, :scope => 'paypal')
@@ -7,7 +7,7 @@ module Spree::Admin::PaymentsControllerDecorator
       end
     elsif request.post?
       response = @payment.payment_method.refund(@payment, params[:refund_amount])
-      if response.success?
+      if response['status']=='COMPLETED'
         flash[:success] = Spree.t(:refund_successful, :scope => 'paypal')
         redirect_to admin_order_payments_path(@order)
       else

data/app/views/spree/admin/payments/{_paypal_complete.html.erb → _paypal_checkout_complete.html.erb}

@@ -1,4 +1,4 @@
-<%= form_tag paypal_refund_admin_order_payment_path(@order, @payment) do %>
+<%= form_tag paypal_checkout_refund_admin_order_payment_path(@order, @payment) do %>
   <div class="label-block left five columns alpha">
     <div>
       <fieldset data-hook="admin_variant_new_form">

data/app/views/spree/admin/payments/{paypal_refund.html.erb → paypal_checkout_refund.html.erb}

@@ -6,7 +6,7 @@
     / <%= Spree.t('refund', :scope => :paypal) %>
 <% end %>
 
-<%= form_tag paypal_refund_admin_order_payment_path(@order, @payment) do %>
+<%= form_tag paypal_checkout_refund_admin_order_payment_path(@order, @payment) do %>
   <div class="label-block left five columns alpha">
     <div>
       <fieldset data-hook="admin_variant_new_form">

data/app/views/spree/admin/payments/source_views/{_paypal.html.erb → _paypal_checkout.html.erb}

@@ -16,7 +16,7 @@
     </div>
 
     <% if payment.source.state != 'refunded' %>
-      <%= button_link_to Spree.t('actions.refund', scope: :paypal), spree.paypal_refund_admin_order_payment_path(@order, payment), icon: 'money' %>
+      <%= button_link_to Spree.t('actions.refund', scope: :paypal), spree.paypal_checkout_refund_admin_order_payment_path(@order, payment), icon: 'money' %>
     <% else %>
       <div class="alpha six columns">
         <dl>

data/app/views/spree/checkout/payment/_paypal_checkout.html.erb

@@ -27,7 +27,10 @@
           var transaction = orderData.purchase_units[0].payments.captures[0];
           fetch(`/paypal_checkout/proceed?number=${data.orderID}&status=${transaction.status}&transaction_id=${transaction.id}`, {
             method: "get",
-          })
+          }).then((response) => response.json())
+            .then((orderData2) => {
+              window.location.href = `${window.location.origin}${orderData2.redirect_to}`
+            });
         });
     }
   }).render('#paypal-button-container');

data/config/routes.rb

@@ -4,4 +4,15 @@ Spree::Core::Engine.add_routes do
   get '/paypal_checkout/cancel', :to => "paypal_checkout#cancel", :as => :cancel_paypal_checkout
   get '/paypal_checkout/notify', :to => "paypal_checkout#notify", :as => :notify_paypal_checkout
   get '/paypal_checkout/proceed', :to => "paypal_checkout#proceed", :as => :proceed_paypal_checkout
+  namespace :admin do
+    # Using :only here so it doesn't redraw those routes
+    resources :orders, :only => [] do
+      resources :payments, :only => [] do
+        member do
+          get 'paypal_checkout_refund'
+          post 'paypal_checkout_refund'
+        end
+      end
+    end
+  end
 end

data/lib/spree_paypal_api_checkout/version.rb

@@ -1,3 +1,3 @@
 module SpreePaypalApiCheckout
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spree_paypal_api_checkout.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spree_paypal_api_checkout".freeze
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.date = "2022-02-22"
   s.description = "Adds PayPal API Checkout as a Payment Method to Spree Commerce".freeze
   s.email = "gems@spreecommerce.com".freeze
-  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "app/assets/javascripts/spree/backend/spree_paypal_checkout.js".freeze, "app/assets/javascripts/spree/frontend/spree_paypal_checkout.js".freeze, "app/assets/stylesheets/spree/backend/spree_paypal_checkout.css".freeze, "app/assets/stylesheets/spree/frontend/spree_paypal_checkout.css".freeze, "app/controllers/spree/admin/payments_controller_decorator.rb".freeze, "app/controllers/spree/admin/paypal_checkout_payments_controller.rb".freeze, "app/controllers/spree/paypal_checkout_controller.rb".freeze, "app/models/spree/gateway/pay_pal_checkout.rb".freeze, "app/models/spree/paypal_api_checkout.rb".freeze, "app/views/spree/admin/payments/_paypal_complete.html.erb".freeze, "app/views/spree/admin/payments/paypal_refund.html.erb".freeze, "app/views/spree/admin/payments/source_forms/_paypal.html.erb".freeze, "app/views/spree/admin/payments/source_views/_paypal.html.erb".freeze, "app/views/spree/checkout/payment/_paypal_checkout.html.erb".freeze, "config/locales/de.yml".freeze, "config/locales/en.yml".freeze, "config/locales/es.yml".freeze, "config/locales/it.yml".freeze, "config/locales/pl.yml".freeze, "config/locales/pt.yml".freeze, "config/routes.rb".freeze, "db/migrate/20220620042734_create_spree_paypal_api_checkouts.rb".freeze, "lib/generators/spree_paypal_api_checkout/install/install_generator.rb".freeze, "lib/spree_paypal_api_checkout.rb".freeze, "lib/spree_paypal_api_checkout/engine.rb".freeze, "lib/spree_paypal_api_checkout/version.rb".freeze, "script/rails".freeze, "spree_paypal_api_checkout.gemspec".freeze]
+  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "app/assets/javascripts/spree/backend/spree_paypal_checkout.js".freeze, "app/assets/javascripts/spree/frontend/spree_paypal_checkout.js".freeze, "app/assets/stylesheets/spree/backend/spree_paypal_checkout.css".freeze, "app/assets/stylesheets/spree/frontend/spree_paypal_checkout.css".freeze, "app/controllers/spree/admin/payments_controller_decorator.rb".freeze, "app/controllers/spree/admin/paypal_checkout_payments_controller.rb".freeze, "app/controllers/spree/paypal_checkout_controller.rb".freeze, "app/models/spree/gateway/pay_pal_checkout.rb".freeze, "app/models/spree/paypal_api_checkout.rb".freeze, "app/views/spree/admin/payments/_paypal_checkout_complete.html.erb".freeze, "app/views/spree/admin/payments/paypal_checkout_refund.html.erb".freeze, "app/views/spree/admin/payments/source_forms/_paypal_checkout.html.erb".freeze, "app/views/spree/admin/payments/source_views/_paypal_checkout.html.erb".freeze, "app/views/spree/checkout/payment/_paypal_checkout.html.erb".freeze, "config/locales/de.yml".freeze, "config/locales/en.yml".freeze, "config/locales/es.yml".freeze, "config/locales/it.yml".freeze, "config/locales/pl.yml".freeze, "config/locales/pt.yml".freeze, "config/routes.rb".freeze, "db/migrate/20220620042734_create_spree_paypal_api_checkouts.rb".freeze, "lib/generators/spree_paypal_api_checkout/install/install_generator.rb".freeze, "lib/spree_paypal_api_checkout.rb".freeze, "lib/spree_paypal_api_checkout/engine.rb".freeze, "lib/spree_paypal_api_checkout/version.rb".freeze, "script/rails".freeze, "spree_paypal_api_checkout.gemspec".freeze]
   s.homepage = "http://www.spreecommerce.com".freeze
   s.required_ruby_version = Gem::Requirement.new(">= 2.2.2".freeze)
   s.requirements = ["none".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_paypal_api_checkout
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Spree Commerce
@@ -363,10 +363,10 @@ files:
 - app/controllers/spree/paypal_checkout_controller.rb
 - app/models/spree/gateway/pay_pal_checkout.rb
 - app/models/spree/paypal_api_checkout.rb
-- app/views/spree/admin/payments/_paypal_complete.html.erb
-- app/views/spree/admin/payments/paypal_refund.html.erb
-- app/views/spree/admin/payments/source_forms/_paypal.html.erb
-- app/views/spree/admin/payments/source_views/_paypal.html.erb
+- app/views/spree/admin/payments/_paypal_checkout_complete.html.erb
+- app/views/spree/admin/payments/paypal_checkout_refund.html.erb
+- app/views/spree/admin/payments/source_forms/_paypal_checkout.html.erb
+- app/views/spree/admin/payments/source_views/_paypal_checkout.html.erb
 - app/views/spree/checkout/payment/_paypal_checkout.html.erb
 - config/locales/de.yml
 - config/locales/en.yml