Commit Graph

660 Commits

Author SHA1 Message Date
Jeremy Quinton ec69e0711b Added better error handling
On the completion of an order Attendize Generates a ticket and sends it via email. However if the ticket could not be generated we still attempt to send a file that does not exist which causes the checkout process to hang and throw an error message. Chained the Generate Ticket and SendOrderTickets events so that if a ticket cannot be generate we don't attempt to send it.
2018-08-17 14:32:30 +02:00
Jeremy Quinton e45fe77568 Latest composer file
Update composer file so Attendize works with Laravel 5.6
2018-08-17 10:22:53 +02:00
Jeremy Quinton 7404c4701a removed the Laravel Localization helper
This library is no longer being supported and only supports Laravel up to 5.5. This prevents us from upgrading to Laravel 5.6.
Will consider adding it back if someone starts maintaining the actual library again.
2018-08-17 09:38:15 +02:00
Jeremy Quinton ac5ff98f61 Removed migs and coinbase as default payment gateways
Going forward Attendize will only support Stripe and Paypal as defaults. In future we will add instructions on customising Attendize with your own payment gateway.
2018-08-16 15:50:12 +02:00
Jeremy Quinton 8d51cd348f Upgrading to Laravel 5.6
1) Changed method call from lists to pluck.
2) Use set put instead of session set.
3) Removed references to artisan optimize command.
4) Added additionl check to base controller if auth user not set redirect to login.
5) Flush the session on logout.
6) Updated Event and Route service providers to work with Laravel 5.6.
7) Added new default logging config file.
8) Bump PHP versions from 7.0.30 to 7.1.20.
9) Added missing translations.
10) Fixed some issues with the templates.
2018-08-15 13:26:10 +02:00
Jeremy Quinton 9eb5d1c062 Merge pull request #423 from Attendize/fix-language-translation
fixes #415
2018-08-14 19:20:06 +02:00
Jeremy Quinton 099ab7d2ff fixes #415
fixes issue where the number of events are not displaying correctly
2018-08-14 19:16:56 +02:00
Jeremy Quinton 8498f248e8 Merge pull request #416 from scottybo/master
Fix issue with inviting attendees
2018-08-14 18:31:35 +02:00
Jeremy Quinton 1c227d6237 Merge pull request #420 from Haroenv/patch-1
fix untranslated string
2018-08-14 16:17:51 +02:00
Haroen Viaene e962c903c6 fix untranslated string
fixes #418
2018-08-14 11:22:29 +02:00
Scott Bowler 97c461cd04 Restore strings incorrectly marked as obsolete 2018-08-13 10:01:37 +01:00
Scott Bowler 98810ea785 Make sure taxamt gets set 2018-08-13 09:52:40 +01:00
Jeremy Quinton ba7ca79df0 removed unnecessary footer from ticket 2018-07-26 14:16:25 +02:00
Sam Bell 8d86ca2003 Missing div close tag added 2018-07-26 11:48:58 +01:00
Jeremy Quinton 1c65daa8b9 Merge pull request #399 from Attendize/charge-vat-at-organiser-level
Added charging tax at the organiser level
2018-07-19 09:54:27 +02:00
Jeremy Quinton cd213b56b3 Merge branch 'master' into charge-vat-at-organiser-level 2018-07-18 19:37:56 +02:00
Jeremy Quinton ebbd4d7b4d updating extra references
1) Updated some extra references to tax amounts in the blade templates
2018-07-18 18:23:36 +02:00
Jeremy Quinton dcd47ea543 Updating template
1) Found a stray template that did not get the latest tax updates so added the standard tax logic to the template
2018-07-18 17:50:06 +02:00
Jeremy Quinton 0c529459d5 moved library to require from require dev so can deploy from master 2018-07-18 15:36:56 +02:00
Jeremy Quinton cfbd3c1674 moved doctrine/dbal to require so that migrations work on master 2018-07-18 15:18:13 +02:00
Jeremy Quinton 65e3bb388f added latest version of lock file. previous version of barryvdh/laravel-ide-helper breaks php artisan clear-compiled 2018-07-18 09:48:34 +02:00
Jeremy Quinton 2a29acd03f updated lock file to match composer.json to avoid problems on deployment 2018-07-18 09:02:45 +02:00
Sam Bell e2aad7914b Image URL fixed 2018-07-12 13:38:43 +01:00
Sam Bell 89cb8c8e2f Merge pull request #398 from Attendize/dummy-payment-gateway
Dummy payment gateway
2018-07-12 08:53:17 +01:00
Jeremy Quinton d94fd83208 change parameter passed to the OrderService 2018-07-12 09:34:06 +02:00
Jeremy Quinton 1c7c8be8f7 Finalised Charging V.A.T
1) Added Javascript partial so display and hide of the Charge Tax functionality can be shared.
2) Moved @yield head for the the master without menus layout to the correct place. Using jQuery functionality @head anywhere wouldn't work as the library was included afterwards.
3) Moved the question for organisers about Tax and the labels for tax fields to the language file.
2018-07-11 19:51:11 +02:00
Jeremy Quinton 9b5d61ffdd Added Tax to emails and various views
1) When Taxed is charged display it on the various views where tax should be displayed. Orders Listing Page, Orders Summary page.
2) Use the Order service to display correct values in emails and views.
2018-07-11 13:47:41 +02:00
Jeremy Quinton 6dd7edec97 introduced a bug when I added number_format
fixed
2018-07-10 17:03:16 +02:00
Jeremy Quinton a588b634b6 added better formatting
1) Omnipay doesn't accept decimals with more than a precision of 2.
2) Once order is created organiser_booking_fee is the correct value to use else use total_booking_fee
3) Controller makes use of OrderService instead of Order Model
2018-07-10 16:50:46 +02:00
Jeremy Quinton 43dab40873 Update attendee ticket email
update tickets to have the correct V.A.T amount
2018-07-10 15:04:46 +02:00
Jeremy Quinton c5676bbe45 Improvements to charging Tax
1) Surfaced more logic from from views into service.
2) If charge_tax is set in database tax is charged.
3) Made the name of the Order service OrderService so its not confused with the Order Eloquent Model.
4) Move order totalling logic in to Service and call service where necessary.
2018-07-10 12:19:20 +02:00
Jeremy Quinton b3dae02cef Tax improvements
1) remove logic for calculating Tax out of the blade view and into a service.
2) implemented service in the correct controller.
2018-07-10 10:36:42 +02:00
Jeremy Quinton 2fa609de26 removed var_dump added by mistake 2018-07-09 18:15:48 +02:00
Jeremy Quinton 6771a56197 Added charging tax at the organiser level
1) Added new field to the organiser model called charge_tax. Added the migration for this.
2)  Renamed tax fields columns in the database to be the same as the other organiser fields for consistency.
3) Added charge_tax option to the various organiser create and edit pages.
4) Have re-enabled some tests and used the @group passing label so we can start running tests for the various parts of the applicaiton.
2018-07-09 18:13:23 +02:00
Jeremy Quinton a6ab321561 Added instructions for how to enable the dummy payment gateway 2018-07-09 12:47:29 +02:00
Jeremy Quinton 651ff36f28 Merge branch 'master' into dummy-payment-gateway 2018-07-09 12:37:44 +02:00
Jeremy Quinton 8cce15520e Listed WKHTMLPDF options a bit better 2018-07-09 12:30:54 +02:00
Jeremy Quinton 1b93fdeff0 improved readbility of document 2018-07-09 12:29:44 +02:00
Sam Bell d06322b1da Merge pull request #392 from Attendize/fix-docker-install-process
Fix docker install process
2018-07-08 23:21:09 +01:00
Jeremy Quinton 3616050b94 installer improvements
1) removed space in mail_from_name. Spaces in .env files cause problems on install.
2) if we are using Docker set some sane defaults
2018-07-06 17:38:18 +02:00
Jeremy Quinton 4dee2011f9 Installer improvements
1) Added additional edge case for installer that I missed.
2) Reference class via use statement and correct namespacing.
3) If we are using the docker environment set certain defaults from environment variables instead of hardcoding.
2018-07-06 13:18:04 +02:00
Jeremy Quinton 37f6fc314f added defaults for mail service 2018-07-06 13:14:35 +02:00
Jeremy Quinton c33a4acc11 removed comment out var_dump which isn't needed 2018-07-05 23:24:52 +02:00
Jeremy Quinton 8cb7c92efb added default config option
1) added configuration option to enable dummy payment gateways
2018-07-05 17:22:29 +02:00
Jeremy Quinton 338afaedb3 Added dummy payment gateway
1) Dummy payment gateway added. When enable allows someone testing or developing on the software to go through the flow end to end without odd errors.
2018-07-05 17:20:59 +02:00
Jeremy Quinton 963b82fac2 Updated wording in the readme 2018-07-05 12:11:35 +02:00
Jeremy Quinton cfc910adf9 file should have not been committed 2018-07-05 12:06:07 +02:00
Jeremy Quinton d10abaafd8 updated error message 2018-07-05 12:04:45 +02:00
Jeremy Quinton 176f33a829 removed css style not needed 2018-07-05 12:04:37 +02:00
Jeremy Quinton 2cb33d6082 Further improvements to install process
1) If a user tested the database connection previously it worked no matter what they entered into the form. Fixed logic to return error message based on whether database exists or not.
2) If a user enters valid text data into the database connection fields but the database doesn't exist fail gracefully.
2018-07-05 12:04:20 +02:00