Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-06-15 23:54:58 +03:00
parent 6fab2cf962
commit fc00c12f98
12 changed files with 2092 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@ -21,6 +21,7 @@ module.exports = function(grunt) {
'public/js/bootstrap-combobox.js',
'public/js/jspdf.source.js',
'public/js/jspdf.plugin.split_text_to_size.js',
'public/js/typedarray.js',
'public/js/script.js',
],
dest: 'public/built.js'

8
app/controllers/ClientController.php
View File

@ -22,7 +22,7 @@ class ClientController extends \BaseController {
{
return View::make('list', array(
'entityType'=>ENTITY_CLIENT,
'title' => '- Clients',
'title' => trans('texts.clients'),
'columns'=>Utils::trans(['checkbox', 'client', 'contact', 'email', 'date_created', 'last_login', 'balance', 'action'])
));
}
@ -99,7 +99,7 @@ class ClientController extends \BaseController {
'showBreadcrumbs' => false,
'client' => $client,
'credit' => $client->getTotalCredit(),
'title' => '- ' . trans('texts.view_client'),
'title' => trans('texts.view_client'),
'hasRecurringInvoices' => Invoice::scope()->where('is_recurring', '=', true)->whereClientId($client->id)->count() > 0
);
@ -122,7 +122,7 @@ class ClientController extends \BaseController {
'client' => null,
'method' => 'POST',
'url' => 'clients',
'title' => '- New Client'
'title' => trans('texts.new_client')
];
$data = array_merge($data, self::getViewModel());
@ -142,7 +142,7 @@ class ClientController extends \BaseController {
'client' => $client,
'method' => 'PUT',
'url' => 'clients/' . $publicId,
'title' => '- ' . trans('texts.edit_client')
'title' => trans('texts.edit_client')
];
$data = array_merge($data, self::getViewModel());

6
app/controllers/CreditController.php
View File

@ -22,7 +22,7 @@ class CreditController extends \BaseController {
{
return View::make('list', array(
'entityType'=>ENTITY_CREDIT,
'title' => '- Credits',
'title' => trans('texts.credits'),
'columns'=>Utils::trans(['checkbox', 'client', 'credit_amount', 'credit_balance', 'credit_date', 'private_notes', 'action'])
));
}
@ -67,7 +67,7 @@ class CreditController extends \BaseController {
'credit' => null,
'method' => 'POST',
'url' => 'credits',
'title' => '- New Credit',
'title' => trans('texts.new_credit'),
//'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
//'invoices' => Invoice::scope()->with('client', 'invoice_status')->orderBy('invoice_number')->get(),
'clients' => Client::scope()->with('contacts')->orderBy('name')->get());
@ -85,7 +85,7 @@ class CreditController extends \BaseController {
'credit' => $credit,
'method' => 'PUT',
'url' => 'credits/' . $publicId,
'title' => '- Edit Credit',
'title' => 'Edit Credit',
//'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
'clients' => Client::scope()->with('contacts')->orderBy('name')->get());
return View::make('credit.edit', $data);

6
app/controllers/InvoiceController.php
View File

@ -25,7 +25,7 @@ class InvoiceController extends \BaseController {
public function index()
{
$data = [
'title' => '- Invoices',
'title' => trans('texts.invoices'),
'entityType'=>ENTITY_INVOICE,
'columns'=>Utils::trans(['checkbox', 'invoice_number', 'client', 'invoice_date', 'invoice_total', 'balance_due', 'due_date', 'status', 'action'])
];
@ -177,7 +177,7 @@ class InvoiceController extends \BaseController {
'method' => $method,
'invitationContactIds' => $contactIds,
'url' => $url,
'title' => '- ' . trans("texts.edit_{$entityType}"),
'title' => trans("texts.edit_{$entityType}"),
'client' => $invoice->client);
$data = array_merge($data, self::getViewModel());
@ -223,7 +223,7 @@ class InvoiceController extends \BaseController {
'invoiceNumber' => $invoiceNumber,
'method' => 'POST',
'url' => 'invoices',
'title' => '- New Invoice',
'title' => trans('texts.new_invoice'),
'client' => $client);
$data = array_merge($data, self::getViewModel());

6
app/controllers/PaymentController.php
View File

@ -19,7 +19,7 @@ class PaymentController extends \BaseController
{
return View::make('list', array(
'entityType'=>ENTITY_PAYMENT,
'title' => '- Payments',
'title' => trans('texts.payments'),
'columns'=>Utils::trans(['checkbox', 'invoice', 'client', 'transaction_reference', 'method', 'payment_amount', 'payment_date', 'action'])
));
}
@ -71,7 +71,7 @@ class PaymentController extends \BaseController
'payment' => null,
'method' => 'POST',
'url' => "payments",
'title' => '- New Payment',
'title' => trans('texts.new_payment'),
//'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
'paymentTypes' => PaymentType::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(),
'clients' => Client::scope()->with('contacts')->orderBy('name')->get());
@ -92,7 +92,7 @@ class PaymentController extends \BaseController
'payment' => $payment,
'method' => 'PUT',
'url' => 'payments/' . $publicId,
'title' => '- Edit Payment',
'title' => 'Edit Payment',
//'currencies' => Currency::remember(DEFAULT_QUERY_CACHE)->orderBy('name')->get(),
'paymentTypes' => PaymentType::remember(DEFAULT_QUERY_CACHE)->orderBy('id')->get(),
'clients' => Client::scope()->with('contacts')->orderBy('name')->get());

4
app/controllers/QuoteController.php
View File

@ -30,7 +30,7 @@ class QuoteController extends \BaseController {
}
$data = [
'title' => '- Quotes',
'title' => trans('texts.quotes'),
'entityType'=>ENTITY_QUOTE,
'columns'=>Utils::trans(['checkbox', 'quote_number', 'client', 'quote_date', 'quote_total', 'due_date', 'status', 'action'])
];
@ -75,7 +75,7 @@ class QuoteController extends \BaseController {
'invoiceNumber' => $invoiceNumber,
'method' => 'POST',
'url' => 'invoices',
'title' => '- New Quote',
'title' => trans('texts.new_quote'),
'client' => $client);
$data = array_merge($data, self::getViewModel());

14
app/views/public/faq.blade.php
View File

@ -151,20 +151,6 @@
</p>
</div>
</div>
<div class="question">
<a class="expander" href="#">I’m interested in removing
the small "Created by Invoice Ninja” image from the
bottom of my invoices. Will you one day offer a
premium, non-branded or otherwise white label-able
version of Invoice Ninja?
</a>
<div class="content">
<p>We are considering one day exploring optional
features like this and will be happy to hear from
you with any suggestions.
</p>
</div>
</div>
<div class="question">
<a class="expander" href="#">My question wasn’t covered
by any of the content on this FAQ page. How can I get

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

@ -100,16 +100,16 @@
<div class="container">
<div class="navbar-inner">
<ul>
<li><a href="https://www.facebook.com/invoiceninja" target="_blank"><span class="socicon">b</span></a></li>
<li><a href="https://twitter.com/invoiceninja" target="_blank"><span class="socicon">a</span></a></li>
<li><a href="https://www.linkedin.com/company/invoice-ninja"><span class="socicon">j</span></a></li>
<li><a href="https://plus.google.com/104031016152831072143" target="_blank"><span class="socicon">c</span></a></li>
<li><a href="https://github.com/hillelcoren/invoice-ninja"><span class="socicon">Q</span></a></li>
<li><a href="https://www.pinterest.com/invoiceninja" target="_blank"><span class="socicon">d</span></a></li>
<li><a href="http://blog.invoiceninja.com/feed/rss2" target="_blank"><span class="socicon">,</span></a></li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}</li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}&nbsp;&nbsp;</li>
<li><a href="https://www.facebook.com/invoiceninja" target="_blank"><span class="socicon">b</span></a></li>
<li><a href="https://twitter.com/invoiceninja" target="_blank"><span class="socicon">a</span></a></li>
<li><a href="https://www.linkedin.com/company/invoice-ninja" target="_blank"><span class="socicon">j</span></a></li>
<li><a href="https://plus.google.com/104031016152831072143" target="_blank"><span class="socicon">c</span></a></li>
<li><a href="https://github.com/hillelcoren/invoice-ninja" target="_blank"><span class="socicon">Q</span></a></li>
<li><a href="https://www.pinterest.com/invoiceninja" target="_blank"><span class="socicon">d</span></a></li>
<li><a href="http://blog.invoiceninja.com/feed/rss2" target="_blank"><span class="socicon">,</span></a></li>
</ul>
</div>
</div>
@ -131,10 +131,11 @@
<li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}</li>
<li class="hidden-desktop">{{ link_to('https://www.invoiceninja.com/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/plans', 'Plans' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/testimonials', 'Testimonials' ) }}</li>
<li>{{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}</li>
<li><span class="glyphicon glyphicon-user"></span>
{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul>
</div>
</div>
@ -477,11 +478,13 @@
});
</script>
<!--
<script type="text/javascript">
jQuery(document).ready(function($) {
$('.expander').simpleexpand();
});
</script>
-->
<!--
All images in the site need to have retina versions otherwise the log fills up with requests for missing files

1031
public/built.js
View File

File diff suppressed because it is too large Load Diff

2
public/built.public.css
View File

@ -617,7 +617,7 @@ section.faq a.expander {
font-weight: 700;
margin-bottom: 10px;
}
section.faq .content{display:none;}
/*section.faq .content{display:none;}*/
section.faq .question {
padding-bottom: 20px;
margin-bottom: 30px;

2
public/css/splash.css
View File

@ -599,7 +599,7 @@ section.faq a.expander {
font-weight: 700;
margin-bottom: 10px;
}
section.faq .content{display:none;}
/*section.faq .content{display:none;}*/
section.faq .question {
padding-bottom: 20px;
margin-bottom: 30px;

1030
public/js/typedarray.js Normal file
View File

File diff suppressed because it is too large Load Diff