Commit Graph

224 Commits

Author SHA1 Message Date
githubertus 21d3234b88 make Tickets Sold and Sales Volume charts working
Honestly, I'm not a Laravel expert and maybe it's just a local issue, but firstOrNew didn't work for me (PHP 5.6) ...
2018-04-24 20:25:07 +02:00
Sam Bell 8c5c0ad656 Merge pull request #2 from Attendize/master
Merge typos
2018-03-29 15:52:02 +01:00
Sam Bell 86e9006333 Correct grammar in ticket cancellation email 2018-03-29 14:17:43 +01:00
Sam Bell be526044ce Fix event logging issue on checkout 2018-03-06 20:45:32 +00:00
EC2 Default User 01daf61cdd Fix merge conflicts 2018-03-04 16:30:09 +00:00
Sam Bell 64a6c44643 Suppress buggy loggin 2018-03-04 14:55:10 +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
Dave Earley 5b1336b3d8 Merge pull request #253 from JapSeyz/remove_unused_email_template
Removed non-unique email templates
2016-11-29 21:58:44 +00:00
Dave Earley f690747845 Merge pull request #259 from JapSeyz/organiser_image_fix
Uniform Organiser Image Upload
2016-11-29 21:48:11 +00:00
Dave Earley 9319031410 Merge pull request #266 from JapSeyz/edit_order_email
Edit an order
2016-11-29 21:20:51 +00:00
JapSeyz 505599251e Active / inactive sponsors 2016-11-28 13:43:28 +01:00
JapSeyz bfd3b42e0a Reflect Attendee cancellation in event stats 2016-11-28 13:19:14 +01:00
JapSeyz 477ae5c105 Edit an order
Edit an order [firstname, lastname and Email]
Resend an entrire order (especially useful if someone entered a wrong email which has then beed edited)

Show ticket reference in the order refund modal, so you can quickly refund/cancel multiple tickets in an order
2016-11-26 22:38:54 +01:00
JapSeyz 7e8c785cf4 Unified Fileupload function to prevent different image and locations 2016-11-20 00:19:54 +01:00
JapSeyz 0f3737e02a Uniform Organiser Image Upload
* Preserve Aspect Ratio
* Use the same size no matter where the upload is happening
2016-11-19 22:17:05 +01:00
JapSeyz cc467dfbb9 Removed non-unique email templates 2016-11-15 14:26:37 +01:00
JapSeyz d067cf1a04 Sponsors tickets 2016-11-15 12:54:52 +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 9460458b5c Update EventCheckoutController.php : stripe receipts.
Added 'receipt_email' to the Stripe charge creation request so customers get a payment receipt as well as their tickets. Also removed a blank line.

