Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-25 13:57:19 +03:00
parent 380d7e0a4a
commit 18bd38f5b6
13 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lang/de/texts.php
View File

@ -336,7 +336,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/lang/en/texts.php
View File

@ -351,7 +351,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/lang/es/texts.php
View File

@ -335,7 +335,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',
'quotes' => 'Quotes',

2
app/lang/fr/texts.php
View File

@ -336,7 +336,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/lang/it/texts.php
View File

@ -336,7 +336,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/lang/nl/texts.php
View File

@ -337,7 +337,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/lang/pt_BR/texts.php
View File

@ -325,7 +325,7 @@ return array(
'chart_builder' => 'Chart Builder',
'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!',
'go_pro' => 'Go Pro',
// Quotes
'quote' => 'Quote',

2
app/models/Invoice.php
View File

@ -62,7 +62,7 @@ class Invoice extends EntityModel
$this->setVisible([
'invoice_number',
'discount',
'shipping',
//'shipping',
'po_number',
'invoice_date',
'due_date',

12
app/ninja/repositories/InvoiceRepository.php
View File

@ -318,7 +318,7 @@ class InvoiceRepository
return $invoice;
}
public function cloneInvoice($invoice, $quoteId = null)
public function cloneInvoice($invoice, $quotePublicId = null)
{
$clone = Invoice::createNew();
$clone->balance = $invoice->amount;
@ -327,7 +327,7 @@ class InvoiceRepository
foreach ([
'client_id',
'discount',
'shipping',
//'shipping',
'invoice_date',
'po_number',
'due_date',
@ -346,17 +346,17 @@ class InvoiceRepository
$clone->$field = $invoice->$field;
}
if ($quoteId)
if ($quotePublicId)
{
$clone->is_quote = false;
$clone->quote_id = $quoteId;
$clone->quote_id = $quotePublicId;
}
$clone->save();
if ($quoteId)
if ($quotePublicId)
{
$invoice->quote_invoice_id = $clone->id;
$invoice->quote_invoice_id = $clone->public_id;
$invoice->save();
}

12
app/views/header.blade.php
View File

@ -78,7 +78,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="{{ Utils::isNinja() || Auth::check() ? URL::to('/') : NINJA_URL }}" class='navbar-brand'>
<a href="{{ URL::to('/') }}" class='navbar-brand'>
<img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:18px;width:auto"/>
</a>
</div>
@ -97,8 +97,12 @@
</ul>
<div class="navbar-form navbar-right">
@if (Auth::check() && !Auth::user()->registered)
{{ Button::sm_success_primary(trans('texts.sign_up'), array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp;
@if (Auth::check())
@if (!Auth::user()->registered)
{{ Button::sm_success_primary(trans('texts.sign_up'), array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }} &nbsp;
@elseif (!Auth::user()->isPro())
{{ Button::sm_success_primary(trans('texts.go_pro'), array('id' => 'proPlanButton', 'data-toggle'=>'modal', 'data-target'=>'#proPlanModal')) }} &nbsp;
@endif
@endif
@if (Auth::user()->getPopOverText() && !Utils::isRegistered())
@ -475,8 +479,10 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
localStorage.setItem('guest_key', '');
trackUrl('/user/sign_up');
NINJA.isRegistered = true;
/*
$('#signUpButton').hide();
$('#myAccountButton').html(result);
*/
}
$('#signUpSuccessDiv, #signUpFooter').show();
$('#working, #saveSignUpButton').hide();

4
app/views/invoices/edit.blade.php
View File

@ -243,7 +243,7 @@
@elseif ($invoice && $entityType == ENTITY_INVOICE)
@if ($invoice->quote_id)
<li class="divider"></li>
<li><a href="{{ URL::to("invoices/{$invoice->quote_id}/edit") }}">{{ trans("texts.view_quote") }}</a></li>
<li><a href="{{ URL::to("quotes/{$invoice->quote_id}/edit") }}">{{ trans("texts.view_quote") }}</a></li>
@endif
@endif
@ -740,7 +740,7 @@
}
function onDeleteClick() {
if (confirm('Are you sure you want to delete this invoice?')) {
if (confirm('Are you sure you want to delete this {{ $entityType }}?')) {
$('#action').val('delete');
$('#submitButton').click();
}

2
app/views/master.blade.php
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>Invoice Ninja {{ isset($title) ? $title : ' - Free Online Invoicing' }}</title>
<title>Invoice Ninja {{ isset($title) ? $title : ' - Free and Open-Source Online Invoicing' }}</title>
<meta charset="utf-8">
<meta property="og:site_name" content="Invoice Ninja"></meta>

22
app/views/public/header.blade.php
View File

@ -94,13 +94,13 @@
<div class="navbar" style="margin-bottom:0px">
<div class="container">
<div class="navbar-inner">
<a class="brand" href="{{ URL::to('/') }}"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
<a class="brand" href="https://www.invoiceninja.com/"><img src="{{ asset('images/invoiceninja-logo.png') }}"></a>
<ul class="navbar-list">
<!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
<!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
<li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('plans', 'Plans' ) }}</li>
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
<!-- <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li> -->
<!-- <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li> -->
<li>{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul>
@ -167,11 +167,11 @@
<img src="{{ asset('images/footer-logo.png') }}">
<hr>
<ul class="navbar-vertical">
<!-- <li>{{ link_to('features', 'Features' ) }}</li> -->
<!-- <li>{{ link_to('faq', 'FAQ' ) }}</li> -->
<li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('plans', 'Plans' ) }}</li>
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
<!-- <li>{{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}</li> -->
<!-- <li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li> -->
<li>{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul>