Button Update

.travis.yml

@@ -1,54 +1,63 @@
-sudo: required
-dist: trusty
+---
+os: linux
+dist: bionic
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+services:
+  - mysql
+  - postgresql
 
 language: ruby
 
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec
+rvm:
+  - 2.5
+  - 2.6
+  - 2.7
 
 env:
   - DB=mysql
   - DB=postgres
 
-addons:
-  chrome: stable
-  postgresql: 9.4
-
-rvm:
-  - 2.3.8
-  - 2.4.4
-  - 2.5.1
-
 gemfile:
-  - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_4_0.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
-before_install:
-  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-
-matrix:
+jobs:
   exclude:
-    - rvm: 2.5.1
-      gemfile: gemfiles/spree_3_5.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.6
+      gemfile: gemfiles/spree_3_7.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/spree_3_7.gemfile
+    - rvm: 2.5
       gemfile: gemfiles/spree_4_0.gemfile
-    - rvm: 2.3.8
+    - rvm: 2.7
       gemfile: gemfiles/spree_4_0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/spree_master.gemfile
-    - rvm: 2.3.8
+    - rvm: 2.5
+      gemfile: gemfiles/spree_4_1.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/spree_4_1.gemfile
+    - rvm: 2.5
       gemfile: gemfiles/spree_master.gemfile
   allow_failures:
-        - gemfile: gemfiles/spree_master.gemfile
+    - gemfile: gemfiles/spree_master.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
-  - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
-  - unzip ~/chromedriver_linux64.zip -d ~/
-  - rm ~/chromedriver_linux64.zip
-  - sudo mv -f ~/chromedriver /usr/local/share/
-  - sudo chmod +x /usr/local/share/chromedriver
-  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec

Appraisals

@@ -1,15 +1,15 @@
-appraise 'spree-3-5' do
-  gem 'spree', '~> 3.5.0'
-  gem 'rails-controller-testing'
-end
-
 appraise 'spree-3-7' do
   gem 'spree', '~> 3.7.0'
   gem 'rails-controller-testing'
 end
 
 appraise 'spree-4-0' do
-  gem 'spree', '~> 4.0.0.rc2'
+  gem 'spree', '~> 4.0.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1.0'
   gem 'rails-controller-testing'
 end
 

app/assets/javascripts/spree/frontend/spree_paypal_express.js

