Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-19 20:54:27 +02:00
parent a43de0eb6b
commit 6876edc510
4 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/HomeController.php
View File

@ -46,7 +46,7 @@ class HomeController extends BaseController {
'text' => $message 'text' => $message
]; ];
$this->mailer->sendTo('contact@invoiceninja.com', 'contact@invoiceninja.com', 'Invoice Ninja Feedback', 'contact', $data); $this->mailer->sendTo(CONTACT_EMAIL, CONTACT_EMAIL, 'Invoice Ninja Feedback', 'contact', $data);
Session::flash('message', 'Successfully sent message'); Session::flash('message', 'Successfully sent message');
return Redirect::to('/contact'); return Redirect::to('/contact');

14
app/database/seeds/UserTableSeeder.php
View File

@ -5,21 +5,7 @@ class UserTableSeeder extends Seeder
public function run() public function run()
{ {
//DB::table('users')->delete();
/*
$account = Account::create(array(
'name' => 'Acme Inc',
));
$user = User::create(array(
'account_id' => $account->id,
'first_name' => 'Hillel',
'last_name' => 'Coren',
'email' => 'hillelcoren@gmail.com',
'password' => Hash::make('1234'),
));
*/
} }
} }

63
app/routes.php
View File

@ -22,37 +22,6 @@
//dd(gethostname()); //dd(gethostname());
//Log::error('test'); //Log::error('test');
/*
Event::listen('illuminate.query', function($query, $bindings, $time, $name)
{
$data = compact('bindings', 'time', 'name');
// Format binding data for sql insertion
foreach ($bindings as $i => $binding)
{
if ($binding instanceof \DateTime)
{
$bindings[$i] = $binding->format('\'Y-m-d H:i:s\'');
}
else if (is_string($binding))
{
$bindings[$i] = "'$binding'";
}
}
// Insert bindings into query
$query = str_replace(array('%', '?'), array('%%', '%s'), $query);
$query = vsprintf($query, $bindings);
Log::info($query, $data);
});
*/
/*
Route::get('/send_emails', function() {
Artisan::call('ninja:send-invoices');
});
*/
Route::get('/', 'HomeController@showWelcome'); Route::get('/', 'HomeController@showWelcome');
Route::get('/rocksteady', 'HomeController@showWelcome'); Route::get('/rocksteady', 'HomeController@showWelcome');
@ -257,7 +226,7 @@ define('DEFAULT_CURRENCY', 1); // US Dollar
define('DEFAULT_DATE_FORMAT', 'M j, Y'); define('DEFAULT_DATE_FORMAT', 'M j, Y');
define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy'); define('DEFAULT_DATE_PICKER_FORMAT', 'M d, yyyy');
define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a'); define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a');
define('DEFAULT_QUERY_CACHE', 120); define('DEFAULT_QUERY_CACHE', 120); // minutes
define('GATEWAY_PAYPAL_EXPRESS', 17); define('GATEWAY_PAYPAL_EXPRESS', 17);
@ -267,7 +236,6 @@ if (Auth::check() && !Session::has(SESSION_TIMEZONE))
Event::fire('user.refresh'); Event::fire('user.refresh');
} }
Validator::extend('positive', function($attribute, $value, $parameters) Validator::extend('positive', function($attribute, $value, $parameters)
{ {
return Utils::parseFloat($value) > 0; return Utils::parseFloat($value) > 0;
@ -282,4 +250,31 @@ Validator::extend('has_credit', function($attribute, $value, $parameters)
$credit = $client->getTotalCredit(); $credit = $client->getTotalCredit();
return $credit >= $amount; return $credit >= $amount;
}); });
/*
Event::listen('illuminate.query', function($query, $bindings, $time, $name)
{
$data = compact('bindings', 'time', 'name');
// Format binding data for sql insertion
foreach ($bindings as $i => $binding)
{
if ($binding instanceof \DateTime)
{
$bindings[$i] = $binding->format('\'Y-m-d H:i:s\'');
}
else if (is_string($binding))
{
$bindings[$i] = "'$binding'";
}
}
// Insert bindings into query
$query = str_replace(array('%', '?'), array('%%', '%s'), $query);
$query = vsprintf($query, $bindings);
Log::info($query, $data);
});
*/

6
app/views/master.blade.php
View File

@ -55,12 +55,6 @@
ga('create', 'UA-46031341-1'); ga('create', 'UA-46031341-1');
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
@else
<style>
.navbar {
background-color: #006600 !important;
}
</style>
@endif @endif
@yield('body') @yield('body')