Commit Graph

62 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 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 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 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
Sam Bell 89969e1b68 Merged pull request with localisation 2018-06-04 17:28:21 +01:00
Jacek Marianski 83205555d7 (localization) Several big changes:
1) Added localization components to the package. They allow usage of localized routes, like http://attendize.site/en/login
2) Added English and Polish localization files. They are ugly, repetitive, but mostly true to the original and relevant. It required rewriting several phrases, and certainly required editing most of the views and controllers.
3) Edited routes to accomodate point 1
4) Rewritten several rules regarding dates. In most cases using English notation (with English names for months) is bad in all other languages. I used environment wide date format that is used.
5) Updated installer. Haven't tested it yet, but should work. Rewrites .env.example file instead of creating it from scratch (by concatenating strings).

There are some minor changes that were simple fixes or other funky requirements from my employer that kinda make sense:
1) QR code reader wasn't working in firefox, fixed it. Works in chrome/firefox on mobile on https sites.
2) Added subscript text in some instances: below ticket registration, below ticket. It is kinda dumb, but in most cases is necessary to receive less complaints from clients.
3) Fixed geocoding api by adding api key in env file. At some point in 2016-2017 it was required by google to use API key from developer console and this requirement wasn't challenged in the code.
4) Ticket has been displaying either flyer or site logo on the side. Now displays both (which may affect 1d barcode - it might need some fixin). Regarding the same issue - description of an event contained the flyer image on the side, it was removed, cause it didn't fit in here.
5) Ticket style was updated, because of the above and because it didn't fit longer character strings. Now it's slightly uglier, but works in all cases.
and other.

There are also some inconveniences, like:
1) Unfinished translations. It was impossible for me to create translations based on strings located inside of a database, which I ignored (I think it's only at one place - surveys).
2) Ugly translation files. At some point I thought it is going to be easier to locate when I try translating vased by file name. Later I divided it by topics, and then I segmented it even more. It might require some serious clean-up.
3) Redundancy. In some cases there are several definitions for the same phrase in my localization files. I used it mostly to protect myself from different contexts for the phrase usage in different languages.
4) File division. There are several files that are placed in dedicated language directory (in /view/, like /view/pl/ or /view/en/). These files don't use language phrases, but they are translated as a whole. Mostly because using language phrases would make those view files unreadable.
5) Localzation helper marks some phrases as obsolete (in file "basic"), because they are used in app/Helpers folder (where this plugin doesn't reach)
2018-05-03 23:41:22 +02:00
Sam Bell 2fc6e90432 Merge pull request #3 from Attendize/master
Realign with master project
2018-04-26 09:17:41 +01:00
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 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 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
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
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
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
Jacob Catayoc 4fc9586a61 - Fix some problems with MIGS 2016-10-07 21:43:04 +08: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 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 5164cb5f25 Minor fixes related to Offline Payments 2016-07-09 15:19:09 +01:00
Dave Earley 4214856f7b Updated EventCheckoutController so it can process offline payments 2016-07-09 12:06:44 +01:00
Dave Earley 5b2233aacd Update comments on EventCheckoutController 2016-07-08 00:00:18 +01:00
Dave Earley 140cc130a8 Refactoring & updating of jobs and mailers. 2016-06-15 11:14:27 +01:00
Dave Earley e8e5e4ac9c Fix incorrect property name from PR #117 2016-05-31 16:27:51 +01: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
Yoann Lecuyer 628efc43b2 Fixes #107 2016-05-21 23:20:25 -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 becea4395c Fixed 'Undefined Variable' related to the calendar_events array on the Organiser Dashboard controller. 2016-05-08 16:36:26 +01:00
Dave Earley e4f6e8cb26 Fixed bug where checkout questions with multiple selections were not being saved + small checkout bug fixes 2016-05-06 00:18:52 +01:00
Dave Earley 862c74d3c3 Revert "Revert "Postgres compatibility"" 2016-04-26 23:10:52 +01:00
Dave Earley 5426eeea19 Revert "Postgres compatibility" 2016-04-22 11:41:39 +01:00
Yoann Lecuyer 17cf0b4a1c Postgres compatibility 2016-04-20 19:14:16 -05:00
Dave 6127084c36 Working on surveys/attendee questions
Working on attendee check-in page
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 310521fff8 Fix issue where checkout would fail if there were no payment gateways set. 2016-03-23 01:09:44 +00:00