From 48835e5ead22833b0352a3bc0121a1391c8f28f1 Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Thu, 8 Sep 2016 04:57:21 +0800 Subject: [PATCH 01/17] - Added MIGS Payment Gateway - Changed default Attendize settings to Philippine Peso / Philippine time zone --- .../Controllers/EventCheckoutController.php | 18 +- .../Controllers/ManageAccountController.php | 3 + composer.json | 4 +- composer.lock | 726 ++++++++---------- config/attendize.php | 7 +- config/services.php | 4 +- database/seeds/PaymentGatewaySeeder.php | 8 + public/assets/images/Opera-logo.png | Bin public/assets/images/chrome_logo.gif | Bin public/assets/images/down.png | Bin public/assets/images/firefox.png | Bin .../jquery-backstretch/examples/basic.html | 0 .../jquery-backstretch/examples/click.html | 0 .../jquery-backstretch/examples/coffee.jpg | Bin .../examples/pot-holder.jpg | Bin .../examples/slideshow.html | 0 .../vendor/jquery-backstretch/test/image2.jpg | Bin public/vendor/jquery-minicolors/readme.md | 0 .../Partials/PaymentGatewayOptions.blade.php | 30 + .../Embedded/EventPageCheckout.blade.php | 2 +- .../ViewEvent/EventPageCheckout.blade.php | 2 +- 21 files changed, 383 insertions(+), 421 deletions(-) mode change 100755 => 100644 public/assets/images/Opera-logo.png mode change 100755 => 100644 public/assets/images/chrome_logo.gif mode change 100755 => 100644 public/assets/images/down.png mode change 100755 => 100644 public/assets/images/firefox.png mode change 100755 => 100644 public/vendor/jquery-backstretch/examples/basic.html mode change 100755 => 100644 public/vendor/jquery-backstretch/examples/click.html mode change 100755 => 100644 public/vendor/jquery-backstretch/examples/coffee.jpg mode change 100755 => 100644 public/vendor/jquery-backstretch/examples/pot-holder.jpg mode change 100755 => 100644 public/vendor/jquery-backstretch/examples/slideshow.html mode change 100755 => 100644 public/vendor/jquery-backstretch/test/image2.jpg mode change 100755 => 100644 public/vendor/jquery-minicolors/readme.md diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 09529fe2..07fcde7a 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -283,6 +283,7 @@ class EventCheckoutController extends Controller $event = Event::findOrFail($event_id); $order = new Order; $ticket_order = session()->get('ticket_order_' . $event_id); + Log::info($ticket_order); $validation_rules = $ticket_order['validation_rules']; $validation_messages = $ticket_order['validation_messages']; @@ -323,11 +324,19 @@ class EventCheckoutController extends Controller 'testMode' => config('attendize.enable_test_payments'), ]); + $transaction_data = []; + switch ($ticket_order['payment_gateway']->id) { - case config('attendize.payment_gateway_paypal'): - case config('attendize.payment_gateway_coinbase'): + case config('attendize.payment_gateway_migs'): $transaction_data = [ + 'transactionId' => 1, + ]; + + case config('attendize.payment_gateway_paypal'): + case config('attendize.payment_gateway_coinbase'): + + $transaction_data += [ 'cancelUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_cancelled' => 1 @@ -341,7 +350,6 @@ class EventCheckoutController extends Controller : $event->organiser->name ]; break; - break; case config('attendize.payment_gateway_stripe'): $token = $request->get('stripeToken'); $transaction_data = [ @@ -381,11 +389,11 @@ class EventCheckoutController extends Controller * when we return */ session()->push('ticket_order_' . $event_id . '.transaction_data', $transaction_data); - + Log::info("Redirect url: " . $response->getRedirectUrl()); return response()->json([ 'status' => 'success', 'redirectUrl' => $response->getRedirectUrl(), - 'redirectData' => $response->getRedirectData(), + //'redirectData' => $response->getRedirectData(), 'message' => 'Redirecting to ' . $ticket_order['payment_gateway']->provider_name ]); diff --git a/app/Http/Controllers/ManageAccountController.php b/app/Http/Controllers/ManageAccountController.php index 1487286f..ef02bdbc 100644 --- a/app/Http/Controllers/ManageAccountController.php +++ b/app/Http/Controllers/ManageAccountController.php @@ -134,6 +134,9 @@ class ManageAccountController extends MyBaseController case config('attendize.payment_gateway_coinbase') : //BitPay $config = $request->get('coinbase'); break; + case config('attendize.payment_gateway_migs') : //MIGS + $config = $request->get('migs'); + break; } $account_payment_gateway = AccountPaymentGateway::firstOrNew( diff --git a/composer.json b/composer.json index 5356e4e8..f494c718 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,9 @@ "omnipay/bitpay": "dev-master", "omnipay/coinbase": "dev-master", "laracasts/utilities": "^2.1", - "predis/predis": "~1.0" + "predis/predis": "~1.0", + "guzzlehttp/guzzle": "^6.2", + "omnipay/migs": "^2.1" }, "require-dev": { "phpunit/phpunit": "~4.0", diff --git a/composer.lock b/composer.lock index f9b149f3..9f7dc052 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7a65c338ea81597aed061e748f1e8f00", - "content-hash": "27392018d8b69d79a355d369b2712fdb", + "hash": "703ddf37c33677efb4bc59e2ac26be70", + "content-hash": "dfd594c812903c8013516f04a3f12bd3", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.18.18", + "version": "3.19.5", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "68b9d0b7e007782bc0f2633cdf5a4a6bf08aaafc" + "reference": "8fbd79d2f7c771b97879cbab09190d77a4fce9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/68b9d0b7e007782bc0f2633cdf5a4a6bf08aaafc", - "reference": "68b9d0b7e007782bc0f2633cdf5a4a6bf08aaafc", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8fbd79d2f7c771b97879cbab09190d77a4fce9fb", + "reference": "8fbd79d2f7c771b97879cbab09190d77a4fce9fb", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1", + "guzzlehttp/guzzle": "^5.3.1|^6.2.1", "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.0", + "guzzlehttp/psr7": "~1.3.1", "mtdowling/jmespath.php": "~2.2", "php": ">=5.5" }, @@ -85,7 +85,7 @@ "s3", "sdk" ], - "time": "2016-06-14 20:35:03" + "time": "2016-09-06 22:14:20" }, { "name": "classpreloader/classpreloader", @@ -247,12 +247,12 @@ "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "8db6e1478e11b4e2bd0753c903dabe375b58ac3b" + "reference": "e4b49285f8c7165f31b5cc6395a5ee1bbc35144a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8db6e1478e11b4e2bd0753c903dabe375b58ac3b", - "reference": "8db6e1478e11b4e2bd0753c903dabe375b58ac3b", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e4b49285f8c7165f31b5cc6395a5ee1bbc35144a", + "reference": "e4b49285f8c7165f31b5cc6395a5ee1bbc35144a", "shasum": "" }, "require": { @@ -300,7 +300,7 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", - "time": "2016-05-12 04:19:17" + "time": "2016-06-23 17:27:50" }, { "name": "erusev/parsedown", @@ -343,16 +343,16 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.7.0", + "version": "v4.8.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "ae1828d955112356f7677c465f94f7deb7d27a40" + "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40", - "reference": "ae1828d955112356f7677c465f94f7deb7d27a40", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", + "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", "shasum": "" }, "require": { @@ -383,7 +383,7 @@ "keywords": [ "html" ], - "time": "2015-08-05 01:03:42" + "time": "2016-07-16 12:58:58" }, { "name": "filp/whoops", @@ -536,31 +536,32 @@ "rest", "web service" ], + "abandoned": "guzzlehttp/guzzle", "time": "2015-03-18 18:23:50" }, { "name": "guzzlehttp/guzzle", - "version": "6.2.0", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "d094e337976dff9d8e2424e8485872194e768662" + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", - "reference": "d094e337976dff9d8e2424e8485872194e768662", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", + "reference": "3f808fba627f2c5b69e2501217bf31af349c1427", "shasum": "" }, "require": { - "guzzlehttp/promises": "~1.0", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.5.0" + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "~4.0", - "psr/log": "~1.0" + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" }, "type": "library", "extra": { @@ -598,7 +599,7 @@ "rest", "web service" ], - "time": "2016-03-21 20:02:09" + "time": "2016-07-15 17:22:37" }, { "name": "guzzlehttp/promises", @@ -653,16 +654,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "31382fef2889136415751badebbd1cb022a4ed72" + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72", - "reference": "31382fef2889136415751badebbd1cb022a4ed72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", "shasum": "" }, "require": { @@ -678,7 +679,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -707,7 +708,7 @@ "stream", "uri" ], - "time": "2016-04-13 19:56:01" + "time": "2016-06-24 23:00:38" }, { "name": "intervention/image", @@ -715,12 +716,12 @@ "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "22088b04728a039bd1fc32f7e79a89a118b78698" + "reference": "4064a980324f6c3bfa2bd981dfb247afa705ec3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/22088b04728a039bd1fc32f7e79a89a118b78698", - "reference": "22088b04728a039bd1fc32f7e79a89a118b78698", + "url": "https://api.github.com/repos/Intervention/image/zipball/4064a980324f6c3bfa2bd981dfb247afa705ec3c", + "reference": "4064a980324f6c3bfa2bd981dfb247afa705ec3c", "shasum": "" }, "require": { @@ -769,49 +770,7 @@ "thumbnail", "watermark" ], - "time": "2016-04-26 14:08:40" - }, - { - "name": "ircmaxell/password-compat", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/ircmaxell/password_compat.git", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", - "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", - "shasum": "" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "autoload": { - "files": [ - "lib/password.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthony Ferrara", - "email": "ircmaxell@php.net", - "homepage": "http://blog.ircmaxell.com" - } - ], - "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", - "homepage": "https://github.com/ircmaxell/password_compat", - "keywords": [ - "hashing", - "password" - ], - "time": "2014-11-20 16:49:30" + "time": "2016-09-01 17:04:03" }, { "name": "iron-io/iron_core", @@ -1106,16 +1065,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.38", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e211a37eab49a124996ad9150f9e1bdfb52aa048" + "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e211a37eab49a124996ad9150f9e1bdfb52aa048", - "reference": "e211a37eab49a124996ad9150f9e1bdfb52aa048", + "url": "https://api.github.com/repos/laravel/framework/zipball/2a79f920d5584ec6df7cf996d922a742d11095d1", + "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1", "shasum": "" }, "require": { @@ -1172,7 +1131,8 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version" + "illuminate/view": "self.version", + "tightenco/collect": "self.version" }, "require-dev": { "aws/aws-sdk-php": "~3.0", @@ -1195,7 +1155,7 @@ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." + "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." }, "type": "library", "extra": { @@ -1231,20 +1191,20 @@ "framework", "laravel" ], - "time": "2016-06-14 01:20:40" + "time": "2016-08-26 11:44:52" }, { "name": "laravel/socialite", - "version": "v2.0.17", + "version": "v2.0.18", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "81d39cde2226f7548d8d1aa99405278c87e50737" + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/81d39cde2226f7548d8d1aa99405278c87e50737", - "reference": "81d39cde2226f7548d8d1aa99405278c87e50737", + "url": "https://api.github.com/repos/laravel/socialite/zipball/76ee5397fcdea5a062361392abca4eb397e519a3", + "reference": "76ee5397fcdea5a062361392abca4eb397e519a3", "shasum": "" }, "require": { @@ -1257,7 +1217,7 @@ }, "require-dev": { "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.0|~5.0" }, "type": "library", "extra": { @@ -1285,7 +1245,7 @@ "laravel", "oauth" ], - "time": "2016-05-27 12:42:05" + "time": "2016-06-22 12:40:16" }, { "name": "laravelcollective/html", @@ -1343,16 +1303,16 @@ }, { "name": "league/flysystem", - "version": "1.0.24", + "version": "1.0.27", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b" + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b", - "reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9", + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9", "shasum": "" }, "require": { @@ -1365,7 +1325,7 @@ "ext-fileinfo": "*", "mockery/mockery": "~0.9", "phpspec/phpspec": "^2.2", - "phpunit/phpunit": "~4.8 || ~5.0" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -1422,20 +1382,20 @@ "sftp", "storage" ], - "time": "2016-06-03 19:11:39" + "time": "2016-08-10 08:55:11" }, { "name": "league/flysystem-aws-s3-v3", - "version": "1.0.12", + "version": "1.0.13", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a" + "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a", - "reference": "d9c27edda5b4b2840c3f602d4ce6fbfeaab10e5a", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/dc56a8faf3aff0841f9eae04b6af94a50657896c", + "reference": "dc56a8faf3aff0841f9eae04b6af94a50657896c", "shasum": "" }, "require": { @@ -1469,30 +1429,30 @@ } ], "description": "Flysystem adapter for the AWS S3 SDK v3.x", - "time": "2016-06-06 11:18:47" + "time": "2016-06-21 21:34:35" }, { "name": "league/oauth1-client", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth1-client.git", - "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422" + "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/cef3ceda13c78f89c323e4d5e6301c0eb7cea422", - "reference": "cef3ceda13c78f89c323e4d5e6301c0eb7cea422", + "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/fca5f160650cb74d23fc11aa570dd61f86dcf647", + "reference": "fca5f160650cb74d23fc11aa570dd61f86dcf647", "shasum": "" }, "require": { - "guzzle/guzzle": "3.*", - "php": ">=5.3.0" + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5.0" }, "require-dev": { - "mockery/mockery": "~0.9", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "mockery/mockery": "^0.9", + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.0" }, "type": "library", "extra": { @@ -1532,7 +1492,7 @@ "tumblr", "twitter" ], - "time": "2015-10-23 04:02:07" + "time": "2016-08-17 00:36:58" }, { "name": "maatwebsite/excel", @@ -1648,27 +1608,30 @@ }, { "name": "mews/purifier", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/mewebstudio/Purifier.git", - "reference": "73c8b50c5626a5d0e416ceea745587d582d10455" + "reference": "e3f8b41dafa21994b9a8349f316d8e967559ee5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mewebstudio/Purifier/zipball/73c8b50c5626a5d0e416ceea745587d582d10455", - "reference": "73c8b50c5626a5d0e416ceea745587d582d10455", + "url": "https://api.github.com/repos/mewebstudio/Purifier/zipball/e3f8b41dafa21994b9a8349f316d8e967559ee5a", + "reference": "e3f8b41dafa21994b9a8349f316d8e967559ee5a", "shasum": "" }, "require": { - "ezyang/htmlpurifier": "4.7.*", - "illuminate/config": "~5.1", - "illuminate/filesystem": "~5.1", - "php": ">=5.4" + "ezyang/htmlpurifier": "4.8.*", + "illuminate/config": "5.1.*|5.2.*|5.3.*", + "illuminate/filesystem": "5.1.*|5.2.*|5.3.*", + "illuminate/support": "5.1.*|5.2.*|5.3.*", + "php": ">=5.5.9" }, "require-dev": { + "graham-campbell/testbench": "^3.2", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "^4.8|^5.0", + "scrutinizer/ocular": "^1.3" }, "suggest": { "laravel/framework": "To test the Laravel bindings", @@ -1706,7 +1669,7 @@ "security", "xss" ], - "time": "2016-04-26 15:21:32" + "time": "2016-07-27 10:02:13" }, { "name": "milon/barcode", @@ -1759,16 +1722,16 @@ }, { "name": "monolog/monolog", - "version": "1.19.0", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf" + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf", - "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", "shasum": "" }, "require": { @@ -1787,8 +1750,8 @@ "php-console/php-console": "^3.1.3", "phpunit/phpunit": "~4.5", "phpunit/phpunit-mock-objects": "2.3.0", - "raven/raven": "^0.13", "ruflin/elastica": ">=0.90 <3.0", + "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "~5.3" }, "suggest": { @@ -1800,9 +1763,9 @@ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", - "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server", + "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", "extra": { @@ -1833,7 +1796,7 @@ "logging", "psr-3" ], - "time": "2016-04-12 18:29:35" + "time": "2016-07-29 03:23:52" }, { "name": "mtdowling/cron-expression", @@ -2197,34 +2160,36 @@ }, { "name": "omnipay/common", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "550138529e850143af7a87eab8cfe16e72a2f768" + "reference": "731386e54688405a475d6dd43cd6397728cd709e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/550138529e850143af7a87eab8cfe16e72a2f768", - "reference": "550138529e850143af7a87eab8cfe16e72a2f768", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/731386e54688405a475d6dd43cd6397728cd709e", + "reference": "731386e54688405a475d6dd43cd6397728cd709e", "shasum": "" }, "require": { "guzzle/guzzle": "~3.9", "php": ">=5.3.2", - "symfony/http-foundation": "~2.1" + "symfony/http-foundation": "~2.1|~3.0" }, "require-dev": { - "omnipay/tests": "~2.0" + "omnipay/tests": "~2.0", + "squizlabs/php_codesniffer": "~1.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.5.x-dev" }, "gateways": [ "AuthorizeNet_AIM", "AuthorizeNet_SIM", + "Buckaroo_CreditCard", "Buckaroo_Ideal", "Buckaroo_PayPal", "CardSave", @@ -2289,20 +2254,78 @@ "payment", "purchase" ], - "time": "2016-03-10 03:03:17" + "time": "2016-07-07 09:52:09" }, { - "name": "omnipay/paypal", - "version": "v2.5.4", + "name": "omnipay/migs", + "version": "v2.1.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/omnipay-paypal.git", - "reference": "3d39ab63f9c1e31893ec61bbab9eda98df5f1a6f" + "url": "https://github.com/thephpleague/omnipay-migs.git", + "reference": "b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-paypal/zipball/3d39ab63f9c1e31893ec61bbab9eda98df5f1a6f", - "reference": "3d39ab63f9c1e31893ec61bbab9eda98df5f1a6f", + "url": "https://api.github.com/repos/thephpleague/omnipay-migs/zipball/b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b", + "reference": "b49e9f2816a5cdd3c1ba2bcb46a0c73dc43c0b3b", + "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\\Migs\\": "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-migs/contributors" + } + ], + "description": "MIGS driver for the Omnipay payment processing library", + "homepage": "https://github.com/thephpleague/omnipay-migs", + "keywords": [ + "gateway", + "mastercard internet gateway service", + "merchant", + "migs", + "omnipay", + "pay", + "payment" + ], + "time": "2014-09-17 00:38:25" + }, + { + "name": "omnipay/paypal", + "version": "v2.5.5", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/omnipay-paypal.git", + "reference": "ec7fc864ae0699dd832cd727da26286a5354a35e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/omnipay-paypal/zipball/ec7fc864ae0699dd832cd727da26286a5354a35e", + "reference": "ec7fc864ae0699dd832cd727da26286a5354a35e", "shasum": "" }, "require": { @@ -2347,20 +2370,20 @@ "paypal", "purchase" ], - "time": "2016-03-25 10:40:17" + "time": "2016-07-15 04:26:38" }, { "name": "omnipay/stripe", - "version": "v2.3.3", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-stripe.git", - "reference": "0ea7a647ee01e29c152814e11c2ea6307e5b0db9" + "reference": "3d21b68403fb4214cbee07d0c4be55a1bb0b1805" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/0ea7a647ee01e29c152814e11c2ea6307e5b0db9", - "reference": "0ea7a647ee01e29c152814e11c2ea6307e5b0db9", + "url": "https://api.github.com/repos/thephpleague/omnipay-stripe/zipball/3d21b68403fb4214cbee07d0c4be55a1bb0b1805", + "reference": "3d21b68403fb4214cbee07d0c4be55a1bb0b1805", "shasum": "" }, "require": { @@ -2404,7 +2427,7 @@ "payment", "stripe" ], - "time": "2016-04-26 08:34:50" + "time": "2016-08-06 04:11:43" }, { "name": "paragonie/random_compat", @@ -2581,16 +2604,16 @@ }, { "name": "predis/predis", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/nrk/predis.git", - "reference": "0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2" + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2", - "reference": "0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2", + "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1", + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1", "shasum": "" }, "require": { @@ -2627,20 +2650,20 @@ "predis", "redis" ], - "time": "2016-06-01 22:06:21" + "time": "2016-06-16 16:22:20" }, { "name": "psr/http-message", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { @@ -2668,6 +2691,7 @@ } ], "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", "keywords": [ "http", "http-message", @@ -2676,7 +2700,7 @@ "request", "response" ], - "time": "2015-05-04 20:22:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -2790,23 +2814,23 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.2", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "d8db871a54619458a805229a057ea2af33c753e8" + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/d8db871a54619458a805229a057ea2af33c753e8", - "reference": "d8db871a54619458a805229a057ea2af33c753e8", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", + "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "mockery/mockery": "~0.9.1" }, "type": "library", "extra": { @@ -2839,20 +2863,20 @@ "mail", "mailer" ], - "time": "2016-05-01 08:45:47" + "time": "2016-07-08 11:51:25" }, { "name": "symfony/console", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115" + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/382fc9ed852edabd6133e34f8549d7a7d99db115", - "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115", + "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f", + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f", "shasum": "" }, "require": { @@ -2899,20 +2923,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-06-06 15:08:35" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/css-selector", - "version": "v3.1.0", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "e17f386efef7258ac671c24e727673abd086b0cf" + "reference": "2851e1932d77ce727776154d659b232d061e816a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/e17f386efef7258ac671c24e727673abd086b0cf", - "reference": "e17f386efef7258ac671c24e727673abd086b0cf", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a", + "reference": "2851e1932d77ce727776154d659b232d061e816a", "shasum": "" }, "require": { @@ -2952,20 +2976,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-03-04 07:56:56" + "time": "2016-06-29 05:41:56" }, { "name": "symfony/debug", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e67e1552dd7313df1cf6535cb606751899e0e727" + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e67e1552dd7313df1cf6535cb606751899e0e727", - "reference": "e67e1552dd7313df1cf6535cb606751899e0e727", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", "shasum": "" }, "require": { @@ -3009,20 +3033,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-06-06 15:08:35" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.7", + "version": "v2.8.11", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110" + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/889983a79a043dfda68f38c38b6dba092dd49cd8", + "reference": "889983a79a043dfda68f38c38b6dba092dd49cd8", "shasum": "" }, "require": { @@ -3069,20 +3093,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-07-28 16:56:28" }, { "name": "symfony/finder", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811" + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811", - "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811", + "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", "shasum": "" }, "require": { @@ -3118,35 +3142,33 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-05-13 18:03:36" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/http-foundation", - "version": "v2.8.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "744dae663ffcfa21d8a111fb63541954199acbb2" + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/744dae663ffcfa21d8a111fb63541954199acbb2", - "reference": "744dae663ffcfa21d8a111fb63541954199acbb2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82", + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php54": "~1.0", - "symfony/polyfill-php55": "~1.0" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { - "symfony/expression-language": "~2.4|~3.0.0" + "symfony/expression-language": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -3173,20 +3195,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-07-17 13:54:30" }, { "name": "symfony/http-kernel", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4" + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4", - "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d97ba4425e36e79c794e7d14ff36f00f081b37b3", + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3", "shasum": "" }, "require": { @@ -3194,7 +3216,7 @@ "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0" + "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2" }, "conflict": { "symfony/config": "<2.8" @@ -3255,7 +3277,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-06-06 16:52:35" + "time": "2016-07-30 09:10:37" }, { "name": "symfony/polyfill-mbstring", @@ -3316,120 +3338,6 @@ ], "time": "2016-05-18 14:26:46" }, - { - "name": "symfony/polyfill-php54", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", - "reference": "34d761992f6f2cc6092cc0e5e93f38b53ba5e4f1", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php54\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-05-18 14:26:46" - }, - { - "name": "symfony/polyfill-php55", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php55.git", - "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", - "reference": "bf2ff9ad6be1a4772cb873e4eea94d70daa95c6d", - "shasum": "" - }, - "require": { - "ircmaxell/password-compat": "~1.0", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php55\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2016-05-18 14:26:46" - }, { "name": "symfony/polyfill-php56", "version": "v1.2.0", @@ -3540,16 +3448,16 @@ }, { "name": "symfony/process", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd" + "reference": "768debc5996f599c4372b322d9061dba2a4bf505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd", - "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd", + "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505", + "reference": "768debc5996f599c4372b322d9061dba2a4bf505", "shasum": "" }, "require": { @@ -3585,20 +3493,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:33:26" + "time": "2016-07-28 11:13:34" }, { "name": "symfony/routing", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64" + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/c780454838a1131adc756d737a4b4cc1d18f8c64", - "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64", + "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b", + "reference": "9038984bd9c05ab07280121e9e10f61a7231457b", "shasum": "" }, "require": { @@ -3660,20 +3568,20 @@ "uri", "url" ], - "time": "2016-05-30 06:58:27" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/translation", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7" + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7", - "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7", + "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26", + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26", "shasum": "" }, "require": { @@ -3724,20 +3632,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:33:26" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/var-dumper", - "version": "v3.0.7", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7" + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d8bb851da153d97abe7c2b71a65dee19f324bcf7", - "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377", + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377", "shasum": "" }, "require": { @@ -3787,7 +3695,7 @@ "debug", "dump" ], - "time": "2016-05-24 10:03:10" + "time": "2016-07-26 08:03:56" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3842,12 +3750,12 @@ "source": { "type": "git", "url": "https://github.com/Vinelab/http.git", - "reference": "26974a6f2c635795aed893f9aa0f87118f137d95" + "reference": "30b6f71c127dbc213e56d1d07c4bfeca8224604f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Vinelab/http/zipball/26974a6f2c635795aed893f9aa0f87118f137d95", - "reference": "26974a6f2c635795aed893f9aa0f87118f137d95", + "url": "https://api.github.com/repos/Vinelab/http/zipball/30b6f71c127dbc213e56d1d07c4bfeca8224604f", + "reference": "30b6f71c127dbc213e56d1d07c4bfeca8224604f", "shasum": "" }, "require": { @@ -3884,20 +3792,20 @@ "laravel", "xml" ], - "time": "2015-12-09 08:57:51" + "time": "2016-07-11 13:20:18" }, { "name": "vlucas/phpdotenv", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a" + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9ca5644c536654e9509b9d257f53c58630eb2a6a", - "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", "shasum": "" }, "require": { @@ -3909,7 +3817,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -3934,22 +3842,22 @@ "env", "environment" ], - "time": "2016-06-14 14:14:52" + "time": "2016-09-01 10:05:43" } ], "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v2.2.0", + "version": "v2.2.1", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "a9484c67d1305e9e2c71d2dfaaed6639200d874c" + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/a9484c67d1305e9e2c71d2dfaaed6639200d874c", - "reference": "a9484c67d1305e9e2c71d2dfaaed6639200d874c", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", + "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463", "shasum": "" }, "require": { @@ -3972,7 +3880,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -4002,7 +3910,7 @@ "phpstorm", "sublime" ], - "time": "2016-06-13 19:36:24" + "time": "2016-07-04 11:52:48" }, { "name": "barryvdh/reflection-docblock", @@ -4739,16 +4647,16 @@ }, { "name": "phpspec/phpspec", - "version": "2.5.0", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/phpspec/phpspec.git", - "reference": "385ecb015e97c13818074f1517928b24d4a26067" + "reference": "7e7e104de01b5052195cefefcd0b29f1add4c116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/phpspec/zipball/385ecb015e97c13818074f1517928b24d4a26067", - "reference": "385ecb015e97c13818074f1517928b24d4a26067", + "url": "https://api.github.com/repos/phpspec/phpspec/zipball/7e7e104de01b5052195cefefcd0b29f1add4c116", + "reference": "7e7e104de01b5052195cefefcd0b29f1add4c116", "shasum": "" }, "require": { @@ -4766,7 +4674,7 @@ }, "require-dev": { "behat/behat": "^3.0.11", - "bossa/phpspec2-expect": "~1.0", + "ciaranmcnulty/versionbasedtestskipper": "^0.2.1", "phpunit/phpunit": "~4.4", "symfony/filesystem": "~2.1|~3.0" }, @@ -4779,7 +4687,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -4813,7 +4721,7 @@ "testing", "tests" ], - "time": "2016-03-20 20:34:32" + "time": "2016-09-04 11:59:15" }, { "name": "phpspec/prophecy", @@ -5122,16 +5030,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.26", + "version": "4.8.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", - "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90", + "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90", "shasum": "" }, "require": { @@ -5190,7 +5098,7 @@ "testing", "xunit" ], - "time": "2016-05-17 03:09:28" + "time": "2016-07-21 06:48:14" }, { "name": "phpunit/phpunit-mock-objects", @@ -5366,23 +5274,23 @@ }, { "name": "sebastian/environment", - "version": "1.3.7", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { @@ -5412,20 +5320,20 @@ "environment", "hhvm" ], - "time": "2016-05-17 03:18:57" + "time": "2016-08-18 05:49:44" }, { "name": "sebastian/exporter", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", - "reference": "7ae5513327cb536431847bcc0c10edba2701064e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { @@ -5433,12 +5341,13 @@ "sebastian/recursion-context": "~1.0" }, "require-dev": { + "ext-mbstring": "*", "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -5478,7 +5387,7 @@ "export", "exporter" ], - "time": "2015-06-21 07:55:53" + "time": "2016-06-17 09:04:28" }, { "name": "sebastian/global-state", @@ -5621,16 +5530,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.1.0", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05" + "reference": "2d0ba77c46ecc96a6641009a98f72632216811ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05", - "reference": "6ebc60f69a6df4b3cf5ad6f260ba4edf5957ea05", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/2d0ba77c46ecc96a6641009a98f72632216811ba", + "reference": "2d0ba77c46ecc96a6641009a98f72632216811ba", "shasum": "" }, "require": { @@ -5673,20 +5582,20 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2016-03-30 10:41:47" + "time": "2016-08-23 13:39:15" }, { "name": "symfony/dom-crawler", - "version": "v3.1.0", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3" + "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/12aa63fd41b060d2bee9a34623d29eda70bc8fe3", - "reference": "12aa63fd41b060d2bee9a34623d29eda70bc8fe3", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/bb7395e8b1db3654de82b9f35d019958276de4d7", + "reference": "bb7395e8b1db3654de82b9f35d019958276de4d7", "shasum": "" }, "require": { @@ -5729,20 +5638,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-05-13 15:49:09" + "time": "2016-08-05 08:37:39" }, { "name": "symfony/yaml", - "version": "v3.1.0", + "version": "v3.1.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a" + "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", - "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f291ed25eb1435bddbe8a96caaef16469c2a092d", + "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d", "shasum": "" }, "require": { @@ -5778,32 +5687,33 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-05-26 21:46:24" + "time": "2016-09-02 02:12:52" }, { "name": "webmozart/assert", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308", + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3|^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -5827,7 +5737,7 @@ "check", "validate" ], - "time": "2015-08-24 13:29:44" + "time": "2016-08-09 15:02:57" } ], "aliases": [], diff --git a/config/attendize.php b/config/attendize.php index a571b021..99c33df0 100644 --- a/config/attendize.php +++ b/config/attendize.php @@ -11,6 +11,7 @@ return [ 'payment_gateway_stripe' => 1, 'payment_gateway_paypal' => 2, 'payment_gateway_coinbase' => 3, + 'payment_gateway_migs' => 4, 'outgoing_email_noreply' => env('MAIL_FROM_ADDRESS'), 'outgoing_email' => env('MAIL_FROM_ADDRESS'), @@ -54,14 +55,14 @@ return [ 'question_radio_single' => 6, - 'default_timezone' => 30, #Europe/Dublin - 'default_currency' => 2, #Euro + 'default_timezone' => 92, #Asia/Singapore + 'default_currency' => 15, #Philippine Peso 'default_date_format' => 'j M, Y', 'default_date_picker_format' => 'd M, yyyy', 'default_datetime_format' => 'F j, Y, g:i a', 'default_query_cache' => 120, #Minutes 'default_locale' => 'en', - 'default_payment_gateway' => 1, #Stripe=1 Paypal=2 BitPay=3 + 'default_payment_gateway' => 4, #Stripe=1 Paypal=2 BitPay=3 MIGS=4 'cdn_url_user_assets' => '', 'cdn_url_static_assets' => '' diff --git a/config/services.php b/config/services.php index cc3097f8..bda1e037 100644 --- a/config/services.php +++ b/config/services.php @@ -15,8 +15,8 @@ return [ */ 'mailgun' => [ - 'domain' => '', - 'secret' => '', + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), ], 'mandrill' => [ diff --git a/database/seeds/PaymentGatewaySeeder.php b/database/seeds/PaymentGatewaySeeder.php index 9b3af096..03f6528d 100644 --- a/database/seeds/PaymentGatewaySeeder.php +++ b/database/seeds/PaymentGatewaySeeder.php @@ -37,6 +37,14 @@ class PaymentGatewaySeeder extends Seeder 'is_on_site' => 0, 'can_refund' => 0, ], + [ + 'id' => 4, + 'name' => 'Migs_ThreeParty', + 'provider_name' => 'MasterCard Internet Gateway Service', + 'provider_url' => 'https://www.mastercard.com/gateway/payment-processing/online-credit-card-and-debit-card-payment-processing.html', + 'is_on_site' => 0, + 'can_refund' => 0, + ], ]; DB::table('payment_gateways')->insert($payment_gateways); diff --git a/public/assets/images/Opera-logo.png b/public/assets/images/Opera-logo.png old mode 100755 new mode 100644 diff --git a/public/assets/images/chrome_logo.gif b/public/assets/images/chrome_logo.gif old mode 100755 new mode 100644 diff --git a/public/assets/images/down.png b/public/assets/images/down.png old mode 100755 new mode 100644 diff --git a/public/assets/images/firefox.png b/public/assets/images/firefox.png old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/examples/basic.html b/public/vendor/jquery-backstretch/examples/basic.html old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/examples/click.html b/public/vendor/jquery-backstretch/examples/click.html old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/examples/coffee.jpg b/public/vendor/jquery-backstretch/examples/coffee.jpg old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/examples/pot-holder.jpg b/public/vendor/jquery-backstretch/examples/pot-holder.jpg old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/examples/slideshow.html b/public/vendor/jquery-backstretch/examples/slideshow.html old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-backstretch/test/image2.jpg b/public/vendor/jquery-backstretch/test/image2.jpg old mode 100755 new mode 100644 diff --git a/public/vendor/jquery-minicolors/readme.md b/public/vendor/jquery-minicolors/readme.md old mode 100755 new mode 100644 diff --git a/resources/views/ManageAccount/Partials/PaymentGatewayOptions.blade.php b/resources/views/ManageAccount/Partials/PaymentGatewayOptions.blade.php index e235ed78..36f2c4a9 100644 --- a/resources/views/ManageAccount/Partials/PaymentGatewayOptions.blade.php +++ b/resources/views/ManageAccount/Partials/PaymentGatewayOptions.blade.php @@ -121,6 +121,36 @@ +{{--BDO MIGS--}} +
+

Mastercard Internet Gateway Service Settings

+ +
+
+
+ {!! Form::label('migs[merchantAccessCode]', 'Merchant Access Code', array('class'=>'control-label ')) !!} + {!! Form::text('migs[merchantAccessCode]', $account->getGatewayConfigVal(config('attendize.payment_gateway_migs'), 'merchantAccessCode'),[ 'class'=>'form-control']) !!} +
+
+
+
+ {!! Form::label('migs[merchantId]', 'Merchant ID', ['class'=>'control-label ']) !!} + {!! Form::text('migs[merchantId]', $account->getGatewayConfigVal(config('attendize.payment_gateway_migs'), 'merchantId'),[ 'class'=>'form-control']) !!} +
+
+
+
+
+
+ {!! Form::label('migs[secureHash]', 'Secure Hash Code', array('class'=>'control-label ')) !!} + {!! Form::text('migs[secureHash]', $account->getGatewayConfigVal(config('attendize.payment_gateway_migs'), 'secureHash'),[ 'class'=>'form-control']) !!} +
+
+
+ + +
+ diff --git a/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php b/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php index 65b16602..f175f307 100644 --- a/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php +++ b/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php @@ -1,7 +1,7 @@ @extends('Public.ViewEvent.Layouts.EmbeddedEventPage') @section('head') - + @stop @section('content') diff --git a/resources/views/Public/ViewEvent/EventPageCheckout.blade.php b/resources/views/Public/ViewEvent/EventPageCheckout.blade.php index 1942720b..a482c8ee 100644 --- a/resources/views/Public/ViewEvent/EventPageCheckout.blade.php +++ b/resources/views/Public/ViewEvent/EventPageCheckout.blade.php @@ -1,7 +1,7 @@ @extends('Public.ViewEvent.Layouts.EventPage') @section('head') - + @stop @section('content') From 437be0e30fc84db38652b43e7fd86e2f7b8c5c47 Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Thu, 8 Sep 2016 05:48:07 +0800 Subject: [PATCH 02/17] - Add MIGS payment gateway - Modified logic to support payment gateways that redirect using GET --- .../Controllers/EventCheckoutController.php | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 07fcde7a..27a158ad 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -324,19 +324,11 @@ class EventCheckoutController extends Controller 'testMode' => config('attendize.enable_test_payments'), ]); - $transaction_data = []; - switch ($ticket_order['payment_gateway']->id) { - case config('attendize.payment_gateway_migs'): - - $transaction_data = [ - 'transactionId' => 1, - ]; - - case config('attendize.payment_gateway_paypal'): + case config('attendize.payment_gateway_paypal'): case config('attendize.payment_gateway_coinbase'): - $transaction_data += [ + $transaction_data = [ 'cancelUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_cancelled' => 1 @@ -356,6 +348,17 @@ class EventCheckoutController extends Controller 'token' => $token, ]; break; + case config('attendize.payment_gateway_migs'): + + $transaction_data = [ + 'transactionId' => 12345, + 'returnUrl' => route('showEventCheckoutPaymentReturn', [ + 'event_id' => $event_id, + 'is_payment_successful' => 1 + ]), + + ]; + break; default: Log::error('No payment gateway configured.'); return repsonse()->json([ @@ -390,12 +393,19 @@ class EventCheckoutController extends Controller */ session()->push('ticket_order_' . $event_id . '.transaction_data', $transaction_data); Log::info("Redirect url: " . $response->getRedirectUrl()); - return response()->json([ + + $return = [ 'status' => 'success', 'redirectUrl' => $response->getRedirectUrl(), - //'redirectData' => $response->getRedirectData(), 'message' => 'Redirecting to ' . $ticket_order['payment_gateway']->provider_name - ]); + ]; + + // GET method requests should not have redirectData on the JSON return string + if($response->getRedirectMethod() == 'POST') { + $return['redirectData'] = $response->getRedirectData(); + } + + return response()->json($return); } else { // display error to customer From fd31a5d96d74e84520086619ac37e385131f293a Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Thu, 8 Sep 2016 06:04:23 +0800 Subject: [PATCH 03/17] - Add MIGS payment gateway - Modified transaction data population logic --- .../Controllers/EventCheckoutController.php | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 27a158ad..63d887a3 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -324,11 +324,18 @@ class EventCheckoutController extends Controller 'testMode' => config('attendize.enable_test_payments'), ]); + $transaction_data = [ + 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']), + 'currency' => $event->currency->code, + 'description' => 'Order for customer: ' . $request->get('order_email'), + ]; + + switch ($ticket_order['payment_gateway']->id) { case config('attendize.payment_gateway_paypal'): case config('attendize.payment_gateway_coinbase'): - $transaction_data = [ + $transaction_data += [ 'cancelUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_cancelled' => 1 @@ -344,20 +351,24 @@ class EventCheckoutController extends Controller break; case config('attendize.payment_gateway_stripe'): $token = $request->get('stripeToken'); - $transaction_data = [ + $transaction_data += [ 'token' => $token, ]; break; case config('attendize.payment_gateway_migs'): - $transaction_data = [ - 'transactionId' => 12345, + $transaction_data += [ + 'transactionId' => "", // TODO: Where to generate transaction id? 'returnUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_successful' => 1 ]), ]; + + // Order description in MIGS is only 34 characters long; so we need to truncate + $transaction_data['description'] = substr($transaction_data['description'], 0, 34); + break; default: Log::error('No payment gateway configured.'); @@ -368,11 +379,6 @@ class EventCheckoutController extends Controller break; } - $transaction_data = [ - 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']), - 'currency' => $event->currency->code, - 'description' => 'Order for customer: ' . $request->get('order_email'), - ] + $transaction_data; $transaction = $gateway->purchase($transaction_data); From e5a994b1c26a230fdfef517fc7fa182578476d76 Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Thu, 8 Sep 2016 06:04:23 +0800 Subject: [PATCH 04/17] - Add MIGS payment gateway - Modified transaction data population logic --- .../Controllers/EventCheckoutController.php | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 27a158ad..b70abb7a 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -324,11 +324,18 @@ class EventCheckoutController extends Controller 'testMode' => config('attendize.enable_test_payments'), ]); + $transaction_data = [ + 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']), + 'currency' => $event->currency->code, + 'description' => 'Order for customer: ' . $request->get('order_email'), + ]; + + switch ($ticket_order['payment_gateway']->id) { case config('attendize.payment_gateway_paypal'): case config('attendize.payment_gateway_coinbase'): - $transaction_data = [ + $transaction_data += [ 'cancelUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_cancelled' => 1 @@ -344,20 +351,24 @@ class EventCheckoutController extends Controller break; case config('attendize.payment_gateway_stripe'): $token = $request->get('stripeToken'); - $transaction_data = [ + $transaction_data += [ 'token' => $token, ]; break; case config('attendize.payment_gateway_migs'): - $transaction_data = [ - 'transactionId' => 12345, + $transaction_data += [ + 'transactionId' => "1", // TODO: Where to generate transaction id? 'returnUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_successful' => 1 ]), ]; + + // Order description in MIGS is only 34 characters long; so we need to truncate + $transaction_data['description'] = substr($transaction_data['description'], 0, 34); + break; default: Log::error('No payment gateway configured.'); @@ -368,11 +379,6 @@ class EventCheckoutController extends Controller break; } - $transaction_data = [ - 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']), - 'currency' => $event->currency->code, - 'description' => 'Order for customer: ' . $request->get('order_email'), - ] + $transaction_data; $transaction = $gateway->purchase($transaction_data); From f1ce15562e68228960c7bdc092fe8b51baeb948f Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Thu, 8 Sep 2016 11:23:24 +0800 Subject: [PATCH 05/17] - MIGS payment gateway generate transaction id --- app/Http/Controllers/EventCheckoutController.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index b70abb7a..1cd44db5 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -283,7 +283,6 @@ class EventCheckoutController extends Controller $event = Event::findOrFail($event_id); $order = new Order; $ticket_order = session()->get('ticket_order_' . $event_id); - Log::info($ticket_order); $validation_rules = $ticket_order['validation_rules']; $validation_messages = $ticket_order['validation_messages']; @@ -358,16 +357,16 @@ class EventCheckoutController extends Controller case config('attendize.payment_gateway_migs'): $transaction_data += [ - 'transactionId' => "1", // TODO: Where to generate transaction id? + 'transactionId' => $event_id . date('YmdHis'), // TODO: Where to generate transaction id? 'returnUrl' => route('showEventCheckoutPaymentReturn', [ 'event_id' => $event_id, 'is_payment_successful' => 1 ]), - + ]; - // Order description in MIGS is only 34 characters long; so we need to truncate - $transaction_data['description'] = substr($transaction_data['description'], 0, 34); + // Order description in MIGS is only 34 characters long; so we need a short description + $transaction_data['description'] = "Ticket sales"; break; default: From 9579dfb10c517fc41e13bb237812267978b41ec7 Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Sun, 11 Sep 2016 16:49:27 +0100 Subject: [PATCH 06/17] Retrieve ICS Content for a event Add getIcsForEvent() method, this returns an ICS formatted text ready for download or attaching to emails. --- app/Models/Event.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/Models/Event.php b/app/Models/Event.php index 4ca918d6..0531a930 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -331,4 +331,32 @@ class Event extends MyBaseModel { return ['created_at', 'updated_at', 'start_date', 'end_date']; } + + public function getIcsForEvent() + { + $siteUrl = URL::to('/'); + $eventUrl = $this->getEventUrlAttribute(); + + $start_date = new Carbon($this->start_date); + $end_date = new Carbon($this->end_date); + $timestamp = new Carbon(); + + $icsTemplate = <<format('Ymd\THis\Z')} +DTSTART:{$start_date->format('Ymd\THis\Z')} +DTEND:{$end_date->format('Ymd\THis\Z')} +SUMMARY:$this->title +LOCATION:{$this->venue_name} +DESCRIPTION:{$this->description} +END:VEVENT +END:VCALENDAR +ICSTemplate; + + return $icsTemplate; + } } From ca4795e9bc4ef9de0b0a6b728e4277c1aedb0b44 Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Sun, 11 Sep 2016 16:50:12 +0100 Subject: [PATCH 07/17] Add Route and Controller for ICS download Provide a route and method for people to download an ICS file --- app/Http/Controllers/EventViewController.php | 12 ++++++++++++ app/Http/routes.php | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index f63ba777..48be7fff 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -124,4 +124,16 @@ class EventViewController extends Controller 'message' => 'Message Successfully Sent', ]); } + + public function showCalendarIcs(Request $request, $event_id) + { + $event = Event::findOrFail($event_id); + + $icsContent = $event->getIcsForEvent(); + + return response()->make($icsContent, 200, [ + 'Content-Type' => 'application/octet-stream', + 'Content-Disposition' => 'attachment; filename="event.ics' + ]); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 5bfb548a..a364c48f 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -116,6 +116,11 @@ Route::group(['prefix' => 'e'], function () { 'uses' => 'EventViewEmbeddedController@showEmbeddedEvent', ]); + Route::get('/{event_id}/calendar.ics', [ + 'as' => 'downloadCalendarIcs', + 'uses' => 'EventViewController@showCalendarIcs', + ]); + Route::get('/{event_id}/{event_slug?}', [ 'as' => 'showEventPage', 'uses' => 'EventViewController@showEventHome', From 4da066772dd84fa0f790f4b7a6dae3c36fd11d98 Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Sun, 11 Sep 2016 17:04:23 +0100 Subject: [PATCH 08/17] Add ICS link to confirmation email This provides a download link for the generated ICS file. --- resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php index b563d4b8..f825eb46 100644 --- a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php +++ b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php @@ -17,7 +17,7 @@ Order Reference: {{$order->order_reference}}
Order Name: {{$order->full_name}}
Order Date: {{$order->created_at->toDayDateTimeString()}}
Order Email: {{$order->email}}
- +Add To Calendar

Order Items

From 4cf4a2f613e27e4ef3f9169d4d51acbbf51c3c20 Mon Sep 17 00:00:00 2001 From: kozi Date: Thu, 15 Sep 2016 14:05:50 +0200 Subject: [PATCH 09/17] Add DB_PREFIX property to .env to support shared databases --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 2ae8fe39..2a9b369b 100644 --- a/config/database.php +++ b/config/database.php @@ -66,7 +66,7 @@ return [ 'password' => env('DB_PASSWORD'), 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '', + 'prefix' => env('DB_PREFIX'), 'strict' => false, ], From a98a7835d86b6df326a116a1b9a29e82fdf67068 Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Fri, 16 Sep 2016 23:29:06 +0100 Subject: [PATCH 10/17] Capture and Store GA Code Capture and store a Google Analytics code per organiser. --- .../OrganiserCustomizeController.php | 1 + ...add_google_analytics_code_to_organiser.php | 31 +++++++++++++++++++ .../views/ManageOrganiser/Customize.blade.php | 8 ++++- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php diff --git a/app/Http/Controllers/OrganiserCustomizeController.php b/app/Http/Controllers/OrganiserCustomizeController.php index a115c886..1a390248 100644 --- a/app/Http/Controllers/OrganiserCustomizeController.php +++ b/app/Http/Controllers/OrganiserCustomizeController.php @@ -45,6 +45,7 @@ class OrganiserCustomizeController extends MyBaseController $organiser->name = $request->get('name'); $organiser->about = $request->get('about'); + $organiser->google_analytics_code = $request->get('google_analytics_code'); $organiser->email = $request->get('email'); $organiser->enable_organiser_page = $request->get('enable_organiser_page'); $organiser->facebook = $request->get('facebook'); diff --git a/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php b/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php new file mode 100644 index 00000000..ab3e0599 --- /dev/null +++ b/database/migrations/2016_09_16_221455_add_google_analytics_code_to_organiser.php @@ -0,0 +1,31 @@ +string('google_analytics_code')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('organisers', function (Blueprint $table) { + $table->dropColumn('google_analytics_code'); + }); + } +} diff --git a/resources/views/ManageOrganiser/Customize.blade.php b/resources/views/ManageOrganiser/Customize.blade.php index e9916289..2bd7fcec 100644 --- a/resources/views/ManageOrganiser/Customize.blade.php +++ b/resources/views/ManageOrganiser/Customize.blade.php @@ -93,7 +93,13 @@ 'rows' => 4 )) !!} - +
+ {!! Form::label('google_analytics_code', 'Organiser Analytics Code', array('class'=>'control-label')) !!} + {!! Form::text('google_analytics_code', Input::old('google_analytics_code'), + array( + 'class'=>'form-control' + )) !!} +
From 1212f71e189376c18a0dd590ee8c1fe3aa19a86a Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Fri, 16 Sep 2016 23:41:40 +0100 Subject: [PATCH 11/17] Include Analytics at footer of Organiser page --- resources/views/Public/Partials/ga.blade.php | 10 ++++++++++ .../ViewOrganiser/Layouts/OrganiserPage.blade.php | 1 + .../views/Public/ViewOrganiser/OrganiserPage.blade.php | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 resources/views/Public/Partials/ga.blade.php diff --git a/resources/views/Public/Partials/ga.blade.php b/resources/views/Public/Partials/ga.blade.php new file mode 100644 index 00000000..baf7e9a3 --- /dev/null +++ b/resources/views/Public/Partials/ga.blade.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php index 29dff25d..434be11b 100644 --- a/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/Layouts/OrganiserPage.blade.php @@ -45,5 +45,6 @@ {!!HTML::script('assets/javascript/frontend.js')!!} @include('Shared.Partials.GlobalFooterJS') + @yield('foot') diff --git a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php index 11a5e71c..e7cff4c8 100644 --- a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php @@ -20,4 +20,8 @@ @include('Public.ViewOrganiser.Partials.OrganiserHeaderSection') @include('Public.ViewOrganiser.Partials.OrganiserEventsSection') @include('Public.ViewOrganiser.Partials.OrganiserFooterSection') +@stop + +@section('foot') + @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code]) @stop \ No newline at end of file From a7698ef403e19e7f055f481ba97c82066b5c6406 Mon Sep 17 00:00:00 2001 From: James Mowatt Date: Fri, 16 Sep 2016 23:42:56 +0100 Subject: [PATCH 12/17] Make Google Analytics code conditional Do not load the partial if an analytics code has not been set on the Organiser. --- .../views/Public/ViewOrganiser/OrganiserPage.blade.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php index e7cff4c8..c4658a5c 100644 --- a/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php +++ b/resources/views/Public/ViewOrganiser/OrganiserPage.blade.php @@ -22,6 +22,8 @@ @include('Public.ViewOrganiser.Partials.OrganiserFooterSection') @stop -@section('foot') - @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code]) -@stop \ No newline at end of file +@if($organiser->google_analytics_code) + @section('foot') + @include('Public.Partials.ga', ['analyticsCode' => $organiser->google_analytics_code]) + @stop +@endif \ No newline at end of file From e5d4f75559a2acc9d5436a888741315e4c09afa3 Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Mon, 19 Sep 2016 06:58:36 +0800 Subject: [PATCH 13/17] - Returned some original defaults for Attendize --- config/attendize.php | 6 +++--- .../Public/ViewEvent/Embedded/EventPageCheckout.blade.php | 2 +- .../views/Public/ViewEvent/EventPageCheckout.blade.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/attendize.php b/config/attendize.php index 99c33df0..8b54c57e 100644 --- a/config/attendize.php +++ b/config/attendize.php @@ -55,14 +55,14 @@ return [ 'question_radio_single' => 6, - 'default_timezone' => 92, #Asia/Singapore - 'default_currency' => 15, #Philippine Peso + 'default_timezone' => 30, #Europe/Dublin + 'default_currency' => 2, #Euro 'default_date_format' => 'j M, Y', 'default_date_picker_format' => 'd M, yyyy', 'default_datetime_format' => 'F j, Y, g:i a', 'default_query_cache' => 120, #Minutes 'default_locale' => 'en', - 'default_payment_gateway' => 4, #Stripe=1 Paypal=2 BitPay=3 MIGS=4 + 'default_payment_gateway' => 1, #Stripe=1 Paypal=2 BitPay=3 MIGS=4 'cdn_url_user_assets' => '', 'cdn_url_static_assets' => '' diff --git a/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php b/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php index f175f307..65b16602 100644 --- a/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php +++ b/resources/views/Public/ViewEvent/Embedded/EventPageCheckout.blade.php @@ -1,7 +1,7 @@ @extends('Public.ViewEvent.Layouts.EmbeddedEventPage') @section('head') - + @stop @section('content') diff --git a/resources/views/Public/ViewEvent/EventPageCheckout.blade.php b/resources/views/Public/ViewEvent/EventPageCheckout.blade.php index a482c8ee..1942720b 100644 --- a/resources/views/Public/ViewEvent/EventPageCheckout.blade.php +++ b/resources/views/Public/ViewEvent/EventPageCheckout.blade.php @@ -1,7 +1,7 @@ @extends('Public.ViewEvent.Layouts.EventPage') @section('head') - + @stop @section('content') From f8be96a6feb2b9b5fbc62d0b4a7f6c1eddeb3036 Mon Sep 17 00:00:00 2001 From: Sinan Taga Date: Fri, 7 Oct 2016 13:46:35 +0300 Subject: [PATCH 14/17] Correct typo in Event Model method Committer: Sinan Taga --- app/Models/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Event.php b/app/Models/Event.php index 0531a930..ad13e16f 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -56,7 +56,7 @@ class Event extends MyBaseModel * * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany */ - public function questions_with_tashed() + public function questions_with_trashed() { return $this->belongsToMany('\App\Models\Question', 'event_question')->withTrashed(); } From 4fc9586a61b9a3063fb79b207282fda6ae7b5777 Mon Sep 17 00:00:00 2001 From: Jacob Catayoc Date: Fri, 7 Oct 2016 21:43:04 +0800 Subject: [PATCH 15/17] - Fix some problems with MIGS --- app/Http/Controllers/EventCheckoutController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 1cd44db5..c2aec882 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -366,7 +366,7 @@ class EventCheckoutController extends Controller ]; // Order description in MIGS is only 34 characters long; so we need a short description - $transaction_data['description'] = "Ticket sales"; + $transaction_data['description'] = "Ticket sales " . $transaction_data['transactionId']; break; default: From 7f26093b49a65474b931319c32e951e29c906c4a Mon Sep 17 00:00:00 2001 From: shibby Date: Sat, 8 Oct 2016 01:48:54 +0300 Subject: [PATCH 16/17] Model relation's fully qualified class name's written instead of string usage --- app/Models/Account.php | 10 +++++----- app/Models/AccountPaymentGateway.php | 4 ++-- app/Models/Attendee.php | 6 +++--- app/Models/Currency.php | 2 +- app/Models/Event.php | 24 ++++++++++++------------ app/Models/Message.php | 2 +- app/Models/Order.php | 14 +++++++------- app/Models/Organiser.php | 8 ++++---- app/Models/Question.php | 10 +++++----- app/Models/QuestionAnswer.php | 6 +++--- app/Models/QuestionOption.php | 2 +- app/Models/Ticket.php | 6 +++--- app/Models/User.php | 4 ++-- 13 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index 6cebdf50..302a2903 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -75,7 +75,7 @@ class Account extends MyBaseModel */ public function users() { - return $this->hasMany('\App\Models\User'); + return $this->hasMany(\App\Models\User::class); } /** @@ -85,7 +85,7 @@ class Account extends MyBaseModel */ public function orders() { - return $this->hasMany('\App\Models\Order'); + return $this->hasMany(\App\Models\Order::class); } /** @@ -95,7 +95,7 @@ class Account extends MyBaseModel */ public function currency() { - return $this->belongsTo('\App\Models\Currency'); + return $this->belongsTo(\App\Models\Currency::class); } /** @@ -105,7 +105,7 @@ class Account extends MyBaseModel */ public function account_payment_gateways() { - return $this->hasMany('\App\Models\AccountPaymentGateway'); + return $this->hasMany(\App\Models\AccountPaymentGateway::class); } /** @@ -124,7 +124,7 @@ class Account extends MyBaseModel */ public function active_payment_gateway() { - return $this->hasOne('\App\Models\AccountPaymentGateway', 'payment_gateway_id', 'payment_gateway_id')->where('account_id', $this->id); + return $this->hasOne(\App\Models\AccountPaymentGateway::class, 'payment_gateway_id', 'payment_gateway_id')->where('account_id', $this->id); } /** diff --git a/app/Models/AccountPaymentGateway.php b/app/Models/AccountPaymentGateway.php index 8435f510..68d26331 100644 --- a/app/Models/AccountPaymentGateway.php +++ b/app/Models/AccountPaymentGateway.php @@ -26,7 +26,7 @@ class AccountPaymentGateway extends MyBaseModel * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ public function account() { - return $this->belongsTo('\App\Models\Account'); + return $this->belongsTo(\App\Models\Account::class); } /** @@ -36,7 +36,7 @@ class AccountPaymentGateway extends MyBaseModel */ public function payment_gateway() { - return $this->belongsTo('\App\Models\PaymentGateway', 'payment_gateway_id', 'id'); + return $this->belongsTo(\App\Models\PaymentGateway::class, 'payment_gateway_id', 'id'); } /** diff --git a/app/Models/Attendee.php b/app/Models/Attendee.php index 078c50c6..484c4e93 100644 --- a/app/Models/Attendee.php +++ b/app/Models/Attendee.php @@ -55,7 +55,7 @@ class Attendee extends MyBaseModel */ public function order() { - return $this->belongsTo('\App\Models\Order'); + return $this->belongsTo(\App\Models\Order::class); } /** @@ -65,7 +65,7 @@ class Attendee extends MyBaseModel */ public function ticket() { - return $this->belongsTo('\App\Models\Ticket'); + return $this->belongsTo(\App\Models\QuestionType::class); } /** @@ -75,7 +75,7 @@ class Attendee extends MyBaseModel */ public function event() { - return $this->belongsTo('\App\Models\Event'); + return $this->belongsTo(\App\Models\Event::class); } /** diff --git a/app/Models/Currency.php b/app/Models/Currency.php index f04efa71..edd433e2 100644 --- a/app/Models/Currency.php +++ b/app/Models/Currency.php @@ -41,6 +41,6 @@ class Currency extends \Illuminate\Database\Eloquent\Model */ public function event() { - return $this->belongsTo('\App\Models\Event'); + return $this->belongsTo(\App\Models\Event::class); } } diff --git a/app/Models/Event.php b/app/Models/Event.php index 0531a930..275e5dab 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -48,7 +48,7 @@ class Event extends MyBaseModel */ public function questions() { - return $this->belongsToMany('\App\Models\Question', 'event_question'); + return $this->belongsToMany(\App\Models\Question::class, 'event_question'); } /** @@ -58,7 +58,7 @@ class Event extends MyBaseModel */ public function questions_with_tashed() { - return $this->belongsToMany('\App\Models\Question', 'event_question')->withTrashed(); + return $this->belongsToMany(\App\Models\Question::class, 'event_question')->withTrashed(); } /** @@ -68,7 +68,7 @@ class Event extends MyBaseModel */ public function attendees() { - return $this->hasMany('\App\Models\Attendee'); + return $this->hasMany(\App\Models\Attendee::class); } /** @@ -78,7 +78,7 @@ class Event extends MyBaseModel */ public function images() { - return $this->hasMany('\App\Models\EventImage'); + return $this->hasMany(\App\Models\EventImage::class); } /** @@ -88,7 +88,7 @@ class Event extends MyBaseModel */ public function messages() { - return $this->hasMany('\App\Models\Message')->orderBy('created_at', 'DESC'); + return $this->hasMany(\App\Models\Message::class)->orderBy('created_at', 'DESC'); } /** @@ -98,7 +98,7 @@ class Event extends MyBaseModel */ public function tickets() { - return $this->hasMany('\App\Models\Ticket'); + return $this->hasMany(\App\Models\QuestionType::class); } /** @@ -108,7 +108,7 @@ class Event extends MyBaseModel */ public function stats() { - return $this->hasMany('\App\Models\EventStats'); + return $this->hasMany(\App\Models\EventStats::class); } /** @@ -118,7 +118,7 @@ class Event extends MyBaseModel */ public function affiliates() { - return $this->hasMany('\App\Models\Affiliate'); + return $this->hasMany(\App\Models\Affiliate::class); } /** @@ -128,7 +128,7 @@ class Event extends MyBaseModel */ public function orders() { - return $this->hasMany('\App\Models\Order'); + return $this->hasMany(\App\Models\Order::class); } /** @@ -138,7 +138,7 @@ class Event extends MyBaseModel */ public function account() { - return $this->belongsTo('\App\Models\Account'); + return $this->belongsTo(\App\Models\Account::class); } /** @@ -148,7 +148,7 @@ class Event extends MyBaseModel */ public function currency() { - return $this->belongsTo('\App\Models\Currency'); + return $this->belongsTo(\App\Models\Currency::class); } /** @@ -158,7 +158,7 @@ class Event extends MyBaseModel */ public function organiser() { - return $this->belongsTo('\App\Models\Organiser'); + return $this->belongsTo(\App\Models\Organiser::class); } /** diff --git a/app/Models/Message.php b/app/Models/Message.php index 7a6d3219..c2d55d00 100644 --- a/app/Models/Message.php +++ b/app/Models/Message.php @@ -31,7 +31,7 @@ class Message extends MyBaseModel */ public function event() { - return $this->belongsTo('\App\Models\Event'); + return $this->belongsTo(\App\Models\Event::class); } /** diff --git a/app/Models/Order.php b/app/Models/Order.php index 8ec91554..d8f138ee 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -39,7 +39,7 @@ class Order extends MyBaseModel */ public function orderItems() { - return $this->hasMany('\App\Models\OrderItem'); + return $this->hasMany(\App\Models\OrderItem::class); } /** @@ -49,7 +49,7 @@ class Order extends MyBaseModel */ public function attendees() { - return $this->hasMany('\App\Models\Attendee'); + return $this->hasMany(\App\Models\Attendee::class); } /** @@ -59,7 +59,7 @@ class Order extends MyBaseModel */ public function account() { - return $this->belongsTo('\App\Models\Account'); + return $this->belongsTo(\App\Models\Account::class); } /** @@ -69,7 +69,7 @@ class Order extends MyBaseModel */ public function event() { - return $this->belongsTo('\App\Models\Event'); + return $this->belongsTo(\App\Models\Event::class); } /** @@ -79,13 +79,13 @@ class Order extends MyBaseModel */ public function tickets() { - return $this->hasMany('\App\Models\Ticket'); + return $this->hasMany(\App\Models\QuestionType::class); } public function payment_gateway() { - return $this->belongsTo('\App\Models\PaymentGateway'); + return $this->belongsTo(\App\Models\PaymentGateway::class); } /** @@ -95,7 +95,7 @@ class Order extends MyBaseModel */ public function orderStatus() { - return $this->belongsTo('\App\Models\OrderStatus'); + return $this->belongsTo('\App\Models\\App\Models\OrderStatus::class'); } diff --git a/app/Models/Organiser.php b/app/Models/Organiser.php index 48ae3fe7..1c9eba8d 100644 --- a/app/Models/Organiser.php +++ b/app/Models/Organiser.php @@ -36,7 +36,7 @@ class Organiser extends MyBaseModel */ public function account() { - return $this->belongsTo('\App\Models\Account'); + return $this->belongsTo(\App\Models\Account::class); } /** @@ -46,7 +46,7 @@ class Organiser extends MyBaseModel */ public function events() { - return $this->hasMany('\App\Models\Event'); + return $this->hasMany(\App\Models\Event::class); } /** @@ -56,7 +56,7 @@ class Organiser extends MyBaseModel */ public function attendees() { - return $this->hasManyThrough('\App\Models\Attendee', '\App\Models\Event'); + return $this->hasManyThrough(\App\Models\Attendee::class, \App\Models\Event::class); } /** @@ -66,7 +66,7 @@ class Organiser extends MyBaseModel */ public function orders() { - return $this->hasManyThrough('\App\Models\Order', '\App\Models\Event'); + return $this->hasManyThrough(\App\Models\Order::class, \App\Models\Event::class); } /** diff --git a/app/Models/Question.php b/app/Models/Question.php index eed81b0c..5e4e92fb 100644 --- a/app/Models/Question.php +++ b/app/Models/Question.php @@ -21,7 +21,7 @@ class Question extends MyBaseModel */ public function events() { - return $this->belongsToMany('\App\Models\Event'); + return $this->belongsToMany(\App\Models\Event::class); } /** @@ -32,12 +32,12 @@ class Question extends MyBaseModel */ public function question_type() { - return $this->belongsTo('\App\Models\QuestionType'); + return $this->belongsTo(\App\Models\QuestionType::class); } public function answers() { - return $this->hasMany('\App\Models\QuestionAnswer'); + return $this->hasMany(\App\Models\QuestionAnswer::class); } /** @@ -48,12 +48,12 @@ class Question extends MyBaseModel */ public function options() { - return $this->hasMany('\App\Models\QuestionOption'); + return $this->hasMany(\App\Models\QuestionOption::class); } public function tickets() { - return $this->belongsToMany('\App\Models\Ticket'); + return $this->belongsToMany(\App\Models\QuestionType::class); } /** diff --git a/app/Models/QuestionAnswer.php b/app/Models/QuestionAnswer.php index 421fc2fb..6f31dd4b 100644 --- a/app/Models/QuestionAnswer.php +++ b/app/Models/QuestionAnswer.php @@ -20,7 +20,7 @@ class QuestionAnswer extends MyBaseModel */ public function event() { - return $this->belongsToMany('\App\Models\Event'); + return $this->belongsToMany(\App\Models\Event::class); } /** @@ -28,7 +28,7 @@ class QuestionAnswer extends MyBaseModel */ public function question() { - return $this->belongsTo('\App\Models\Question')->withTrashed(); + return $this->belongsTo(\App\Models\Question::class)->withTrashed(); } /** @@ -36,7 +36,7 @@ class QuestionAnswer extends MyBaseModel */ public function attendee() { - return $this->belongsTo('\App\Models\Attendee'); + return $this->belongsTo(\App\Models\Attendee::class); } } diff --git a/app/Models/QuestionOption.php b/app/Models/QuestionOption.php index b5af3674..479e7de3 100644 --- a/app/Models/QuestionOption.php +++ b/app/Models/QuestionOption.php @@ -30,6 +30,6 @@ class QuestionOption extends MyBaseModel */ public function question() { - return $this->belongsTo('\App\Models\Question'); + return $this->belongsTo(\App\Models\Question::class); } } diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 291fac26..4cbc96ae 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -41,7 +41,7 @@ class Ticket extends MyBaseModel */ public function event() { - return $this->belongsTo('\App\Models\Event'); + return $this->belongsTo(\App\Models\Event::class); } /** @@ -51,7 +51,7 @@ class Ticket extends MyBaseModel */ public function order() { - return $this->belongsToMany('\App\Models\Order'); + return $this->belongsToMany(\App\Models\Order::class); } /** @@ -61,7 +61,7 @@ class Ticket extends MyBaseModel */ public function questions() { - return $this->belongsToMany('\App\Models\Question'); + return $this->belongsToMany(\App\Models\Question::class); } /** diff --git a/app/Models/User.php b/app/Models/User.php index 56598138..544ab416 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -60,7 +60,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function account() { - return $this->belongsTo('\App\Models\Account'); + return $this->belongsTo(\App\Models\Account::class); } /** @@ -70,7 +70,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function activity() { - return $this->hasMany('\App\Models\Activity'); + return $this->hasMany(\App\Models\Activity::class); } /** From c356c6b9f2875c1c2ca785dde1f22ede98563524 Mon Sep 17 00:00:00 2001 From: shibby Date: Sat, 8 Oct 2016 01:51:04 +0300 Subject: [PATCH 17/17] fix for wrong FQN --- app/Models/Attendee.php | 2 +- app/Models/Event.php | 2 +- app/Models/Order.php | 2 +- app/Models/Question.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/Attendee.php b/app/Models/Attendee.php index 484c4e93..720041d4 100644 --- a/app/Models/Attendee.php +++ b/app/Models/Attendee.php @@ -65,7 +65,7 @@ class Attendee extends MyBaseModel */ public function ticket() { - return $this->belongsTo(\App\Models\QuestionType::class); + return $this->belongsTo(\App\Models\Ticket::class); } /** diff --git a/app/Models/Event.php b/app/Models/Event.php index 275e5dab..cd709f8e 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -98,7 +98,7 @@ class Event extends MyBaseModel */ public function tickets() { - return $this->hasMany(\App\Models\QuestionType::class); + return $this->hasMany(\App\Models\Ticket::class); } /** diff --git a/app/Models/Order.php b/app/Models/Order.php index d8f138ee..732eb8b5 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -79,7 +79,7 @@ class Order extends MyBaseModel */ public function tickets() { - return $this->hasMany(\App\Models\QuestionType::class); + return $this->hasMany(\App\Models\Ticket::class); } diff --git a/app/Models/Question.php b/app/Models/Question.php index 5e4e92fb..28a8fd5d 100644 --- a/app/Models/Question.php +++ b/app/Models/Question.php @@ -53,7 +53,7 @@ class Question extends MyBaseModel public function tickets() { - return $this->belongsToMany(\App\Models\QuestionType::class); + return $this->belongsToMany(\App\Models\Ticket::class); } /**