spree_paypal_api_checkout 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac381ac7aa6843029df5f451f7d1808a637e0b830157b66459d946cb79788d15
-  data.tar.gz: dacb44b1f3407eec37c1b181361c946511811c423a0e0f01ce90c70e9f88f8f2
+  metadata.gz: b79612956a0c2a85e4e971f5967be818be56d438b7034f7cc7b7bef83a01178d
+  data.tar.gz: f0ef4e1ea934c9c0309401707474219acb71a99a7471ec59a0da91eb29749eae
 SHA512:
-  metadata.gz: 833dac68e15e27afc15f50babc6c334020db77d5c76e72efb4663d36b1b814ba785b070e342a1a573a4c8197fbab9e67b7dd366881f1dc833676e0c94fecd438
-  data.tar.gz: '0678f4ca959ade6bf86e26f3540ab73ada30bb5e3b87bd855b9cb6582712a955938dab9b66f4cabbf0f8d8ed96115aa659a51e5816e886a183451c733bed6122'
+  metadata.gz: a3a8b3c4673d8ce405272ee20010636c0d3ded18eccf5c446cb2ad3a4f386bd5fa696e1f9d5783de6dcf12f0ce684668c9f62f7f36d07fce46fbb7a9678bb5f8
+  data.tar.gz: 2fb57d527e37a19d25b92a2e9f97f7f5143294e77b12f5b369d19e96a0b5670fc6dff7e11a30f1b03af9714e4ae6726bc393cec629f681c0aa5a3b6db5af782e

data/README.md

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

data/app/assets/javascripts/spree/backend/spree_paypal_checkout.js

@@ -3,7 +3,7 @@
 SpreePaypalCheckout = {
   hideSettings: function(paymentMethod) {
     if (SpreePaypalCheckout.paymentMethodID && paymentMethod.val() == SpreePaypalCheckout.paymentMethodID) {
-      $('.payment-method-settings').children().hide();
+      // $('.payment-method-settings').children().hide();
       $('#payment_amount').prop('disabled', 'disabled');
       $('button[type="submit"]').prop('disabled', 'disabled');
       $('#paypal-warning').show();

data/app/controllers/spree/paypal_checkout_controller.rb

@@ -84,6 +84,7 @@ module Spree
         intent: 'CAPTURE',
         purchase_units: [
           {
+            invoice_id: current_order.number,
             amount: {
               currency_code: current_order.currency,
               value: order.total,

data/app/models/spree/log_entry_decorator.rb

@@ -0,0 +1,22 @@
+module Spree
+  module LogEntryDecorator
+    def parsed_details
+      @details ||= YAML.safe_load(details, [ActiveMerchant::Billing::Response, Net::HTTPCreated, URI::HTTPS, URI::RFC3986_Parser, Symbol, Regexp, Object])
+    end
+
+    def success_parsed_details?
+      if parsed_details.is_a?(Net::HTTPCreated)
+        parsed_paypal_entry == 'COMPLETED'
+      elsif parsed_details.is_a?(ActiveMerchant::Billing::Response)
+        parsed_details.success?
+      else
+        true
+      end
+    end
+
+    def parsed_paypal_entry
+      JSON.parse(parsed_details.read_body)['status'] rescue parsed_details.to_json
+    end
+  end
+end
+::Spree::LogEntry.prepend(Spree::LogEntryDecorator)

data/app/views/spree/admin/log_entries/_paypal_checkout.html.erb

@@ -0,0 +1,8 @@
+<% currency = ::Money::Currency.new(entry.source.currency) %>
+<tr>
+  <td><b><%= Spree.t('paypal.status').capitalize %></b></td>
+  <td><%= entry.source.amount.negative? ? entry.source.source.source.state : entry.source.state %></td>
+  <td><%= entry.parsed_paypal_entry %></td>
+  <td><%= currency.symbol %><%= entry.source.amount %></td>
+  <td><%= entry.source.response_code %></td>
+</tr>

data/app/views/spree/admin/log_entries/index.html.erb

@@ -0,0 +1,27 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i>
+  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
+  <i class="icon-arrow-right"></i>
+  <%= Spree.t(:log_entries) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file.svg' %>
+<% end %>
+
+<table class='table table-striped' id='listing_log_entries'>
+  <% @log_entries.each do |entry| %>
+    <thead>
+      <tr class="log_entry <%= entry.success_parsed_details? ? 'success' : 'fail' %>">
+        <td colspan='2'>
+          <i class='icon icon-<%= entry.success_parsed_details? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render "spree/admin/log_entries/#{@payment.payment_method.method_type.gsub(' ', '').underscore}", entry: entry %>
+    </tbody>
+  <% end %>
+</table>

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

@@ -1,4 +1,4 @@
-<div id='paypal-warning' style="display:none">
+<div id='paypal-warning'>
   <strong><%= Spree.t('no_payment_via_admin_backend', :scope => 'paypal') %></strong>
 </div>
 <script>

data/lib/spree_paypal_api_checkout/version.rb

@@ -1,3 +1,3 @@
 module SpreePaypalApiCheckout
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 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.1.2"
+  s.version = "0.1.3"
 
   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_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.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/models/spree/log_entry_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, "app/views/spree/admin/log_entries/_paypal_checkout.html.erb".freeze, "app/views/spree/admin/log_entries/index.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.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Spree Commerce
@@ -362,7 +362,10 @@ files:
 - app/controllers/spree/admin/paypal_checkout_payments_controller.rb
 - app/controllers/spree/paypal_checkout_controller.rb
 - app/models/spree/gateway/pay_pal_checkout.rb
+- app/models/spree/log_entry_decorator.rb
 - app/models/spree/paypal_api_checkout.rb
+- app/views/spree/admin/log_entries/_paypal_checkout.html.erb
+- app/views/spree/admin/log_entries/index.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