solidus_gateway 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a4a18f259485f7da30b7413eb26805dc4b020e
-  data.tar.gz: a5e173405475bc7ae103eb3c6538bd1457afa76c
+  metadata.gz: edb5286317a172fc0994ca78e1d5532a7c648cfd
+  data.tar.gz: b808a3847b095a1dfb4d44ded6c8a04639281f7d
 SHA512:
-  metadata.gz: 102239a4ac27b4d035bd5884616e7a5a2f2cac02a5e558c9ea209f3168d75fd6b7b6e83b858b0c2545527ab7a391d1e07274e0e784a57e1a22fc541d94222c88
-  data.tar.gz: f064d47f57ae61d47a0d99f25423d7773645ee77ec5bcb3044bf28f30b6f392ed3159fa07251dc4130a036588a89b15fd012df54d33d440f7f82288649947634
+  metadata.gz: 18233008d74271e67a697f4705c6b67b3f80a502000522670baaf6944cb162c5eaf299bb5fe7b3c3dfd44315472b8b08d4018b270bd1bea59e626054fb2b2534
+  data.tar.gz: e7458514a6d6be0b16a51e610f47e61eca217d8fc3a858bf70f771cda35b17a2c71da427591ea7f03cb47287d1e0cb10e8c2359b2885b0ecc7c4e67b0e30e480

data/.travis.yml

@@ -1,8 +1,11 @@
-sudo: false
+sudo: required
+dist: trusty
 cache: bundler
 language: ruby
 rvm:
   - 2.3.1
+before_install:
+  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'travis'@'%';"
 env:
   matrix:
     - SOLIDUS_BRANCH=v1.1 DB=postgres
@@ -10,10 +13,16 @@ env:
     - SOLIDUS_BRANCH=v1.3 DB=postgres
     - SOLIDUS_BRANCH=v1.4 DB=postgres
     - SOLIDUS_BRANCH=v2.0 DB=postgres
+    - SOLIDUS_BRANCH=v2.1 DB=postgres
+    - SOLIDUS_BRANCH=v2.2 DB=postgres
+    - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.1 DB=mysql
     - SOLIDUS_BRANCH=v1.2 DB=mysql
     - SOLIDUS_BRANCH=v1.3 DB=mysql
     - SOLIDUS_BRANCH=v1.4 DB=mysql
     - SOLIDUS_BRANCH=v2.0 DB=mysql
+    - SOLIDUS_BRANCH=v2.1 DB=mysql
+    - SOLIDUS_BRANCH=v2.2 DB=mysql
+    - SOLIDUS_BRANCH=v2.3 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/README.md

