Commit Graph

65 Commits

Author SHA1 Message Date
Sam Bell 2fc6e90432 Merge pull request #3 from Attendize/master
Realign with master project
2018-04-26 09:17:41 +01:00
githubertus f50d708b7a make Charts on dashboard work 2018-04-24 20:34:03 +02:00
EC2 Default User 01daf61cdd Fix merge conflicts 2018-03-04 16:30:09 +00:00
Sam Bell 7c1c62dd37 Added ability to charge to tax on tickets 2018-03-04 14:49:35 +00:00
Sachin 95d3806c0f Added TAX ID field in Create Organizer, Customise Organiser
Same is shown in Invoice.
2018-03-01 22:13:51 +05:30
Sachin d7cce49f3c Added two new fields to an 'Organiser':
- Tax name, a text field (so the user can call it VAT, TVA, sales tax, etc. as required by their country)
- Tax value, a float number

Also added tax value on these pages.
- The ticket sales page, to show how much tax will be added on top of a ticket
- The total basket value that is sent through to Stripe
- The receipt email that gets sent to the user
2018-02-27 23:56:23 +05:30
Dave Earley 004f86c6a7 Revert "Sponsors" 2016-12-01 22:11:34 +00:00
Dave Earley 64092660f9 Merge pull request #252 from JapSeyz/sponsors
Sponsors
2016-12-01 20:39:32 +00:00
JapSeyz 505599251e Active / inactive sponsors 2016-11-28 13:43:28 +01:00
JapSeyz 7e8c785cf4 Unified Fileupload function to prevent different image and locations 2016-11-20 00:19:54 +01:00
JapSeyz 4101e51824 Two types of tickets 2016-11-15 10:45:41 +01:00
JapSeyz 638a1762cf Update/delete sponsors 2016-11-15 10:13:49 +01:00
JapSeyz 0a59df3493 Start Sponsors Work 2016-11-15 09:51:04 +01:00
jharris70 2e5916d603 Update Order.php 2016-10-13 13:57:07 -07:00
Dave Earley 539a0c4fec Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Http/Controllers/OrganiserCustomizeController.php
#	app/Models/Account.php
#	app/Models/AccountPaymentGateway.php
#	composer.lock
2016-10-11 21:25:47 +01:00
Dave Earley cab32d6e01 Merge pull request #212 from shibby/master
Model FQN written instead of class name string
2016-10-09 12:46:32 +01:00
shibby c356c6b9f2 fix for wrong FQN 2016-10-08 01:51:04 +03:00
shibby 7f26093b49 Model relation's fully qualified class name's written instead of string usage 2016-10-08 01:48:54 +03:00
Sinan Taga f8be96a6fe Correct typo in Event Model method
Committer: Sinan Taga <sinantaga@gmail.com>
2016-10-07 13:46:35 +03:00
James Mowatt 9579dfb10c Retrieve ICS Content for a event
Add getIcsForEvent() method, this returns an ICS formatted text ready
for download or attaching to emails.
2016-09-11 16:49:27 +01:00
Dave Earley def39ce73f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Listeners/OrderCompletedListener.php
#	app/Models/EventStats.php
2016-09-07 21:56:17 +01:00
Dave Earley 9ec1cc20f2 Reformat code 2016-09-06 21:39:27 +01:00
Pásztor Gábor ab2ceff24f Typo and phpDoc 2016-09-06 21:33:19 +02:00
Dave Earley 6d9433a45c Fixed used where exported answers data was inaccurate (closes #13) 2016-08-11 13:19:59 +01:00
Dave Earley 6104b0e3d8 Moved admin links to footer and simplified checks for user permissions 2016-07-27 20:26:41 +01:00
Dave Earley 45fb180f1b Fix bug where payment gateway could apply to multiple accounts 2016-07-24 23:48:29 +01:00
Dave Earley c9e7e0e671 Tidying up account payment gateway model 2016-07-16 11:44:23 +01:00
bretto36 7f19499d7b Added event attendees tests 2016-06-15 22:06:27 -04:00
bretto36 30362dcc16 Added Tests and numerous fixes 2016-06-15 21:36:09 -04:00
Dave Earley 8914cb63fd Added 'Is Enabled' scope to Question model 2016-05-28 09:16:44 +01:00
Dave Earley d45d0a39e5 Normalized attendees reference in attendees table (closes #106) 2016-05-26 01:40:49 +01:00
Dave Earley cc911f7344 worked on implementing custom attendee questions 2016-05-20 23:56:47 +01:00
Dave Earley d256fecaf8 Fixed bug where PDF ticket generation would fail when no logo was passed (closes #97) 2016-05-12 13:33:34 +01:00
Dave Earley f689ff3b1e Fixed bug where incorrect currency symbol was showing on organiser dashbaord. 2016-05-12 11:44:42 +01:00
Yoann Lecuyer cd155f4571 Standalone ticket generator (#93) 2016-05-12 00:14:58 +01:00
Dave Earley 6b10a05563 Began work on tests 2016-04-28 00:06:17 +01:00
Dave Earley cd5979f8f1 Working on UI redesign
Added recent orders to organiser dashboard
2016-04-26 14:36:43 +01:00
Dave Earley 4580730f13 Working on UI update 2016-04-22 12:01:48 +01:00
Yoann Lecuyer 17cf0b4a1c Postgres compatibility 2016-04-20 19:14:16 -05:00
Dave Earley f24e80a929 Fixed bug where adding users failed 2016-04-17 23:41:19 +01:00
Dave 6c4af6e015 More work on API 2016-04-17 21:12:38 +01:00
Dave 4007b89587 Started work on a simple API 2016-04-17 21:12:38 +01:00
Dave 2df5d86a14 Added api_token column to user table
Updated Authentication middleware to L5.2
2016-04-17 21:12:38 +01:00
Dave 3ef62fd8a2 Work on Qr Scanner check-in
Work on global JS
Minor tweaks and fixes
2016-04-17 21:12:38 +01:00
Dave 6127084c36 Working on surveys/attendee questions
Working on attendee check-in page
2016-04-17 21:12:38 +01:00
Dave 82da15cad4 Work on event survey
Removed the need to pass modal_id to each modal
Cleaned up the UI
2016-04-17 21:12:38 +01:00
Dave ed4e86baa1 Work on custom attendee questions
Start on moving surveys, widgets, check-in to their own pages
Refactoring code
Fix bug where tickets sales volume was not updating
2016-04-17 21:12:38 +01:00
Dave 6d101cea05 Work on custom attendee questions
Start on moving surveys, widgets, check-in to their own pages
2016-04-17 21:12:38 +01:00
Dave ad8b5d9f62 Work on custom attendee questions
Created answers table in DB
2016-04-17 21:12:38 +01:00
Dave 637d8265ee Work on attendee questions backend design 2016-04-17 21:12:38 +01:00