gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2045 commits 2 branches 2 tags 50 MiB
Commit graph

2045 commits

This branch
This branch
All branches
Author SHA1 Message Date
charliequinn
af08dabc12 Update ConferenceRegistrationsController#new 
- authenticate on all controller actions unless (OSEM_ICHAIN_ENABLED != true and
  action is 'new' or 'create')

- before_filter rename to before_action

- addition of before_action :user_already_registered on :new action (redirects
  to edit if user already registered)

- increased specs
 2016-08-19 16:25:39 +01:00
Hernán Schmidt
c6be0999b9 Merge pull request #1116 from rishabhs95/payments-documentation 
add documentation for Stripe configuration
 2016-08-18 16:10:35 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe 
Online payment feature - direct stripe integration
 2016-08-18 16:04:11 +02:00
Christian Bruckmayer
529cfcf4c7 Merge pull request #1150 from charliequinn/add-specs-for-show-time 
Added specs for ApplicationHelper.show_time
 2016-08-18 14:41:02 +02:00
Rishabh Saxena
2605c8f239 docs/PAYMENTS: add API docs 
docs: remove OSEM_ICON docs
 2016-08-18 15:31:34 +05:30
Rishabh Saxena
4152cb242c run stripe feature test only if key is set 2016-08-17 23:57:40 +05:30
charliequinn
ef9ba3b981 Added specs for ApplicationHelper.show_time 
- refactor of code to use divmod and handle decimal number parameter
- return '0 h 0 min' if length blank
 2016-08-17 13:55:29 +01:00
Christian Bruckmayer
4450202d8d Merge pull request #1137 from arun1595/ichain-documentation 
Update CONTRIBUTING.md to setup ichain in test mode using dotenv
 2016-08-17 14:42:50 +02:00
Rishabh Saxena
cc09dd76ba support/external_request: only allow stripe 2016-08-17 12:25:49 +05:30
Rishabh Saxena
43ac7742a1 travis: provide Stripe API keys 2016-08-16 23:01:28 +05:30
Stella Rouzi
99992750bb Merge pull request #1128 from nishanthvijayan/event-changelog 
Improve event history page
 2016-08-16 18:23:56 +03:00
Nishanth Vijayan
a02060b665 cfp team users should have access to event commercials only 2016-08-16 18:56:54 +05:30
Stella Rouzi
10121ae6d0 Merge pull request #1110 from jmks/ichain-signin-page-layout 
Updated layout of ichain sign in page
 2016-08-16 13:48:57 +03:00
Stella Rouzi
9c5fd18c3e Merge pull request #1097 from shlok007/manual_confirmation 
Ability to confirm users by admin
 2016-08-16 13:43:27 +03:00
Christian Bruckmayer
3e2b2f3678 Merge pull request #1149 from charliequinn/allow-nil-value-in-markdown-1145 
Bug fix nil parameter ApplicationHelper.markdown
 2016-08-16 09:47:48 +02:00
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
charliequinn
89d45f62a0 Bug fix nil parameter ApplicationHelper.markdown 
Added specs for nil value parameter and header markdown
 2016-08-16 00:33:32 +01:00
Rishabh Saxena
75e11223d2 spec/feature: add stripe integration tests 2016-08-16 00:46:11 +05:30
Rishabh Saxena
060d65c430 views/_payment: decrease script indentation 2016-08-16 00:43:48 +05:30
Christian Bruckmayer
6c2dc92b84 Merge pull request #1148 from Ana06/event-schedule-validation 
Validation in EventSchedule
 2016-08-15 16:28:39 +02:00
Ana
f0a7f3c59b Validation in EventSchedule 
Validation to avoid scheduling the same event twice for the same schedule.
 2016-08-15 16:10:57 +02:00
Nishanth Vijayan
e2659ae907 Show changes to event commercials in event changelog 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
da1c8fc691 Allow cfp team members to revert changes to events through event#history-content 2016-08-15 18:18:03 +05:30
Nishanth Vijayan
0a3466ca7c Move shared version partials to views/shared 2016-08-15 18:17:59 +05:30
Nishanth Vijayan
c80f37f3ff Change look of event history page similar to changelog 2016-08-15 16:48:10 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog 
Changelog/Revision History page
 2016-08-15 14:16:12 +03:00
Rishabh Saxena
4147114e02 add test card docs 2016-08-15 11:00:47 +05:30
Rishabh Saxena
4509bf09bb add email-invoice documentation. 
correct language errors.
 2016-08-15 11:00:46 +05:30
Rishabh Saxena
f40caa8b24 improve documentation 2016-08-15 11:00:46 +05:30
Rishabh Saxena
c8b3b95d74 add documentation for Stripe configuration 2016-08-15 11:00:46 +05:30
Rishabh Saxena
164101f2fe change "purchase" to "get" in views 2016-08-15 10:59:36 +05:30
Rishabh Saxena
6aecf2d446 modify conference registration view message 2016-08-15 10:59:36 +05:30
Rishabh Saxena
261d7dd0de improve flash error collection 
improve views
 2016-08-15 10:59:36 +05:30
Rishabh Saxena
6bd2e5e335 refactor tests 2016-08-15 10:59:36 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
922440fb77 improve payment view styling 2016-08-15 10:59:35 +05:30
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 2016-08-15 10:59:35 +05:30
Rishabh Saxena
4b0a5b1125 move params merge to private method 2016-08-15 10:59:35 +05:30
Rishabh Saxena
05e2a061cc add stripe key to development env 2016-08-15 10:59:35 +05:30
Rishabh Saxena
048f20bcfc fix typo. change secrets.yml config. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation. 
repair abilities. add ticket purchasing check.
 2016-08-15 10:59:35 +05:30
Rishabh Saxena
72ef33cbe6 remove stripe#customer creation. 
remove amount validation.
 2016-08-15 10:59:35 +05:30
Rishabh Saxena
112d2c6fff change camel case variable to ruby style. 2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
be6d046154 move stripe API call to model, schema changes 2016-08-15 10:59:34 +05:30
Rishabh Saxena
47e16e5653 add stripe gateway config 2016-08-15 10:59:34 +05:30
Rishabh Saxena
7b23018a06 add payment tests 2016-08-15 10:59:34 +05:30
Rishabh Saxena
a5bb038f61 modify tests for changed payment flow 2016-08-15 10:59:34 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30