solidus_paypal_braintree 0.4.0 → 1.0.0

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+gem install bundler --conservative
+bundle update
+bundle exec rake clobber

data/config/locales/en.yml

@@ -2,6 +2,12 @@ en:
   activerecord:
     models:
       solidus_paypal_braintree/gateway: Braintree
+    attributes:
+      solidus_paypal_braintree/configuration:
+        paypal: PayPal
+        apple_pay: Apple Pay
+        credit_card: Credit Card
+        three_d_secure: 3D Secure
   spree:
     admin:
       tab:
@@ -14,12 +20,14 @@ en:
     private_key: Private key
     public_key: Public key
     token_generation_enabled: Token generation enabled?
+    paypal_flow: PayPal flow
   solidus_paypal_braintree:
     braintree: Braintree
     nonce: Nonce
     token: Token
     errors:
       default_error: "Something bad happened!"
+      paypal_popup_closed: "PayPal popup has been closed before payment completion."
       empty_fields: "All fields are empty! Please fill out the form."
       invalid_fields: "Some payment input fields are invalid."
       invalid_card: "Credit card data is incorrect."
@@ -27,6 +35,8 @@ en:
       duplicate_iframe: "Duplicate Braintree iframe."
       fail_on_duplicate: "This payment method already exists in your vault."
       cvv_verification_failed: "CVV did not pass verification."
+      threeds:
+        authentication_failed: "3D Secure authentication failed. Please try again using a different payment method."
     payment_type:
       label: Payment Type
       apple_pay_card: Apple Pay

data/config/locales/it.yml

@@ -1,11 +1,54 @@
 it:
+  activerecord:
+    models:
+      solidus_paypal_braintree/gateway: Braintree
+  spree:
+    admin:
+      tab:
+        braintree: Braintree
+    client_sdk_enabled: Client SDK abilitato?
+    environment: Environment
+    merchant_currency_map: Associazioni tra merchant Braintree e valute
+    merchant_id: Merchant ID
+    paypal_payee_email_map: Associazioni tra email beneficiari PayPal e valute
+    private_key: Private key
+    public_key: Public key
+    token_generation_enabled: Generazione dei Token abilitata?
+    paypal_flow: Flusso PayPal
   solidus_paypal_braintree:
+    braintree: Braintree
+    nonce: Nonce
+    token: Token
     errors:
-      default_error: "Qualcosa è andato storto."
-      empty_fields: "I campi non possono essere vuoti."
-      invalid_fields: "Alcuni campi non sono corretti."
-      invalid_card: "I dati della carta di credito non sono corretti."
-      network_error: "Si è verificato un errore di rete."
-      duplicate_iframe: "Ci sono due form Braintree."
-      fail_on_duplicate: "Questo metodo di pagamento già esiste."
-      cvv_verification_failed: "Il codice CVV non è corretto."
+      default_error: Qualcosa è andato storto!
+      paypal_popup_closed: La finestra di PayPal è stata chiusa prima di completare il pagamento.
+      empty_fields: I campi non possono essere vuoti!
+      invalid_fields: Alcuni campi non sono corretti.
+      invalid_card: I dati della carta di credito non sono corretti.
+      network_error: Si è verificato un errore di rete.
+      duplicate_iframe: Ci sono due iframe di Braintree.
+      fail_on_duplicate: Questo metodo di pagamento esiste già.
+      cvv_verification_failed: Il codice CVV non è corretto.
+    payment_type:
+      label: Metodo di Pagamento
+      apple_pay_card: Apple Pay
+      credit_card: Carta di credito
+      pay_pal_account: PayPal
+    configurations:
+      title: Configurazioni di Braintree
+      tab: Braintree
+      update_success: Configurazioni di Braintree aggiornate con successo.
+      update_error: Si è verificato un errore durante l'aggiornamento delle configurazioni di Braintree.
+    gateway_rejection_reasons:
+      avs: Controllo AVS fallito.
+      avs_and_cvv: Controlli AVS e CVV falliti.
+      cvv: Controllo CVV fallito.
+      duplicate: Transazione duplicata.
+      fraud: La carta di credito è stata rifiutata a seguito di un potenziale uso fraudolento.
+      three_d_secure: Controllo '3D Secure' fallito.
+    transaction_statuses:
+      authorization_expired: L'autorizzazione di pagamento è scaduta.
+      failed: Si è verificato un errore durante l'invio della transazione al sistema di pagamento.
+      gateway_rejected: Il gateway di pagamento ha rifiutato questa transazione.
+      processor_declined: Il sistema di pagamento ha rifiutato questa transazione.
+      settlement_declined: Il saldo di questa transazione è stato rifiutato dal sistema di pagamento.

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SolidusPaypalBraintree::Engine.routes.draw do
   resource :checkout, only: [:update, :edit]
   resource :client_token, only: [:create], format: :json

