siddhantbajaj
6b3a6fa967
Fixed ticket_sold method of ticket model
2017-07-03 06:17:32 +05:30
siddhantbajaj
3d4adb5683
Allow admin to show/generate ticket
...
Created physical ticket controller and views for admin.
2017-07-03 06:17:27 +05:30
AEtherC0r3
f37d3095e1
Rework cfp abilities
2017-06-27 21:16:46 +03:00
AEtherC0r3
5f3b48c9f7
Update shoulda-matchers to 2.8
2017-06-27 21:16:46 +03:00
AEtherC0r3
a1124546f1
Fix rspec tests because of the changes to the cfp
...
Remove redundant association
Note: a conference created with :full_conference already has a cfp
2017-06-27 21:16:46 +03:00
AEtherC0r3
2bff918556
Add index view for the cfp and modify existing ones
...
Add cfp_type to the form partial
Refactor Cfps#show to use partials for the different cfp types
Modify the rest of the view, where the cfp was used
2017-06-27 21:16:46 +03:00
AEtherC0r3
c3eb178546
Modify CFP to accept proposals for other things
...
Add field cfp_type and relevant validations
Add Program#cfp to preserve backwards compatibility
Add 'for_events' scope to the cfp, in order for it to be used like
program.cfps.events
Add useful methods
Add rspec test for the new code
The supported cfp types can be viewed via Cfp::TYPES
2017-06-27 21:16:46 +03:00
Dimitris
7fd738bc7d
Add option to render html at format_helper
2017-06-27 18:30:26 +03:00
Moisés Déniz Alemán
775a93fc26
Merge pull request #1560 from Ana06/comment-annotation
...
Enable Style/CommentAnnotation Rubocop cop
2017-06-27 10:51:34 +02:00
Ana María Martínez Gómez
267f080ac7
Enable Style/CommentAnnotation Rubocop cop
...
This cop checks that comment annotation keywords are written according
to guidelines. The offense was automatically corrected.
2017-06-26 16:47:07 +02:00
Ana María Martínez Gómez
2223523fa0
Merge pull request #1550 from Ana06/version-test
...
Fix broken test in Admin::EventsController
2017-06-26 16:27:17 +02:00
Ana María Martínez Gómez
905f8954d0
Fix broken test in Admin::EventsController
...
We are using `paper_trail` gem, which saves data in database table
versions. It has a native way to search in the versions records,
using `where_object()` and `where_object_changes()`. They are broken,
under certain conditions. We changed them to a manual `where()`.
To test this case we need: an Event with ID 1, an Event with ID 2, and
a commercial with ID 1, for event with ID 2 - obviously the numbers
could be different as long as there is this matching of IDs. Before
this was made wit ha expect, which would make the test fail if this is
not the case. But this is actually the test case, not what we want to
test, so I moved to the `let`.
This was also the case why one of the test was broken after we change
how the database is cleaned in:
https://github.com/openSUSE/osem/pull/1541
I also remove the feature test, as this should be tested in a
controller test.
2017-06-26 15:35:05 +02:00
Ana María Martínez Gómez
b6e1a336d4
Merge pull request #1553 from Ana06/fix-rubocop
...
Fix Rubocop offense & remove default configuration
2017-06-23 15:07:15 +02:00
Ana María Martínez Gómez
702edef3a0
Merge pull request #1516 from siddhantbajaj/PhysicalTicket
...
Created PhysicalTicket model
2017-06-23 13:20:46 +02:00
AEtherC0r3
a925ceac35
Fix typo in bootstrap.sh
2017-06-23 11:00:44 +03:00
AEtherC0r3
bf7e890739
Update vagrant box image to openSUSE 42.2
...
And fix dependencies
2017-06-23 11:00:44 +03:00
AEtherC0r3
ed1f219b81
Update Ruby to 2.2
...
Force development environment to use ruby 2.2 in preparation for the
update to Rails 5
2017-06-23 11:00:44 +03:00
Ana María Martínez Gómez
5378b7524b
Fix Style/LeadingCommentSpace Rubocop offense
...
Fix Rubocop offense introduced in:
https://github.com/openSUSE/osem/pull/1229
2017-06-22 16:55:00 +02:00
Ana María Martínez Gómez
6469ea7da5
Remove default configuration from .rubocop.yml
...
We had part of the default Rubocop configuration in the `.rubocop.yml`
file. It is not needed as it is the default and it also don't make
sense, because we only have part of it.
That was caused because when enabling a cop we were moving it from
`.rubocop_todo.yml` to `.rubocop.yml`, but this is only needed if we
overwrite the default configuration.
2017-06-22 16:49:52 +02:00
siddhantbajaj
02f27dd4bc
Fixed association between TicketPurchase and Payment Model.
...
One to many association between TicketPurchase model and Payment Model wasn't properly set up.
2017-06-22 19:51:08 +05:30
Siddhant Bajaj
d7678b2fa0
Added model test
...
Added test for physical ticket model.
2017-06-22 19:51:08 +05:30
Siddhant Bajaj
5c56683ae8
Introduced Physical Ticket
...
Added PhysicalTicket model and controller. It holds the information about each physical ticket bought at the purchase. Physical Tickets are created after every successfull payment.
2017-06-22 19:50:55 +05:30
Eugene Dubinin
1c38b091cc
Fixes for PostreSQL support
2017-06-20 15:49:15 +03:00
Ana María Martínez Gómez
f2c0367a74
Merge pull request #1545 from dPliakos/enable_rails_find_each
...
Enable rails/findEach Rubocop cop
2017-06-20 10:38:29 +02:00
Dimitris
d160c22a0b
Enable rails/findEach Rubocop cop
...
This cop enforce the use of `find_each` instead of `each`.
Closes #1535
2017-06-20 10:46:04 +03:00
Ana María Martínez Gómez
4d895ae3bc
Merge pull request #1541 from siddhantbajaj/travis
...
Improved test performance.
2017-06-16 10:04:21 +02:00
Stella Rouzi
2f70a1ddd1
Avoid horizontal scroll bar
2017-06-15 13:54:06 +03:00
siddhantbajaj
0496ed23e5
Improves test speed
2017-06-15 04:26:15 +05:30
Ana María Martínez Gómez
e3f5b48d26
Merge pull request #1543 from shlok007/update-nokogiri
...
Update nokogiri to 1.8.0
2017-06-14 22:42:22 +02:00
Ana María Martínez Gómez
bfcb1a3164
Merge pull request #1536 from divyanshumehta/issue_1531
...
Add Style/SelfAssignment Rubocop Cop
2017-06-14 22:41:37 +02:00
shlok007
58c80f1447
update nokogiri to 1.8.0
2017-06-14 22:12:10 +05:30
divyanshumehta
cdf794ecbf
Add Style/SelfAssignment Rubocop cop
...
The cop enforces use of self assignment operator E.g. a=a+2 gets
written as a+=2. Also the offenses listed in rubocop.todo.yml
have been corrected automatically with the --auto-correct option.
Fixes issue #1531
2017-06-14 09:22:19 +05:30
Dimitris
be72b9d02e
Allow user to remove openid
2017-06-13 13:04:55 +03:00
Shlok Srivastava
703dce4f5c
Merge pull request #1517 from shlok007/copy-organizations
...
Introduce organizations to OSEM
2017-06-12 23:21:09 +05:30
Shlok Srivastava
6bb2143282
Merge branch 'master' into copy-organizations
2017-06-12 22:46:53 +05:30
Ana María Martínez Gómez
53040b3be9
Merge pull request #1498 from divyanshumehta/issue_1497
...
Added Style/SpaceInsideBrackets Rubocop cop
2017-06-12 17:45:30 +02:00
shlok007
cc5d47e6de
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
6cf9ddbdea
fix failing test
2017-06-12 19:43:44 +05:30
shlok007
521c05af61
skip failing tests
2017-06-12 19:43:44 +05:30
shlok007
b29856a122
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
949f5cb591
add foreign key to conferences
2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea
creating default organization while creating a conference
2017-06-12 19:43:44 +05:30
shlok007
3fb316482c
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
ac85bad9b3
migrate conferences to organizations
2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
8edf896d86
introduce organizations
2017-06-12 19:43:44 +05:30
Shlok Srivastava
bf54487a19
Merge pull request #1537 from shlok007/fix-haml-lint
...
Fixes failing haml-lint in admin/conferences/show
2017-06-12 19:28:20 +05:30
shlok007
ce9d2b3c5b
fixes failing haml-lint in admin/conference/show
2017-06-12 18:37:50 +05:30
nasia
8cd3326520
Add charts about sold tickets
2017-06-12 15:24:27 +03:00
AEtherC0r3
41503bb7a0
Compute ticket statistics
...
And exclude admin/ConferencesController from rubocop_todo.yml
2017-06-12 15:24:27 +03:00
