Commit graph

591 commits

Author SHA1 Message Date
nasia
32c5af2a17 Add booths to non admin 2017-08-08 16:18:07 +03:00
shlok007
80a9544279 move admin/users to be accessed only by site admins 2017-08-01 13:52:17 +05:30
siddhantbajaj
906f08baf8 Send mail on ticket confirmation.
Added mailer method to send ticket confirmation email along with the attached pdf for ticket.
2017-07-26 11:31:19 +05:30
Ana María Martínez Gómez
e2bad46d00 Merge pull request #1576 from siddhantbajaj/qr-code
Add token field in ticket
2017-07-25 11:46:04 +02:00
siddhantbajaj
9e154a1dcd Added Token field for physical_ticket
Added token field in physical_ticket model. This token will also be stored in the qr code and will uniqely identify the ticket.
2017-07-24 16:58:36 +05:30
Dimitris
2bf7e4bbd3 Fix user already subscribed exception
Prevent excpetion at user subscription when already is subscribed to a conference and add hanling to the similar unsubscribe event.

remove double validation at app/models/subscription.rb

update subscription_controller_spec
2017-07-23 17:07:28 +03:00
nasia
c6b0a1f52e Add tests for booth controller 2017-07-21 17:34:05 +03:00
nasia
d9b2ebfc36 Add paper_trail 2017-07-18 14:18:42 +03:00
nasia
f7c0b64eb5 Introduce Booths for admin 2017-07-18 14:18:42 +03:00
Hernan Schmidt
d9a3b0de72 Fix Style/ConditionalAssignment errors
They did not get excluded by `--auto-gen-config`
2017-07-14 15:16:43 +02:00
nasia
b86472ac3c Add Call for Booths 2017-07-14 15:14:25 +03:00
AEtherC0r3
9671696adf Add to_param to the Track model
And update the urls
2017-07-14 12:38:53 +03:00
AEtherC0r3
68fc750e9f Implement track requests and add the track organizer role
About track requests:
Create migration that adds the fields submitter_id, state, and
cfp_active to Tracks
Add validations and the self_organized? method to the Track model
Create a new TracksController outide of the admin namespace
Create the relevant views for index, show, new and edit
Modify the admin views for tracks to include extra info for
self-organized tracks

About track organizers:
Create the role when a self-organized track is created
Define track organizer abilities
Modify the roles views and controller to handle the new role

The route for Roles#edit needs to have higher priority than the nested
routes for track roles, otherwise, the word edit in the url is matched
as a track with short_name edit
2017-07-14 12:38:53 +03:00
shlok007
98fc1137e1 suggested changes 2017-07-13 23:45:13 +05:30
shlok007
05fdd443a4 fix failing tests for volunteers_coordinator 2017-07-13 23:45:13 +05:30
shlok007
d26a5dcf9b fix failing tests about accessing admin area 2017-07-13 23:45:13 +05:30
shlok007
366fced200 Move abilities for admin views in separate model 2017-07-13 23:45:13 +05:30
shlok007
eb23d838b5 correct past and upcoming conferences in admin/organizations#index 2017-07-12 17:42:19 +05:30
siddhantbajaj
c066aadae2 Added TicketScanning Model 2017-07-11 17:05:07 +05:30
shlok007
b33e9ed28e fix revision count and drop observers 2017-07-09 03:36:57 +05:30
shlok007
9c6286182e caching comment counts 2017-07-09 01:57:44 +05:30
siddhantbajaj
dd52a9b2ab Make ticket layout configurable
Added option for conference organizer to switch between ticket layouts (horizontal or vertical). Added test for the same.
2017-07-07 14:19:51 +05:30
siddhantbajaj
72537ba2a8 Fixed user abilities in Physical Ticket 2017-07-05 16:39:31 +05:30
AEtherC0r3
95fbd10153 Friendly urls for tracks
Don't use tracks ids in urls
Add short_name to tracks and use that in urls as the identifier
2017-07-04 20:42:10 +03:00
Hernán Schmidt
85a021ef05 Merge branch 'master' into org-admins-backend 2017-07-04 15:30:30 +02:00
siddhantbajaj
6b3a6fa967 Fixed ticket_sold method of ticket model 2017-07-03 06:17:32 +05:30
shlok007
f68fd39095 fixed abilities for conference#new and organization#new 2017-07-03 04:17:06 +05:30
shlok007
651abcab87 split feature tests for abilities and suggested changes 2017-06-30 09:18:17 +05:30
shlok007
7d408ee33c suggested changes
change description of organization_admin
remove assign_role callback
2017-06-28 06:55:30 +05:30
shlok007
8839a928ed mending failing tests 2017-06-28 06:55:30 +05:30
shlok007
ad3d6f2f95 modify admin/conference_controller_spec and not authorized error messages 2017-06-28 06:55:30 +05:30
shlok007
aa3df0243e mending permissions and test 2017-06-28 06:55:30 +05:30
shlok007
b72e64b238 Introduce organization admins 2017-06-28 06:55:30 +05:30
AEtherC0r3
f37d3095e1 Rework cfp abilities 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
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
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
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
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
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
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
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
3fb316482c suggested changes 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
AEtherC0r3
41503bb7a0 Compute ticket statistics
And exclude admin/ConferencesController from rubocop_todo.yml
2017-06-12 15:24:27 +03:00
AEtherC0r3
c2184c1c4f Add 'week' column to TicketPurchases 2017-06-12 15:24:27 +03:00