Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-04-26 22:35:14 +03:00
parent b0091bd27b
commit ec7dd89936
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/libraries/utils.php
View File

@ -79,7 +79,11 @@ class Utils
static::logError($message . ' ' . $exception);
return View::make('error')->with('error', $message);
$data = [
'showBreadcrumbs' => false
];
return View::make('error', $data)->with('error', $message);
}
public static function logError($error, $context = 'PHP')

2
app/ninja/mailers/UserMailer.php
View File

@ -40,7 +40,7 @@ class UserMailer extends Mailer {
'userName' => $user->getDisplayName(),
'invoiceAmount' => Utils::formatMoney($invoice->amount, $invoice->client->currency_id),
'invoiceNumber' => $invoice->invoice_number,
'invoiceLink' => "http://www.invoiceninja.com/invoices/{$invoice->public_id}"
'invoiceLink' => "http://".$_SERVER['SERVER_NAME']."/invoices/{$invoice->public_id}"
];
if ($payment)

1
app/ninja/repositories/AccountRepository.php
View File

@ -206,6 +206,7 @@ class AccountRepository
$contact = new Contact;
$contact->user_id = $ninjaAccount->users()->first()->id;
$contact->public_id = Auth::user()->account_id;
$contact->is_primary = true;
foreach (['first_name', 'last_name', 'email', 'phone'] as $field)
{

2
app/routes.php
View File

@ -189,7 +189,7 @@ define('GATEWAY_PAYPAL_EXPRESS', 17);
define('GATEWAY_BEANSTREAM', 29);
define('GATEWAY_PSIGATE', 30);
define('PRO_PLAN_PRICE', 50);
define('PRO_PLAN_PRICE', 50);
define('REQUESTED_PRO_PLAN', 'REQUESTED_PRO_PLAN');
define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
define('NINJA_GATEWAY_ID', GATEWAY_AUTHORIZE_NET);