spree_paypal_api_checkout 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae3ca282bbb42703dee161639c0bc575070c8743c5731e269017689985fdb26
-  data.tar.gz: 8acd1a06f1b8ef885359d36b724319107d8ffdfc1378b5238b95ff9afa70c915
+  metadata.gz: 6a5a5201c741e77e835868a6fda79d71b658c1b58fabca8ef39d3990199294f2
+  data.tar.gz: d9b4e0c18fef43f234f07ed9bfc011811fbd87b49751cb524dfba3f189c428df
 SHA512:
-  metadata.gz: 27bd28c102d8d41e14e99a44463f2ed50f1f739e58d8e3da932caa325f08f8af71d1f3737eb8b083865f1d513eac605168c3e83d860489b2dc182f66de749b30
-  data.tar.gz: 042cdcbf7f71ab1a8e8238d7495d8f947a240a794d21d143e10f925df4adee2e5ac5b5df1ea178ab4f6938a1984fcf858f047c8bf408b3ffeeaced54d65c72b4
+  metadata.gz: fb54727dee1cef2a75bdf4527b6ba3c33d2dad98cb14a85ec36099be4c7f3dd9c0ed80918fd4a794330d47055c069113b20fc01fb8b62c0df73cfe2988dc4e33
+  data.tar.gz: 9cf9906841e3359b96fae7f8581dcea5c24026035c7a02e46a7351efc9c1b17d8bb9a3c1f029330b07f7f4f89cb5dae9be5c04d14f034cd2335282e31fabfe45

data/README.md

@@ -4,7 +4,7 @@
 
 1. Add this extension to your Gemfile with this line:
         
-        gem 'spree_paypal_checkout', '~> 0.0.5'
+        gem 'spree_paypal_api_checkout', '~> 0.0.8'
 
 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/controllers/spree/admin/paypal_checkout_payments_controller.rb

@@ -3,7 +3,7 @@ module Spree
     before_action :load_order
 
     def index
-      @payments = @order.payments.includes(:payment_method).where(:spree_payment_methods => { :name => 'Spree::Gateway::PayPalCheckout' })
+      @payments = @order.payments.includes(:payment_method).where(:spree_payment_methods => {:name => 'PayPal Checkout'})
     end
 
     private

data/app/controllers/spree/paypal_checkout_controller.rb

@@ -49,14 +49,14 @@ module Spree
       order = current_order || raise(ActiveRecord::RecordNotFound)
       order.payments.last.source.update(transaction_id: params[:transaction_id])
       order.next
+      path = checkout_state_path(order.state)
       if order.complete?
         flash.notice = Spree.t(:order_processed_successfully)
         flash[:order_completed] = true
         session[:order_id] = nil
-        redirect_to completion_route(order)
-      else
-        redirect_to checkout_state_path(order.state)
+        path = completion_route(order)
       end
+      render json: { redirect_to: path }
     end
 
     def cancel

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

@@ -2,7 +2,7 @@ module Spree
   class Gateway::PayPalCheckout < Gateway
     preference :api_key, :string
     preference :secret_key, :string
-    preference :server, :string, default: 'https://api-m.sandbox.paypal.com'
+    preference :server, :string, default: 'api-m.sandbox.paypal.com'
 
     def supports?(source)
       true

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.5'
+  VERSION = '0.0.8'
 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.5"
+  s.version = "0.0.8"
 
   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.5
+  version: 0.0.8
 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
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Adds PayPal API Checkout as a Payment Method to Spree Commerce