From 951774a76526b227c3817b76c44a5b640ff26357 Mon Sep 17 00:00:00 2001 From: Dave Date: Sun, 6 Mar 2016 17:59:19 +0000 Subject: [PATCH 1/6] - Removing unnecessary content from email templates - Fixed bug where cancelling attendees would fail --- app/Http/Controllers/EventAttendeesController.php | 2 +- resources/views/Emails/ConfirmEmail.blade.php | 3 +-- resources/views/Emails/OrderConfirmation.blade.php | 3 +-- resources/views/Emails/inviteUser.blade.php | 3 +-- resources/views/Emails/messageAttendees.blade.php | 9 +-------- resources/views/Emails/messageOrder.blade.php | 8 -------- 6 files changed, 5 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index 9adc0a1a..c7ad047b 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -411,7 +411,7 @@ class EventAttendeesController extends MyBaseController $data = [ 'attendee' => $attendee, - 'email_logo' => $attendee->organiser->full_logo_path, + 'email_logo' => $attendee->event->organiser->full_logo_path, ]; if (Input::get('notify_attendee') == '1') { diff --git a/resources/views/Emails/ConfirmEmail.blade.php b/resources/views/Emails/ConfirmEmail.blade.php index 716c508e..e97f6159 100644 --- a/resources/views/Emails/ConfirmEmail.blade.php +++ b/resources/views/Emails/ConfirmEmail.blade.php @@ -19,8 +19,7 @@ If you have any questions, feedback or suggestions feel free to reply to this email.

- Thank you,
- Team Attendize. + Thank you

@stop diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php index 28ec1290..f1354a94 100644 --- a/resources/views/Emails/OrderConfirmation.blade.php +++ b/resources/views/Emails/OrderConfirmation.blade.php @@ -87,6 +87,5 @@ Order Email: {{$order->email}}




-Thank you,
-The Attendize Team +Thank you @stop diff --git a/resources/views/Emails/inviteUser.blade.php b/resources/views/Emails/inviteUser.blade.php index d18223ca..76f2a745 100644 --- a/resources/views/Emails/inviteUser.blade.php +++ b/resources/views/Emails/inviteUser.blade.php @@ -26,8 +26,7 @@ If you have any questions, feedback or suggestions feel free to reply to this email.

- Thank you,
- The Attendize team. + Thank you

@stop diff --git a/resources/views/Emails/messageAttendees.blade.php b/resources/views/Emails/messageAttendees.blade.php index 5f373445..1eeab93c 100644 --- a/resources/views/Emails/messageAttendees.blade.php +++ b/resources/views/Emails/messageAttendees.blade.php @@ -14,13 +14,6 @@ @stop @section('footer') -
-

- You have received this message as you are listed as an attendee on an event which was created with Attendize Ticketing. -

-
-

- If you have any questions, simply contact us at {{config('attendize.incoming_email')}} and we'll be happy to help. -

+ @stop diff --git a/resources/views/Emails/messageOrder.blade.php b/resources/views/Emails/messageOrder.blade.php index 5f373445..f064e867 100644 --- a/resources/views/Emails/messageOrder.blade.php +++ b/resources/views/Emails/messageOrder.blade.php @@ -14,13 +14,5 @@ @stop @section('footer') -
-

- You have received this message as you are listed as an attendee on an event which was created with Attendize Ticketing. -

-
-

- If you have any questions, simply contact us at {{config('attendize.incoming_email')}} and we'll be happy to help. -

@stop From 5e003e407f2321beb265e4e6032a76b2c37a4545 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Mar 2016 17:45:51 +0000 Subject: [PATCH 2/6] - Bumping version number --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 341cf11f..9325c3cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 \ No newline at end of file +0.3.0 \ No newline at end of file From f928d09fe0ff630984e7126ffb66c2ad8b2a8c85 Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 7 Mar 2016 18:41:27 +0000 Subject: [PATCH 3/6] - Updated composer.lock --- composer.lock | 329 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 279 insertions(+), 50 deletions(-) diff --git a/composer.lock b/composer.lock index cbb66bd2..5b6f23dd 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c028b93a571f6e9bd3372f1afe762663", - "content-hash": "e1b0560236e256d67bdfeb9450bba135", + "hash": "ad6d371505f2c87ad08cf28e15040acd", + "content-hash": "e8a0412614c1f11a3313c1259a1aaf9c", "packages": [ { "name": "aws/aws-sdk-php", @@ -765,6 +765,52 @@ ], "time": "2016-02-18 21:54:00" }, + { + "name": "ignited/laravel-omnipay", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/ignited/laravel-omnipay.git", + "reference": "c64bb5acab93dcf99d4d601ef644eaf33b88433f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ignited/laravel-omnipay/zipball/c64bb5acab93dcf99d4d601ef644eaf33b88433f", + "reference": "c64bb5acab93dcf99d4d601ef644eaf33b88433f", + "shasum": "" + }, + "require": { + "illuminate/support": "~5", + "omnipay/common": "2.3.*", + "php": ">=5.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-0": { + "Ignited\\LaravelOmnipay": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Alex Whiteside", + "email": "alexwhiteside@ignitedlabs.com.au" + } + ], + "description": "Integerates Omnipay with Laravel and provides an easy configuration.", + "keywords": [ + "laravel", + "laravel5", + "omnipay", + "payments" + ], + "time": "2015-09-03 01:40:05" + }, { "name": "illuminate/html", "version": "v5.0.0", @@ -2036,6 +2082,237 @@ ], "time": "2016-02-29 14:44:41" }, + { + "name": "omnipay/common", + "version": "v2.3.4", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/omnipay-common.git", + "reference": "fcd5a606713d11536c89315a5ae02d965a737c21" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/fcd5a606713d11536c89315a5ae02d965a737c21", + "reference": "fcd5a606713d11536c89315a5ae02d965a737c21", + "shasum": "" + }, + "require": { + "guzzle/guzzle": "~3.9", + "php": ">=5.3.2", + "symfony/http-foundation": "~2.1" + }, + "require-dev": { + "omnipay/tests": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + }, + "gateways": [ + "AuthorizeNet_AIM", + "AuthorizeNet_SIM", + "Buckaroo", + "Buckaroo_Ideal", + "Buckaroo_PayPal", + "CardSave", + "Coinbase", + "Dummy", + "Eway_Rapid", + "FirstData_Connect", + "GoCardless", + "Manual", + "Migs_ThreeParty", + "Migs_TwoParty", + "Mollie", + "MultiSafepay", + "Netaxept", + "NetBanx", + "PayFast", + "Payflow_Pro", + "PaymentExpress_PxPay", + "PaymentExpress_PxPost", + "PayPal_Express", + "PayPal_Pro", + "Pin", + "SagePay_Direct", + "SagePay_Server", + "SecurePay_DirectPost", + "Stripe", + "TargetPay_Directebanking", + "TargetPay_Ideal", + "TargetPay_Mrcash", + "TwoCheckout", + "WorldPay", + "Alipay Bank", + "AliPay Dual Func", + "Alipay Express", + "Alipay Mobile Express", + "Alipay Secured", + "Alipay Wap Express", + "Cybersource", + "DataCash", + "Ecopayz", + "Neteller", + "Pacnet", + "PaymentSense", + "Realex Remote", + "SecPay (PayPoint.net)", + "Sisow", + "Skrill", + "YandexMoney", + "YandexMoneyIndividual" + ] + }, + "autoload": { + "psr-0": { + "Omnipay\\Common\\": "src/" + }, + "classmap": [ + "src/Omnipay/Omnipay.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Adrian Macneil", + "email": "adrian@adrianmacneil.com" + }, + { + "name": "Omnipay Contributors", + "homepage": "https://github.com/thephpleague/omnipay-common/contributors" + } + ], + "description": "Common components for Omnipay payment processing library", + "homepage": "https://github.com/thephpleague/omnipay-common", + "keywords": [ + "gateway", + "merchant", + "omnipay", + "pay", + "payment", + "purchase" + ], + "time": "2015-03-30 14:34:46" + }, + { + "name": "omnipay/paypal", + "version": "v2.5.3", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/omnipay-paypal.git", + "reference": "97fc3b1ff43e130ee911b35e139dcc853488d07a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/omnipay-paypal/zipball/97fc3b1ff43e130ee911b35e139dcc853488d07a", + "reference": "97fc3b1ff43e130ee911b35e139dcc853488d07a", + "shasum": "" + }, + "require": { + "omnipay/common": "~2.0" + }, + "require-dev": { + "omnipay/tests": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Omnipay\\PayPal\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Adrian Macneil", + "email": "adrian@adrianmacneil.com" + }, + { + "name": "Omnipay Contributors", + "homepage": "https://github.com/thephpleague/omnipay-paypal/contributors" + } + ], + "description": "PayPal gateway for Omnipay payment processing library", + "homepage": "https://github.com/thephpleague/omnipay-paypal", + "keywords": [ + "gateway", + "merchant", + "omnipay", + "pay", + "payment", + "paypal", + "purchase" + ], + "time": "2016-02-29 00:06:43" + }, + { + "name": "omnipay/stripe", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/omnipay-stripe.git", + "reference": "6c4cef5b5168a58476eef6fa73b7875e15c94b6f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/6c4cef5b5168a58476eef6fa73b7875e15c94b6f", + "reference": "6c4cef5b5168a58476eef6fa73b7875e15c94b6f", + "shasum": "" + }, + "require": { + "omnipay/common": "~2.0" + }, + "require-dev": { + "omnipay/tests": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Omnipay\\Stripe\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Adrian Macneil", + "email": "adrian@adrianmacneil.com" + }, + { + "name": "Omnipay Contributors", + "homepage": "https://github.com/thephpleague/omnipay-stripe/contributors" + } + ], + "description": "Stripe driver for the Omnipay payment processing library", + "homepage": "https://github.com/thephpleague/omnipay-stripe", + "keywords": [ + "gateway", + "merchant", + "omnipay", + "pay", + "payment", + "stripe" + ], + "time": "2016-01-13 04:00:45" + }, { "name": "paragonie/random_compat", "version": "v1.2.1", @@ -2368,54 +2645,6 @@ ], "time": "2015-07-16 15:26:57" }, - { - "name": "stripe/stripe-php", - "version": "v1.18.0", - "source": { - "type": "git", - "url": "https://github.com/stripe/stripe-php.git", - "reference": "022c3f21ec1e4141b46738bd5e7ab730d04f78cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/022c3f21ec1e4141b46738bd5e7ab730d04f78cc", - "reference": "022c3f21ec1e4141b46738bd5e7ab730d04f78cc", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-mbstring": "*", - "php": ">=5.2" - }, - "require-dev": { - "simpletest/simpletest": "*" - }, - "type": "library", - "autoload": { - "classmap": [ - "lib/Stripe/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stripe and contributors", - "homepage": "https://github.com/stripe/stripe-php/contributors" - } - ], - "description": "Stripe PHP Library", - "homepage": "https://stripe.com/", - "keywords": [ - "api", - "payment processing", - "stripe" - ], - "time": "2015-01-22 05:01:46" - }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.1", From 638d06af1da9cd72e54732664a24cdf1bea009f8 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 8 Mar 2016 00:02:09 +0000 Subject: [PATCH 4/6] - Removed unused config info from the queue config file --- config/queue.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/queue.php b/config/queue.php index fd16e588..7b5785c7 100644 --- a/config/queue.php +++ b/config/queue.php @@ -54,9 +54,9 @@ return [ 'iron' => [ 'driver' => 'iron', 'host' => 'mq-aws-eu-west-1.iron.io', - 'token' => 'e86QTHwOmEDzqYtti9xAKSgjS7E', - 'project' => '535d254120fa16000900000a', - 'queue' => '54e8a61d8d560bccac9dc83e', + 'token' => '', + 'project' => '', + 'queue' => '', 'encrypt' => true ], 'redis' => [ From 88f9903f0806d325a60d1410c215edb16765230d Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 8 Mar 2016 13:30:13 +0000 Subject: [PATCH 5/6] - Fixed label on the organiser dashboard - Work on event the check-in page --- resources/views/ManageEvent/CheckIn.blade.php | 15 ++++++++++++++- .../views/ManageOrganiser/Dashboard.blade.php | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/resources/views/ManageEvent/CheckIn.blade.php b/resources/views/ManageEvent/CheckIn.blade.php index 3fea1bbc..2d055a12 100644 --- a/resources/views/ManageEvent/CheckIn.blade.php +++ b/resources/views/ManageEvent/CheckIn.blade.php @@ -7,7 +7,6 @@ {!! HTML::style('assets/stylesheet/application.css') !!} {!!HTML::script('vendor/jquery/jquery.js')!!} - {!!HTML::script('vendor/jquery-fastLiveFilter/jquery.fastLiveFilter.js')!!} @@ -21,6 +20,16 @@ +