diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 3870989789..109373a509 100755 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -9,6 +9,11 @@ class HomeController extends BaseController { return View::make('splash'); } + public function showAboutUs() + { + return View::make('about_us'); + } + public function showComingSoon() { return View::make('coming_soon'); diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php index b22b59c16d..9e62e4fc34 100755 --- a/app/ninja/repositories/InvoiceRepository.php +++ b/app/ninja/repositories/InvoiceRepository.php @@ -36,7 +36,10 @@ class InvoiceRepository { $query->where('clients.name', 'like', '%'.$filter.'%') ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%') - ->orWhere('invoice_statuses.name', 'like', '%'.$filter.'%'); + ->orWhere('invoice_statuses.name', 'like', '%'.$filter.'%') + ->orWhere('contacts.first_name', 'like', '%'.$filter.'%') + ->orWhere('contacts.last_name', 'like', '%'.$filter.'%') + ->orWhere('contacts.email', 'like', '%'.$filter.'%'); }); } diff --git a/app/routes.php b/app/routes.php index 367b5b08fb..b3ad8e0103 100755 --- a/app/routes.php +++ b/app/routes.php @@ -56,6 +56,7 @@ Route::get('/send_emails', function() { Route::get('/', 'HomeController@showWelcome'); Route::get('/rocksteady', 'HomeController@showWelcome'); +Route::get('/about_us', 'HomeController@showAboutUs'); Route::get('log_error', 'HomeController@logError'); Route::post('get_started', 'AccountController@getStarted'); diff --git a/composer.lock b/composer.lock index 812e4f15b5..078fca440f 100644 --- a/composer.lock +++ b/composer.lock @@ -107,12 +107,12 @@ "source": { "type": "git", "url": "https://github.com/Anahkiasen/rocketeer.git", - "reference": "3cd90ab14b9bfd0b9afe619e3bbb1f0c4e2bf833" + "reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/3cd90ab14b9bfd0b9afe619e3bbb1f0c4e2bf833", - "reference": "3cd90ab14b9bfd0b9afe619e3bbb1f0c4e2bf833", + "url": "https://api.github.com/repos/Anahkiasen/rocketeer/zipball/f25f73671938cf8a29b11c3c8b773e47f78663ff", + "reference": "f25f73671938cf8a29b11c3c8b773e47f78663ff", "shasum": "" }, "require": { @@ -143,7 +143,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "1.1-dev" + "dev-develop": "1.2-dev" } }, "autoload": { @@ -170,7 +170,7 @@ "laravel", "ssh" ], - "time": "2014-02-18 10:51:35" + "time": "2014-02-21 18:34:20" }, { "name": "anahkiasen/underscore-php", @@ -221,12 +221,12 @@ "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "3392e3e18f207538c315c5a435502d286c58a07b" + "reference": "7ffde7c3627e18760a2713cd0260472436fe488c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3392e3e18f207538c315c5a435502d286c58a07b", - "reference": "3392e3e18f207538c315c5a435502d286c58a07b", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7ffde7c3627e18760a2713cd0260472436fe488c", + "reference": "7ffde7c3627e18760a2713cd0260472436fe488c", "shasum": "" }, "require": { @@ -260,7 +260,7 @@ "profiler", "webprofiler" ], - "time": "2014-02-18 09:06:53" + "time": "2014-02-24 15:47:08" }, { "name": "chumper/datatable", @@ -268,12 +268,12 @@ "source": { "type": "git", "url": "https://github.com/Chumper/Datatable.git", - "reference": "46af8b4200bee5a6cc85ba5918b952a688051b72" + "reference": "c3aa3f189a8b75efdb049210d39898cc9a8caafe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chumper/Datatable/zipball/46af8b4200bee5a6cc85ba5918b952a688051b72", - "reference": "46af8b4200bee5a6cc85ba5918b952a688051b72", + "url": "https://api.github.com/repos/Chumper/Datatable/zipball/c3aa3f189a8b75efdb049210d39898cc9a8caafe", + "reference": "c3aa3f189a8b75efdb049210d39898cc9a8caafe", "shasum": "" }, "require": { @@ -312,7 +312,7 @@ "jquery", "laravel" ], - "time": "2014-02-10 14:27:52" + "time": "2014-02-23 17:47:19" }, { "name": "classpreloader/classpreloader", @@ -367,12 +367,12 @@ "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "83ab8207c78f802a1bc46f401f1db27d8b2e9961" + "reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/83ab8207c78f802a1bc46f401f1db27d8b2e9961", - "reference": "83ab8207c78f802a1bc46f401f1db27d8b2e9961", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/57072cb9dbf23dfd7f2806de61e54ccc57cbbdef", + "reference": "57072cb9dbf23dfd7f2806de61e54ccc57cbbdef", "shasum": "" }, "require": { @@ -422,7 +422,7 @@ "functional testing", "unit testing" ], - "time": "2014-02-18 03:27:40" + "time": "2014-02-24 23:38:17" }, { "name": "d11wtq/boris", @@ -464,12 +464,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Goutte.git", - "reference": "33c03fbdeaf5f8a7a5cf0ad88b33c95eba43e7a3" + "reference": "cf1731350b0d677476a786f17732b80dc6494c3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Goutte/zipball/33c03fbdeaf5f8a7a5cf0ad88b33c95eba43e7a3", - "reference": "33c03fbdeaf5f8a7a5cf0ad88b33c95eba43e7a3", + "url": "https://api.github.com/repos/fabpot/Goutte/zipball/cf1731350b0d677476a786f17732b80dc6494c3a", + "reference": "cf1731350b0d677476a786f17732b80dc6494c3a", "shasum": "" }, "require": { @@ -514,24 +514,26 @@ "keywords": [ "scraper" ], - "time": "2014-02-17 17:11:08" + "time": "2014-02-24 16:22:54" }, { "name": "facebook/webdriver", - "version": "v0.3", + "version": "v0.4", "source": { "type": "git", "url": "https://github.com/facebook/php-webdriver.git", - "reference": "1b0facc33133f0ff990df8cebe7f2e19b2603da3" + "reference": "342df507312ea5ae5337be47e16e4268d7ed661f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1b0facc33133f0ff990df8cebe7f2e19b2603da3", - "reference": "1b0facc33133f0ff990df8cebe7f2e19b2603da3", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/342df507312ea5ae5337be47e16e4268d7ed661f", + "reference": "342df507312ea5ae5337be47e16e4268d7ed661f", "shasum": "" }, "require": { - "php": ">=5.3.19", + "php": ">=5.3.19" + }, + "require-dev": { "phpunit/phpunit": "3.7.*" }, "type": "library", @@ -552,7 +554,7 @@ "selenium", "webdriver" ], - "time": "2013-11-26 23:16:02" + "time": "2014-02-21 18:22:11" }, { "name": "filp/whoops", @@ -857,12 +859,12 @@ "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "aa75c42975801286d00cba84b6ac845199880e8b" + "reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/aa75c42975801286d00cba84b6ac845199880e8b", - "reference": "aa75c42975801286d00cba84b6ac845199880e8b", + "url": "https://api.github.com/repos/Intervention/image/zipball/18f50ac4317d82ecfe88b6b1ed46d071478c5022", + "reference": "18f50ac4317d82ecfe88b6b1ed46d071478c5022", "shasum": "" }, "require": { @@ -899,7 +901,7 @@ "thumbnail", "watermark" ], - "time": "2014-02-11 16:27:23" + "time": "2014-02-20 15:58:24" }, { "name": "ircmaxell/password-compat", @@ -1134,12 +1136,12 @@ "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1faf4c8508378b0b102d148c53c322a8048b16dd" + "reference": "f7935afc541fc15324efc8538c60866e593ee447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1faf4c8508378b0b102d148c53c322a8048b16dd", - "reference": "1faf4c8508378b0b102d148c53c322a8048b16dd", + "url": "https://api.github.com/repos/laravel/framework/zipball/f7935afc541fc15324efc8538c60866e593ee447", + "reference": "f7935afc541fc15324efc8538c60866e593ee447", "shasum": "" }, "require": { @@ -1243,20 +1245,20 @@ "framework", "laravel" ], - "time": "2014-02-18 17:05:05" + "time": "2014-02-25 22:33:32" }, { "name": "laravelbook/ardent", - "version": "v2.4.1", + "version": "v2.4.2", "source": { "type": "git", "url": "https://github.com/laravelbook/ardent.git", - "reference": "e3ad5bb898fa03d1b393cd3e46851e10f229b652" + "reference": "0a0238b8040abc1c71401ce27a8edf2619fa5bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravelbook/ardent/zipball/e3ad5bb898fa03d1b393cd3e46851e10f229b652", - "reference": "e3ad5bb898fa03d1b393cd3e46851e10f229b652", + "url": "https://api.github.com/repos/laravelbook/ardent/zipball/0a0238b8040abc1c71401ce27a8edf2619fa5bed", + "reference": "0a0238b8040abc1c71401ce27a8edf2619fa5bed", "shasum": "" }, "require": { @@ -1280,7 +1282,7 @@ "name": "Max Ehsan", "email": "contact@laravelbook.com", "homepage": "http://laravelbook.com/", - "role": "Maintainer" + "role": "Developer" }, { "name": "Igor Santos", @@ -1302,7 +1304,7 @@ "sql", "validation" ], - "time": "2014-02-10 01:32:08" + "time": "2014-02-25 20:39:04" }, { "name": "maximebf/debugbar", @@ -1360,12 +1362,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "4c74b127eb5f1475157bb54c2b7cb3d529fe18f7" + "reference": "7085f3e424dfbaba98461a433f6c55fec3229355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4c74b127eb5f1475157bb54c2b7cb3d529fe18f7", - "reference": "4c74b127eb5f1475157bb54c2b7cb3d529fe18f7", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/7085f3e424dfbaba98461a433f6c55fec3229355", + "reference": "7085f3e424dfbaba98461a433f6c55fec3229355", "shasum": "" }, "require": { @@ -1375,7 +1377,7 @@ "require-dev": { "aws/aws-sdk-php": "~2.4.8", "doctrine/couchdb": "dev-master", - "mlehner/gelf-php": "1.0.*", + "graylog2/gelf-php": "~1.0", "phpunit/phpunit": "~3.7.0", "raven/raven": "~0.5", "ruflin/elastica": "0.90.*" @@ -1385,7 +1387,7 @@ "doctrine/couchdb": "Allow sending log messages to a CouchDB server", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", - "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "raven/raven": "Allow sending log messages to a Sentry server", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -1419,7 +1421,7 @@ "logging", "psr-3" ], - "time": "2014-02-18 14:12:15" + "time": "2014-02-25 22:48:41" }, { "name": "nesbot/carbon", @@ -1636,12 +1638,12 @@ "source": { "type": "git", "url": "https://github.com/omnipay/buckaroo.git", - "reference": "dcc15ceea803f7adfb13ea10436a298fcdceaffc" + "reference": "e77acd768cc28a8f6686c737d2de590d0470122e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/omnipay/buckaroo/zipball/dcc15ceea803f7adfb13ea10436a298fcdceaffc", - "reference": "dcc15ceea803f7adfb13ea10436a298fcdceaffc", + "url": "https://api.github.com/repos/omnipay/buckaroo/zipball/e77acd768cc28a8f6686c737d2de590d0470122e", + "reference": "e77acd768cc28a8f6686c737d2de590d0470122e", "shasum": "" }, "require": { @@ -1685,7 +1687,7 @@ "pay", "payment" ], - "time": "2014-01-19 12:15:09" + "time": "2014-02-21 20:42:22" }, { "name": "omnipay/cardsave", @@ -2254,12 +2256,12 @@ "source": { "type": "git", "url": "https://github.com/omnipay/multisafepay.git", - "reference": "fef04ce22ce61e16713531137c5025a7f2193d47" + "reference": "9041b7c520d1fb0634afdce3f149bda89e43a1c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/omnipay/multisafepay/zipball/fef04ce22ce61e16713531137c5025a7f2193d47", - "reference": "fef04ce22ce61e16713531137c5025a7f2193d47", + "url": "https://api.github.com/repos/omnipay/multisafepay/zipball/9041b7c520d1fb0634afdce3f149bda89e43a1c3", + "reference": "9041b7c520d1fb0634afdce3f149bda89e43a1c3", "shasum": "" }, "require": { @@ -2304,7 +2306,7 @@ "pay", "payment" ], - "time": "2014-01-22 20:38:58" + "time": "2014-02-20 23:31:30" }, { "name": "omnipay/netaxept", @@ -3111,12 +3113,12 @@ "source": { "type": "git", "url": "https://github.com/orchestral/testbench.git", - "reference": "6c6ddd723fe4e2fc95b615d96929c54a7b05a356" + "reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench/zipball/6c6ddd723fe4e2fc95b615d96929c54a7b05a356", - "reference": "6c6ddd723fe4e2fc95b615d96929c54a7b05a356", + "url": "https://api.github.com/repos/orchestral/testbench/zipball/425d887bc5357dc2929da4887c8a13b3ba67a17e", + "reference": "425d887bc5357dc2929da4887c8a13b3ba67a17e", "shasum": "" }, "require": { @@ -3150,7 +3152,7 @@ "keywords": [ "laravel" ], - "time": "2014-02-12 04:47:27" + "time": "2014-02-19 14:52:34" }, { "name": "patchwork/utf8", @@ -3209,12 +3211,12 @@ "source": { "type": "git", "url": "https://github.com/patricktalmadge/bootstrapper.git", - "reference": "28f928133ce7f0aedb1ba16c40533b613cfd8dc7" + "reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/28f928133ce7f0aedb1ba16c40533b613cfd8dc7", - "reference": "28f928133ce7f0aedb1ba16c40533b613cfd8dc7", + "url": "https://api.github.com/repos/patricktalmadge/bootstrapper/zipball/c0cee9c65ea063b0817e0c5f788371bbcbbf7d71", + "reference": "c0cee9c65ea063b0817e0c5f788371bbcbbf7d71", "shasum": "" }, "require": { @@ -3256,7 +3258,7 @@ "bootstrap", "laravel" ], - "time": "2014-02-18 17:27:51" + "time": "2014-02-24 10:46:34" }, { "name": "phpseclib/phpseclib", @@ -3264,12 +3266,12 @@ "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "8dc659d694d3e0af68688600908ff1cac9d079dc" + "reference": "76c9692908a6c25601df2db373043fcbb335332e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/8dc659d694d3e0af68688600908ff1cac9d079dc", - "reference": "8dc659d694d3e0af68688600908ff1cac9d079dc", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/76c9692908a6c25601df2db373043fcbb335332e", + "reference": "76c9692908a6c25601df2db373043fcbb335332e", "shasum": "" }, "require": { @@ -3350,7 +3352,7 @@ "x.509", "x509" ], - "time": "2014-02-17 17:53:54" + "time": "2014-02-23 01:03:22" }, { "name": "phpunit/php-code-coverage", @@ -3358,12 +3360,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "3a60a660998e8d41d5ea81ff8d96ead546bce150" + "reference": "69e55e68481cf708a6db43aff0b504e31402fe27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3a60a660998e8d41d5ea81ff8d96ead546bce150", - "reference": "3a60a660998e8d41d5ea81ff8d96ead546bce150", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/69e55e68481cf708a6db43aff0b504e31402fe27", + "reference": "69e55e68481cf708a6db43aff0b504e31402fe27", "shasum": "" }, "require": { @@ -3411,7 +3413,7 @@ "testing", "xunit" ], - "time": "2014-02-16 12:11:19" + "time": "2014-02-25 03:34:05" }, { "name": "phpunit/php-file-iterator", @@ -3602,12 +3604,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5728eadfb7859241d7aafd26592cee0ad1876d2d" + "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5728eadfb7859241d7aafd26592cee0ad1876d2d", - "reference": "5728eadfb7859241d7aafd26592cee0ad1876d2d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", + "reference": "2752cbb9ea5bd84c2811b34b6953f76965ec7a2f", "shasum": "" }, "require": { @@ -3624,7 +3626,7 @@ "symfony/yaml": "~2.0" }, "require-dev": { - "pear-pear/pear": "1.9.4" + "pear-pear.php.net/pear": "1.9.4" }, "suggest": { "ext-json": "*", @@ -3668,7 +3670,7 @@ "testing", "xunit" ], - "time": "2014-02-15 22:46:11" + "time": "2014-02-25 03:47:29" }, { "name": "phpunit/phpunit-mock-objects", @@ -3902,9 +3904,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Chris Corbyn" @@ -3962,9 +3962,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", @@ -4289,9 +4287,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" }, { "name": "Symfony Community", @@ -4309,12 +4305,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "b6735d1fc16da13c4c7dddfe78366a4a098cf011" + "reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/b6735d1fc16da13c4c7dddfe78366a4a098cf011", - "reference": "b6735d1fc16da13c4c7dddfe78366a4a098cf011", + "url": "https://api.github.com/repos/symfony/Finder/zipball/d712f4a26737300b4d7546705a4fb15feeb3e96f", + "reference": "d712f4a26737300b4d7546705a4fb15feeb3e96f", "shasum": "" }, "require": { @@ -4349,7 +4345,7 @@ ], "description": "Symfony Finder Component", "homepage": "http://symfony.com", - "time": "2014-01-07 13:28:54" + "time": "2014-02-24 16:20:54" }, { "name": "symfony/http-foundation", @@ -4483,12 +4479,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "bfa6a176e9c680cf87bbd65096826ef000c46f51" + "reference": "18290692a81cc7d8b5d909bf828414fcf95e9538" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/bfa6a176e9c680cf87bbd65096826ef000c46f51", - "reference": "bfa6a176e9c680cf87bbd65096826ef000c46f51", + "url": "https://api.github.com/repos/symfony/Process/zipball/18290692a81cc7d8b5d909bf828414fcf95e9538", + "reference": "18290692a81cc7d8b5d909bf828414fcf95e9538", "shasum": "" }, "require": { @@ -4523,7 +4519,7 @@ ], "description": "Symfony Process Component", "homepage": "http://symfony.com", - "time": "2014-02-18 16:29:54" + "time": "2014-02-24 16:20:54" }, { "name": "symfony/routing", @@ -4657,12 +4653,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "9921872611710df49cf035c259e5a461ea2d0f8c" + "reference": "e49a47d60348665261f6e279ba383241deb73cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/9921872611710df49cf035c259e5a461ea2d0f8c", - "reference": "9921872611710df49cf035c259e5a461ea2d0f8c", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/e49a47d60348665261f6e279ba383241deb73cab", + "reference": "e49a47d60348665261f6e279ba383241deb73cab", "shasum": "" }, "require": { @@ -4697,7 +4693,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-01-07 13:29:57" + "time": "2014-02-24 16:21:51" }, { "name": "webpatser/laravel-countries",