Commit Graph

586 Commits

Author SHA1 Message Date
Sam Bell 89969e1b68 Merged pull request with localisation 2018-06-04 17:28:21 +01:00
Sam Bell d2180ea92b Merge pull request #380 from samdb/master
Addition of tax options
2018-06-04 17:03:47 +01:00
Sam Bell 932bdbcfa8 Merge pull request #378 from randomCards/patch-1
Update Dockerfile-php
2018-05-29 14:01:56 +01:00
Mirko Sacchetti f5ec83dafc Update Dockerfile-php
The package libpng12-dev was dropped after 16.04. It's been gone a long time.
2018-05-27 21:37:20 +02:00
Sam Bell 0a6ddf56f6 Logo URL fix 2018-05-06 13:12:37 +01:00
Sam Bell c519ae318b Hide unpublished listings from organizer page 2018-05-06 13:07:02 +01:00
Sam Bell 6b1867be89 Option to set DB port 2018-05-06 12:41:58 +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
Sam Bell 7514aa4ba8 Merge pull request #358 from githubertus/patch-2
Make charts on dashboard work
2018-04-25 08:17:51 +01:00
Sam Bell 47e9aaf4b0 Merge pull request #357 from githubertus/patch-1
Tickets Sold and Sales Volume charts working
2018-04-25 08:16:17 +01:00
githubertus f50d708b7a make Charts on dashboard work 2018-04-24 20:34:03 +02: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 0bfe124514 Update readme.md 2018-04-24 14:38:57 +01:00
Sam Bell 8c5c0ad656 Merge pull request #2 from Attendize/master
Merge typos
2018-03-29 15:52:02 +01:00
Sam Bell 93ec2c3f76 Merge branch 'master' of https://github.com/samdb/attendize 2018-03-29 14:43:14 +00:00
Sam Bell e2dcf4e805 Updated incorrect page title 2018-03-29 15:25:05 +01:00
Sam Bell 86e9006333 Correct grammar in ticket cancellation email 2018-03-29 14:17:43 +01:00
Sam Bell cb98c6a161 Merge pull request #1 from Attendize/master
Update demo link
2018-03-29 14:03:50 +01:00
Sam Bell 88222eb50f Update demo link 2018-03-27 12:49:30 +01:00
Sam Bell 1f03d33fd0 Conflict resolution 2018-03-07 09:03:54 +00:00
Sam Bell ec36de54c5 Recompile styles 2018-03-06 20:45:52 +00:00
Sam Bell be526044ce Fix event logging issue on checkout 2018-03-06 20:45:32 +00:00
Sam Bell f5d392cc23 Revert config change to most users defaults 2018-03-06 20:44:14 +00:00
Sam Bell f8ea51dd97 Add VAT and updated totals to order confirmations 2018-03-06 20:40:49 +00:00
Ubuntu 9d3abc611e Revert PDF config to defaults 2018-03-05 09:08:46 +00:00
Sam Bell e0cfb98b8b iframe resize css fix 2018-03-04 22:53:23 +00:00
Sam Bell f033b115d1 iFrame resizing script included in all embed widgets 2018-03-04 18:21:35 +00:00
Sam Bell 3b630d5eef iFrame resizing script for optional auto-sizing of widget 2018-03-04 18:12:52 +00:00
Sam Bell f3e6e136f2 Smaller text for tax amount 2018-03-04 17:50:37 +00:00
Sam Bell e2e54d12ff Smaller text for tax amount 2018-03-04 17:49:57 +00:00
Sam Bell 12ac3a0e0a Remove Tax Rate from header 2018-03-04 17:21:39 +00:00
Sam Bell c2258c80be Merge branch 'master' of https://github.com/samdb/attendize 2018-03-04 17:13:20 +00:00
Sam Bell e17bb7f1ce Option for database port 2018-03-04 17:12:52 +00:00
Sam Bell f364cab40b Option for database port 2018-03-04 16:41:20 +00:00
EC2 Default User 01daf61cdd Fix merge conflicts 2018-03-04 16:30:09 +00:00
EC2 Default User bb7b9e2b72 Test mailer for use with Artisan 2018-03-04 16:00:47 +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 c94b8eaf8b Merge pull request #342 from bryant1410/master
Fix broken headings in Markdown files
2017-04-20 19:06:17 +01:00
Santiago Castro d1978b7bd7 Fix broken Markdown headings 2017-04-17 00:43:01 -03:00
Dave Earley 085c54bb40 Update readme.md 2017-03-21 20:37:07 +00:00
Dave Earley cb2ca1ac3d Updated readme 2017-03-21 19:53:51 +00:00
Dave Earley 812bc79d1f Merge pull request #310 from eventrooms/master
fix docker-compose setup configurations
2017-02-07 21:35:44 +00:00
Tristan Guo 1ac0dbcff7 fix docker-compose setup configurations 2017-02-05 18:49:06 +08:00
Dave Earley 19b4fb6a2f Merge pull request #301 from CrNMGuy/patch-2
Create passwords.php
2017-02-01 21:25:48 +00:00
Dave Earley f50820c0ab Merge pull request #302 from CrNMGuy/patch-1
Create pagination.php
2017-02-01 21:25:40 +00:00
Dave Earley e2735cc865 Merge pull request #300 from CrNMGuy/patch-3
Create validation.php
2017-02-01 21:25:33 +00:00