Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-12-31 12:23:39 +02:00
parent c2c51360dd
commit 35bb36fd34
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Account.php
View File

@ -220,13 +220,7 @@ class Account extends Eloquent
public function getCustomDateFormat() public function getCustomDateFormat()
{ {
$format = $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT; return $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT;
if ($this->military_time) {
$format = str_replace('g:i a', 'H:i', $format);
}
return $format;
} }
public function formatMoney($amount, $client = null, $hideSymbol = false) public function formatMoney($amount, $client = null, $hideSymbol = false)

7
app/Ninja/Mailers/ContactMailer.php
View File

@ -149,7 +149,6 @@ class ContactMailer extends Mailer
$account->loadLocalizationSettings($client); $account->loadLocalizationSettings($client);
$invoice = $payment->invoice; $invoice = $payment->invoice;
$view = 'payment_confirmation';
$accountName = $account->getDisplayName(); $accountName = $account->getDisplayName();
$emailTemplate = $account->getEmailTemplate(ENTITY_PAYMENT); $emailTemplate = $account->getEmailTemplate(ENTITY_PAYMENT);
$emailSubject = $invoice->account->getEmailSubject(ENTITY_PAYMENT); $emailSubject = $invoice->account->getEmailSubject(ENTITY_PAYMENT);
@ -189,6 +188,12 @@ class ContactMailer extends Mailer
$subject = $this->processVariables($emailSubject, $variables); $subject = $this->processVariables($emailSubject, $variables);
$data['invoice_id'] = $payment->invoice->id; $data['invoice_id'] = $payment->invoice->id;
if ($account->email_design_id == EMAIL_DESIGN_PLAIN) {
$view = 'payment_confirmation';
} else {
$view = 'design' . ($account->email_design_id - 1);
}
if ($user->email && $contact->email) { if ($user->email && $contact->email) {
$this->sendTo($contact->email, $user->email, $accountName, $subject, $view, $data); $this->sendTo($contact->email, $user->email, $accountName, $subject, $view, $data);
} }

2
resources/views/accounts/details.blade.php
View File

@ -52,7 +52,7 @@
<div class="col-lg-4 col-sm-4"></div> <div class="col-lg-4 col-sm-4"></div>
<div class="col-lg-8 col-sm-8"> <div class="col-lg-8 col-sm-8">
<a href="/{{ $account->getLogoPath().'?no_cache='.time() }}" target="_blank"> <a href="/{{ $account->getLogoPath().'?no_cache='.time() }}" target="_blank">
{!! HTML::image($account->getLogoPath().'?no_cache='.time(), 'Logo', ['width' => 200]) !!} {!! HTML::image($account->getLogoPath().'?no_cache='.time(), 'Logo', ['max-width' => 200]) !!}
</a> &nbsp; </a> &nbsp;
<a href="#" onclick="deleteLogo()">{{ trans('texts.remove_logo') }}</a> <a href="#" onclick="deleteLogo()">{{ trans('texts.remove_logo') }}</a>
</div> </div>