Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for Spree 3.x and Fix #43 crowdint/spree_conekta#43 #44

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8691935
Updated paths of assets
bishma-stornelli May 9, 2014
7ae8050
Added payment method and user to conekta payment
bishma-stornelli May 9, 2014
d05102b
Update version number
bishma-stornelli May 9, 2014
ca985b2
Fixed path of backend/spree_conekta.js
bishma-stornelli May 10, 2014
4079622
Agregada respuesta para cancelar ordenes por tarjetas de crédito
bishma-stornelli May 30, 2014
0cd70ff
Skipped verify_authenticity_token to avoid CSRF warning/error
bishma-stornelli May 30, 2014
d003d76
Renaming folders to new Spree 2.3.0.beta standard
Jun 18, 2014
61b0914
Merging https://github.com/bishma-stornelli/spree_conekta
Jun 18, 2014
7cc7ad1
Improving form for conekta_card
Jun 18, 2014
9062aa6
Delete unecessary files after Rails and Spree updates
Jun 18, 2014
7bccdd6
Including factories for testing
Jun 25, 2014
43f1a1e
Removing name methods in credit card decorator because spree/spree #4…
Jun 26, 2014
7c241cb
Updating Spree version
Jul 2, 2014
1b5516b
Merge branch 'master' into 2.3.0.beta
Jul 10, 2014
3e06184
Update Spree version to 2.4.0.beta and README including Contributors
Jul 10, 2014
22cf053
Updates the field name_card in the form to the new convention in spre…
Aug 20, 2014
f164b43
Bump Spree version to 2.4.0.rc3 and updating translations
Oct 11, 2014
659958e
Update specs to RSpec 3.1
Oct 19, 2014
c2e3111
Update README for branch 2.4.0.rc3
Oct 20, 2014
786c779
Add configuring options for installements and improving the print of …
Oct 30, 2014
d6f57a7
Add OrderHelpers for FIX error in show the payments for missing order…
Oct 30, 2014
2378600
i18n fixes
Nov 12, 2014
612408d
Bump to 2.4.1
Nov 24, 2014
d74e29c
Merge branch 'release/2.4.1'
Nov 24, 2014
37fb0fc
Update to Spree 3.0.0.beta
Jan 14, 2015
f707b4c
Update Trevis YML config file
Jan 14, 2015
2054aa1
Update for new Bootstrap Frontend in Spree 3.0.0.beta
Jan 22, 2015
83dc148
Bump version to Spree 3.0.0.rc2
Feb 10, 2015
0f0e392
Bump version to Spree 3.0.0
Feb 10, 2015
b6e617a
Bump to Spree 3.1.0.beta
Mar 6, 2015
35d8983
FIX #1 Refactoring of using expiration month and year
Jun 1, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ spec/dummy/tmp/
spec/dummy/.sass-cache
spec/dummy/db/migrate/
.idea
.#*
.#*
tmp/**
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ before_install:
- "sh -e /etc/init.d/xvfb start"

before_script: "LIB_NAME=spree_conekta bundle exec rake common:test_app -s"
script: "bundle exec rspec spec"
script:
- RAILS_ENV=test bundle exec rake db:migrate --trace
- bundle exec rake db:test:prepare
- bundle exec rspec spec
10 changes: 9 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
source "http://rubygems.org"
# gem 'spree', github: 'spree/spree', branch: 'master'
gem 'spree', github: 'spree/spree', branch: 'master'
gem 'sass-rails', '~> 4.0.3'

# Spree Internationalization https://github.com/spree/spree_i18n
gem 'globalize', github: 'globalize/globalize', branch: 'master'
gem 'spree_i18n', github: 'AgilTec/spree_i18n', branch: 'master'

group :test, :development do
gem 'rspec-rails', '~> 2.13'
gem 'rspec-rails', '~> 3.1.0'
gem 'sqlite3'
gem 'factory_girl'
gem 'pry'
gem 'database_cleaner'
gem 'spork'
gem 'poltergeist'
gem 'selenium-webdriver'
gem 'capybara-webkit'
gem 'capybara'
Expand Down
Loading