From 0e75ddb5e66edc502957768d58ea7ca7c613cb08 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 29 May 2016 12:26:02 +0300 Subject: [PATCH] Added setting to hide second tax rate --- app/Http/Controllers/AccountController.php | 6 +- app/Http/Controllers/InvoiceApiController.php | 11 +- app/Models/Account.php | 159 +++++++++--------- config/former.php | 4 +- resources/lang/en/texts.php | 3 +- resources/views/accounts/tax_rates.blade.php | 21 ++- resources/views/invoices/edit.blade.php | 22 ++- 7 files changed, 119 insertions(+), 107 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 45057914f1e6..8ad53a7d260c 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -790,11 +790,7 @@ class AccountController extends BaseController private function saveTaxRates() { $account = Auth::user()->account; - - $account->invoice_taxes = Input::get('invoice_taxes') ? true : false; - $account->invoice_item_taxes = Input::get('invoice_item_taxes') ? true : false; - $account->show_item_taxes = Input::get('show_item_taxes') ? true : false; - $account->default_tax_rate_id = Input::get('default_tax_rate_id'); + $account->fill(Input::all()); $account->save(); Session::flash('message', trans('texts.updated_settings')); diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index 983e8fa14d71..520b5b09acac 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -134,6 +134,7 @@ class InvoiceApiController extends BaseAPIController 'city', 'state', 'postal_code', + 'country_id', 'private_notes', 'currency_code', ] as $field) { @@ -182,7 +183,7 @@ class InvoiceApiController extends BaseAPIController $invoice = Invoice::scope($invoice->public_id) ->with('client', 'invoice_items', 'invitations') ->first(); - + return $this->itemResponse($invoice); } @@ -269,7 +270,7 @@ class InvoiceApiController extends BaseAPIController $item[$key] = $val; } } - + return $item; } @@ -308,7 +309,7 @@ class InvoiceApiController extends BaseAPIController public function update(UpdateInvoiceAPIRequest $request, $publicId) { if ($request->action == ACTION_CONVERT) { - $quote = $request->entity(); + $quote = $request->entity(); $invoice = $this->invoiceRepo->cloneInvoice($quote, $quote->id); return $this->itemResponse($invoice); } elseif ($request->action) { @@ -322,7 +323,7 @@ class InvoiceApiController extends BaseAPIController $invoice = Invoice::scope($publicId) ->with('client', 'invoice_items', 'invitations') ->firstOrFail(); - + return $this->itemResponse($invoice); } @@ -351,7 +352,7 @@ class InvoiceApiController extends BaseAPIController public function destroy(UpdateInvoiceAPIRequest $request) { $invoice = $request->entity(); - + $this->invoiceRepo->delete($invoice); return $this->itemResponse($invoice); diff --git a/app/Models/Account.php b/app/Models/Account.php index c489d21b180b..2aa1b910b5b4 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -18,7 +18,7 @@ class Account extends Eloquent { use PresentableTrait; use SoftDeletes; - + public static $plan_prices = array( PLAN_PRO => array( PLAN_TERM_MONTHLY => PLAN_PRICE_PRO_MONTHLY, @@ -56,6 +56,11 @@ class Account extends Eloquent 'currency_id', 'language_id', 'military_time', + 'invoice_taxes', + 'invoice_item_taxes', + 'show_item_taxes', + 'default_tax_rate_id', + 'enable_second_tax_rate', ]; public static $basicSettings = [ @@ -401,7 +406,7 @@ class Account extends Eloquent return $gateway; } } - + return false; } @@ -421,27 +426,27 @@ class Account extends Eloquent if($this->logo == ''){ $this->calculateLogoDetails(); } - + return !empty($this->logo); } - + public function getLogoDisk(){ return Storage::disk(env('LOGO_FILESYSTEM', 'logos')); } - + protected function calculateLogoDetails(){ $disk = $this->getLogoDisk(); - + if($disk->exists($this->account_key.'.png')){ $this->logo = $this->account_key.'.png'; } else if($disk->exists($this->account_key.'.jpg')) { $this->logo = $this->account_key.'.jpg'; } - + if(!empty($this->logo)){ $image = imagecreatefromstring($disk->get($this->logo)); $this->logo_width = imagesx($image); - $this->logo_height = imagesy($image); + $this->logo_height = imagesy($image); $this->logo_size = $disk->size($this->logo); } else { $this->logo = null; @@ -453,33 +458,33 @@ class Account extends Eloquent if(!$this->hasLogo()){ return null; } - + $disk = $this->getLogoDisk(); return $disk->get($this->logo); } - + public function getLogoURL($cachebuster = false) { if(!$this->hasLogo()){ return null; } - + $disk = $this->getLogoDisk(); $adapter = $disk->getAdapter(); - + if($adapter instanceof \League\Flysystem\Adapter\Local) { // Stored locally $logo_url = str_replace(public_path(), url('/'), $adapter->applyPathPrefix($this->logo), $count); - + if ($cachebuster) { $logo_url .= '?no_cache='.time(); } - + if($count == 1){ return str_replace(DIRECTORY_SEPARATOR, '/', $logo_url); } } - + return Document::getDirectFileUrl($this->logo, $this->getLogoDisk()); } @@ -529,7 +534,7 @@ class Account extends Eloquent $invoice->start_date = Utils::today(); $invoice->invoice_design_id = $this->invoice_design_id; $invoice->client_id = $clientId; - + if ($entityType === ENTITY_RECURRING_INVOICE) { $invoice->invoice_number = microtime(true); $invoice->is_recurring = true; @@ -544,7 +549,7 @@ class Account extends Eloquent $invoice->invoice_number = $this->getNextInvoiceNumber($invoice); } } - + if (!$clientId) { $invoice->client = Client::createNew(); $invoice->client->public_id = 0; @@ -574,7 +579,7 @@ class Account extends Eloquent public function hasClientNumberPattern($invoice) { $pattern = $invoice->is_quote ? $this->quote_number_pattern : $this->invoice_number_pattern; - + return strstr($pattern, '$custom'); } @@ -654,7 +659,7 @@ class Account extends Eloquent $prefix = $this->getNumberPrefix($invoice->is_quote); $counterOffset = 0; - // confirm the invoice number isn't already taken + // confirm the invoice number isn't already taken do { $number = $prefix . str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT); $check = Invoice::scope(false, $this->id)->whereInvoiceNumber($number)->withTrashed()->first(); @@ -690,7 +695,7 @@ class Account extends Eloquent $this->invoice_number_counter += 1; } } - + $this->save(); } @@ -713,7 +718,7 @@ class Account extends Eloquent $query->where('updated_at', '>=', $updatedAt); } }]); - } + } } public function loadLocalizationSettings($client = false) @@ -726,8 +731,8 @@ class Account extends Eloquent Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT); Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT); - $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY; - $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE); + $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY; + $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE); Session::put(SESSION_CURRENCY, $currencyId); Session::put(SESSION_LOCALE, $locale); @@ -810,7 +815,7 @@ class Account extends Eloquent if ( ! Utils::isNinja()) { return; } - + $this->company->trial_plan = $plan; $this->company->trial_started = date_create()->format('Y-m-d'); $this->company->save(); @@ -821,18 +826,18 @@ class Account extends Eloquent if (Utils::isNinjaDev()) { return true; } - + $planDetails = $this->getPlanDetails(); $selfHost = !Utils::isNinjaProd(); - + if (!$selfHost && function_exists('ninja_account_features')) { $result = ninja_account_features($this, $feature); - + if ($result != null) { return $result; } } - + switch ($feature) { // Pro case FEATURE_CUSTOMIZE_INVOICE_DESIGN: @@ -849,7 +854,7 @@ class Account extends Eloquent case FEATURE_CLIENT_PORTAL_PASSWORD: case FEATURE_CUSTOM_URL: return $selfHost || !empty($planDetails); - + // Pro; No trial allowed, unless they're trialing enterprise with an active pro plan case FEATURE_MORE_CLIENTS: return $selfHost || !empty($planDetails) && (!$planDetails['trial'] || !empty($this->getPlanDetails(false, false))); @@ -862,26 +867,26 @@ class Account extends Eloquent // Fallthrough case FEATURE_CLIENT_PORTAL_CSS: return !empty($planDetails);// A plan is required even for self-hosted users - + // Enterprise; No Trial allowed; grandfathered for old pro users case FEATURE_USERS:// Grandfathered for old Pro users if($planDetails && $planDetails['trial']) { // Do they have a non-trial plan? $planDetails = $this->getPlanDetails(false, false); } - + return $selfHost || !empty($planDetails) && ($planDetails['plan'] == PLAN_ENTERPRISE || $planDetails['started'] <= date_create(PRO_USERS_GRANDFATHER_DEADLINE)); - + // Enterprise; No Trial allowed case FEATURE_DOCUMENTS: case FEATURE_USER_PERMISSIONS: return $selfHost || !empty($planDetails) && $planDetails['plan'] == PLAN_ENTERPRISE && !$planDetails['trial']; - + default: return false; } } - + public function isPro(&$plan_details = null) { if (!Utils::isNinjaProd()) { @@ -893,7 +898,7 @@ class Account extends Eloquent } $plan_details = $this->getPlanDetails(); - + return !empty($plan_details); } @@ -908,36 +913,36 @@ class Account extends Eloquent } $plan_details = $this->getPlanDetails(); - + return $plan_details && $plan_details['plan'] == PLAN_ENTERPRISE; } - + public function getPlanDetails($include_inactive = false, $include_trial = true) { if (!$this->company) { return null; } - + $plan = $this->company->plan; $trial_plan = $this->company->trial_plan; - + if(!$plan && (!$trial_plan || !$include_trial)) { return null; - } - + } + $trial_active = false; if ($trial_plan && $include_trial) { $trial_started = DateTime::createFromFormat('Y-m-d', $this->company->trial_started); $trial_expires = clone $trial_started; $trial_expires->modify('+2 weeks'); - + if ($trial_expires >= date_create()) { $trial_active = true; } } - + $plan_active = false; - if ($plan) { + if ($plan) { if ($this->company->plan_expires == null) { $plan_active = true; $plan_expires = false; @@ -948,11 +953,11 @@ class Account extends Eloquent } } } - + if (!$include_inactive && !$plan_active && !$trial_active) { return null; } - + // Should we show plan details or trial details? if (($plan && !$trial_plan) || !$include_trial) { $use_plan = true; @@ -979,7 +984,7 @@ class Account extends Eloquent $use_plan = $plan_expires >= $trial_expires; } } - + if ($use_plan) { return array( 'trial' => false, @@ -1006,7 +1011,7 @@ class Account extends Eloquent if (!Utils::isNinjaProd()) { return false; } - + $plan_details = $this->getPlanDetails(); return $plan_details && $plan_details['trial']; @@ -1021,7 +1026,7 @@ class Account extends Eloquent return array(PLAN_PRO, PLAN_ENTERPRISE); } } - + if ($this->company->trial_plan == PLAN_PRO) { if ($plan) { return $plan != PLAN_PRO; @@ -1029,28 +1034,28 @@ class Account extends Eloquent return array(PLAN_ENTERPRISE); } } - + return false; } public function getCountTrialDaysLeft() { $planDetails = $this->getPlanDetails(true); - + if(!$planDetails || !$planDetails['trial']) { return 0; } - + $today = new DateTime('now'); $interval = $today->diff($planDetails['expires']); - + return $interval ? $interval->d : 0; } public function getRenewalDate() { $planDetails = $this->getPlanDetails(); - + if ($planDetails) { $date = $planDetails['expires']; $date = max($date, date_create()); @@ -1180,7 +1185,7 @@ class Account extends Eloquent $field = "email_template_{$entityType}"; $template = $this->$field; } - + if (!$template) { $template = $this->getDefaultEmailTemplate($entityType, $message); } @@ -1270,7 +1275,7 @@ class Account extends Eloquent { $url = SITE_URL; $iframe_url = $this->iframe_url; - + if ($iframe_url) { return "{$iframe_url}/?"; } else if ($this->subdomain) { @@ -1305,10 +1310,10 @@ class Account extends Eloquent if (!$entity) { return false; } - + // convert (for example) 'custom_invoice_label1' to 'invoice.custom_value1' $field = str_replace(['invoice_', 'label'], ['', 'value'], $field); - + return Utils::isEmpty($entity->$field) ? false : true; } @@ -1316,7 +1321,7 @@ class Account extends Eloquent { return $this->hasFeature(FEATURE_PDF_ATTACHMENT) && $this->pdf_email_attachment; } - + public function getEmailDesignId() { return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->email_design_id : EMAIL_DESIGN_PLAIN; @@ -1324,11 +1329,11 @@ class Account extends Eloquent public function clientViewCSS(){ $css = ''; - + if ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN)) { $bodyFont = $this->getBodyFontCss(); $headerFont = $this->getHeaderFontCss(); - + $css = 'body{'.$bodyFont.'}'; if ($headerFont != $bodyFont) { $css .= 'h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{'.$headerFont.'}'; @@ -1338,17 +1343,17 @@ class Account extends Eloquent // For self-hosted users, a white-label license is required for custom CSS $css .= $this->client_view_css; } - + return $css; } - + public function getFontsUrl($protocol = ''){ $bodyFont = $this->getHeaderFontId(); $headerFont = $this->getBodyFontId(); $bodyFontSettings = Utils::getFromCache($bodyFont, 'fonts'); $google_fonts = array($bodyFontSettings['google_font']); - + if($headerFont != $bodyFont){ $headerFontSettings = Utils::getFromCache($headerFont, 'fonts'); $google_fonts[] = $headerFontSettings['google_font']; @@ -1356,7 +1361,7 @@ class Account extends Eloquent return ($protocol?$protocol.':':'').'//fonts.googleapis.com/css?family='.implode('|',$google_fonts); } - + public function getHeaderFontId() { return ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) && $this->header_font_id) ? $this->header_font_id : DEFAULT_HEADER_FONT; } @@ -1368,47 +1373,47 @@ class Account extends Eloquent public function getHeaderFontName(){ return Utils::getFromCache($this->getHeaderFontId(), 'fonts')['name']; } - + public function getBodyFontName(){ return Utils::getFromCache($this->getBodyFontId(), 'fonts')['name']; } - + public function getHeaderFontCss($include_weight = true){ $font_data = Utils::getFromCache($this->getHeaderFontId(), 'fonts'); $css = 'font-family:'.$font_data['css_stack'].';'; - + if($include_weight){ $css .= 'font-weight:'.$font_data['css_weight'].';'; } - + return $css; } - + public function getBodyFontCss($include_weight = true){ $font_data = Utils::getFromCache($this->getBodyFontId(), 'fonts'); $css = 'font-family:'.$font_data['css_stack'].';'; - + if($include_weight){ $css .= 'font-weight:'.$font_data['css_weight'].';'; } - + return $css; } - + public function getFonts(){ return array_unique(array($this->getHeaderFontId(), $this->getBodyFontId())); } - + public function getFontsData(){ $data = array(); - + foreach($this->getFonts() as $font){ $data[] = Utils::getFromCache($font, 'fonts'); } - + return $data; } - + public function getFontFolders(){ return array_map(function($item){return $item['folder'];}, $this->getFontsData()); } diff --git a/config/former.php b/config/former.php index b9c729e2f9ae..110fffe8ae2b 100644 --- a/config/former.php +++ b/config/former.php @@ -27,7 +27,7 @@ // Whether checkboxes should always be present in the POST data, // no matter if you checked them or not - 'push_checkboxes' => false, + 'push_checkboxes' => true, // The value a checkbox will have in the POST array if unchecked 'unchecked_value' => 0, @@ -181,4 +181,4 @@ ), -); \ No newline at end of file +); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index e70250130638..9bf85f0202ae 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1312,7 +1312,8 @@ $LANG = array( 'security' => 'Security', 'see_whats_new' => 'See what\'s new in v:version', 'wait_for_upload' => 'Please wait for the document upload to complete.', - 'upgrade_for_permissions' => 'Upgrade to our Enterprise plan to enable permissions.' + 'upgrade_for_permissions' => 'Upgrade to our Enterprise plan to enable permissions.', + 'enable_second_tax_rate' => 'Enable specifying a second tax rate', ); diff --git a/resources/views/accounts/tax_rates.blade.php b/resources/views/accounts/tax_rates.blade.php index 2079d72f2155..1a482dff8cad 100644 --- a/resources/views/accounts/tax_rates.blade.php +++ b/resources/views/accounts/tax_rates.blade.php @@ -1,6 +1,6 @@ @extends('header') -@section('content') +@section('content') @parent @include('accounts.nav', ['selected' => ACCOUNT_TAX_RATES]) @@ -10,12 +10,13 @@ {{ Former::populateField('invoice_taxes', intval($account->invoice_taxes)) }} {{ Former::populateField('invoice_item_taxes', intval($account->invoice_item_taxes)) }} {{ Former::populateField('show_item_taxes', intval($account->show_item_taxes)) }} + {{ Former::populateField('enable_second_tax_rate', intval($account->enable_second_tax_rate)) }}

{!! trans('texts.tax_settings') !!}

-
+
{!! Former::checkbox('invoice_taxes') @@ -30,6 +31,10 @@ ->text(trans('texts.show_line_item_tax')) ->label(' ') !!} + {!! Former::checkbox('enable_second_tax_rate') + ->text(trans('texts.enable_second_tax_rate')) + ->label(' ') !!} +   {!! Former::select('default_tax_rate_id') @@ -51,22 +56,22 @@ @include('partials.bulk_form', ['entityType' => ENTITY_TAX_RATE]) - {!! Datatable::table() + {!! Datatable::table() ->addColumn( trans('texts.name'), trans('texts.rate'), trans('texts.action')) - ->setUrl(url('api/tax_rates/')) + ->setUrl(url('api/tax_rates/')) ->setOptions('sPaginationType', 'bootstrap') - ->setOptions('bFilter', false) - ->setOptions('bAutoWidth', false) + ->setOptions('bFilter', false) + ->setOptions('bAutoWidth', false) ->setOptions('aoColumns', [[ "sWidth"=> "40%" ], [ "sWidth"=> "40%" ], ["sWidth"=> "20%"]]) ->setOptions('aoColumnDefs', [['bSortable'=>false, 'aTargets'=>[2]]]) ->render('datatable') !!} + -@stop \ No newline at end of file +@stop diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 4f6940645ada..7a744bee4601 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -243,7 +243,7 @@ @endif {{ $invoiceLabels['unit_cost'] }} {{ $invoiceLabels['quantity'] }} - {{ trans('texts.tax') }} + {{ trans('texts.tax') }} {{ trans('texts.line_total') }} @@ -288,16 +288,18 @@ ->addOption('', '') ->options($taxRateOptions) ->data_bind('value: tax1') - ->addClass('tax-select') + ->addClass($account->enable_second_tax_rate ? 'tax-select' : '') ->raw() !!} - {!! Former::select('') - ->addOption('', '') - ->options($taxRateOptions) - ->data_bind('value: tax2') - ->addClass('tax-select') - ->raw() !!} +
+ {!! Former::select('') + ->addOption('', '') + ->options($taxRateOptions) + ->data_bind('value: tax2') + ->addClass('tax-select') + ->raw() !!} +
@@ -438,17 +440,19 @@ ->id('taxRateSelect1') ->addOption('', '') ->options($taxRateOptions) - ->addClass('tax-select') + ->addClass($account->enable_second_tax_rate ? 'tax-select' : '') ->data_bind('value: tax1') ->raw() !!} +
{!! Former::select('') ->addOption('', '') ->options($taxRateOptions) ->addClass('tax-select') ->data_bind('value: tax2') ->raw() !!} +