Commit Graph

645 Commits

Author SHA1 Message Date
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
Jeremy Quinton fe65e36c57 Improved install process
1. If Attendize is already installed don't throw an Unauthorized 403 error but instead ask user to create default account or login if default account already created.
2. Added defaults to the install process for database connection so if user gets to install page and hits install will use default database values.
3. Added basic validation on database connection details. If the details where empty previously allowed user to submit form.
2018-07-04 16:54:33 +02:00
Jeremy Quinton 915f1f8722 Improved install Process.
1. Added csrf token to form on install. This was causing Laravel to throw an error as no CSRF token was present.
2. During the install process default to MySQL as the default database.
2018-07-04 15:26:12 +02:00
Jeremy Quinton 08fbff0e98 Updated the documentation
1. Update the Readme with better instructions for installation.
2. Migrated the website instructions
2018-07-04 13:46:20 +02:00
Jeremy Quinton 9c1763f475 used mysql in the containers by default
the PHP containers were set to use postgres by default. This change install mysql by default
2018-07-04 13:38:47 +02:00
Jeremy Quinton 55ada1bb80 added mysql configuration
Added configuration so that mysql is the default database.
2018-07-04 13:36:58 +02:00
Jeremy Quinton 6e94d5a2e1 Set the default development environment type back to MySQL
As the projects default setup uses Docker and MySQL default the DB adapter to MySQL.
2018-07-03 15:48:03 +02:00
Jeremy Quinton 78696e47de Added a composer image
1. Bumped the PHP version in the PHP Docker file so that composer can run successfully as some packages are depdendent on PHP 7.0.8 or higher
2. Added a composer image that is dependent on the same version of the PHP container so that there are no issues running composer.
2018-07-03 15:46:02 +02:00
Sam Bell 6e608b47ed Merge pull request #390 from jeremyquinton/fix-defaults
Changed the default db adapter
2018-07-02 20:31:34 +01:00
Jeremy Quinton d97dfdfb17 fixed incorrect typo 2018-06-29 18:49:56 +02:00
Jeremy Quinton 9f3f3fd450 changed the default db adapter
In the docker compose file we are using Postgres as the DB but the
default adapter is set to use MySQL so trying to create the default app
out the box does not work.
2018-06-29 18:44:34 +02:00
Sam Bell 55ef3545c7 Merge pull request #387 from deucecreative/fix-safari-qr-code-scanning
Fix QR code scanning in Safari (inc. iOS).
2018-06-28 17:24:50 +01:00
Sam Bell b3da2e9d6b Update readme.md 2018-06-27 20:44:05 +01:00
Sam Bell b56e17f188 Merge pull request #388 from Fohdeesha/master
Fix attendee email subject
2018-06-27 19:29:23 +01:00
BuildTools 95ae91dacc Fix attendee email subject 2018-06-22 00:08:50 -04:00
Matt Sims d43d2a4c5f Fix QR code scanning in Safari (inc. iOS). 2018-06-20 22:01:38 +01:00