From 63c1293e3b83098ac6de42ec03274ea484535af7 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 31 Jan 2016 23:55:02 +0200 Subject: [PATCH] Add Header/Footer options to invoice design settings --- app/Http/Controllers/AccountController.php | 1 + resources/lang/en/texts.php | 11 ++++++----- resources/views/accounts/invoice_design.blade.php | 15 +++++++++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 02921782e035..5cedc354ae12 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -722,6 +722,7 @@ class AccountController extends BaseController private function saveInvoiceDesign() { + //dd(Input::get('all_pages_header')); if (Auth::user()->account->isPro()) { $account = Auth::user()->account; $account->hide_quantity = Input::get('hide_quantity') ? true : false; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 95566e73f00b..76129376c421 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1135,9 +1135,10 @@ return array( 'expense_error_mismatch_currencies' => 'The client\'s currency does not match the expense currency.', 'trello_roadmap' => 'Trello Roadmap', 'header_footer' => 'Header/Footer', - 'all_pages_header' => 'Header', - 'all_pages_header_help' => 'Show on all pages', - 'all_pages_footer' => 'Footer', - 'all_pages_footer_help' => 'Show on all pages', - + 'first_page' => 'first page', + 'all_pages' => 'all pages', + 'last_page' => 'last page', + 'all_pages_header' => 'Show header on', + 'all_pages_footer' => 'Show footer on', + ); diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php index 647e9ba4699c..2c7468cb1652 100644 --- a/resources/views/accounts/invoice_design.blade.php +++ b/resources/views/accounts/invoice_design.blade.php @@ -200,8 +200,19 @@
- {!! Former::checkbox('all_pages_header')->text(trans('texts.all_pages_header_help')) !!} - {!! Former::checkbox('all_pages_footer')->text(trans('texts.all_pages_footer_help')) !!} + {!! Former::inline_radios('all_pages_header') + ->label(trans('texts.all_pages_header')) + ->radios([ + trans('texts.first_page') => ['value' => 0, 'name' => 'all_pages_header'], + trans('texts.all_pages') => ['value' => 1, 'name' => 'all_pages_header'], + ])->check($account->all_pages_header) !!} + + {!! Former::inline_radios('all_pages_footer') + ->label(trans('texts.all_pages_footer')) + ->radios([ + trans('texts.last_page') => ['value' => 0, 'name' => 'all_pages_footer'], + trans('texts.all_pages') => ['value' => 1, 'name' => 'all_pages_footer'], + ])->check($account->all_pages_footer) !!}