@@ -1,6 +1,4 @@
-//= require spree/frontend
-
-SpreePaypalExpress = {
+var SpreePaypalExpress = {
   updateSaveAndContinueVisibility: function() {
     if (this.isButtonHidden()) {
       $(this).trigger('hideSaveAndContinue')
@@ -23,7 +21,7 @@ SpreePaypalExpress = {
   }
 }
 
-$(document).ready(function() {
+document.addEventListener("DOMContentLoaded", function() {
   SpreePaypalExpress.updateSaveAndContinueVisibility();
   paymentMethods = $('div[data-hook="checkout_payment_step"] input[type="radio"]').click(function (e) {
     SpreePaypalExpress.updateSaveAndContinueVisibility();

app/assets/stylesheets/spree/frontend/card_styling.scss

@@ -0,0 +1,37 @@
+@mixin button_styles {
+  vertical-align: top;
+  text-align: left;
+  width: 100%;
+  max-width: 332px;
+  display: inline-block;
+  padding: 9px 0;
+  text-align: center;
+  overflow: hidden;
+  text-decoration: none;
+  border-radius: 4px;
+}
+
+div#paypal_express_checkout {
+  margin-top: 10px;
+  text-align: center;
+
+  a#paypal_button {
+    @include button_styles;
+    margin: 7px 0 0 0;
+    background-color: #FEC349;
+
+    img {
+      position: relative;
+      width: 96px;
+      line-height: 0.5em;
+
+      &#paypal_logo_colour {
+        width: 90px;
+      }
+    }
+
+    &:hover {
+      background-color: #F2BA46;
+    }
+  }
+}

app/assets/stylesheets/spree/frontend/spree_paypal_express.css

@@ -1,3 +1,3 @@
 /*
- *= require spree/frontend
+ *= require spree/frontend/card_styling
 */

app/models/spree/gateway/pay_pal_express.rb

@@ -19,11 +19,13 @@ def provider_class
 
     def provider
       ::PayPal::SDK.configure(
-        :mode      => preferred_server.present? ? preferred_server : "sandbox",
-        :username  => preferred_login,
-        :password  => preferred_password,
-        :signature => preferred_signature)
-      provider_class.new
+        mode: preferred_server.present? ? preferred_server : "sandbox",
+        username: preferred_login,
+        password: preferred_password,
+        signature: preferred_signature,
+        ssl_options: { ca_file: nil }
+        )
+        provider_class.new
     end
 
     def auto_capture?

app/views/spree/checkout/payment/_paypal.html.erb

@@ -1,6 +1,15 @@
-
-<%= link_to(image_tag("https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif"), paypal_express_url(:payment_method_id => payment_method.id), :method => :post, :id => "paypal_button") %>
+<div id="paypal_express_checkout">
+  <div>
+    <%= link_to paypal_express_url( payment_method_id: payment_method.id ),
+                                    method: :post,
+                                    id: "paypal_button" do %>
+      <%= render partial: 'spree/shared/paypal_color_logo', cached: true %>
+    <% end %>
+  </div>
+</div>
 
 <script>
-  SpreePaypalExpress.paymentMethodID = "<%= payment_method.id %>"  
- </script>
+  document.addEventListener("DOMContentLoaded", function() {
+    SpreePaypalExpress.paymentMethodID = "<%= payment_method.id %>"
+  })
+</script>

app/views/spree/shared/_paypal_color_logo.html.erb

@@ -0,0 +1 @@
+<img id="paypal_logo_color" alt="PayPal Logo" src="data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 246 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g id="pp_h_rgb"><path id="Fill-1" d="M190.422,26.432c-0.737,4.841 -4.434,4.841 -8.01,4.841l-2.034,0l1.427,-9.038c0.086,-0.546 0.557,-0.948 1.11,-0.948l0.933,0c2.433,0 4.733,0 5.918,1.386c0.709,0.83 0.924,2.06 0.656,3.759Zm-1.557,-12.628l-13.485,0c-0.922,0 -1.707,0.671 -1.85,1.581l-5.453,34.578c-0.108,0.682 0.419,1.299 1.11,1.299l6.919,0c0.646,0 1.195,-0.47 1.295,-1.107l1.547,-9.803c0.144,-0.911 0.928,-1.582 1.85,-1.582l4.267,0c8.883,0 14.009,-4.298 15.349,-12.818c0.603,-3.726 0.024,-6.654 -1.721,-8.704c-1.917,-2.253 -5.316,-3.444 -9.828,-3.444Z" style="fill:#2790c3;"/><path id="Fill-2" d="M94.242,26.432c-0.737,4.841 -4.434,4.841 -8.009,4.841l-2.035,0l1.427,-9.038c0.087,-0.546 0.557,-0.948 1.11,-0.948l0.933,0c2.434,0 4.733,0 5.918,1.386c0.71,0.83 0.924,2.06 0.656,3.759Zm-1.556,-12.628l-13.485,0c-0.922,0 -1.707,0.671 -1.851,1.581l-5.453,34.578c-0.107,0.682 0.42,1.299 1.11,1.299l6.439,0c0.922,0 1.707,-0.671 1.851,-1.581l1.471,-9.329c0.144,-0.911 0.929,-1.582 1.851,-1.582l4.267,0c8.882,0 14.009,-4.298 15.349,-12.818c0.603,-3.726 0.024,-6.654 -1.721,-8.704c-1.918,-2.253 -5.317,-3.444 -9.828,-3.444Z" style="fill:#27346a;"/><path id="Fill-3" d="M123.992,38.845c-0.624,3.69 -3.553,6.167 -7.288,6.167c-1.873,0 -3.372,-0.602 -4.336,-1.743c-0.955,-1.131 -1.315,-2.742 -1.012,-4.536c0.582,-3.656 3.557,-6.213 7.236,-6.213c1.834,0 3.323,0.608 4.306,1.759c0.989,1.16 1.377,2.782 1.094,4.566Zm8.999,-12.567l-6.457,0c-0.553,0 -1.024,0.401 -1.11,0.949l-0.285,1.805l-0.451,-0.654c-1.398,-2.03 -4.515,-2.708 -7.627,-2.708c-7.134,0 -13.228,5.406 -14.414,12.988c-0.617,3.783 0.259,7.397 2.404,9.92c1.97,2.318 4.782,3.283 8.133,3.283c5.75,0 8.939,-3.694 8.939,-3.694l-0.288,1.795c-0.108,0.682 0.419,1.3 1.11,1.3l5.815,0c0.922,0 1.707,-0.67 1.85,-1.581l3.491,-22.105c0.108,-0.682 -0.419,-1.298 -1.11,-1.298Z" style="fill:#27346a;"/><path id="Fill-4" d="M220.172,38.845c-0.624,3.69 -3.553,6.167 -7.288,6.167c-1.874,0 -3.372,-0.602 -4.337,-1.743c-0.955,-1.131 -1.314,-2.742 -1.011,-4.536c0.581,-3.656 3.557,-6.213 7.236,-6.213c1.833,0 3.323,0.608 4.305,1.759c0.989,1.16 1.378,2.782 1.095,4.566Zm8.998,-12.567l-6.457,0c-0.553,0 -1.024,0.401 -1.11,0.949l-0.284,1.805l-0.451,-0.654c-1.399,-2.03 -4.515,-2.708 -7.627,-2.708c-7.134,0 -13.228,5.406 -14.414,12.988c-0.617,3.783 0.259,7.397 2.403,9.92c1.971,2.318 4.783,3.283 8.133,3.283c5.75,0 8.939,-3.694 8.939,-3.694l-0.287,1.795c-0.109,0.682 0.418,1.3 1.11,1.3l5.814,0c0.922,0 1.707,-0.67 1.851,-1.581l3.491,-22.105c0.107,-0.682 -0.42,-1.298 -1.111,-1.298Z" style="fill:#2790c3;"/><g id="Group-10"><path id="Fill-5" d="M167.382,26.278l-6.49,0c-0.621,0 -1.202,0.307 -1.55,0.821l-8.953,13.186l-3.794,-12.671c-0.237,-0.793 -0.967,-1.336 -1.795,-1.336l-6.38,0c-0.77,0 -1.313,0.757 -1.064,1.486l7.146,20.977l-6.721,9.485c-0.528,0.744 0.004,1.774 0.917,1.774l6.484,0c0.614,0 1.19,-0.301 1.54,-0.807l21.584,-31.151c0.516,-0.745 -0.017,-1.764 -0.924,-1.764" style="fill:#27346a;"/><path id="Fill-7" d="M236.781,14.753l-5.534,35.21c-0.108,0.682 0.42,1.299 1.11,1.299l5.567,0c0.921,0 1.706,-0.671 1.85,-1.581l5.457,-34.578c0.108,-0.682 -0.419,-1.299 -1.11,-1.299l-6.229,0c-0.554,0 -1.025,0.403 -1.111,0.949" style="fill:#2790c3;"/><path id="Fill-8" d="M25.547,57.548l1.812,-11.494l0.117,-0.637c0.088,-0.554 0.371,-1.061 0.799,-1.425c0.427,-0.365 0.972,-0.567 1.533,-0.567l1.44,0c2.399,0 4.604,-0.256 6.552,-0.761c2.079,-0.539 3.928,-1.379 5.495,-2.493c1.662,-1.182 3.058,-2.71 4.149,-4.54c1.152,-1.931 1.997,-4.256 2.514,-6.909c0.456,-2.343 0.541,-4.441 0.255,-6.235c-0.304,-1.896 -1.034,-3.514 -2.171,-4.809c-0.689,-0.785 -1.57,-1.465 -2.62,-2.022l-0.025,-0.013l-0.001,-0.03c0.367,-2.339 0.353,-4.29 -0.041,-5.969c-0.397,-1.683 -1.199,-3.198 -2.456,-4.629c-2.603,-2.967 -7.337,-4.471 -14.071,-4.471l-18.494,0c-0.618,0 -1.218,0.221 -1.689,0.623c-0.47,0.402 -0.781,0.96 -0.878,1.571l-7.701,48.832c-0.07,0.446 0.058,0.898 0.351,1.24c0.293,0.344 0.72,0.541 1.171,0.541l11.473,0l-0.01,0.054l-0.788,4.997c-0.061,0.388 0.051,0.782 0.306,1.08c0.255,0.299 0.627,0.471 1.019,0.471l9.624,0c0.54,0 1.063,-0.193 1.473,-0.544c0.41,-0.351 0.683,-0.837 0.767,-1.37l0.095,-0.491" style="fill:#27346a;"/><path id="Fill-9" d="M18.954,15.676c0.122,-0.774 0.618,-1.407 1.287,-1.728c0.304,-0.145 0.643,-0.226 0.999,-0.226l14.496,0c1.718,0 3.319,0.113 4.783,0.348c0.419,0.068 0.825,0.145 1.221,0.233c0.396,0.088 0.779,0.185 1.151,0.295c0.186,0.054 0.368,0.11 0.548,0.17c0.719,0.239 1.388,0.52 2.004,0.847c0.726,-4.629 -0.005,-7.779 -2.508,-10.631c-2.757,-3.141 -7.736,-4.486 -14.107,-4.486l-18.494,0c-1.302,0 -2.41,0.947 -2.613,2.233l-7.701,48.832c-0.152,0.964 0.593,1.835 1.568,1.835l11.417,0l5.949,-37.722" style="fill:#27346a;"/></g><path id="Fill-11" d="M45.443,15.615c-0.055,0.353 -0.116,0.712 -0.189,1.083c-2.438,12.521 -10.782,16.85 -21.439,16.85l-5.427,0c-1.302,0 -2.401,0.948 -2.604,2.234l-3.567,22.613c-0.133,0.843 0.519,1.605 1.371,1.605l9.624,0c1.139,0 2.109,-0.828 2.286,-1.954l0.095,-0.489l1.812,-11.496l0.117,-0.635c0.178,-1.125 1.148,-1.954 2.286,-1.954l1.44,0c9.323,0 16.623,-3.788 18.756,-14.742c0.891,-4.577 0.431,-8.397 -1.926,-11.083c-0.713,-0.812 -1.6,-1.485 -2.635,-2.032" style="fill:#2790c3;"/><path id="Fill-12" d="M42.891,14.598c-0.372,-0.11 -0.755,-0.207 -1.151,-0.295c-0.396,-0.088 -0.802,-0.165 -1.221,-0.233c-1.464,-0.235 -3.065,-0.348 -4.783,-0.348l-14.496,0c-0.356,0 -0.695,0.081 -0.999,0.226c-0.669,0.321 -1.165,0.954 -1.287,1.728l-3.081,19.536l-0.089,0.57c0.203,-1.286 1.302,-2.234 2.604,-2.234l5.427,0c10.657,0 19.001,-4.329 21.439,-16.85c0.073,-0.371 0.134,-0.73 0.189,-1.083c-0.616,-0.327 -1.285,-0.608 -2.004,-0.847c-0.18,-0.06 -0.362,-0.116 -0.548,-0.17" style="fill:#1f264f;"/></g></svg>">

config/locales/en.yml

@@ -3,7 +3,7 @@ en:
   spree:
     paypal:
       already_refunded: "This payment has been refunded and no further action can be taken on it."
-      no_payment_via_admin_backend: "You cannot charge PayPal accounts through the admin backend at this time."
+      no_payment_via_admin_backend: "You cannot charge PayPal accounts through the admin back-end at this time."
       transaction: "PayPal Transaction"
       payer_id: "Payer ID"
       transaction_id: "Transaction ID"
@@ -18,4 +18,4 @@ en:
       flash:
         cancel: "Don't want to use PayPal? No problems."
         connection_failed: "Could not connect to PayPal."
-        generic_error: "PayPal failed. %{reasons}"
+        generic_error: "PayPal failed. %{reasons}"

gemfiles/spree_3_7.gemfile

@@ -1,9 +1,9 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "spree", "~> 3.7.0"
-gem "rails-controller-testing"
-gem "sass-rails"
+gem 'spree', '~> 3.7.0'
+gem 'rails-controller-testing'
+gem 'sass-rails'
 
-gemspec path: "../"
+gemspec path: '../'

gemfiles/spree_4_0.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "spree", "~> 4.0.0.rc2"
-gem "rails-controller-testing"
+gem 'spree', '~> 4.0.0'
+gem 'rails-controller-testing'
 
-gemspec path: "../"
+gemspec path: '../'

gemfiles/spree_4_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'spree', '~> 4.1.0'
+gem 'rails-controller-testing'
+
+gemspec path: '../'

gemfiles/spree_master.gemfile

@@ -1,8 +1,8 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "spree", github: "spree/spree", branch: "master"
-gem "rails-controller-testing"
+gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'rails-controller-testing'
 
-gemspec path: "../"
+gemspec path: '../'