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-05-22 21:29:29 +03:00
parent 8049a27beb
commit 380d7e0a4a
13 changed files with 95 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/AccountController.php
View File

@ -200,7 +200,7 @@ class AccountController extends \BaseController {
}
}
public function doSection($section = ACCOUNT_DETAILS)
public function doSection($section = ACCOUNT_DETAILS, $subSection = false)
{
if ($section == ACCOUNT_DETAILS)
{
@ -257,7 +257,7 @@ class AccountController extends \BaseController {
private function saveCustomFields()
{
if (!Auth::user()->account->isPro())
if (Auth::user()->account->isPro())
{
$account = Auth::user()->account;
$account->custom_label1 = Input::get('custom_label1');
@ -271,12 +271,12 @@ class AccountController extends \BaseController {
Session::flash('message', trans('texts.updated_settings'));
}
return Redirect::to('company/advanced_settings');
return Redirect::to('company/advanced_settings/custom_fields');
}
private function saveInvoiceDesign()
{
if (!Auth::user()->account->isPro())
if (Auth::user()->account->isPro())
{
$account = Auth::user()->account;
$account->primary_color = Input::get('primary_color');// ? Input::get('primary_color') : null;
@ -286,7 +286,7 @@ class AccountController extends \BaseController {
Session::flash('message', trans('texts.updated_settings'));
}
return Redirect::to('company/advanced_settings');
return Redirect::to('company/advanced_settings/invoice_design');
}
private function export()
@ -679,7 +679,9 @@ class AccountController extends \BaseController {
{
$path = Input::file('logo')->getRealPath();
File::delete('logo/' . $account->account_key . '.jpg');
Image::make($path)->resize(200, 120, true, false)->save('logo/' . $account->account_key . '.jpg');
$image = Image::make($path)->resize(200, 120, true, false);
Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath());
}
Event::fire('user.refresh');

2
app/database/migrations/2014_05_17_175626_add_quotes.php
View File

@ -15,7 +15,6 @@ class AddQuotes extends Migration {
Schema::table('invoices', function($table)
{
$table->boolean('is_quote');
$table->unsignedInteger('quote_id')->nullable();
$table->unsignedInteger('quote_invoice_id')->nullable();
});
@ -31,7 +30,6 @@ class AddQuotes extends Migration {
Schema::table('invoices', function($table)
{
$table->dropColumn('is_quote');
$table->dropColumn('quote_id');
$table->dropColumn('quote_invoice_id');
});

2
app/database/seeds/ConstantsSeeder.php
View File

@ -124,7 +124,7 @@ class ConstantsSeeder extends Seeder
Currency::create(array('name' => 'Pound Sterling', 'code' => 'GBP', 'symbol' => '£', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
Currency::create(array('name' => 'Euro', 'code' => 'EUR', 'symbol' => '€', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'));
Currency::create(array('name' => 'Rand', 'code' => 'ZAR', 'symbol' => 'R', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => '.'));
Currency::create(array('name' => 'Danish Krone', 'code' => 'DKK', 'symbol' => 'kr ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','));
DatetimeFormat::create(array('format' => 'd/M/Y g:i a', 'label' => '10/Mar/2013'));
DatetimeFormat::create(array('format' => 'd-M-Yk g:i a', 'label' => '10-Mar-2013'));

1
app/models/Invoice.php
View File

@ -62,6 +62,7 @@ class Invoice extends EntityModel
$this->setVisible([
'invoice_number',
'discount',
'shipping',
'po_number',
'invoice_date',
'due_date',

8
app/ninja/repositories/InvoiceRepository.php
View File

@ -119,11 +119,12 @@ class InvoiceRepository
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="' . \URL::to("{$entityType}s/".$model->public_id.'/edit') . '">'.trans("texts.edit_{$entityType}").'</a></li>
<li><a href="' . \URL::to("{$entityType}s/".$model->public_id.'/clone') . '">'.trans("texts.clone_{$entityType}").'</a></li>';
<li><a href="' . \URL::to("{$entityType}s/".$model->public_id.'/clone') . '">'.trans("texts.clone_{$entityType}").'</a></li>
<li class="divider"></li><li>';
if ($entityType == ENTITY_INVOICE)
{
$str .= '<li class="divider"></li><li><a href="' . \URL::to('payments/create/' . $model->client_public_id . '/' . $model->public_id ) . '">'.trans('texts.enter_payment').'</a></li>';
$str .= '<a href="' . \URL::to('payments/create/' . $model->client_public_id . '/' . $model->public_id ) . '">'.trans('texts.enter_payment').'</a></li>';
if ($model->quote_id)
{
@ -134,7 +135,7 @@ class InvoiceRepository
{
if ($model->quote_invoice_id)
{
$str .= '<li class="divider"></li><li><a href="' . \URL::to("invoices/{$model->quote_invoice_id}/edit") . '">' . trans("texts.view_invoice") . '</a></li>';
$str .= '<li><a href="' . \URL::to("invoices/{$model->quote_invoice_id}/edit") . '">' . trans("texts.view_invoice") . '</a></li>';
}
}
@ -326,6 +327,7 @@ class InvoiceRepository
foreach ([
'client_id',
'discount',
'shipping',
'invoice_date',
'po_number',
'due_date',

2
app/views/emails/invoice_html.blade.php
View File

@ -18,7 +18,7 @@
@endif
<p/>
{{ trans('texts.ninja_email_footer', ['site' => '<a href="'.SITE_URL.'">Invoice Ninja</a>']) }}
{{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com">Invoice Ninja</a>']) }}
</body>
</html>

2
app/views/emails/invoice_text.blade.php
View File

@ -11,4 +11,4 @@
@endif
{{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
{{ SITE_URL }}
https://www.invoiceninja.com

2
app/views/emails/payment_confirmation_html.blade.php
View File

@ -17,7 +17,7 @@
@endif
<p/>
{{ trans('texts.ninja_email_footer', ['site' => '<a href="'.SITE_URL.'">Invoice Ninja</a>']) }}
{{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com">Invoice Ninja</a>']) }}
</body>
</html>

2
app/views/emails/payment_confirmation_text.blade.php
View File

@ -10,4 +10,4 @@
@endif
{{ trans('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
{{ SITE_URL }}
https://www.invoiceninja.com

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

@ -9,7 +9,7 @@
<div class="cell">Live .PDF invoice creation </div>
<div class="cell">4 beatiful invoice templates</div>
<div class="cell">Accept credit card payments</div>
<div class="cell">Quotes/Pro-Forma Invoices</div>
<div class="cell">Quotes/pro-forma invoices</div>
<div class="cell">Custom invoice fields and colors</div>
<div class="cell">Dynamic chart builder</div>
<div class="cell">Priority email support</div>
@ -26,7 +26,7 @@
<div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Quotes/Pro-Forma Invoices</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Custom fields and invoice colors</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-remove"></div>
@ -43,7 +43,7 @@
<div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">4 beatiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Quotes/Pro-Forma Invoices</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Custom invoice fields and colors</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Priority email support</div><span class="glyphicon glyphicon-ok"></div>

2
app/views/public/header.blade.php
View File

@ -108,6 +108,7 @@
</div>
</div>
<div style="background-color:#211f1f; width:100%">
<div class="container">
@if (Session::has('warning'))
<div class="alert alert-warning">{{ Session::get('warning') }}</div>
@ -121,6 +122,7 @@
<div class="alert alert-danger">{{ Session::get('error') }}</div>
@endif
</div>
</div>
@yield('content')