From fc00c12f989c171547675fb3d56d73e84ba9a095 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 15 Jun 2014 23:54:58 +0300 Subject: [PATCH] Bug fixes --- Gruntfile.js | 1 + app/controllers/ClientController.php | 8 +- app/controllers/CreditController.php | 6 +- app/controllers/InvoiceController.php | 6 +- app/controllers/PaymentController.php | 6 +- app/controllers/QuoteController.php | 4 +- app/views/public/faq.blade.php | 14 - app/views/public/header.blade.php | 23 +- public/built.js | 1031 +++++++++++++++++++++++++ public/built.public.css | 2 +- public/css/splash.css | 2 +- public/js/typedarray.js | 1030 ++++++++++++++++++++++++ 12 files changed, 2092 insertions(+), 41 deletions(-) create mode 100644 public/js/typedarray.js diff --git a/Gruntfile.js b/Gruntfile.js index c2fba67f89fc..f0df6a98277d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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' diff --git a/app/controllers/ClientController.php b/app/controllers/ClientController.php index e4a69711bac7..4468eced2d30 100755 --- a/app/controllers/ClientController.php +++ b/app/controllers/ClientController.php @@ -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()); diff --git a/app/controllers/CreditController.php b/app/controllers/CreditController.php index b2a44086853c..9d36a45214c6 100755 --- a/app/controllers/CreditController.php +++ b/app/controllers/CreditController.php @@ -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); diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 83aaa340f0dd..675f35c06945 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -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()); diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php index bdc49f3cd267..f229a01ae782 100755 --- a/app/controllers/PaymentController.php +++ b/app/controllers/PaymentController.php @@ -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()); diff --git a/app/controllers/QuoteController.php b/app/controllers/QuoteController.php index dbdc7b63a643..3dee961af837 100644 --- a/app/controllers/QuoteController.php +++ b/app/controllers/QuoteController.php @@ -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()); diff --git a/app/views/public/faq.blade.php b/app/views/public/faq.blade.php index ed90f657b85e..bbe13e56bdbc 100644 --- a/app/views/public/faq.blade.php +++ b/app/views/public/faq.blade.php @@ -151,20 +151,6 @@

-
- 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? - -
-

We are considering one day exploring optional - features like this and will be happy to hear from - you with any suggestions. -

-
-
My question wasn’t covered by any of the content on this FAQ page. How can I get diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index d8f9b25be2f8..301f10a1a726 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -100,16 +100,16 @@
    -
  • b
    • -
  • a
    • -
  • j
    • -
  • c
    • -
  • Q
    • -
  • d
    • -
  • ,
    • -
  • {{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}
  • {{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}
  • {{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}
    • +
  • {{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}  
    • +
  • b
    • +
  • a
    • +
  • j
    • +
  • c
    • +
  • Q
    • +
  • d
    • +
  • ,
@@ -131,10 +131,11 @@
  • {{ link_to('https://www.invoiceninja.com/about', 'About Us' ) }}
  • {{ link_to('https://www.invoiceninja.com/contact', 'Contact Us' ) }}
  • {{ link_to('https://www.invoiceninja.com/features', 'Features' ) }}
    • -
  • {{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}
  • {{ link_to('https://www.invoiceninja.com/plans', 'Plans' ) }}
    • +
  • {{ link_to('https://www.invoiceninja.com/testimonials', 'Testimonials' ) }}
    • +
  • {{ link_to('https://www.invoiceninja.com/faq', 'FAQ' ) }}
  • -{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}
    • + {{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}
    @@ -477,11 +478,13 @@ }); +