data/db/migrate/20160906201711_create_solidus_paypal_braintree_customers.rb

@@ -3,9 +3,11 @@ class CreateSolidusPaypalBraintreeCustomers < SolidusSupport::Migration[4.2]
     create_table :solidus_paypal_braintree_customers do |t|
       t.references :user
       t.string :braintree_customer_id
+
+      t.timestamps
     end
 
     add_index :solidus_paypal_braintree_customers, :user_id, unique: true, name: "index_braintree_customers_on_user_id"
-    add_index :solidus_paypal_braintree_customers, :braintree_customer_id, unique: true, name: "index_braintree_customers_on_braintree_customer_id"
+    add_index :solidus_paypal_braintree_customers, :braintree_customer_id, unique: true, name: "index_braintree_customers_on_braintree_customer_id" # rubocop:disable Layout/LineLength
   end
 end

data/db/migrate/20161125172005_add_braintree_configuration_to_stores.rb

@@ -1,9 +1,7 @@
 class AddBraintreeConfigurationToStores < SolidusSupport::Migration[4.2]
-  def up
-    Spree::Store.all.each(&:create_braintree_configuration)
-  end
-
-  def down
-    SolidusPaypalBraintree::Configuration.joins(:store).destroy_all
-  end
+  # The content of this migration has been removed because store's Braintree
+  # configuration doesn't already have paypal_button_preferences fields, so
+  # their validations will break this migration.
+  #
+  # Ref here for more info https://github.com/solidusio/solidus_paypal_braintree/pull/249
 end

data/db/migrate/20170505193712_add_null_constraint_to_sources.rb

@@ -15,7 +15,9 @@ class AddNullConstraintToSources < SolidusSupport::Migration[4.2]
 
     Spree::Payment.joins(join_sources).find_each do |payment|
       Rails.logger.info("Updating source #{payment.source_id} with payment method id #{payment.payment_method_id}")
-      SolidusPaypalBraintree::Source.where(id: payment.source_id).update_all(payment_method_id: payment.payment_method_id)
+      SolidusPaypalBraintree::Source.where(id: payment.source_id).update_all(
+        payment_method_id: payment.payment_method_id
+      )
     end
 
     # We use a foreign key constraint on the model,

data/db/migrate/20190705115327_add_paypal_button_preferences_to_braintree_configurations.rb

@@ -0,0 +1,5 @@
+class AddPaypalButtonPreferencesToBraintreeConfigurations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :solidus_paypal_braintree_configurations, :preferences, :text
+  end
+end

data/db/migrate/20190911141712_add_3d_secure_to_braintree_configuration.rb

@@ -0,0 +1,5 @@
+class Add3dSecureToBraintreeConfiguration < SolidusSupport::Migration[4.2]
+  def change
+    add_column :solidus_paypal_braintree_configurations, :three_d_secure, :boolean, null: false, default: false
+  end
+end

data/lib/controllers/backend/solidus_paypal_braintree/configurations_controller.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
-  class ConfigurationsController < Spree::Admin::BaseController
-    helper Spree::Core::Engine.routes.url_helpers
+  class ConfigurationsController < ::Spree::Admin::BaseController
+    helper ::Spree::Core::Engine.routes.url_helpers
 
     def list
       authorize! :list, SolidusPaypalBraintree::Configuration
 
