Commit graph

1944 commits

Author SHA1 Message Date
Rishabh Saxena
4d4736f042 repair tests 2016-07-22 01:15:22 +05:30
Rishabh Saxena
851b467235 payment view improvement 2016-07-22 00:08:56 +05:30
Rishabh Saxena
6d8605073f use full_name instead of first and last name, test changes, schema improvements 2016-07-21 22:53:20 +05:30
Rishabh Saxena
f00e051eff refactor payment#purchase method, improve environment variable names 2016-07-21 10:15:17 +05:30
Rishabh Saxena
c4d934d711 refactor payment model and its tests 2016-07-19 12:40:16 +05:30
Rishabh Saxena
25c0046290 repair code reviews, improve environment configs 2016-07-18 12:04:10 +05:30
Rishabh Saxena
223a0eead9 delete unused methods, add feature tests 2016-07-15 02:46:31 +05:30
Rishabh Saxena
3b4c7d70c0 remove card_types from helpers 2016-07-14 22:20:31 +05:30
Rishabh Saxena
ae44abc7e6 solve code reviews, resolve rebase conflicts 2016-07-14 19:10:33 +05:30
Rishabh Saxena
9b704e483e modify tests 2016-07-14 19:09:39 +05:30
Rishabh Saxena
a3d709bc75 add helper tests 2016-07-14 19:08:28 +05:30
Rishabh Saxena
07c9aee7cc remove 'paid' argument in testing function calls 2016-07-11 23:34:02 +05:30
Rishabh Saxena
888c7a8524 use short-form presence validator.
use two-argument form.
add unpaid scope.
repair tests.
2016-07-11 23:34:02 +05:30
Rishabh Saxena
893f517ab0 pass paid value as hash, improve code reviews 2016-07-11 23:34:01 +05:30
Rishabh Saxena
8b03f1be74 check for other tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
df4b015c09 replace submit form capybara 2016-07-11 23:34:01 +05:30
Rishabh Saxena
e31ca46f87 submit form directly in tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
2e66e5807a check path transition after payment 2016-07-11 23:34:01 +05:30
Rishabh Saxena
58a240a9f2 add tests and repair button click 2016-07-11 23:34:01 +05:30
Rishabh Saxena
99b4d18729 check failing tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
5b8e7ade2f use select instead of fill_in capybara 2016-07-11 23:34:01 +05:30
Rishabh Saxena
1af6fa5ad1 add id to inputs and repair tests 2016-07-11 23:34:01 +05:30
Rishabh Saxena
c57a8a1d00 repair tests and move method belonging to controller 2016-07-11 23:34:00 +05:30
Rishabh Saxena
38ae24c6b3 add more tests 2016-07-11 23:34:00 +05:30
Rishabh Saxena
c0c84b9dbf add more explanatory true/false values 2016-07-11 23:34:00 +05:30
Rishabh Saxena
f202c6b93b repairing code reviews 2016-07-11 23:34:00 +05:30
Rishabh Saxena
ee71456060 improve tests[WIP] 2016-07-11 23:34:00 +05:30
Rishabh Saxena
809e2b7156 active merchant GATEWAY config 2016-07-11 23:32:41 +05:30
Rishabh Saxena
b202984fa9 update ticket purchase and conference registration views for new structure 2016-07-11 23:32:41 +05:30
Rishabh Saxena
14594c7a4d add payment views, styling and its helper methods 2016-07-11 23:31:13 +05:30
Rishabh Saxena
81ef41be8b modify controllers and models to just save paid ticket purchases 2016-07-11 23:31:13 +05:30
Rishabh Saxena
900a1b32a8 add payment resources, controllers and method for updating purchased ticket's parameters 2016-07-11 23:24:53 +05:30
Rishabh Saxena
36f2cf4373 add payment model and its associations 2016-07-11 23:24:52 +05:30
Rishabh Saxena
e8f1645fc2 add active merchant and payment schema 2016-07-11 23:24:52 +05:30
Christian Bruckmayer
69a5d41b79 Merge pull request #1080 from Ana06/text-color
Text color of event types and difficulty levels
2016-07-11 16:31:47 +02:00
Ana
feb002de1a Text color of event types and difficulty levels
Changing the text color of event types and difficulty levels taking the background color into account. Similar to what it is done with tracks. See issue https://github.com/openSUSE/osem/issues/1033

Closes https://github.com/openSUSE/osem/issues/1078
2016-07-11 15:32:02 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color
Different colors for new tracks, types and levels
2016-07-11 15:10:26 +02:00
Ana
2e73c3f67b Rubocop class length increased 2016-07-11 13:46:02 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
2016-07-11 13:46:01 +02:00
Stella Rouzi
eb312f139e Merge pull request #1084 from arun1595/define-singular-resource
Modify conference registration to a singular resource
2016-07-11 13:40:56 +03:00
Stella Rouzi
798998b73f Merge pull request #1085 from Ana06/validation
Name validation repeated in Track
2016-07-05 10:49:16 +02:00
Ana
9d4a82b062 Name validation repeated in Track
The validation to check that the name is present in track.rb is twice.
2016-07-05 10:13:41 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Henne Vogelsang
8b831b1977 Merge pull request #1070 from Ana06/style
unnecessary %div deleted
2016-07-01 14:52:36 +02:00
Henne Vogelsang
99d11bb3d0 Merge pull request #1073 from danimo/fix_osm_tiles_for_https
Use protocol relative URL when loading OSM tiles
2016-07-01 14:52:18 +02:00
Daniel Molkentin
2b43b348cd Use relative URL when loading OSM tiles
This avoids mixed content warnings and gives us our
padlock back on Chromium and Firefox.

This also switches the domain for the tile servers from osm.org to
openstreetmap.org because the certificates do not mention osm.org
and hence using this domain the tiles fail to load.
2016-07-01 14:27:32 +02:00
Ana
c1ce420c5d unnecessary %div deleted
unnecessary %div deleted from haml files as div is the default
2016-06-30 21:01:06 +02:00
Henne Vogelsang
8c27a3dbac Merge branch 'arun1595-venue-splash-page' 2016-06-30 17:31:46 +02:00
Henne Vogelsang
ff025a4839 Fix the venue display on splash 2016-06-30 17:31:11 +02:00