mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Bug fixes
This commit is contained in:
parent
d34fbcf726
commit
8da5517206
@ -32,6 +32,7 @@ class PublicClientController extends BaseController
|
|||||||
'color' => $color,
|
'color' => $color,
|
||||||
'account' => $account,
|
'account' => $account,
|
||||||
'client' => $client,
|
'client' => $client,
|
||||||
|
'hideLogo' => $account->isWhiteLabel(),
|
||||||
];
|
];
|
||||||
|
|
||||||
return response()->view('invited.dashboard', $data);
|
return response()->view('invited.dashboard', $data);
|
||||||
|
@ -401,12 +401,11 @@ if (!defined('CONTACT_EMAIL')) {
|
|||||||
define('NINJA_DATE', '2000-01-01');
|
define('NINJA_DATE', '2000-01-01');
|
||||||
|
|
||||||
define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
|
define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
|
||||||
define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
|
define('RELEASES_URL', 'https://trello.com/b/63BbiVVe/invoice-ninja');
|
||||||
define('ZAPIER_URL', 'https://zapier.com/zapbook/invoice-ninja');
|
define('ZAPIER_URL', 'https://zapier.com/zapbook/invoice-ninja');
|
||||||
define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/');
|
define('OUTDATE_BROWSER_URL', 'http://browsehappy.com/');
|
||||||
define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html');
|
define('PDFMAKE_DOCS', 'http://pdfmake.org/playground.html');
|
||||||
define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/single/browser/v1/');
|
define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/single/browser/v1/');
|
||||||
define('GITHUB_RELEASES', 'https://github.com/hillelcoren/invoice-ninja/releases');
|
|
||||||
define('REFERRAL_PROGRAM_URL', false);
|
define('REFERRAL_PROGRAM_URL', false);
|
||||||
|
|
||||||
define('COUNT_FREE_DESIGNS', 4);
|
define('COUNT_FREE_DESIGNS', 4);
|
||||||
|
@ -26,6 +26,7 @@ If you'd like to use our code to sell your own invoicing app email us for detail
|
|||||||
* Tax rates and payment terms
|
* Tax rates and payment terms
|
||||||
* Reminder emails
|
* Reminder emails
|
||||||
* Partial payments
|
* Partial payments
|
||||||
|
* Client portal
|
||||||
* Custom email templates
|
* Custom email templates
|
||||||
* [Zapier](https://zapier.com/) integration
|
* [Zapier](https://zapier.com/) integration
|
||||||
* [D3.js](http://d3js.org/) visualizations
|
* [D3.js](http://d3js.org/) visualizations
|
||||||
|
@ -28,8 +28,6 @@
|
|||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@parent
|
@parent
|
||||||
@include('accounts.nav', ['selected' => ACCOUNT_INVOICE_DESIGN, 'advanced' => true])
|
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
var invoiceDesigns = {!! $invoiceDesigns !!};
|
var invoiceDesigns = {!! $invoiceDesigns !!};
|
||||||
|
@ -43,13 +43,12 @@
|
|||||||
|
|
||||||
<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>
|
<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>
|
||||||
|
|
||||||
<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="medium">Follow @invoiceninja</a>
|
<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="large">Follow @invoiceninja</a>
|
||||||
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
|
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
|
||||||
|
</div>
|
||||||
</div></div>
|
</div>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">{!! trans('texts.custom_messages') !!}</h3>
|
<h3 class="panel-title">{!! trans('texts.custom_messages') !!}</h3>
|
||||||
|
@ -82,7 +82,7 @@
|
|||||||
{{ $client->getCityState() }}<br/>
|
{{ $client->getCityState() }}<br/>
|
||||||
@endif
|
@endif
|
||||||
@if ($client->country)
|
@if ($client->country)
|
||||||
<br/>{{ $client->country->name }}
|
{{ $client->country->name }}<br/>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if ($client->account->custom_client_label1 && $client->custom_value1)
|
@if ($client->account->custom_client_label1 && $client->custom_value1)
|
||||||
|
@ -669,7 +669,7 @@
|
|||||||
<p> </p>
|
<p> </p>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
{{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/?utm_source=powered_by" target="_blank">InvoiceNinja.com</a> -
|
{{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/?utm_source=powered_by" target="_blank">InvoiceNinja.com</a> -
|
||||||
{!! link_to(GITHUB_RELEASES, 'v' . NINJA_VERSION, ['target' => '_blank']) !!} |
|
{!! link_to(RELEASES_URL, 'v' . NINJA_VERSION, ['target' => '_blank']) !!} |
|
||||||
@if (Auth::user()->account->isWhiteLabel())
|
@if (Auth::user()->account->isWhiteLabel())
|
||||||
{{ trans('texts.white_labeled') }}
|
{{ trans('texts.white_labeled') }}
|
||||||
@else
|
@else
|
||||||
|
@ -28,6 +28,8 @@
|
|||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var NINJA = NINJA || {};
|
var NINJA = NINJA || {};
|
||||||
|
NINJA.fontSize = 9;
|
||||||
|
|
||||||
NINJA.isRegistered = {{ \Utils::isRegistered() ? 'true' : 'false' }};
|
NINJA.isRegistered = {{ \Utils::isRegistered() ? 'true' : 'false' }};
|
||||||
|
|
||||||
window.onerror = function(e) {
|
window.onerror = function(e) {
|
||||||
|
@ -12,6 +12,8 @@
|
|||||||
NINJA.primaryColor = "{{ Auth::user()->account->primary_color }}";
|
NINJA.primaryColor = "{{ Auth::user()->account->primary_color }}";
|
||||||
NINJA.secondaryColor = "{{ Auth::user()->account->secondary_color }}";
|
NINJA.secondaryColor = "{{ Auth::user()->account->secondary_color }}";
|
||||||
NINJA.fontSize = {{ Auth::user()->account->font_size ?: DEFAULT_FONT_SIZE }};
|
NINJA.fontSize = {{ Auth::user()->account->font_size ?: DEFAULT_FONT_SIZE }};
|
||||||
|
@else
|
||||||
|
NINJA.fontSize = {{ DEFAULT_FONT_SIZE }};
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
NINJA.parseFloat = function(str) {
|
NINJA.parseFloat = function(str) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user