-      @configurations = Spree::Store.all.map(&:braintree_configuration)
+      @configurations = ::Spree::Store.all.map { |s| s.braintree_configuration || s.create_braintree_configuration }
     end
 
     def update
       authorize! :update, SolidusPaypalBraintree::Configuration
 
       params = configurations_params[:configuration_fields]
-      if SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      results = SolidusPaypalBraintree::Configuration.update(params.keys, params.values)
+      if results.all?(&:valid?)
         flash[:success] = t('update_success', scope: 'solidus_paypal_braintree.configurations')
       else
         flash[:error] = t('update_error', scope: 'solidus_paypal_braintree.configurations')
@@ -24,7 +27,19 @@ module SolidusPaypalBraintree
 
     def configurations_params
       params.require(:configurations).
-        permit(configuration_fields: [:paypal, :apple_pay, :credit_card])
+        permit(configuration_fields: [
+          :paypal,
+          :apple_pay,
+          :credit_card,
+          :three_d_secure,
+          :preferred_paypal_button_locale,
+          :preferred_paypal_button_color,
+          :preferred_paypal_button_shape,
+          :preferred_paypal_button_label,
+          :preferred_paypal_button_tagline,
+          :preferred_paypal_button_layout,
+          :preferred_paypal_button_messaging
+        ])
     end
   end
 end

data/lib/controllers/frontend/solidus_paypal_braintree/checkouts_controller.rb

@@ -1,27 +1,31 @@
-class SolidusPaypalBraintree::CheckoutsController < Spree::CheckoutController
-  PERMITTED_PAYMENT_PARAMS = [
-    :payment_method_id,
-    source_attributes: [
-      :nonce,
-      :payment_type
-    ]
-  ].freeze
+# frozen_string_literal: true
 
-  def update
-    @payment = Spree::PaymentCreate.new(@order, payment_params).build
+module SolidusPaypalBraintree
+  class CheckoutsController < ::Spree::CheckoutController
+    PERMITTED_PAYMENT_PARAMS = [
+      :payment_method_id,
+      { source_attributes: [
+        :nonce,
+        :payment_type
+      ] }
+    ].freeze
 
-    if @payment.save
-      render plain: "ok"
-    else
-      render plain: "not-ok"
+    def update
+      @payment = ::Spree::PaymentCreate.new(@order, payment_params).build
+
+      if @payment.save
+        render plain: "ok"
+      else
+        render plain: "not-ok"
+      end
     end
-  end
 
-  def payment_params
-    params.
-      require(:order).
-      require(:payments_attributes).
-      first.
-      permit(PERMITTED_PAYMENT_PARAMS)
+    def payment_params
+      params.
+        require(:order).
+        require(:payments_attributes).
+        first.
+        permit(PERMITTED_PAYMENT_PARAMS)
+    end
   end
 end

data/lib/controllers/frontend/solidus_paypal_braintree/transactions_controller.rb

@@ -1,62 +1,66 @@
-class SolidusPaypalBraintree::TransactionsController < Spree::StoreController
-  class InvalidImportError < StandardError; end
-
-  PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
-    :nonce,
-    :payment_type,
-    :phone,
-    :email,
-    address_attributes: [
-      :country_code, :country_name, :last_name, :first_name,
-      :city, :zip, :state_code, :address_line_1, :address_line_2
-    ]
-  ]
-
-  def create
-    transaction = SolidusPaypalBraintree::Transaction.new transaction_params
-    import = SolidusPaypalBraintree::TransactionImport.new(current_order, transaction)
-    restart_checkout = params[:options] && params[:options][:restart_checkout] == "true"
-
-    respond_to do |format|
-      if import.valid?
-        import.import!(import_state, restart_checkout: restart_checkout)
-
-        format.html { redirect_to redirect_url(import) }
-        format.json { render json: { redirectUrl: redirect_url(import) } }
-      else
-        status = 422
-        format.html { import_error(import) }
-        format.json { render json: { errors: import.errors, status: status }, status: status }
+# frozen_string_literal: true
+
+module SolidusPaypalBraintree
+  class TransactionsController < ::Spree::StoreController
+    class InvalidImportError < StandardError; end
+
+    PERMITTED_BRAINTREE_TRANSACTION_PARAMS = [
+      :nonce,
+      :payment_type,
+      :phone,
+      :email,
+      { address_attributes: [
+        :country_code, :country_name, :name, :city, :zip, :state_code,
+        :address_line_1, :address_line_2, :first_name, :last_name
+      ] }
+    ].freeze
+
+    def create
+      transaction = SolidusPaypalBraintree::Transaction.new transaction_params
+      import = SolidusPaypalBraintree::TransactionImport.new(current_order, transaction)
+      restart_checkout = params[:options] && params[:options][:restart_checkout] == "true"
+
+      respond_to do |format|
+        if import.valid?
+          import.import!(import_state, restart_checkout: restart_checkout)
+
+          format.html { redirect_to redirect_url(import) }
+          format.json { render json: { redirectUrl: redirect_url(import) } }
+        else
+          status = 422
+          format.html { import_error(import) }
+          format.json { render json: { errors: import.errors, status: status }, status: status }
+        end
       end
     end
