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

Added _id to header/body font properties

Browse Source
This commit is contained in:
Hillel Coren 2016-01-07 09:19:57 +02:00
parent 14192846e8
commit 77f9e89b40
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AccountController.php
View File

@ -690,8 +690,8 @@ class AccountController extends BaseController
$account = Auth::user()->account; $account = Auth::user()->account;
$account->hide_quantity = Input::get('hide_quantity') ? true : false; $account->hide_quantity = Input::get('hide_quantity') ? true : false;
$account->hide_paid_to_date = Input::get('hide_paid_to_date') ? true : false; $account->hide_paid_to_date = Input::get('hide_paid_to_date') ? true : false;
$account->header_font = Input::get('header_font'); $account->header_font_id = Input::get('header_font_id');
$account->body_font = Input::get('body_font'); $account->body_font_id = Input::get('body_font_id');
$account->primary_color = Input::get('primary_color'); $account->primary_color = Input::get('primary_color');
$account->secondary_color = Input::get('secondary_color'); $account->secondary_color = Input::get('secondary_color');
$account->invoice_design_id = Input::get('invoice_design_id'); $account->invoice_design_id = Input::get('invoice_design_id');

14
app/Models/Account.php
View File

@ -899,8 +899,8 @@ class Account extends Eloquent
public function getFontsUrl($protocol = ''){ public function getFontsUrl($protocol = ''){
if ($this->isPro()){ if ($this->isPro()){
$bodyFont = $this->body_font; $bodyFont = $this->body_font_id;
$headerFont = $this->header_font; $headerFont = $this->header_font_id;
} }
else{ else{
$bodyFont = DEFAULT_BODY_FONT; $bodyFont = DEFAULT_BODY_FONT;
@ -920,15 +920,15 @@ class Account extends Eloquent
} }
public function getHeaderFontName(){ public function getHeaderFontName(){
return Utils::getFromCache($this->header_font, 'fonts')['name']; return Utils::getFromCache($this->header_font_id, 'fonts')['name'];
} }
public function getBodyFontName(){ public function getBodyFontName(){
return Utils::getFromCache($this->body_font, 'fonts')['name']; return Utils::getFromCache($this->body_font_id, 'fonts')['name'];
} }
public function getHeaderFontCss($include_weight = true){ public function getHeaderFontCss($include_weight = true){
$font_data = Utils::getFromCache($this->header_font, 'fonts'); $font_data = Utils::getFromCache($this->header_font_id, 'fonts');
$css = 'font-family:'.$font_data['css_stack'].';'; $css = 'font-family:'.$font_data['css_stack'].';';
if($include_weight){ if($include_weight){
@ -939,7 +939,7 @@ class Account extends Eloquent
} }
public function getBodyFontCss($include_weight = true){ public function getBodyFontCss($include_weight = true){
$font_data = Utils::getFromCache($this->body_font, 'fonts'); $font_data = Utils::getFromCache($this->body_font_id, 'fonts');
$css = 'font-family:'.$font_data['css_stack'].';'; $css = 'font-family:'.$font_data['css_stack'].';';
if($include_weight){ if($include_weight){
@ -950,7 +950,7 @@ class Account extends Eloquent
} }
public function getFonts(){ public function getFonts(){
return array_unique(array($this->header_font, $this->body_font)); return array_unique(array($this->header_font_id, $this->body_font_id));
} }
public function getFontsData(){ public function getFontsData(){

16
database/migrations/2016_01_06_153144_add_invoice_font_support.php
View File

@ -36,14 +36,14 @@ class AddInvoiceFontSupport extends Migration {
Schema::table('accounts', function($table) Schema::table('accounts', function($table)
{ {
$table->unsignedInteger('header_font')->default(1); $table->unsignedInteger('header_font_id')->default(1);
$table->unsignedInteger('body_font')->default(1); $table->unsignedInteger('body_font_id')->default(1);
}); });
Schema::table('accounts', function($table) Schema::table('accounts', function($table)
{ {
$table->foreign('header_font')->references('id')->on('fonts'); $table->foreign('header_font_id')->references('id')->on('fonts');
$table->foreign('body_font')->references('id')->on('fonts'); $table->foreign('body_font_id')->references('id')->on('fonts');
}); });
} }
@ -54,21 +54,21 @@ class AddInvoiceFontSupport extends Migration {
*/ */
public function down() public function down()
{ {
if (Schema::hasColumn('accounts', 'header_font')) if (Schema::hasColumn('accounts', 'header_font_id'))
{ {
Schema::table('accounts', function($table) Schema::table('accounts', function($table)
{ {
$table->dropForeign('accounts_header_font_foreign'); $table->dropForeign('accounts_header_font_foreign');
$table->dropColumn('header_font'); $table->dropColumn('header_font_id');
}); });
} }
if (Schema::hasColumn('accounts', 'body_font')) if (Schema::hasColumn('accounts', 'body_font_id'))
{ {
Schema::table('accounts', function($table) Schema::table('accounts', function($table)
{ {
$table->dropForeign('accounts_body_font_foreign'); $table->dropForeign('accounts_body_font_foreign');
$table->dropColumn('body_font'); $table->dropColumn('body_font_id');
}); });
} }

12
resources/views/accounts/invoice_design.blade.php
View File

@ -53,8 +53,8 @@
NINJA.primaryColor = $('#primary_color').val(); NINJA.primaryColor = $('#primary_color').val();
NINJA.secondaryColor = $('#secondary_color').val(); NINJA.secondaryColor = $('#secondary_color').val();
NINJA.fontSize = parseInt($('#font_size').val()); NINJA.fontSize = parseInt($('#font_size').val());
NINJA.headerFont = $('#header_font option:selected').text(); NINJA.headerFont = $('#header_font_id option:selected').text();
NINJA.bodyFont = $('#body_font option:selected').text(); NINJA.bodyFont = $('#body_font_id option:selected').text();
var fields = ['item', 'description', 'unit_cost', 'quantity', 'line_total', 'terms']; var fields = ['item', 'description', 'unit_cost', 'quantity', 'line_total', 'terms'];
invoiceLabels.old = {}; invoiceLabels.old = {};
@ -84,8 +84,8 @@
$('#primary_color').spectrum(options); $('#primary_color').spectrum(options);
$('#secondary_color').spectrum(options); $('#secondary_color').spectrum(options);
$('#header_font').change(function(){loadFont($('#header_font').val())}); $('#header_font_id').change(function(){loadFont($('#header_font').val())});
$('#body_font').change(function(){loadFont($('#body_font').val())}); $('#body_font_id').change(function(){loadFont($('#body_font').val())});
refreshPDF(); refreshPDF();
@ -133,10 +133,10 @@
->style('display:inline; width:300px') ->style('display:inline; width:300px')
->fromQuery($invoiceDesigns, 'name', 'id') !!} ->fromQuery($invoiceDesigns, 'name', 'id') !!}
@endif @endif
{!! Former::select('header_font') {!! Former::select('header_font_id')
->style('display:inline; width:300px') ->style('display:inline; width:300px')
->fromQuery($invoiceFonts, 'name', 'id') !!} ->fromQuery($invoiceFonts, 'name', 'id') !!}
{!! Former::select('body_font') {!! Former::select('body_font_id')
->style('display:inline; width:300px') ->style('display:inline; width:300px')
->fromQuery($invoiceFonts, 'name', 'id') !!} ->fromQuery($invoiceFonts, 'name', 'id') !!}