@@ -23,9 +23,10 @@ bundle install
 rails g solidus_gateway:install
 ```
 
-Finally, make sure to **restart your app**. Navigate to *Configuration >
-Payment Methods > New Payment Method* in the admin panel and you should see
-that a bunch of additional gateways have been added to the list.
+Finally, make sure to **restart your app**. Navigate to *Settings >
+Payments > Payment Methods* in the admin panel.  You should see a number of payment
+methods and the assigned provider for each.  Click on the payment method you wish
+to change the provider, and you should see a number of options under the provider dropdown.
 
 Testing
 -------

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

@@ -7,10 +7,9 @@ module Spree
       ActiveMerchant::Billing::AuthorizeNetGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(test: self.preferred_test_mode)
+    def options
+      super().merge(test: self.preferred_test_mode)
     end
-    alias_method_chain :options, :test_preference
 
     def credit(amount, response_code, refund, gateway_options = {})
       gateway_options[:card_number] = refund[:originator].payment.source.last_digits

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

@@ -32,10 +32,9 @@ module Spree
       payment.send(:gateway_error, ex.message)
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-    alias_method_chain :options, :test_preference
 
     def payment_profiles_supported?
       true

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

@@ -11,10 +11,8 @@ module Spree
       ActiveMerchant::Billing::EwayGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
   end
 end

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

@@ -7,10 +7,8 @@ module Spree
       ActiveMerchant::Billing::PayJunctionGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
   end
 end

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

@@ -8,11 +8,8 @@ module Spree
       ActiveMerchant::Billing::PayflowGateway
     end
 
-    def options_with_test_preference
-      options_without_test_preference.merge(:test => self.preferred_test_mode)
+    def options
+      super().merge(:test => self.preferred_test_mode)
     end
-
-    alias_method_chain :options, :test_preference
-
   end
 end

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

@@ -9,8 +9,14 @@ module Spree
       'Visa' => 'visa'
     }
 
-    def method_type
-      'stripe'
+    if SolidusSupport.solidus_gem_version < Gem::Version.new('2.3.x')
+      def method_type
+        'stripe'
+      end
+    else
+      def partial_name
+        'stripe'
+      end
     end
 
     def provider_class

data/db/migrate/20121017004102_update_braintree_payment_method_type.rb

@@ -1,4 +1,4 @@
-class UpdateBraintreePaymentMethodType < ActiveRecord::Migration
+class UpdateBraintreePaymentMethodType < SolidusSupport::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Braintree").update_all(:type => "Spree::Gateway::BraintreeGateway")
   end

data/db/migrate/20130213222555_update_stripe_payment_method_type.rb

@@ -1,4 +1,4 @@
-class UpdateStripePaymentMethodType < ActiveRecord::Migration
+class UpdateStripePaymentMethodType < SolidusSupport::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Stripe").update_all(:type => "Spree::Gateway::StripeGateway")
   end

data/db/migrate/20130415222802_update_balanced_payment_method_type.rb

@@ -1,4 +1,4 @@
-class UpdateBalancedPaymentMethodType < ActiveRecord::Migration
+class UpdateBalancedPaymentMethodType < SolidusSupport::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::Balanced").update_all(:type => "Spree::Gateway::BalancedGateway")
   end

data/db/migrate/20131008221012_update_paypal_payment_method_type.rb

@@ -1,4 +1,4 @@
-class UpdatePaypalPaymentMethodType < ActiveRecord::Migration
+class UpdatePaypalPaymentMethodType < SolidusSupport::Migration[4.2]
   def up
     Spree::PaymentMethod.where(:type => "Spree::Gateway::PayPal").update_all(:type => "Spree::Gateway::PayPalGateway")
   end

data/db/migrate/20131112133401_migrate_stripe_preferences.rb

@@ -1,4 +1,4 @@
-class MigrateStripePreferences < ActiveRecord::Migration
+class MigrateStripePreferences < SolidusSupport::Migration[4.2]
   def up
     Spree::Preference.where("#{ActiveRecord::Base.connection.quote_column_name("key")} LIKE 'spree/gateway/stripe_gateway/login%'").each do |pref|
       pref.key = pref.key.gsub('login', 'secret_key')

data/lib/solidus_gateway.rb

@@ -1,4 +1,5 @@
-require "spree_core"
+require "solidus_core"
+require "solidus_support"
 require "spree_gateway/engine"
 require "solidus_gateway/version"
 require "sass/rails"

data/lib/solidus_gateway/version.rb

@@ -1,3 +1,3 @@
 module SolidusGateway
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/spree_gateway/engine.rb

@@ -20,7 +20,6 @@ module SpreeGateway
         app.config.spree.payment_methods << Spree::Gateway::Worldpay
         app.config.spree.payment_methods << Spree::Gateway::Banwire
         app.config.spree.payment_methods << Spree::Gateway::UsaEpay
-        app.config.spree.payment_methods << Spree::BillingIntegration::Skrill::QuickCheckout
         app.config.spree.payment_methods << Spree::Gateway::BalancedGateway
         app.config.spree.payment_methods << Spree::Gateway::DataCash
         app.config.spree.payment_methods << Spree::Gateway::UsaEpay
@@ -52,9 +51,6 @@ module SpreeGateway
           'lib/assets/javascripts/spree/frontend/solidus_gateway.js',
           'lib/assets/javascripts/spree/frontend/solidus_gateway.css',
         ]
-        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
       end
     end
 
@@ -71,7 +67,6 @@ module SpreeGateway
     end
 
     if self.frontend_available?
-      paths["app/controllers"] << "lib/controllers/frontend"
       paths["app/views"] << "lib/views/frontend"
     end
 

data/solidus_gateway.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.requirements << "none"
 
   s.add_dependency "solidus_core", [">= 1.1", "< 3"]
+  s.add_dependency "solidus_support"
 
   # ActiveMerchant v1.58 through v1.59 introduced a breaking change
   # to the stripe gateway.
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coffee-rails"
   s.add_development_dependency "factory_girl", "~> 4.4"
   s.add_development_dependency "capybara"
+  s.add_development_dependency "capybara-screenshot"
   s.add_development_dependency "poltergeist", "~> 1.9"
-  s.add_development_dependency "database_cleaner", "1.2.0"
+  s.add_development_dependency "database_cleaner", "~> 1.5"
 end

data/spec/features/stripe_checkout_spec.rb

@@ -21,9 +21,11 @@ RSpec.describe "Stripe checkout", type: :feature do
     click_link "DL-44"
     click_button "Add To Cart"
 
+    expect(page).to have_current_path("/cart")
     click_button "Checkout"
 
     # Address
+    expect(page).to have_current_path("/checkout/address")
     fill_in "Customer E-Mail", with: "han@example.com"
     within("#billing") do
       fill_in "First Name", with: "Han"
@@ -38,6 +40,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     click_on "Save and Continue"
 
     # Delivery
+    expect(page).to have_current_path("/checkout/delivery")
     click_on "Save and Continue"
   end
 
@@ -78,6 +81,7 @@ RSpec.describe "Stripe checkout", type: :feature do
   it "shows an error with invalid security fields", js: true do
     fill_in "Card Number", with: "4242 4242 4242 4242"
     fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+    fill_in "Card Code", with: "12"
     click_button "Save and Continue"
     expect(page).to have_content("Your card's security code is invalid.")
   end

data/spec/spec_helper.rb

@@ -8,11 +8,13 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 
 require "capybara/rspec"
+require 'capybara-screenshot/rspec'
 require 'capybara/poltergeist'
 Capybara.register_driver(:poltergeist) do |app|
   Capybara::Poltergeist::Driver.new app, timeout: 90
 end
 Capybara.javascript_driver = :poltergeist
+Capybara.default_max_wait_time = 10
 
 require "database_cleaner"
 require "braintree"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_gateway
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +182,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -186,16 +214,16 @@ dependencies:
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.5'
 description: Additional Payment Gateways for Solidus
 email: contact@solidus.io
 executables: []
@@ -209,7 +237,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/models/spree/billing_integration/skrill/quick_checkout.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
 - app/models/spree/gateway/balanced_gateway.rb
@@ -234,26 +261,15 @@ files:
 - app/models/spree/gateway/stripe_gateway.rb
 - app/models/spree/gateway/usa_epay.rb
 - app/models/spree/gateway/worldpay.rb
-- app/models/spree/skrill_transaction.rb
 - bin/rails
 - circle.yml
-- config/locales/bg.yml
-- config/locales/de.yml
-- config/locales/en.yml
-- config/locales/it.yml
-- config/locales/sv.yml
-- config/routes.rb
-- db/migrate/20111118164631_create_skrill_transactions.rb
 - db/migrate/20121017004102_update_braintree_payment_method_type.rb
 - db/migrate/20130213222555_update_stripe_payment_method_type.rb
 - db/migrate/20130415222802_update_balanced_payment_method_type.rb
 - db/migrate/20131008221012_update_paypal_payment_method_type.rb
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
-- lib/active_merchant/billing/skrill.rb
 - lib/assets/javascripts/spree/frontend/solidus_gateway.js
 - lib/assets/stylesheets/spree/frontend/solidus_gateway.css
-- lib/controllers/frontend/spree/checkout_controller_decorator.rb
-- lib/controllers/frontend/spree/skrill_status_controller.rb
 - lib/generators/solidus_gateway/install/install_generator.rb
 - lib/solidus_gateway.rb
 - lib/solidus_gateway/version.rb
@@ -262,15 +278,10 @@ files:
 - lib/views/backend/spree/admin/log_entries/_stripe.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_stripe.html.erb
-- lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_stripe.html.erb
-- lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - solidus_gateway.gemspec
-- spec/factories/skrill_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -293,7 +304,6 @@ files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb
 homepage: https://solidus.io
 licenses:
@@ -316,15 +326,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Additional Payment Gateways for Solidus
 test_files:
-- spec/factories/skrill_factory.rb
 - spec/features/stripe_checkout_spec.rb
-- spec/lib/active_merchant/billing_skrill_spec.rb
-- spec/models/billing_integration/skrill_quick_checkout_spec.rb
 - spec/models/gateway/authorize_net_cim_spec.rb
 - spec/models/gateway/authorize_net_spec.rb
 - spec/models/gateway/balanced_gateway_spec.rb
@@ -347,5 +354,4 @@ test_files:
 - spec/models/gateway/stripe_gateway_spec.rb
 - spec/models/gateway/usa_epay_spec.rb
 - spec/models/gateway/worldpay_spec.rb
-- spec/models/skrill_transaction_spec.rb
 - spec/spec_helper.rb

data/app/models/spree/billing_integration/skrill/quick_checkout.rb

@@ -1,48 +0,0 @@
-module Spree
-  class BillingIntegration::Skrill::QuickCheckout < BillingIntegration
-    preference :merchant_id, :string
-    preference :language, :string, :default => 'EN'
-    preference :currency, :string, :default => 'EUR'
-    preference :payment_options, :string, :default => 'ACC'
-    preference :pay_to_email, :string ,   :default => 'your@merchant.email_here'
-
-    def provider_class
-      ActiveMerchant::Billing::Skrill
-    end
-
-    def redirect_url(order, opts = {})
-      opts.merge! self.preferences
-
-      set_global_options(opts)
-
-      opts[:detail1_text] = order.number
-      opts[:detail1_description] = "Order:"
-
-      opts[:pay_from_email] = order.email
-      opts[:firstname] = order.bill_address.firstname
-      opts[:lastname] = order.bill_address.lastname
-      opts[:address] = order.bill_address.address1
-      opts[:address2] = order.bill_address.address2
-      opts[:phone_number] = order.bill_address.phone.gsub(/\D/,'') if order.bill_address.phone
-      opts[:city] = order.bill_address.city
-      opts[:postal_code] = order.bill_address.zipcode
-      opts[:state] = order.bill_address.state.nil? ? order.bill_address.state_name.to_s : order.bill_address.state.abbr
-      opts[:country] = order.bill_address.country.name
-      opts[:pay_to_email] = self.preferred_pay_to_email
-      opts[:hide_login] = 1
-      opts[:merchant_fields] = 'platform,order_id,payment_method_id'
-      opts[:platform] = 'Spree'
-      opts[:order_id] = order.number
-
-      skrill = self.provider
-      skrill.payment_url(opts)
-    end
-
-    private
-      def set_global_options(opts)
-        opts[:recipient_description] = Spree::Config[:site_name]
-        opts[:payment_methods] = self.preferred_payment_options
-      end
-
-  end
-end

data/app/models/spree/skrill_transaction.rb

@@ -1,19 +0,0 @@
-module Spree
-  class SkrillTransaction < ActiveRecord::Base
-    has_many :payments, :as => :source
-
-    def actions
-      []
-    end
-
-    def self.create_from_postback(params)
-       SkrillTransaction.create(:email => params[:pay_from_email],
-                               :amount => params[:mb_amount],
-                               :currency => params[:mb_currency],
-                               :transaction_id => params[:mb_transaction_id],
-                               :customer_id => params[:customer_id],
-                               :payment_type => params[:payment_type])
-    end
-
-  end
-end

data/config/locales/bg.yml

@@ -1,11 +0,0 @@
----
-bg:
-  spree:
-    payment_has_been_cancelled: Плащането беше прекъснато.
-    complete_skrill_checkout: Моля довършете Вашето плащане със Skrill преди да продължите
-    skrill: Skrill
-    skrill_transaction: Транзакция
-    skrill_customer_id: Клиентски номер
-    skrill_transaction_id: Номер на транкцията
-    skrill_payment_type: Вид на плащане
-    skrill_payment_currency: Валута

data/config/locales/de.yml

@@ -1,11 +0,0 @@
----
-de:
-  spree:
-    payment_has_been_cancelled: Die Zahlung wurde abgebrochen.
-    complete_skrill_checkout: Bitte schliessen Sie die Skrill-Zahlung ab
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kunden ID
-    skrill_transaction_id: Transaktions ID
-    skrill_payment_type: Bezahlart
-    skrill_payment_currency: Währung

data/config/locales/en.yml

@@ -1,30 +0,0 @@
----
-en:
-  spree:
-    payment_has_been_cancelled: The payment has been cancelled.
-    complete_skrill_checkout: Please complete Skrill checkout before continuing
-    skrill: Skrill
-    skrill_transaction: Transaction
-    skrill_customer_id: Customer ID
-    skrill_transaction_id: Transaction ID
-    skrill_payment_type: Payment Type
-    skrill_payment_currency: Payment Currency
-    log_entry:
-      braintree:
-        message: Message
-        status: Status
-        cc_token: Braintree Credit Card Token
-        customer_id: Braintree Customer ID
-        cvv_result: CVV Result
-        avs_result_title: AVS result
-        avs_result:
-          message: Message
-          street_match: Street Match
-          postal_match: Postal Match
-      stripe:
-        message: Message
-        charge_id: Stripe Charge ID
-        card_id: Stripe Card ID
-        cvv_result: CVV Result
-        cvc_check: CVC Check
-        address_zip_check: Address ZIP check

data/config/locales/it.yml

@@ -1,30 +0,0 @@
----
-it:
-  spree:
-    payment_has_been_cancelled: Il pagamento è stato cancellato.
-    complete_skrill_checkout: Ti preghiamo di completate il checkout Skrill prima di continuare
-    skrill: Skrill
-    skrill_transaction: Transazione
-    skrill_customer_id: ID cliente
-    skrill_transaction_id: ID Transazione
-    skrill_payment_type: Tipo di pagamento
-    skrill_payment_currency: Valuta pagamento
-    log_entry:
-      braintree:
-        message: Message
-        status: Status
-        cc_token: Token carta di credito Braintree
-        customer_id: ID cliente Braintree
-        cvv_result: Risultato CVV
-        avs_result_title: Risultato AVS
-        avs_result:
-          message: Messaggio
-          street_match: Match indirizzo
-          postal_match: Match CAP
-      stripe:
-        message: Message
-        charge_id: ID addebito Stripe
-        card_id: ID carta Stripe
-        cvv_result: Risultato CVV
-        cvc_check: Controllo CVC
-        address_zip_check: Controllo CAP

data/config/locales/sv.yml

@@ -1,11 +0,0 @@
----
-sv:
-  spree:
-    payment_has_been_cancelled: Betalningen har avbrutits.
-    complete_skrill_checkout: Var god fyll i Skrill kassan innan du fortsätter
-    skrill: Skrill
-    skrill_transaction: Transaktion
-    skrill_customer_id: Kund ID
-    skrill_transaction_id: Transaktion ID
-    skrill_payment_type: Betalningstyp
-    skrill_payment_currency: Betalningsvaluta

data/config/routes.rb

@@ -1,12 +0,0 @@
-Spree::Core::Engine.routes.draw do
-  resources :orders, only: [] do
-    resource :checkout, controller: 'checkout' do
-      member do
-        get :skrill_cancel
-        get :skrill_return
-      end
-    end
-  end
-
-  post '/skrill', to: 'skrill_status#update'
-end

data/db/migrate/20111118164631_create_skrill_transactions.rb

@@ -1,14 +0,0 @@
-class CreateSkrillTransactions < ActiveRecord::Migration
-  def change
-    create_table :spree_skrill_transactions do |t|
-      t.string :email
-      t.float :amount
-      t.string :currency
-      t.integer :transaction_id
-      t.integer :customer_id
-      t.string :payment_type
-      t.timestamps null: true
-    end
-  end
-end
-

data/lib/active_merchant/billing/skrill.rb

@@ -1,18 +0,0 @@
-module ActiveMerchant #:nodoc:
-  module Billing #:nodoc:
-    class Skrill < Gateway
-
-      def service_url
-        "https://www.moneybookers.com/app/payment.pl"
-      end
-
-      def payment_url(opts)
-        post = PostData.new
-        post.merge! opts
-
-        "#{service_url}?#{post.to_s}"
-      end
-
-    end
-  end
-end

data/lib/controllers/frontend/spree/checkout_controller_decorator.rb

@@ -1,51 +0,0 @@
-module Spree
-  CheckoutController.class_eval do
-    before_filter :confirm_skrill, :only => [:update]
-
-    def skrill_return
-
-      unless @order.payments.where(:source_type => 'Spree::SkrillTransaction').present?
-        payment_method = PaymentMethod.find(params[:payment_method_id])
-        skrill_transaction = SkrillTransaction.new
-
-        payment = @order.payments.create({:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method},
-                                         :without_protection => true)
-        payment.started_processing!
-        payment.pend!
-      end
-
-      @order.update_attributes({:state => "complete", :completed_at => Time.now}, :without_protection => true)
-
-      until @order.state == "complete"
-        if @order.next!
-          @order.update!
-          state_callback(:after)
-        end
-      end
-
-      @order.finalize!
-
-      flash.notice = Spree.t(:order_processed_successfully)
-      redirect_to completion_route
-    end
-
-    def skrill_cancel
-      flash[:error] = Spree.t(:payment_has_been_cancelled)
-      redirect_to edit_order_path(@order)
-    end
-
-    private
-    def confirm_skrill
-      return unless (params[:state] == "payment") && params[:order] && params[:order][:payments_attributes]
-
-      payment_method = PaymentMethod.find(params[:order][:payments_attributes].first[:payment_method_id])
-      if payment_method.kind_of?(BillingIntegration::Skrill::QuickCheckout)
-        #TODO confirming payment method
-        redirect_to edit_order_checkout_url(@order, :state => 'payment'),
-                    :notice => Spree.t(:complete_skrill_checkout)
-      end
-    end
-  end
-end

data/lib/controllers/frontend/spree/skrill_status_controller.rb

@@ -1,39 +0,0 @@
-module Spree
-  class SkrillStatusController < ApplicationController
-    def update
-      @order = Order.find_by_number!(params[:order_id])
-      payment_method = PaymentMethod.find(params[:payment_method_id])
-      skrill_transaction = SkrillTransaction.create_from_postback params
-
-      payment = @order.payments.where(:state => "pending",
-                                      :payment_method_id => payment_method).first
-
-      if payment
-        payment.source = skrill_transaction
-        payment.save
-      else
-        payment = @order.payments.create(:amount => @order.total,
-                                         :source => skrill_transaction,
-                                         :payment_method => payment_method)
-      end
-
-      payment.started_processing!
-
-       unless payment.completed?
-        case params[:status]
-          when "0"
-            payment.pend #may already be pending
-          when "2" #processed / captured
-            payment.complete!
-          when "-1", "-2"
-            payment.failure!
-          else
-            raise "Unexpected payment status"
-        end
-      end
-
-      render :text => ""
-    end
-
-  end
-end

data/lib/views/backend/spree/admin/payments/source_views/_quickcheckout.html.erb

@@ -1,39 +0,0 @@
-<fieldset>
-  <legend><%= Spree.t(:skrill) %></legend>
-
-  <table class="index">
-    <tr>
-      <th colspan="6"><%= Spree.t(:skrill_transaction) %></th>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:email) %>:</label></td>
-      <td>
-        <%= payment.source.email %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_customer_id) %>:</label></td>
-      <td>
-        <%= payment.source.customer_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_transaction_id) %>:</label></td>
-      <td>
-        <%= payment.source.transaction_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_type) %>:</label></td>
-      <td>
-        <%= payment.source.payment_type %>
-      </td>
-    </tr>
-    <tr>
-      <td><label><%= Spree.t(:skrill_payment_currency) %>:</label></td>
-      <td>
-        <%= payment.source.currency %>
-      </td>
-    </tr>
-  </table>
-</fieldset>

data/lib/views/frontend/spree/checkout/payment/_quickcheckout.html.erb

@@ -1,26 +0,0 @@
-<p data-hook="skrill_quick_checkout"></p>
-
-<%
-opts = {}
-opts[:transaction_id] = "#{@order.number}"
-opts[:amount] = @order.total
-opts[:return_url] = skrill_return_order_checkout_url(@order, :token => @order.guest_token,
-                                                             :payment_method_id => payment_method.id)
-opts[:cancel_url] = skrill_cancel_order_checkout_url(@order, :token => @order.guest_token)
-opts[:status_url] = skrill_url
-opts[:payment_method_id] = payment_method.id
-%>
-
-<style>
-  iframe.skrill_frame{
-    border: 0px;
-    width: 500px;
-    height: 500px;
-  }
-</style>
-
-<fieldset id="skrill_payment__<%= payment_method.id %>" data-hook>
-  <legend><%= Spree.t(:payment_information) %></legend>
-  <iframe id="skrill_frame_<%= payment_method.id %>"
-          class="skrill_frame" src="<%= payment_method.redirect_url @order, opts %>"></iframe>
-</fieldset>

data/spec/factories/skrill_factory.rb

@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :skrill_quick_checkout, class: Spree::BillingIntegration::Skrill::QuickCheckout do
-    name "Skrill - Quick Checkout"
-  end
-end

data/spec/lib/active_merchant/billing_skrill_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe ActiveMerchant::Billing::Skrill do
-  let(:url) { 'https://www.moneybookers.com/app/payment.pl' }
-
-  context '.service_url' do
-    it 'return its url' do
-      expect(subject.service_url).to eq url
-    end
-  end
-
-  context '.payment_url' do
-    it 'prepend options to url' do
-      options = { 'hi' => 'you' }
-      expect(subject.payment_url(options)).to eq "#{url}?hi=you"
-    end
-  end
-end

data/spec/models/billing_integration/skrill_quick_checkout_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Spree::BillingIntegration::Skrill::QuickCheckout do
-  let(:quick_checkout) { create(:skrill_quick_checkout) }
-
-  context '.provider_class' do
-    it 'is a Billing::Skrill class' do
-      expect(quick_checkout.provider_class).to eq ::ActiveMerchant::Billing::Skrill
-    end
-  end
-end

data/spec/models/skrill_transaction_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Spree::SkrillTransaction do
-  let(:skrill_transaction) { create(:skrill_transaction) }
-
-  context '.actions' do
-    it { expect(subject.actions).to match_array([]) }
-  end
-end