I would still like to see the $order->order_reference in the description, but I'm not sure if $order has that property at this point: line 330 of EventCheckoutController.php.
2016-11-09 14:02:42 -08:00
Dave Earley e1956b2da9 Fix issue where widgets would refresh to full site on timeout (closes #235) 2016-11-06 21:56:35 +00:00
Gary Guo 28e124c6de Make tickets be sorted in ASC order
In EventTicketsController::postUpdateTicketsOrder, sort_order is generated in ascending order, however, when displaying tickets, tickets is sorted in descending order. 964e456 tries to solve the issue but it is the other way around.
2016-10-23 19:52:40 -04:00
Dave Earley 964e45688d Change default ticket sort on frontend to correspond with the backend 2016-10-23 18:18:05 +01:00
Dave Earley cc0c22a743 Added ability to order tickets (closes #214) 2016-10-23 17:51:46 +01:00
Dave Earley a3d1e946bc Hide tickets on embedded ticket lists (closes #225) 2016-10-22 23:18:36 +01:00
Dave Earley c5a7bc328a Add ability to hide tickets (closes #218) 2016-10-22 17:06:34 +01: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 852172b9a5 Add about section 2016-10-11 21:23:16 +01:00
Jacob Catayoc 4fc9586a61 - Fix some problems with MIGS 2016-10-07 21:43:04 +08:00
Jacob Catayoc ef826d4ff1 Merge branch 'master' into add_migs_payment_gateway 2016-09-24 22:51:35 +08:00
James Mowatt a98a7835d8 Capture and Store GA Code
Capture and store a Google Analytics code per organiser.
2016-09-16 23:29:06 +01:00
James Mowatt ca4795e9bc Add Route and Controller for ICS download
Provide a route and method for people to download an ICS file
2016-09-11 16:50:12 +01:00
Jacob Catayoc f1ce15562e - MIGS payment gateway generate transaction id 2016-09-08 11:23:24 +08:00
Jacob Catayoc e5a994b1c2 - Add MIGS payment gateway
- Modified transaction data population logic
2016-09-08 06:06:26 +08:00
Jacob Catayoc 437be0e30f - Add MIGS payment gateway
- Modified logic to support payment gateways that redirect using GET
2016-09-08 05:48:07 +08:00
Jacob Catayoc 48835e5ead - Added MIGS Payment Gateway
- Changed default Attendize settings to Philippine Peso / Philippine time zone
2016-09-08 05:02:02 +08:00
Dave Earley 9ec1cc20f2 Reformat code 2016-09-06 21:39:27 +01:00
JapSeyz e881e7ede1 Fix no tickets selected returns an exception 2016-08-29 13:25:49 +02:00
Dave Earley 3b804b00d5 Add support for additional currencies + improve how currencies are displayed 2016-08-12 13:02:37 +01:00
Dave Earley e79aeb10c1 Remove unnecessary symbol from filename when exporting answers 2016-08-11 13:22:37 +01:00
Dave Earley 6d9433a45c Fixed used where exported answers data was inaccurate (closes #13) 2016-08-11 13:19:59 +01:00
Dave Earley 839a691e26 Minor code formatting change 2016-08-08 15:41:54 +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 4b64835be3 Updated admin links design on the frontend 2016-07-26 20:23:22 +01:00
Dave Earley 2de84966e4 Fix bug where offline payment would fail if no payment gateway was configured (issue #170) 2016-07-24 23:51:16 +01:00
Dave Earley 821f936dac Fix issue where users weren't redirected to the intended page after login 2016-07-15 13:02:35 +01:00
Dave Earley 5164cb5f25 Minor fixes related to Offline Payments 2016-07-09 15:19:09 +01:00
Dave Earley db44d743dc Added notice on check-in page for when an attendee has an outstanding payment 2016-07-09 14:50:31 +01:00
Dave Earley 47c3fdede1 Added ability to mark orders as payment received from the manage orders page 2016-07-09 14:44:00 +01:00
Dave Earley 4214856f7b Updated EventCheckoutController so it can process offline payments 2016-07-09 12:06:44 +01:00
Dave Earley efcb2ba84e Added offline payment setting migrations.
Added offline payment options to the event customize page
2016-07-08 15:08:04 +01:00
Dave Earley 91a9f9e41e Added the Whkhtml2pdf bin file config setting to the .env file 2016-07-08 13:55:42 +01:00
Dave Earley e64ccbba2b Changed the default background for new events 2016-07-08 13:33:45 +01:00
Dave Earley 5b2233aacd Update comments on EventCheckoutController 2016-07-08 00:00:18 +01:00
Dave Earley 2ebc6800e6 Added ability to enable 1D barcode on tickets (closes #18) 2016-07-07 15:50:39 +01:00
Yoann Lecuyer dca10200f4 Use event image if present 2016-06-19 12:01:53 -05:00
bretto36 ea5d4fa0e8 Added Organiser Events Test fixed model factory 2016-06-16 20:03:47 -04:00
bretto36 adf16e7eb1 Added User Password change tests 2016-06-16 19:28:42 -04:00
bretto36 63f0f4ec1a Fixed Edit User 2016-06-16 18:59:31 -04:00
bretto36 2eb1fef4a2 removed Response calls 2016-06-15 22:12:44 -04: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 3e79c2c5cc Users are now directed to the Organiser Events page instead of the Dashboard after they create an organiser. 2016-06-15 14:14:50 +01:00
Dave Earley 00f574da27 Fix bug which prevented the check-in QR scanner from working (closes #126) 2016-06-15 13:48:35 +01:00
Dave Earley 6bd4947fd8 Updated / Refactoring of PDF ticket mailers/jobs 2016-06-15 13:34:12 +01:00
Dave Earley 39fb757926 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/Http/Controllers/EventCheckoutController.php
2016-06-15 11:23:32 +01:00
Dave Earley 140cc130a8 Refactoring & updating of jobs and mailers. 2016-06-15 11:14:27 +01:00
Dave Earley 9d9ba51832 Merge pull request #127 from bretto36/controller-clean-up
Controller clean up
2016-06-15 10:53:51 +01:00
bretto36 f9c031f0d0 Controller clean up 2016-06-14 22:31:24 -04:00
JapSeyz 2daa2e1b99 Allow Refunds of individual tickets
Fixed use statement

Fixed a spelling mistake
2016-06-14 14:23:31 +02:00
Dave Earley c552b5742e Limit the number of past events to 10 public organiser pages 2016-06-09 12:27:46 +01:00
Dave Earley a1f2356eab Deleted unused file 2016-06-07 14:29:32 +01:00
Dave Earley 4f05292f08 Added feature to preview organiser profiles styles from the backend 2016-06-07 14:28:45 +01:00
Dave Earley e8e5e4ac9c Fix incorrect property name from PR #117 2016-05-31 16:27:51 +01:00
Yoann Lecuyer 5ce0711da3 Change create attendee to invite 2016-05-30 11:34:57 -05:00
Yoann Lecuyer fc2ee7244c ticket refactoring 2016-05-30 11:05:28 -05:00
Dave Earley 15de38ab91 Added DB transaction to the checkout page 2016-05-28 09:28:53 +01:00
Dave Earley f7327c4859 Fix bug where disabled attendee questions causing checkout to fail 2016-05-28 09:20:15 +01:00
Dave Earley d45d0a39e5 Normalized attendees reference in attendees table (closes #106) 2016-05-26 01:40:49 +01:00
Dave Earley 6e3ad53f93 Begin implementing transactions 2016-05-25 13:20:26 +01:00
Yoann Lecuyer 628efc43b2 Fixes #107 2016-05-21 23:20:25 -05:00
Dave Earley 48be489f61 Merge pull request #103 from ylecuyer/installer
Fixed installer
2016-05-21 22:17:03 +01:00
Yoann Lecuyer eb3d1b6123 Fixed installer 2016-05-21 13:23:18 -05:00
Dave Earley 9e29a7fc22 Working on custom event questions 2016-05-21 18:37:15 +01:00
Dave Earley fe2c5d6223 Fixed issue where CSS was not being passed to the ticket view 2016-05-21 00:09:34 +01:00
Dave Earley cc911f7344 worked on implementing custom attendee questions 2016-05-20 23:56:47 +01:00
Dave Earley acbeffb0ef Updated mass messaging to work with the queue system 2016-05-13 10:55:15 +01:00
Dave Earley d719a0c5a5 Merge remote-tracking branch 'origin/master' 2016-05-13 10:30:19 +01:00
Yoann Lecuyer fed1cde69d Fix mass messaging (#99) 2016-05-13 10:30:11 +01:00
Dave Earley dccdd9c276 Started work on exporting survey answers 2016-05-12 23:33:23 +01:00
Dave Earley 25b1b03b68 Removed unnecessary use statement in logout controller (closes #96) 2016-05-12 11:19:12 +01:00
Dave Earley 4b9dd02a3d removed unsed attendees json from check-in page 2016-05-12 00:42:19 +01:00
Yoann Lecuyer 6198b4925d Postgresql compatibility (#91) 2016-05-12 00:15:30 +01:00
Dave Earley 84b0a11203 Rewrote the Check-In page in VueJs and upgraded the UI 2016-05-12 00:07:57 +01:00
Dave Earley 4b2e6059f9 Merge branch 'master' into vue_checkin
# Conflicts:
#	resources/views/ManageEvent/Modals/CreateQuestion.blade.php
2016-05-09 17:47:22 +01:00