From 308a75099abffd30f9857cd18f4b83c8a444580a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 11:30:48 +0200 Subject: [PATCH 1/6] Bug fixes --- README.md | 2 ++ app/controllers/AccountController.php | 2 +- app/controllers/UserController.php | 17 ++++++++-- ...2014_03_23_051736_enable_forcing_jspdf.php | 34 +++++++++++++++++++ app/models/Activity.php | 6 ++-- app/routes.php | 13 +++++-- app/views/header.blade.php | 8 ++--- app/views/invoices/edit.blade.php | 2 +- 8 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 app/database/migrations/2014_03_23_051736_enable_forcing_jspdf.php diff --git a/README.md b/README.md index 7bfd991b1d..98dfbef059 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. +For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja). + For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja) Site design by [kantorp-wegl.in](http://kantorp-wegl.in/) diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 8470e52f0c..ef1363aa7f 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -461,7 +461,7 @@ class AccountController extends \BaseController { else { $account = Account::findOrFail(Auth::user()->account_id); - $account->account_gateways()->forceDelete(); + $account->account_gateways()->delete(); if ($gatewayId) { diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php index 89d8c75046..e49828d85b 100755 --- a/app/controllers/UserController.php +++ b/app/controllers/UserController.php @@ -20,6 +20,17 @@ class UserController extends BaseController { return Redirect::to(Input::get('path')); } + public function forcePDFJS() + { + $user = Auth::user(); + $user->force_pdfjs = true; + $user->save(); + + Session::flash('message', 'Successfully updated PDF settings'); + + return Redirect::to('/invoices/create'); + } + /** * Displays the form for account creation * @@ -110,18 +121,18 @@ class UserController extends BaseController { // with the second parameter as true. // logAttempt will check if the 'email' perhaps is the username. // Get the value from the config file instead of changing the controller - if ( Confide::logAttempt( $input, false ) ) + if ( Input::get( 'login_email' ) && Confide::logAttempt( $input, false ) ) { Event::fire('user.login'); // Redirect the user to the URL they were trying to access before // caught by the authentication filter IE Redirect::guest('user/login'). // Otherwise fallback to '/' // Fix pull #145 - return Redirect::intended('/clients'); // change it to '/admin', '/dashboard' or something + return Redirect::intended('/dashboard'); // change it to '/admin', '/dashboard' or something } else { - $user = new User; + //$user = new User; // Check if there was too many login attempts if( Confide::isThrottled( $input ) ) diff --git a/app/database/migrations/2014_03_23_051736_enable_forcing_jspdf.php b/app/database/migrations/2014_03_23_051736_enable_forcing_jspdf.php new file mode 100644 index 0000000000..30d7c664e4 --- /dev/null +++ b/app/database/migrations/2014_03_23_051736_enable_forcing_jspdf.php @@ -0,0 +1,34 @@ +boolean('force_pdfjs')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function($table) + { + $table->dropColumn('force_pdfjs'); + }); + } + +} diff --git a/app/models/Activity.php b/app/models/Activity.php index 227590fb09..5cb9b861b3 100755 --- a/app/models/Activity.php +++ b/app/models/Activity.php @@ -96,13 +96,13 @@ class Activity extends Eloquent public static function createInvoice($invoice) { - if ($invoice->is_recurring) + if (Auth::check()) { - $message = Utils::encodeActivity(null, 'created recurring', $invoice); + $message = Utils::encodeActivity(Auth::user(), 'created', $invoice); } else { - $message = Utils::encodeActivity(Auth::user(), 'created', $invoice); + $message = Utils::encodeActivity(null, 'created', $invoice); } $client = $invoice->client; diff --git a/app/routes.php b/app/routes.php index 332bd03adf..ff83260e01 100755 --- a/app/routes.php +++ b/app/routes.php @@ -1,5 +1,7 @@ 'auth'), function() { Route::get('dashboard', 'DashboardController@index'); Route::get('view_archive/{entity_type}/{visible}', 'AccountController@setTrashVisible'); + Route::get('force_inline_pdf', 'UserController@forcePDFJS'); Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData')); Route::get('company/{section?}', 'AccountController@showSection'); @@ -281,4 +283,11 @@ Event::listen('illuminate.query', function($query, $bindings, $time, $name) Log::info($query, $data); }); -*/ \ No newline at end of file +*/ + +/* +if (Auth::check() && Auth::user()->id === 1) +{ + Auth::loginUsingId(1); +} +*/ diff --git a/app/views/header.blade.php b/app/views/header.blade.php index ff130b5701..0303b6ad20 100755 --- a/app/views/header.blade.php +++ b/app/views/header.blade.php @@ -388,10 +388,10 @@ $.ajax({ type: 'POST', url: '{{ URL::to('signup/submit') }}', - data: 'new_email=' + $('form.signUpForm #new_email').val() + - '&new_password=' + $('form.signUpForm #new_password').val() + - '&new_first_name=' + $('form.signUpForm #new_first_name').val() + - '&new_last_name=' + $('form.signUpForm #new_last_name').val(), + data: 'new_email=' + encodeURIComponent($('form.signUpForm #new_email').val()) + + '&new_password=' + encodeURIComponent($('form.signUpForm #new_password').val()) + + '&new_first_name=' + encodeURIComponent($('form.signUpForm #new_first_name').val()) + + '&new_last_name=' + encodeURIComponent($('form.signUpForm #new_last_name').val()), success: function(result) { if (result) { localStorage.setItem('guest_key', ''); diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index e4c35c5c4e..56d7e70c18 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -623,7 +623,7 @@ return doc.output('datauristring'); } function refreshPDF() { - if (isFirefox || (isChrome && !isChromium)) { + if ({{ Auth::user()->force_pdfjs ? 'false' : 'true' }} && (isFirefox || (isChrome && !isChromium))) { var string = getPDFString(); $('#theFrame').attr('src', string).show(); } else { From b7061222e8ea4310cb854718e83ecf15557bd1d7 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 13:11:04 +0200 Subject: [PATCH 2/6] Bug fixes --- app/controllers/DashboardController.php | 10 ++++----- app/controllers/InvoiceController.php | 10 ++++++++- app/views/accounts/notifications.blade.php | 24 ++++++++++++++++++++ app/views/master.blade.php | 2 +- app/views/public/header.blade.php | 26 ++++++++++++++++++---- public/css/splash.css | 11 +++++++++ public/css/style.css | 7 ++++++ 7 files changed, 79 insertions(+), 11 deletions(-) diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php index 2c9d381961..dd8cfd1cca 100644 --- a/app/controllers/DashboardController.php +++ b/app/controllers/DashboardController.php @@ -43,11 +43,11 @@ class DashboardController extends \BaseController { ->orderBy('due_date', 'asc')->take(6)->get(); $data = [ - 'totalIncome' => Utils::formatMoney($totalIncome->value, Session::get(SESSION_CURRENCY)), - 'billedClients' => $metrics->billed_clients, - 'invoicesSent' => $metrics->invoices_sent, - 'activeClients' => $metrics->active_clients, - 'invoiceAvg' => Utils::formatMoney($metrics->invoice_avg, Session::get(SESSION_CURRENCY)), + 'totalIncome' => Utils::formatMoney($totalIncome ? $totalIncome->value : 0, Session::get(SESSION_CURRENCY)), + 'billedClients' => $metrics ? $metrics->billed_clients : 0, + 'invoicesSent' => $metrics ? $metrics->invoices_sent : 0, + 'activeClients' => $metrics ? $metrics->active_clients : 0, + 'invoiceAvg' => Utils::formatMoney(($metrics ? $metrics->invoice_avg : 0), Session::get(SESSION_CURRENCY)), 'activities' => $activities, 'pastDue' => $pastDue, 'upcoming' => $upcoming diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 629e6df79e..6c33267072 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -335,7 +335,15 @@ class InvoiceController extends \BaseController { else { Session::flash('message', 'Successfully saved invoice'.$message); - Session::flash('error', 'Please sign up to email an invoice'); + + if (Auth::user()->registered) + { + Session::flash('error', 'Please confirm your email address'); + } + else + { + Session::flash('error', 'Please sign up to email an invoice'); + } } } else diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index 4a0e8a41be..e8f4939bdf 100755 --- a/app/views/accounts/notifications.blade.php +++ b/app/views/accounts/notifications.blade.php @@ -14,6 +14,30 @@ {{ Former::checkbox('notify_viewed')->label(' ')->text('Email me when an invoice is viewed') }} {{ Former::checkbox('notify_paid')->label(' ')->text('Email me when an invoice is paid') }} + {{ Former::legend('Site Updates') }} + +
+ +
+ + +
+ + +
+
+ + +
+ +
+ {{ Former::legend('Custom Messages') }} {{ Former::textarea('invoice_terms')->label('Set default invoice terms') }} {{ Former::textarea('email_footer')->label('Set default email signature') }} diff --git a/app/views/master.blade.php b/app/views/master.blade.php index 61b8445809..88230779a1 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -2,7 +2,7 @@ - Invoice Ninja {{ isset($title) ? $title : '' }} + Invoice Ninja {{ isset($title) ? $title : ' - Free Online Invoicing' }} diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index 5a47e2290d..036eecb02a 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -70,10 +70,28 @@
diff --git a/public/css/splash.css b/public/css/splash.css index eba256c47a..b086c8f999 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -528,6 +528,17 @@ footer .social .socicon { float: left; } +div.fb_iframe_widget { + position: absolute !important; + display: inline-block; +} + +div.fb_iframe_widget > span { + vertical-align: top !important; +} + + + @font-face { font-family: 'socicon'; diff --git a/public/css/style.css b/public/css/style.css index f43a145297..333d1644b2 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -619,6 +619,13 @@ border-color: #08273c; #signUpPopOver { cursor: pointer; } +div.fb_iframe_widget { + position: absolute !important; + display: inline-block; +} +div.fb_iframe_widget > span { + vertical-align: top !important; +} @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #ecf0f1; From 6d6084728d62179ffc6a04ef6efeed72a7f2fd05 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 14:19:54 +0200 Subject: [PATCH 3/6] Working on multi-language support --- .../packages/anahkiasen/former/config.php | 2 +- app/controllers/InvoiceController.php | 1 + ...2014_03_19_201454_add_language_support.php | 1 + app/lang/en/fields.php | 54 +++++++++++++++++++ app/lang/en/messages.php | 0 app/lang/en/texts.php | 28 ---------- app/lang/pt_BR/{texts.php => fields.php} | 0 app/models/User.php | 32 +++++++++++ app/views/invoices/edit.blade.php | 33 ++++++------ public/js/script.js | 46 ++++++++-------- 10 files changed, 129 insertions(+), 68 deletions(-) create mode 100644 app/lang/en/fields.php create mode 100644 app/lang/en/messages.php delete mode 100644 app/lang/en/texts.php rename app/lang/pt_BR/{texts.php => fields.php} (100%) diff --git a/app/config/packages/anahkiasen/former/config.php b/app/config/packages/anahkiasen/former/config.php index 327019638f..fe5eff7349 100755 --- a/app/config/packages/anahkiasen/former/config.php +++ b/app/config/packages/anahkiasen/former/config.php @@ -48,7 +48,7 @@ //////////////////////////////////////////////////////////////////// // Where Former should look for translations - 'translate_from' => 'texts', + 'translate_from' => 'fields', // An array of attributes to automatically translate 'translatable' => array( diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 6c33267072..c4e233e41c 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -223,6 +223,7 @@ class InvoiceController extends \BaseController { 'paymentTerms' => PaymentTerm::remember(DEFAULT_QUERY_CACHE)->orderBy('num_days')->get(['name', 'num_days']), 'industries' => Industry::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), 'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), + 'invoiceLabels' => Auth::user()->getInvoiceLabels(), 'frequencies' => array( 1 => 'Weekly', 2 => 'Two weeks', diff --git a/app/database/migrations/2014_03_19_201454_add_language_support.php b/app/database/migrations/2014_03_19_201454_add_language_support.php index 5e63292a7d..b48683073e 100644 --- a/app/database/migrations/2014_03_19_201454_add_language_support.php +++ b/app/database/migrations/2014_03_19_201454_add_language_support.php @@ -23,6 +23,7 @@ class AddLanguageSupport extends Migration { DB::table('languages')->insert(['name' => 'Italian', 'locale' => 'it']); DB::table('languages')->insert(['name' => 'German', 'locale' => 'de']); DB::table('languages')->insert(['name' => 'French', 'locale' => 'fr']); + DB::table('languages')->insert(['name' => 'Brazilian Portuguese', 'locale' => 'pt_BR']); Schema::table('accounts', function($table) { diff --git a/app/lang/en/fields.php b/app/lang/en/fields.php new file mode 100644 index 0000000000..10f5d738c3 --- /dev/null +++ b/app/lang/en/fields.php @@ -0,0 +1,54 @@ + 'Organization', + 'name' => 'Name', + 'website' => 'Website', + 'work_phone' => 'Phone', + 'address' => 'Address', + 'address1' => 'Street', + 'address2' => 'Apt/Suite', + 'city' => 'City', + 'state' => 'State/Province', + 'postal_code' => 'Postal Code', + 'country_id' => 'Country', + 'contacts' => 'Contacts', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', + 'phone' => 'Phone', + 'email' => 'Email', + 'additional_info' => 'Additional Info', + 'payment_terms' => 'Payment Terms', + 'currency_id' => 'Currency', + 'size_id' => 'Size', + 'industry_id' => 'Industry', + 'private_notes' => 'Private Notes', + + // invoice + 'invoice' => 'Invoice', + 'client' => 'Client', + 'invoice_date' => 'Invoice Date', + 'due_date' => 'Due Date', + 'invoice_number' => 'Invoice Number', + 'invoice_number_short' => 'Invoice #', + 'po_number' => 'PO Number', + 'po_number_short' => 'PO #', + 'frequency_id' => 'How often', + 'dicount' => 'Discount', + 'taxes' => 'Taxes', + 'tax' => 'Tax', + 'item' => 'Item', + 'description' => 'Description', + 'unit_cost' => 'Unit Cost', + 'quantity' => 'Quantity', + 'line_total' => 'Line Total', + 'subtotal' => 'Subtotal', + 'paid_to_date' => 'Paid to Date', + 'balance_due' => 'Balance Due', + 'invoice_design_id' => 'Design', + 'terms' => 'Terms', + 'your_invoice' => 'Your Invoice', + +); \ No newline at end of file diff --git a/app/lang/en/messages.php b/app/lang/en/messages.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php deleted file mode 100644 index 97fa8600f4..0000000000 --- a/app/lang/en/texts.php +++ /dev/null @@ -1,28 +0,0 @@ - 'Organization', - 'name' => 'Name', - 'website' => 'Website', - 'work_phone' => 'Phone', - 'address' => 'Address', - 'address1' => 'Street', - 'address2' => 'Apt/Suite', - 'city' => 'City', - 'state' => 'State/Province', - 'postal_code' => 'Postal Code', - 'country_id' => 'Country', - 'contacts' => 'Contacts', - 'first_name' => 'First Name', - 'last_name' => 'Last Name', - 'phone' => 'Phone', - 'email' => 'Email', - 'additional_info' => 'Additional Info', - 'payment_terms' => 'Payment Terms', - 'currency_id' => 'Currency', - 'size_id' => 'Size', - 'industry_id' => 'Industry', - 'private_notes' => 'Private Notes', - -); \ No newline at end of file diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/fields.php similarity index 100% rename from app/lang/pt_BR/texts.php rename to app/lang/pt_BR/fields.php diff --git a/app/models/User.php b/app/models/User.php index f9fb73acb8..2d2d03ee2b 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -110,6 +110,38 @@ class User extends ConfideUser implements UserInterface, RemindableInterface return $language->locale; } + public function getInvoiceLabels() + { + $data = []; + $fields = [ + 'invoice', + 'invoice_date', + 'due_date', + 'invoice_number', + 'po_number', + 'dicount', + 'taxes', + 'tax', + 'item', + 'description', + 'unit_cost', + 'quantity', + 'line_total', + 'subtotal', + 'paid_to_date', + 'balance_due', + 'terms', + 'your_invoice', + ]; + + foreach ($fields as $field) + { + $data[$field] = trans("fields.$field"); + } + + return $data; + } + public function showGreyBackground() { return !$this->theme_id || in_array($this->theme_id, [2, 3, 5, 6, 7, 8, 10, 11, 12]); diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 56d7e70c18..d797854732 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -70,7 +70,7 @@ ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))->append('') }}
- {{ Former::select('frequency_id')->label('How often')->options($frequencies)->data_bind("value: frequency_id") }} + {{ Former::select('frequency_id')->options($frequencies)->data_bind("value: frequency_id") }} {{ Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'") ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))->append('') }} {{ Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'") @@ -90,10 +90,10 @@
- {{ Former::text('invoice_number')->label('Invoice #')->data_bind("value: invoice_number, valueUpdate: 'afterkeydown'") }} - {{ Former::text('po_number')->label('PO #')->data_bind("value: po_number, valueUpdate: 'afterkeydown'") }} + {{ Former::text('invoice_number')->label(trans('fields.invoice_number_short'))->data_bind("value: invoice_number, valueUpdate: 'afterkeydown'") }} + {{ Former::text('po_number')->label(trans('fields.po_number_short'))->data_bind("value: po_number, valueUpdate: 'afterkeydown'") }} {{ Former::text('discount')->data_bind("value: discount, valueUpdate: 'afterkeydown'")->append('%') }} - {{-- Former::select('currency_id')->label('Currency')->addOption('', '')->fromQuery($currencies, 'name', 'id')->data_bind("value: currency_id") --}} + {{-- Former::select('currency_id')->addOption('', '')->fromQuery($currencies, 'name', 'id')->data_bind("value: currency_id") --}}
@@ -210,7 +210,7 @@ - {{ Former::select('invoice_design_id')->label('Design')->style('display:inline;width:120px')->raw() + {{ Former::select('invoice_design_id')->style('display:inline;width:120px')->raw() ->fromQuery($invoiceDesigns, 'name', 'id')->data_bind("value: invoice_design_id") }} @@ -291,16 +291,16 @@ {{ Former::legend('Organization') }} {{ Former::text('name')->data_bind("value: name, valueUpdate: 'afterkeydown', attr { placeholder: name.placeholder }") }} {{ Former::text('website')->data_bind("value: website, valueUpdate: 'afterkeydown'") }} - {{ Former::text('work_phone')->data_bind("value: work_phone, valueUpdate: 'afterkeydown'")->label('Phone') }} + {{ Former::text('work_phone')->data_bind("value: work_phone, valueUpdate: 'afterkeydown'") }} {{ Former::legend('Address') }} - {{ Former::text('address1')->label('Street')->data_bind("value: address1, valueUpdate: 'afterkeydown'") }} - {{ Former::text('address2')->label('Apt/Suite')->data_bind("value: address2, valueUpdate: 'afterkeydown'") }} + {{ Former::text('address1')->data_bind("value: address1, valueUpdate: 'afterkeydown'") }} + {{ Former::text('address2')->data_bind("value: address2, valueUpdate: 'afterkeydown'") }} {{ Former::text('city')->data_bind("value: city, valueUpdate: 'afterkeydown'") }} - {{ Former::text('state')->label('State/Province')->data_bind("value: state, valueUpdate: 'afterkeydown'") }} + {{ Former::text('state')->data_bind("value: state, valueUpdate: 'afterkeydown'") }} {{ Former::text('postal_code')->data_bind("value: postal_code, valueUpdate: 'afterkeydown'") }} - {{ Former::select('country_id')->addOption('','')->label('Country')->addGroupClass('country_select') + {{ Former::select('country_id')->addOption('','')->addGroupClass('country_select') ->fromQuery($countries, 'name', 'id')->data_bind("dropdown: country_id") }}
@@ -332,11 +332,11 @@ {{ Former::legend('Additional Info') }} {{ Former::select('payment_terms')->addOption('','0')->data_bind('value: payment_terms') ->fromQuery($paymentTerms, 'name', 'num_days') }} - {{ Former::select('currency_id')->addOption('','')->label('Currency')->data_bind('value: currency_id') + {{ Former::select('currency_id')->addOption('','')->data_bind('value: currency_id') ->fromQuery($currencies, 'name', 'id') }} - {{ Former::select('size_id')->addOption('','')->label('Size')->data_bind('value: size_id') + {{ Former::select('size_id')->addOption('','')->data_bind('value: size_id') ->fromQuery($sizes, 'name', 'id') }} - {{ Former::select('industry_id')->addOption('','')->label('Industry')->data_bind('value: industry_id') + {{ Former::select('industry_id')->addOption('','')->data_bind('value: industry_id') ->fromQuery($industries, 'name', 'id') }} {{ Former::textarea('private_notes')->data_bind('value: private_notes') }} @@ -616,9 +616,10 @@ var isRefreshing = false; var needsRefresh = false; + function getPDFString() { var invoice = createInvoiceModel(); - var doc = generatePDF(invoice); + var doc = generatePDF(invoice, invoiceLabels); if (!doc) return; return doc.output('datauristring'); } @@ -1445,10 +1446,10 @@ var products = {{ $products }}; var clients = {{ $clients }}; + var invoiceLabels = {{ json_encode($invoiceLabels) }}; var clientMap = {}; var $clientSelect = $('select#client'); - - + for (var i=0; i 0 ? formatMoney(invoice.discount_amount, invoice.client.currency_id) : false}, - {'Tax': invoice.tax_amount > 0 ? formatMoney(invoice.tax_amount, invoice.client.currency_id) : false}, - {'Paid to Date': formatMoney(invoice.amount - invoice.balance, invoice.client.currency_id)} + {'subtotal': formatMoney(invoice.subtotal_amount, invoice.client.currency_id)}, + {'discount': invoice.discount_amount > 0 ? formatMoney(invoice.discount_amount, invoice.client.currency_id) : false}, + {'tax': invoice.tax_amount > 0 ? formatMoney(invoice.tax_amount, invoice.client.currency_id) : false}, + {'paid_to_date': formatMoney(invoice.amount - invoice.balance, invoice.client.currency_id)} ]; return displayGrid(doc, invoice, data, 300, y, layout, true, 550, rightAlignTitleX) + 10; @@ -1396,6 +1396,7 @@ function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, r doc.setFontType('normal'); } + key = invoiceLabels[key]; if (rightAlignTitleX) { marginLeft = rightAlignTitleX - (doc.getStringUnitWidth(key) * doc.internal.getFontSize()); } else { @@ -1426,7 +1427,7 @@ function displayNotesAndTerms(doc, layout, invoice, y) if (invoice.terms) { doc.setFontType("bold"); - doc.text(layout.marginLeft, y, "Terms"); + doc.text(layout.marginLeft, y, invoiceLabels.terms); y += 16; doc.setFontType("normal"); doc.text(layout.marginLeft, y, invoice.terms); @@ -1502,26 +1503,25 @@ function getInvoiceTaxRate(invoice) { function displayInvoiceHeader(doc, invoice, layout) { - var costX = layout.unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize()); - var qtyX = layout.qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize()); - var taxX = layout.taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize()); - var totalX = layout.lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()); + var costX = layout.unitCostRight - (doc.getStringUnitWidth(invoiceLabels.unit_cost) * doc.internal.getFontSize()); + var qtyX = layout.qtyRight - (doc.getStringUnitWidth(invoiceLabels.quantity) * doc.internal.getFontSize()); + var taxX = layout.taxRight - (doc.getStringUnitWidth(invoiceLabels.tax) * doc.internal.getFontSize()); + var totalX = layout.lineTotalRight - (doc.getStringUnitWidth(invoiceLabels.line_total) * doc.internal.getFontSize()); - doc.text(layout.marginLeft, layout.tableTop, 'Item'); - doc.text(layout.descriptionLeft, layout.tableTop, 'Description'); - doc.text(costX, layout.tableTop, 'Unit Cost'); - doc.text(qtyX, layout.tableTop, 'Quantity'); - doc.text(totalX, layout.tableTop, 'Line Total'); + doc.text(layout.marginLeft, layout.tableTop, invoiceLabels.item); + doc.text(layout.descriptionLeft, layout.tableTop, invoiceLabels.description); + doc.text(costX, layout.tableTop, invoiceLabels.unit_cost); + doc.text(qtyX, layout.tableTop, invoiceLabels.quantity); + doc.text(totalX, layout.tableTop, invoiceLabels.line_total); if (invoice.has_taxes) { - doc.text(taxX, layout.tableTop, 'Tax'); + doc.text(taxX, layout.tableTop, invoiceLabels.tax); } } function displayInvoiceItems(doc, invoice, layout) { - doc.setFontType("normal"); var line = 1; From 58f6c0ff97ac718b7d100688e2ed3372df2cd3d9 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 14:21:40 +0200 Subject: [PATCH 4/6] Working on multi-language support --- app/lang/de/fields.php | 54 ++++++++++++++++++++++++++++++++++++++++++ app/lang/fr/fields.php | 54 ++++++++++++++++++++++++++++++++++++++++++ app/lang/it/fields.php | 54 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 app/lang/de/fields.php create mode 100644 app/lang/fr/fields.php create mode 100644 app/lang/it/fields.php diff --git a/app/lang/de/fields.php b/app/lang/de/fields.php new file mode 100644 index 0000000000..10f5d738c3 --- /dev/null +++ b/app/lang/de/fields.php @@ -0,0 +1,54 @@ + 'Organization', + 'name' => 'Name', + 'website' => 'Website', + 'work_phone' => 'Phone', + 'address' => 'Address', + 'address1' => 'Street', + 'address2' => 'Apt/Suite', + 'city' => 'City', + 'state' => 'State/Province', + 'postal_code' => 'Postal Code', + 'country_id' => 'Country', + 'contacts' => 'Contacts', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', + 'phone' => 'Phone', + 'email' => 'Email', + 'additional_info' => 'Additional Info', + 'payment_terms' => 'Payment Terms', + 'currency_id' => 'Currency', + 'size_id' => 'Size', + 'industry_id' => 'Industry', + 'private_notes' => 'Private Notes', + + // invoice + 'invoice' => 'Invoice', + 'client' => 'Client', + 'invoice_date' => 'Invoice Date', + 'due_date' => 'Due Date', + 'invoice_number' => 'Invoice Number', + 'invoice_number_short' => 'Invoice #', + 'po_number' => 'PO Number', + 'po_number_short' => 'PO #', + 'frequency_id' => 'How often', + 'dicount' => 'Discount', + 'taxes' => 'Taxes', + 'tax' => 'Tax', + 'item' => 'Item', + 'description' => 'Description', + 'unit_cost' => 'Unit Cost', + 'quantity' => 'Quantity', + 'line_total' => 'Line Total', + 'subtotal' => 'Subtotal', + 'paid_to_date' => 'Paid to Date', + 'balance_due' => 'Balance Due', + 'invoice_design_id' => 'Design', + 'terms' => 'Terms', + 'your_invoice' => 'Your Invoice', + +); \ No newline at end of file diff --git a/app/lang/fr/fields.php b/app/lang/fr/fields.php new file mode 100644 index 0000000000..10f5d738c3 --- /dev/null +++ b/app/lang/fr/fields.php @@ -0,0 +1,54 @@ + 'Organization', + 'name' => 'Name', + 'website' => 'Website', + 'work_phone' => 'Phone', + 'address' => 'Address', + 'address1' => 'Street', + 'address2' => 'Apt/Suite', + 'city' => 'City', + 'state' => 'State/Province', + 'postal_code' => 'Postal Code', + 'country_id' => 'Country', + 'contacts' => 'Contacts', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', + 'phone' => 'Phone', + 'email' => 'Email', + 'additional_info' => 'Additional Info', + 'payment_terms' => 'Payment Terms', + 'currency_id' => 'Currency', + 'size_id' => 'Size', + 'industry_id' => 'Industry', + 'private_notes' => 'Private Notes', + + // invoice + 'invoice' => 'Invoice', + 'client' => 'Client', + 'invoice_date' => 'Invoice Date', + 'due_date' => 'Due Date', + 'invoice_number' => 'Invoice Number', + 'invoice_number_short' => 'Invoice #', + 'po_number' => 'PO Number', + 'po_number_short' => 'PO #', + 'frequency_id' => 'How often', + 'dicount' => 'Discount', + 'taxes' => 'Taxes', + 'tax' => 'Tax', + 'item' => 'Item', + 'description' => 'Description', + 'unit_cost' => 'Unit Cost', + 'quantity' => 'Quantity', + 'line_total' => 'Line Total', + 'subtotal' => 'Subtotal', + 'paid_to_date' => 'Paid to Date', + 'balance_due' => 'Balance Due', + 'invoice_design_id' => 'Design', + 'terms' => 'Terms', + 'your_invoice' => 'Your Invoice', + +); \ No newline at end of file diff --git a/app/lang/it/fields.php b/app/lang/it/fields.php new file mode 100644 index 0000000000..10f5d738c3 --- /dev/null +++ b/app/lang/it/fields.php @@ -0,0 +1,54 @@ + 'Organization', + 'name' => 'Name', + 'website' => 'Website', + 'work_phone' => 'Phone', + 'address' => 'Address', + 'address1' => 'Street', + 'address2' => 'Apt/Suite', + 'city' => 'City', + 'state' => 'State/Province', + 'postal_code' => 'Postal Code', + 'country_id' => 'Country', + 'contacts' => 'Contacts', + 'first_name' => 'First Name', + 'last_name' => 'Last Name', + 'phone' => 'Phone', + 'email' => 'Email', + 'additional_info' => 'Additional Info', + 'payment_terms' => 'Payment Terms', + 'currency_id' => 'Currency', + 'size_id' => 'Size', + 'industry_id' => 'Industry', + 'private_notes' => 'Private Notes', + + // invoice + 'invoice' => 'Invoice', + 'client' => 'Client', + 'invoice_date' => 'Invoice Date', + 'due_date' => 'Due Date', + 'invoice_number' => 'Invoice Number', + 'invoice_number_short' => 'Invoice #', + 'po_number' => 'PO Number', + 'po_number_short' => 'PO #', + 'frequency_id' => 'How often', + 'dicount' => 'Discount', + 'taxes' => 'Taxes', + 'tax' => 'Tax', + 'item' => 'Item', + 'description' => 'Description', + 'unit_cost' => 'Unit Cost', + 'quantity' => 'Quantity', + 'line_total' => 'Line Total', + 'subtotal' => 'Subtotal', + 'paid_to_date' => 'Paid to Date', + 'balance_due' => 'Balance Due', + 'invoice_design_id' => 'Design', + 'terms' => 'Terms', + 'your_invoice' => 'Your Invoice', + +); \ No newline at end of file From 6e532063fd39df04de496f7d4e86f2a927966b37 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 14:53:16 +0200 Subject: [PATCH 5/6] Working on multi-language support --- app/controllers/InvoiceController.php | 5 ++-- app/models/Account.php | 33 +++++++++++++++++++++++++++ app/models/User.php | 32 -------------------------- app/views/invoices/view.blade.php | 15 ++++++++++++ public/js/script.js | 4 ++++ 5 files changed, 55 insertions(+), 34 deletions(-) diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index c4e233e41c..6cd3d2295f 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -143,7 +143,8 @@ class InvoiceController extends \BaseController { $data = array( 'showBreadcrumbs' => false, 'invoice' => $invoice->hidePrivateFields(), - 'invitation' => $invitation + 'invitation' => $invitation, + 'invoiceLabels' => $client->account->getInvoiceLabels(), ); return View::make('invoices.view', $data); @@ -223,7 +224,7 @@ class InvoiceController extends \BaseController { 'paymentTerms' => PaymentTerm::remember(DEFAULT_QUERY_CACHE)->orderBy('num_days')->get(['name', 'num_days']), 'industries' => Industry::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), 'invoiceDesigns' => InvoiceDesign::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(), - 'invoiceLabels' => Auth::user()->getInvoiceLabels(), + 'invoiceLabels' => Auth::user()->account->getInvoiceLabels(), 'frequencies' => array( 1 => 'Weekly', 2 => 'Two weeks', diff --git a/app/models/Account.php b/app/models/Account.php index 0c73e2fd39..bc74165573 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -168,4 +168,37 @@ class Account extends Eloquent Session::put(SESSION_DATETIME_FORMAT, $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT); Session::put(SESSION_CURRENCY, $this->currency_id ? $this->currency_id : DEFAULT_CURRENCY); } + + public function getInvoiceLabels() + { + $data = []; + $fields = [ + 'invoice', + 'invoice_date', + 'due_date', + 'invoice_number', + 'po_number', + 'dicount', + 'taxes', + 'tax', + 'item', + 'description', + 'unit_cost', + 'quantity', + 'line_total', + 'subtotal', + 'paid_to_date', + 'balance_due', + 'terms', + 'your_invoice', + ]; + + foreach ($fields as $field) + { + $data[$field] = trans("fields.$field"); + } + + return $data; + } + } \ No newline at end of file diff --git a/app/models/User.php b/app/models/User.php index 2d2d03ee2b..f9fb73acb8 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -110,38 +110,6 @@ class User extends ConfideUser implements UserInterface, RemindableInterface return $language->locale; } - public function getInvoiceLabels() - { - $data = []; - $fields = [ - 'invoice', - 'invoice_date', - 'due_date', - 'invoice_number', - 'po_number', - 'dicount', - 'taxes', - 'tax', - 'item', - 'description', - 'unit_cost', - 'quantity', - 'line_total', - 'subtotal', - 'paid_to_date', - 'balance_due', - 'terms', - 'your_invoice', - ]; - - foreach ($fields as $field) - { - $data[$field] = trans("fields.$field"); - } - - return $data; - } - public function showGreyBackground() { return !$this->theme_id || in_array($this->theme_id, [2, 3, 5, 6, 7, 8, 10, 11, 12]); diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php index 0f5fd53934..628ec4774b 100755 --- a/app/views/invoices/view.blade.php +++ b/app/views/invoices/view.blade.php @@ -29,6 +29,19 @@ $(function() { window.invoice = {{ $invoice->toJson() }}; + + invoice.imageLogo1 = "{{ HTML::image_data('images/report_logo1.jpg') }}"; + invoice.imageLogoWidth1 =120; + invoice.imageLogoHeight1 = 40 + + invoice.imageLogo2 = "{{ HTML::image_data('images/report_logo2.jpg') }}"; + invoice.imageLogoWidth2 =325/2; + invoice.imageLogoHeight2 = 81/2; + + invoice.imageLogo3 = "{{ HTML::image_data('images/report_logo3.jpg') }}"; + invoice.imageLogoWidth3 =325/2; + invoice.imageLogoHeight3 = 81/2; + @if (file_exists($invoice->client->account->getLogoPath())) invoice.image = "{{ HTML::image_data($invoice->client->account->getLogoPath()) }}"; invoice.imageWidth = {{ $invoice->client->account->getLogoWidth() }}; @@ -59,6 +72,8 @@ }); } }); + + var invoiceLabels = {{ json_encode($invoiceLabels) }}; function onDownloadClick() { var doc = generatePDF(invoice); diff --git a/public/js/script.js b/public/js/script.js index 87dfcfb4a3..11a0fc3446 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1390,11 +1390,15 @@ function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, r } doc.text(marginLeft, y, value); + /* if (rightAlignTitleX && i === 0) { doc.setFontType('bold'); } else { doc.setFontType('normal'); } + */ + + doc.setFontType('normal'); key = invoiceLabels[key]; if (rightAlignTitleX) { From 631cdef3458633e869d83e07290b21abb9ab02ef Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 23 Mar 2014 15:36:18 +0200 Subject: [PATCH 6/6] Bug fixes --- .gitignore | 1 + app/controllers/AccountController.php | 2 +- app/routes.php | 3 +- app/views/accounts/details.blade.php | 4 +-- app/views/accounts/notifications.blade.php | 21 +++++------ app/views/master.blade.php | 4 +-- app/views/public/header.blade.php | 42 ++++++++++------------ public/css/splash.css | 4 +-- public/css/style.css | 4 +-- 9 files changed, 37 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 0981b45f55..5bc74ae5ba 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /bootstrap/compiled.php /bootstrap/environment.php /vendor +/.env.development.php /composer.phar /composer.lock /.DS_Store diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index ef1363aa7f..d82c2ebccf 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -516,7 +516,7 @@ class AccountController extends \BaseController { $account->date_format_id = Input::get('date_format_id') ? Input::get('date_format_id') : null; $account->datetime_format_id = Input::get('datetime_format_id') ? Input::get('datetime_format_id') : null; $account->currency_id = Input::get('currency_id') ? Input::get('currency_id') : 1; // US Dollar - $account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English + //$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English $account->save(); $user = Auth::user(); diff --git a/app/routes.php b/app/routes.php index ff83260e01..4db3a8cfc8 100755 --- a/app/routes.php +++ b/app/routes.php @@ -1,7 +1,6 @@ addOption('','')->label('Language') - ->fromQuery($languages, 'name', 'id') }} + {{-- Former::select('language_id')->addOption('','')->label('Language') + ->fromQuery($languages, 'name', 'id') --}} {{ Former::select('currency_id')->addOption('','')->label('Currency') ->fromQuery($currencies, 'name', 'id') }} {{ Former::select('timezone_id')->addOption('','')->label('Timezone') diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index e8f4939bdf..3dd004f739 100755 --- a/app/views/accounts/notifications.blade.php +++ b/app/views/accounts/notifications.blade.php @@ -20,21 +20,18 @@
+
+ -
- - -
-
+
   -
diff --git a/app/views/master.blade.php b/app/views/master.blade.php index 88230779a1..0007b13cd9 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -45,14 +45,14 @@ - @if (App::environment() == ENV_PRODUCTION) + @if (App::environment() == ENV_PRODUCTION && isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY']) @endif diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index 036eecb02a..49f74f4b40 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -75,32 +75,26 @@
+   -
- - -   - -
+ + +   + +
+ + + +   + + - - -
-

 

Copyright © 2014 InvoiceNinja. All rights reserved.

diff --git a/public/css/splash.css b/public/css/splash.css index b086c8f999..23e9c34d4e 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -529,10 +529,8 @@ footer .social .socicon { } div.fb_iframe_widget { - position: absolute !important; - display: inline-block; + display: inline; } - div.fb_iframe_widget > span { vertical-align: top !important; } diff --git a/public/css/style.css b/public/css/style.css index 333d1644b2..fa13e78efc 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -620,12 +620,12 @@ border-color: #08273c; cursor: pointer; } div.fb_iframe_widget { - position: absolute !important; - display: inline-block; + display: inline; } div.fb_iframe_widget > span { vertical-align: top !important; } + @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #ecf0f1;