-  end
 
-  private
+    private
 
-  def import_state
-    params[:state] || 'confirm'
-  end
+    def import_state
+      params[:state] || 'confirm'
+    end
 
-  def import_error(import)
-    raise InvalidImportError,
-      "Import invalid: #{import.errors.full_messages.join(', ')}"
-  end
+    def import_error(import)
+      raise InvalidImportError,
+        "Import invalid: #{import.errors.full_messages.join(', ')}"
+    end
 
-  def redirect_url(import)
-    if import.order.complete?
-      spree.order_url(import.order)
-    else
-      spree.checkout_state_url(import.order.state)
+    def redirect_url(import)
+      if import.order.complete?
+        spree.order_url(import.order)
+      else
+        spree.checkout_state_url(import.order.state)
+      end
     end
-  end
 
-  def transaction_params
-    params.require(:transaction)
-      .permit(PERMITTED_BRAINTREE_TRANSACTION_PARAMS)
-      .merge({ payment_method: payment_method })
-  end
+    def transaction_params
+      params.require(:transaction)
+        .permit(PERMITTED_BRAINTREE_TRANSACTION_PARAMS)
+        .merge({ payment_method: payment_method })
+    end
 
-  def payment_method
-    SolidusPaypalBraintree::Gateway.find(params[:payment_method_id])
+    def payment_method
+      SolidusPaypalBraintree::Gateway.find(params[:payment_method_id])
+    end
   end
 end

data/lib/generators/solidus_paypal_braintree/install/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -5,12 +7,12 @@ module SolidusPaypalBraintree
 
       def add_javascripts
         append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require solidus_paypal_braintree/frontend\n"
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_paypal_braintree\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_paypal_braintree\n" # rubocop:disable Layout/LineLength
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_paypal_braintree\n", before: /\*\//, verbose: true
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_paypal_braintree\n", before: /\*\//, verbose: true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_paypal_braintree\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_paypal_braintree\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
       end
 
       def add_migrations
@@ -24,11 +26,11 @@ module SolidusPaypalBraintree
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
         if run_migrations
           run 'bundle exec rake db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+          say_status :skipping, 'rake db:migrate, don\'t forget to run it!'
         end
       end
     end

data/lib/solidus_paypal_braintree.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require 'solidus_core'
+require 'solidus_paypal_braintree/version'
 require 'solidus_paypal_braintree/engine'
 require 'solidus_paypal_braintree/country_mapper'
 require 'solidus_paypal_braintree/request_protection'
+require 'solidus_support'
 
 module SolidusPaypalBraintree
   def self.table_name_prefix

data/lib/solidus_paypal_braintree/country_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidusPaypalBraintree
   module CountryMapper
     extend ActiveSupport::Concern
@@ -12,12 +14,12 @@ module SolidusPaypalBraintree
       "usa",
       "u.s.",
       "us"
-    ]
+    ].freeze
 
     CANADA_VARIANTS = [
       "canada",
       "ca"
-    ]
+    ].freeze
 
     # Generates a hash mapping each variant of the country name to the same ISO
     # ie: { "usa" => "US", "united states" => "US", "canada" => "CA", ... }