From 1e288aafdf72dd4bb1b761299bbd1e44d662bd62 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 25 Jan 2015 22:44:36 +0200 Subject: [PATCH] Updating text files --- app/controllers/AccountController.php | 17 +++++++++++++---- app/lang/da/texts.php | 6 ++++++ app/lang/de/texts.php | 5 +++++ app/lang/es/texts.php | 6 ++++++ app/lang/fr/texts.php | 6 ++++++ app/lang/it/texts.php | 5 +++++ app/lang/lt/texts.php | 5 +++++ app/lang/nb_NO/texts.php | 6 ++++++ app/lang/nl/texts.php | 6 ++++++ app/lang/pt_BR/texts.php | 5 +++++ app/views/invoices/view.blade.php | 11 ++++++----- public/built.public.css | 6 ++++++ public/css/splash.css | 7 +++++++ public/logo/.gitkeep | 0 .../logo/zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h.jpg | Bin 15 files changed, 82 insertions(+), 9 deletions(-) mode change 100644 => 100755 public/logo/.gitkeep mode change 100644 => 100755 public/logo/zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h.jpg diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 2cd63747f874..348e5bbc75a0 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -703,18 +703,27 @@ class AccountController extends \BaseController $user->phone = trim(Input::get('phone')); $user->save(); } - + /* Logo image file */ if ($file = Input::file('logo')) { $path = Input::file('logo')->getRealPath(); File::delete('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()); + $image = Image::make($path); + $mimeType = $file->getMimeType(); + + if ($image->width == 200 && $mimeType == 'image/jpeg') { + $file->move('logo/', $account->account_key . '.jpg'); + } else { + $image->resize(200, 120, true, false); + Image::canvas($image->width, $image->height, '#FFFFFF')->insert($image)->save($account->getLogoPath()); + } + + //$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'); - Session::flash('message', trans('texts.updated_settings')); return Redirect::to('company/details'); diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php index a178594d9bbb..536b9292b8b7 100644 --- a/app/lang/da/texts.php +++ b/app/lang/da/texts.php @@ -493,5 +493,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', + ); diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php index 32b01db0002e..cd3abbd98530 100644 --- a/app/lang/de/texts.php +++ b/app/lang/de/texts.php @@ -483,6 +483,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', ); diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php index c325342adb4b..ea0f84d14630 100644 --- a/app/lang/es/texts.php +++ b/app/lang/es/texts.php @@ -463,5 +463,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', + ); \ No newline at end of file diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php index c8f64dd9443b..1539d7216223 100644 --- a/app/lang/fr/texts.php +++ b/app/lang/fr/texts.php @@ -484,5 +484,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', + ); \ No newline at end of file diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php index f0f0e900909c..a1332c3ad927 100644 --- a/app/lang/it/texts.php +++ b/app/lang/it/texts.php @@ -486,6 +486,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', ); diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php index c3d3cbf1a8b6..d67d743a495a 100644 --- a/app/lang/lt/texts.php +++ b/app/lang/lt/texts.php @@ -494,6 +494,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', ); diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php index 06e5c1d28c4c..e93105b736d8 100644 --- a/app/lang/nb_NO/texts.php +++ b/app/lang/nb_NO/texts.php @@ -492,6 +492,12 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', + ); \ No newline at end of file diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php index c3a2d6873de9..3243fd07dfd9 100644 --- a/app/lang/nl/texts.php +++ b/app/lang/nl/texts.php @@ -487,6 +487,12 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', + ); \ No newline at end of file diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php index 3b8db1cbd54a..83751837ccb3 100644 --- a/app/lang/pt_BR/texts.php +++ b/app/lang/pt_BR/texts.php @@ -474,6 +474,11 @@ return array( 'discount_percent' => 'Percent', 'discount_amount' => 'Amount', + 'invoice_history' => 'Invoice History', + 'quote_history' => 'Quote History', + 'current_version' => 'Current version', + 'select_versiony' => 'Select version', + 'view_history' => 'View History', diff --git a/app/views/invoices/view.blade.php b/app/views/invoices/view.blade.php index cd17e1fecebf..e8337001ccdb 100755 --- a/app/views/invoices/view.blade.php +++ b/app/views/invoices/view.blade.php @@ -24,9 +24,9 @@

 

@if ($invoice->client->account->isGatewayConfigured() && !$invoice->isPaid() && !$invoice->is_recurring) -
- {{ Button::normal(trans('texts.download_pdf'), array('onclick' => 'onDownloadClick()', 'class' => 'btn-lg')) }} - {{ Button::success_link(URL::to('payment/' . $invitation->invitation_key), trans('texts.pay_now'), array('class' => 'btn-lg pull-right')) }} +
+ {{ Button::normal(trans('texts.download_pdf'), array('onclick' => 'onDownloadClick()', 'class' => 'btn-lg')) }}   + {{ Button::success_link(URL::to('payment/' . $invitation->invitation_key), trans('texts.pay_now'), array('class' => 'btn-lg')) }}
@else
@@ -53,9 +53,10 @@ refreshPDF(); }); - function onDownloadClick() { + function onDownloadClick() { var doc = generatePDF(invoice, invoice.invoice_design.javascript, true); - doc.save('Invoice-' + invoice.invoice_number + '.pdf'); + var fileName = invoice.is_quote ? invoiceLabels.quote : invoiceLabels.invoice; + doc.save(fileName + '-' + invoice.invoice_number + '.pdf'); } diff --git a/public/built.public.css b/public/built.public.css index 763408739c27..ed6c61672308 100644 --- a/public/built.public.css +++ b/public/built.public.css @@ -1386,6 +1386,12 @@ table.compare-table-paid th { } } +/* Hide bootstrap sort header icons */ +table.table thead .sorting:after { content: '' !important } +table.table thead .sorting_asc:after { content: '' !important } +table.table thead .sorting_desc:after { content: '' !important} +table.table thead .sorting_asc_disabled:after { content: '' !important } +table.table thead .sorting_desc_disabled:after { content: '' !important } /* * Table styles */ diff --git a/public/css/splash.css b/public/css/splash.css index efa32d17b853..bfa1be306403 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -1369,3 +1369,10 @@ table.compare-table-paid th { display: none !important; } } + +/* Hide bootstrap sort header icons */ +table.table thead .sorting:after { content: '' !important } +table.table thead .sorting_asc:after { content: '' !important } +table.table thead .sorting_desc:after { content: '' !important} +table.table thead .sorting_asc_disabled:after { content: '' !important } +table.table thead .sorting_desc_disabled:after { content: '' !important } \ No newline at end of file diff --git a/public/logo/.gitkeep b/public/logo/.gitkeep old mode 100644 new mode 100755 diff --git a/public/logo/zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h.jpg b/public/logo/zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h.jpg old mode 100644 new mode 100755