From e2f09021c65141fe64b66e5314a4f41f5de847bc Mon Sep 17 00:00:00 2001
From: samoilis <samoilis@aroundweb.gr>
Date: Wed, 9 Mar 2016 02:00:19 +0200
Subject: [PATCH 001/111] Update ContactMailer.php

a small fix to payment links of email templates

this links is relating to payments and not to invoice view
---
 app/Ninja/Mailers/ContactMailer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index dc513c3e8822..fd51dd5b6a71 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -259,7 +259,7 @@ class ContactMailer extends Mailer
         foreach (Gateway::$paymentTypes as $type) {
             $camelType = Gateway::getPaymentTypeName($type);
             $type = Utils::toSnakeCase($camelType);
-            $variables["\${$camelType}Link"] = $invitation->getLink() . "/{$type}";
+            $variables["\${$camelType}Link"] = $invitation->getLink('payment') . "/{$type}";
             $variables["\${$camelType}Button"] = HTML::emailPaymentButton($invitation->getLink('payment')  . "/{$type}");
         }
 

From 62d0840d02d32811538f9a8373065e62cb1dd223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=BCske?= <tobias.hueske@googlemail.com>
Date: Wed, 9 Mar 2016 17:34:41 +0100
Subject: [PATCH 002/111] Fix typo in de-lang

---
 resources/lang/de/texts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 5fea0bf82b63..ccec754558d0 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -1122,7 +1122,7 @@ return array(
     'all_pages_header' => 'Show header on',
     'all_pages_footer' => 'Show footer on',
     'invoice_currency' => 'Rechnungs-Währung',
-    'enable_https' => 'Wir empfehlen dringend HTTPS zu verwendne, um Kreditkarten online zu akzeptieren.',
+    'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
     'quote_issued_to' => 'Quote issued to',
     'show_currency_code' => 'Währungscode',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',

From 4eae70400e22ad821da6e4b3d46f52af1353d72a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 22 Mar 2016 20:00:41 +0200
Subject: [PATCH 003/111] Updated travis branch

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index b6a5b63a3df4..c8fc462f01f4 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@
 # Invoice Ninja
 ### [https://www.invoiceninja.com](https://www.invoiceninja.com)
 
-[![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=develop)](https://travis-ci.org/invoiceninja/invoiceninja)
+[![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Note: we've recently updated this branch to Laravel 5.2. If you're upgrading here are some things to note

From 39f426e3522448135ad5c025d271579fcdb097d1 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 23 Mar 2016 15:02:53 +0200
Subject: [PATCH 004/111] Prevent duplicate deletions

---
 app/Ninja/Repositories/BaseRepository.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/Ninja/Repositories/BaseRepository.php b/app/Ninja/Repositories/BaseRepository.php
index bec95fb96921..f674c406549e 100644
--- a/app/Ninja/Repositories/BaseRepository.php
+++ b/app/Ninja/Repositories/BaseRepository.php
@@ -20,6 +20,10 @@ class BaseRepository
 
     public function archive($entity)
     {
+        if ($entity->trashed()) {
+            return;
+        }
+        
         $entity->delete();
 
         $className = $this->getEventClass($entity, 'Archived');
@@ -31,6 +35,10 @@ class BaseRepository
 
     public function restore($entity)
     {
+        if ( ! $entity->trashed()) {
+            return;
+        }
+
         $fromDeleted = false;
         $entity->restore();
 
@@ -49,6 +57,10 @@ class BaseRepository
 
     public function delete($entity)
     {
+        if ($entity->is_deleted) {
+            return;
+        }
+        
         $entity->is_deleted = true;
         $entity->save();
 

From 90baeb5018f44528793489a0efc36df72ed4ee9f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 24 Mar 2016 09:15:02 +0200
Subject: [PATCH 005/111] Fixed invitation iframe URL

---
 app/Models/Invitation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 2cc71029578d..7abd074a08b4 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -40,7 +40,7 @@ class Invitation extends EntityModel
         
         if ($this->account->isPro()) {
             if ($iframe_url) {
-                return "{$iframe_url}/?{$this->invitation_key}";
+                return "{$iframe_url}?{$this->invitation_key}";
             } elseif ($this->account->subdomain) {
                 $url = Utils::replaceSubdomain($url, $this->account->subdomain);
             }

From 6a6c932bf634bed7a013fd968ffd559a5ba0ac7a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 31 Mar 2016 17:14:34 +0300
Subject: [PATCH 006/111] Merge fix #787 for spaces in .env file

---
 app/Http/Controllers/AppController.php | 43 ++++++++++++++++----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 394323d7420a..23757f2e0297 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -83,23 +83,29 @@ class AppController extends BaseController
             return Redirect::to('/');
         }
 
-        $config = "APP_ENV=production\n".
-                    "APP_DEBUG={$app['debug']}\n".
-                    "APP_URL={$app['url']}\n".
-                    "APP_KEY={$app['key']}\n\n".
-                    "DB_TYPE={$dbType}\n".
-                    "DB_HOST={$database['type']['host']}\n".
-                    "DB_DATABASE={$database['type']['database']}\n".
-                    "DB_USERNAME={$database['type']['username']}\n".
-                    "DB_PASSWORD={$database['type']['password']}\n\n".
-                    "MAIL_DRIVER={$mail['driver']}\n".
-                    "MAIL_PORT={$mail['port']}\n".
-                    "MAIL_ENCRYPTION={$mail['encryption']}\n".
-                    "MAIL_HOST={$mail['host']}\n".
-                    "MAIL_USERNAME={$mail['username']}\n".
-                    "MAIL_FROM_NAME={$mail['from']['name']}\n".
-                    "MAIL_PASSWORD={$mail['password']}\n\n".
-                    "PHANTOMJS_CLOUD_KEY='a-demo-key-with-low-quota-per-ip-address'";
+        $_ENV['APP_ENV']='production';
+        $_ENV['APP_DEBUG']=$app['debug'];
+        $_ENV['APP_URL']=$app['url'];
+        $_ENV['APP_KEY']=$app['key'];
+        $_ENV['DB_TYPE']=$dbType;
+        $_ENV['DB_HOST']=$database['type']['host'];
+        $_ENV['DB_DATABASE']=$database['type']['database'];
+        $_ENV['DB_USERNAME']=$database['type']['username'];
+        $_ENV['DB_PASSWORD']=$database['type']['password'];
+        $_ENV['MAIL_DRIVER']=$mail['driver'];
+        $_ENV['MAIL_PORT']=$mail['port'];
+        $_ENV['MAIL_ENCRYPTION']=$mail['encryption'];
+        $_ENV['MAIL_HOST']=$mail['host'];
+        $_ENV['MAIL_USERNAME']=$mail['username'];;
+
+        $config = '';
+        foreach ($_ENV as $key => $val) {
+            if (preg_match('/\s/',$val)) {
+                $val = "'{$val}'";
+            }
+            $config .= "{$key}={$val}\n";
+        }
+
 
         // Write Config Settings
         $fp = fopen(base_path()."/.env", 'w');
@@ -166,6 +172,9 @@ class AppController extends BaseController
 
         $config = '';
         foreach ($_ENV as $key => $val) {
+                        if (preg_match('/\s/',$val)) {
+                                $val = "'{$val}'";
+                        }
             $config .= "{$key}={$val}\n";
         }
 

From 0c4cbd69bd091341343bc8ffcba5b410905082aa Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 31 Mar 2016 17:27:18 +0300
Subject: [PATCH 007/111] Merge bug fixes from develop branch

---
 app/Http/Controllers/ReportController.php | 9 +++++++--
 app/Models/TaxRate.php                    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index f1feb65b4bd9..cfb9caaddef6 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -158,8 +158,10 @@ class ReportController extends BaseController
             }
 
             $records = DB::table($entityType.'s')
-                ->select(DB::raw('sum(amount) as total, '.$timeframe.' as '.$groupBy))
-                ->where('account_id', '=', Auth::user()->account_id)
+                ->select(DB::raw('sum('.$entityType.'s.amount) as total, '.$timeframe.' as '.$groupBy))
+                ->join('clients', 'clients.id', '=', $entityType.'s.client_id')
+                ->where('clients.is_deleted', '=', false)
+                ->where($entityType.'s.account_id', '=', Auth::user()->account_id)
                 ->where($entityType.'s.is_deleted', '=', false)
                 ->where($entityType.'s.'.$entityType.'_date', '>=', $startDate->format('Y-m-d'))
                 ->where($entityType.'s.'.$entityType.'_date', '<=', $endDate->format('Y-m-d'))
@@ -168,6 +170,9 @@ class ReportController extends BaseController
             if ($entityType == ENTITY_INVOICE) {
                 $records->where('is_quote', '=', false)
                         ->where('is_recurring', '=', false);
+            } elseif ($entityType == ENTITY_PAYMENT) {
+                $records->join('invoices', 'invoices.id', '=', 'payments.invoice_id')
+                        ->where('invoices.is_deleted', '=', false);
             }
 
             $totals = $records->lists('total');
diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php
index 15c39a7572a0..cf0a576a8f0d 100644
--- a/app/Models/TaxRate.php
+++ b/app/Models/TaxRate.php
@@ -1,5 +1,6 @@
 <?php namespace App\Models;
 
+use Auth;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class TaxRate extends EntityModel

From 8dd9e99112e11f06151618b23e0fff359f6a5517 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 31 Mar 2016 17:28:04 +0300
Subject: [PATCH 008/111] Updated version number

---
 app/Http/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 1f5289d44326..a47f75ac1dea 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -535,7 +535,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG');
     define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
     define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-    define('NINJA_VERSION', '2.5.1.1');
+    define('NINJA_VERSION', '2.5.1.2');
     define('NINJA_DATE', '2000-01-01');
 
     define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja');

From be9163a926a83d9af22e9cd7de257b55ed8c6c58 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpeters1986@users.noreply.github.com>
Date: Thu, 31 Mar 2016 23:08:10 +0200
Subject: [PATCH 009/111] #793: Reference pro_plan images with templatetag

Updated references to the pro_plan before- and after-images with the asset-templatetag. They were referenced by `ninja.dev`, which doesn't resolve on a lot of computers
---
 resources/views/header.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 3ce364da6441..4c21c277fde0 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -784,11 +784,11 @@
             <div class="row">
                 <div class="col-md-6">
                     <h4>{{ trans('texts.before') }}</h4>
-                    <img src="{{ BLANK_IMAGE }}" data-src="http://ninja.dev/images/pro_plan/white_label_before.png" width="100%" alt="before">
+                    <img src="{{ BLANK_IMAGE }}" data-src="{{ asset('images/pro_plan/white_label_before.png') }}" width="100%" alt="before">
                 </div>
                 <div class="col-md-6">
                     <h4>{{ trans('texts.after') }}</h4>
-                    <img src="{{ BLANK_IMAGE }}" data-src="http://ninja.dev/images/pro_plan/white_label_after.png" width="100%" alt="after">
+                    <img src="{{ BLANK_IMAGE }}" data-src="{{ asset('images/pro_plan/white_label_after.png') }}" width="100%" alt="after">
                 </div>
             </div>
           </div>
@@ -811,4 +811,4 @@
 <p>&nbsp;</p>
 
 
-@stop
\ No newline at end of file
+@stop

From eed5074cabeef26e37927fd60d98c34ebbe86ce3 Mon Sep 17 00:00:00 2001
From: Stefan Welsch <stefan.welsch@b-nova.com>
Date: Sat, 2 Apr 2016 12:39:18 +0200
Subject: [PATCH 010/111] Update texts.php

Add and correct some german translations
---
 resources/lang/de/texts.php | 178 ++++++++++++++++++------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 08ffaf7b8a0b..c6000eb44f88 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -865,7 +865,7 @@ return array(
     'activity_15' => ':user aktualisierte :credit Guthaben',
     'activity_16' => ':user archivierte :credit Guthaben',
     'activity_17' => ':user löschte :credit Guthaben',
-    'activity_18' => ':user löschte Angebot :quote',
+    'activity_18' => ':user erstellte Angebot :quote',
     'activity_19' => ':user aktualisierte Angebot :quote',
     'activity_20' => ':user mailte Angebot :quote an :contact',
     'activity_21' => ':contact schaute Angebot :quote an',
@@ -916,50 +916,50 @@ return array(
     'country' => 'Land',
     'include' => 'Hinzufügen',
 
-    'logo_too_large' => 'Your logo is :size, for better PDF performance we suggest uploading an image file less than 200KB',
-    'import_freshbooks' => 'Import From FreshBooks',
-    'import_data' => 'Import Data',
-    'source' => 'Source',
+    'logo_too_large' => 'Ihr Logo ist nur :size. Um eine bessere Darstellung im PDF Dokument zu erhalten, empfehlen wir ein Bild größer als 200KB',
+    'import_freshbooks' => 'Importiere von FreshBooks',
+    'import_data' => 'Importiere Daten',
+    'source' => 'Quelle',
     'csv' => 'CSV',
-    'client_file' => 'Client File',
-    'invoice_file' => 'Invoice File',
+    'client_file' => 'Kunden Datei',
+    'invoice_file' => 'Rechnungs Datei',
     'task_file' => 'Task File',
-    'no_mapper' => 'No valid mapping for file',
-    'invalid_csv_header' => 'Invalid CSV Header',
+    'no_mapper' => 'Kein gültiges Mapping für die Datei',
+    'invalid_csv_header' => 'Ungültiger CSV Header',
 
     'email_errors' => [
-        'inactive_client' => 'Emails can not be sent to inactive clients',
-        'inactive_contact' => 'Emails can not be sent to inactive contacts',
-        'inactive_invoice' => 'Emails can not be sent to inactive invoices',
-        'user_unregistered' => 'Please register your account to send emails',
-        'user_unconfirmed' => 'Please confirm your account to send emails',
-        'invalid_contact_email' => 'Invalid contact email',
+        'inactive_client' => 'Emails können nicht zu inaktiven Kunden gesendet werden',
+        'inactive_contact' => 'Emails können nicht zu inaktiven Kontakten gesendet werden',
+        'inactive_invoice' => 'Emails können nicht zu inaktiven Rechnungen gesendet werden',
+        'user_unregistered' => 'Bitte registrieren Sie sich um Emails zu versenden',
+        'user_unconfirmed' => 'Bitte bestätigen Sie Ihr Konto um Emails zu senden',
+        'invalid_contact_email' => 'Ungültige Kontakt Email Adresse',
     ],
 
-    'client_portal' => 'Client Portal',
+    'client_portal' => 'Kunden-Portal',
     'admin' => 'Admin',
     'disabled' => 'Disabled',
-    'show_archived_users' => 'Show archived users',
+    'show_archived_users' => 'Zeige archivierte Benutzer',
     'notes' => 'Notes',
-    'invoice_will_create' => 'client will be created',
-    'invoices_will_create' => 'invoices will be created',
-    'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.',
+    'invoice_will_create' => 'Kunde wird erstellt',
+    'invoices_will_create' => 'Rechnung wird erstellt',
+    'failed_to_import' => 'Die folgenden Daten konnten nicht importiert werden. Entweder sind diese bereits vorhanden oder es fehlen benötigte Felder.',
 
-    'publishable_key' => 'Publishable Key',
-    'secret_key' => 'Secret Key',
+    'publishable_key' => 'Öffentlicher Schlüssel',
+    'secret_key' => 'Geheimer Schlüssel',
     'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process',
 
     'email_design' => 'Email Design',
     'due_by' => 'Due by :date',
     'enable_email_markup' => 'Enable Markup',
     'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
-    'template_help_title' => 'Templates Help',
-    'template_help_1' => 'Available variables:',
+    'template_help_title' => 'Templates Hilfe',
+    'template_help_1' => 'Verfügbare Variablen:',
     'email_design_id' => 'Email Style',
-    'email_design_help' => 'Make your emails look more professional with HTML layouts',
-    'plain' => 'Plain',
-    'light' => 'Light',
-    'dark' => 'Dark',
+    'email_design_help' => 'Lassen Sie Ihre Email professioneller mit HTML Layouts aussehen',
+    'plain' => 'Einfach',
+    'light' => 'Hell',
+    'dark' => 'Dunkel',
 
     'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.',
     'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.',
@@ -972,19 +972,19 @@ return array(
     'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.',
 
     'token_expired' => 'Validation token was expired. Please try again.',
-    'invoice_link' => 'Invoice Link',
-    'button_confirmation_message' => 'Click to confirm your email address.',
-    'confirm' => 'Confirm',
-    'email_preferences' => 'Email Preferences',
-    'created_invoices' => 'Successfully created :count invoice(s)',
-    'next_invoice_number' => 'The next invoice number is :number.',
-    'next_quote_number' => 'The next quote number is :number.',
+    'invoice_link' => 'Link zur Rechnung',
+    'button_confirmation_message' => 'Bitte klicken um Ihre Email-Adresse zu bestätigen.',
+    'confirm' => 'Bestätigen',
+    'email_preferences' => 'Email Einstellungen',
+    'created_invoices' => ':count Rechnung(en) erfolgreich erstellt',
+    'next_invoice_number' => 'Die nächste Rechnungsnummer ist :number.',
+    'next_quote_number' => 'Die nächste Angebotsnummer ist :number.',
 
-    'days_before' => 'days before',
-    'days_after' => 'days after',
-    'field_due_date' => 'due date',
-    'field_invoice_date' => 'invoice date',
-    'schedule' => 'Schedule',
+    'days_before' => 'Tage vorher',
+    'days_after' => 'Tage danach',
+    'field_due_date' => 'Fälligkeitsdatum',
+    'field_invoice_date' => 'Rechnungsdatum',
+    'schedule' => 'Zeitgesteuert',
     'email_designs' => 'Email Designs',
     'assigned_when_sent' => 'Assigned when sent',
 
@@ -1036,7 +1036,7 @@ return array(
     'convert_currency' => 'Währung umrechnen',
 
     // Payment terms
-    'num_days' => 'Number of days',
+    'num_days' => 'Anzahl Tage',
     'create_payment_term' => 'Create Payment Term',
     'edit_payment_terms' => 'Edit Payment Term',
     'edit_payment_term' => 'Edit Payment Term',
@@ -1118,8 +1118,8 @@ return array(
     'first_page' => 'Erste Seite',
     'all_pages' => 'Alle Seiten',
     'last_page' => 'Letzte Seite',
-    'all_pages_header' => 'Show header on',
-    'all_pages_footer' => 'Show footer on',
+    'all_pages_header' => 'Zeige Header auf',
+    'all_pages_footer' => 'Zeige Footer auf',
     'invoice_currency' => 'Rechnungs-Währung',
     'enable_https' => 'Wir empfehlen dringend HTTPS zu verwenden, um Kreditkarten online zu akzeptieren.',
     'quote_issued_to' => 'Quote issued to',
@@ -1128,77 +1128,77 @@ return array(
     'trial_footer' => 'Your free trial lasts :count more days, :link to upgrade now.',
     'trial_footer_last_day' => 'Heute ist der letzte Tag Ihrer kostenlosen Probezeit, :link um upzugraden.',
     'trial_call_to_action' => 'Kostenlose Probezeit starten',
-    'trial_success' => 'Successfully enabled two week free pro plan trial',
-    'overdue' => 'Overdue',
-    'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.',
+    'trial_success' => 'Erfolgreich eine 2-Wochen Testversion aktiviert',
+    'overdue' => 'Überfällig',
+    'white_label_text' => 'Kaufen Sie eine 1 Jahres Whitelabel Lizenz zum Preis von $'.WHITE_LABEL_PRICE.' um das Invoice Ninja Branding vom Kundenportal zu entfernen und unser Projekt zu unterstützen.',
 
     'navigation' => 'Navigation',
-    'list_invoices' => 'List Invoices',
-    'list_clients' => 'List Clients',
-    'list_quotes' => 'List Quotes',
-    'list_tasks' => 'List Tasks',
-    'list_expenses' => 'List Expenses',
-    'list_recurring_invoices' => 'List Recurring Invoices',
-    'list_payments' => 'List Payments',
-    'list_credits' => 'List Credits',
-    'tax_name' => 'Tax Name',
-    'report_settings' => 'Report Settings',
-    'search_hotkey' => 'shortcut is /',
+    'list_invoices' => 'Liste Rechnungen',
+    'list_clients' => 'Liste Kunden',
+    'list_quotes' => 'Liste Angebote',
+    'list_tasks' => 'Liste Aufgaben',
+    'list_expenses' => 'Liste Ausgaben',
+    'list_recurring_invoices' => 'Liste wiederkehrende Rechnungen',
+    'list_payments' => 'Liste Zahlungen',
+    'list_credits' => 'Liste Guthaben',
+    'tax_name' => 'Steuersatz Name',
+    'report_settings' => 'Report Einstellungen',
+    'search_hotkey' => 'Kürzel ist /',
 
-    'new_user' => 'New User',
-    'new_product' => 'New Product',
-    'new_tax_rate' => 'New Tax Rate',
-    'invoiced_amount' => 'Invoiced Amount',
-    'invoice_item_fields' => 'Invoice Item Fields',
+    'new_user' => 'Neuer Benutzer',
+    'new_product' => 'Neues Produkt',
+    'new_tax_rate' => 'Neuer Steuersatz',
+    'invoiced_amount' => 'Rechnungsbetrag',
+    'invoice_item_fields' => 'Rechnungspositions Feld',
     'custom_invoice_item_fields_help' => 'Add a field when creating an invoice item and display the label and value on the PDF.',
-    'recurring_invoice_number' => 'Recurring Invoice Number',
-    'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.',
+    'recurring_invoice_number' => 'Wiederkehrende Rechnungsnummer',
+    'recurring_invoice_number_prefix_help' => 'Geben Sie einen Präfix für wiederkehrende Rechnungen an. Standard ist \'R\'.',
     'enable_client_portal' => 'Dashboard',
-    'enable_client_portal_help' => 'Show/hide the dashboard page in the client portal.',
+    'enable_client_portal_help' => 'Zeige das Dashboard im Kundenportal.',
 
     // Client Passwords
-    'enable_portal_password'=>'Password protect invoices',
-    'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.',
-    'send_portal_password'=>'Generate password automatically',
-    'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.',
+    'enable_portal_password'=>'Passwortgeschützte Rechnungen',
+    'enable_portal_password_help'=>'Erlaubt Ihnen ein Passwort für jeden Kontakt zu erstellen. Wenn ein Passwort erstellt wurde, muss der Kunde dieses eingeben, bevor er eine Rechnung ansehen darf.',
+    'send_portal_password'=>'Erstelle das Passwort automatisch',
+    'send_portal_password_help'=>'Wenn kein Passwort gesetzt wurde, wird eins generiert und mit der ersten Rechnung verschickt.',
     
-    'expired' => 'Expired',
-    'invalid_card_number' => 'The credit card number is not valid.',
-    'invalid_expiry' => 'The expiration date is not valid.',
-    'invalid_cvv' => 'The CVV is not valid.',
-    'cost' => 'Cost',
-    'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.',
+    'expired' => 'Abgelaufen',
+    'invalid_card_number' => 'Die Kreditkartennummer ist nicht gültig.',
+    'invalid_expiry' => 'Das Ablaufdatum ist nicht gültig.',
+    'invalid_cvv' => 'Der CVV Code ist nicht gültig.',
+    'cost' => 'Kosten',
+    'create_invoice_for_sample' => 'Hinweis: Erstellen Sie Ihre erste Rechnung um hier eine Vorschau zu sehen.',
     
     // User Permissions
-    'owner' => 'Owner',
+    'owner' => 'Eigentümer',
     'administrator' => 'Administrator',
     'administrator_help' => 'Allow user to manage users, change settings and modify all records',
-    'user_create_all' => 'Create clients, invoices, etc.',
-    'user_view_all' => 'View all clients, invoices, etc.',
-    'user_edit_all' => 'Edit all clients, invoices, etc.',
+    'user_create_all' => 'Erstelle Kunden, Rechnungen, usw.',
+    'user_view_all' => 'Alle Kunden, Rechnungen, usw. ansehen',
+    'user_edit_all' => 'Alle Kunden, Rechnungen, usw. bearbeiten',
     'gateway_help_20' => ':link to sign up for Sage Pay.',
     'gateway_help_21' => ':link to sign up for Sage Pay.',
     'partial_due' => 'Partial Due',
     'restore_vendor' => 'Restore Vendor',
     'restored_vendor' => 'Successfully restored vendor',
     'restored_expense' => 'Successfully restored expense',
-    'permissions' => 'Permissions',
+    'permissions' => 'Berechtigungen',
     'create_all_help' => 'Allow user to create and modify records',
     'view_all_help' => 'Allow user to view records they didn\'t create',
     'edit_all_help' => 'Allow user to modify records they didn\'t create',
-    'view_payment' => 'View Payment', 
+    'view_payment' => 'Zahlung zeigen', 
    
-    'january' => 'January',
-    'february' => 'February',
-    'march' => 'March',
+    'january' => 'Januar',
+    'february' => 'Februar',
+    'march' => 'März',
     'april' => 'April',
-    'may' => 'May',
-    'june' => 'June',
-    'july' => 'July',
+    'may' => 'Mai',
+    'june' => 'Juni',
+    'july' => 'Juli',
     'august' => 'August',
     'september' => 'September',
-    'october' => 'October',
+    'october' => 'Oktober',
     'november' => 'November',
-    'december' => 'December',
+    'december' => 'Dezember',
 
 );

From 26130680e344614703a67e12132140ed24ad670b Mon Sep 17 00:00:00 2001
From: Stefan Welsch <stefan.welsch@b-nova.com>
Date: Sun, 3 Apr 2016 10:16:05 +0200
Subject: [PATCH 011/111] Update texts.php

update due date translation
---
 resources/lang/de/texts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index c6000eb44f88..4bb50425823d 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -950,7 +950,7 @@ return array(
     'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process',
 
     'email_design' => 'Email Design',
-    'due_by' => 'Due by :date',
+    'due_by' => 'Fällig am :date',
     'enable_email_markup' => 'Enable Markup',
     'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
     'template_help_title' => 'Templates Hilfe',

From 4fe388746809466568b22ceb6429524cded78805 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 8 Apr 2016 10:42:14 +0300
Subject: [PATCH 012/111] Merge fix for #800

---
 app/Models/Account.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index f6a7194bdf6f..834152fc15e1 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -948,7 +948,7 @@ class Account extends Eloquent
             // Add line breaks if HTML isn't already being used
             return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer;
         } else {
-            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</ p>";
+            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</p>";
         }
     }
 

From 263fe35923f51fdb2075f56d2817907ceac5dd9c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 8 Apr 2016 12:14:09 +0300
Subject: [PATCH 013/111] Updated postmark driver for Laravel 5.2

---
 composer.json |  2 +-
 composer.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 45e6e1872640..3d349c74fd9e 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
 		"alfaproject/omnipay-skrill": "dev-master",
 		"omnipay/bitpay": "dev-master",
 		"guzzlehttp/guzzle": "~6.0",
-		"wildbit/laravel-postmark-provider": "2.0",
+		"wildbit/laravel-postmark-provider": "3.0",
 		"Dwolla/omnipay-dwolla": "dev-master",
 		"laravel/socialite": "~2.0",
 		"simshaun/recurr": "dev-master",
diff --git a/composer.lock b/composer.lock
index 6ce01e65ba67..f47bad86a156 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e5e8524886bd38794a15e406acc3745a",
-    "content-hash": "6b3f343959ba3f330c425325574dfe28",
+    "hash": "ce6df956642de67a38a4a22775eaeff3",
+    "content-hash": "fcd326b2ee271a65f719ba87f57a6c14",
     "packages": [
         {
             "name": "agmscode/omnipay-agms",
@@ -3815,7 +3815,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/77b316bd08c6b7a1e93721f15d1bfbd21a62ba6b",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/b27d2823d052f5c227eeb29324bb564cfdb8f9af",
                 "reference": "e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
                 "shasum": ""
             },
@@ -7585,20 +7585,20 @@
         },
         {
             "name": "wildbit/laravel-postmark-provider",
-            "version": "2.0.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wildbit/laravel-postmark-provider.git",
-                "reference": "79a7e8bde66b2bd6f314829b00ee08616847ebc5"
+                "reference": "b80815602f618abe24030ea6d3f117da49a72885"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wildbit/laravel-postmark-provider/zipball/79a7e8bde66b2bd6f314829b00ee08616847ebc5",
-                "reference": "79a7e8bde66b2bd6f314829b00ee08616847ebc5",
+                "url": "https://api.github.com/repos/wildbit/laravel-postmark-provider/zipball/b80815602f618abe24030ea6d3f117da49a72885",
+                "reference": "b80815602f618abe24030ea6d3f117da49a72885",
                 "shasum": ""
             },
             "require": {
-                "illuminate/mail": "~5.0",
+                "illuminate/mail": "~5.2",
                 "wildbit/swiftmailer-postmark": "~2.0"
             },
             "type": "library",
@@ -7612,7 +7612,7 @@
                 "MIT"
             ],
             "description": "An officially supported mail provider to send mail from Laravel through Postmark, see instructions for integrating it here: https://github.com/wildbit/laravel-postmark-provider/blob/master/README.md",
-            "time": "2015-11-10 14:43:06"
+            "time": "2016-02-10 14:15:58"
         },
         {
             "name": "wildbit/swiftmailer-postmark",

From 65164cbaf327116eae06a2fd54ad0090a7cab381 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 9 Apr 2016 23:00:55 +0300
Subject: [PATCH 014/111] Fixes #798 Setup error

---
 app/Http/Controllers/AppController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index 23757f2e0297..6a78290e0634 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -100,7 +100,10 @@ class AppController extends BaseController
 
         $config = '';
         foreach ($_ENV as $key => $val) {
-            if (preg_match('/\s/',$val)) {
+            if (is_array($val)) {
+                continue;
+            }
+            if (preg_match('/\s/', $val)) {
                 $val = "'{$val}'";
             }
             $config .= "{$key}={$val}\n";

From 80d0dda1e0748a477493a4065862866ec7468655 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 9 Apr 2016 23:03:51 +0300
Subject: [PATCH 015/111] Bumped version to 2.5.1.3

---
 app/Http/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index a47f75ac1dea..59d22caf3e94 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -535,7 +535,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG');
     define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
     define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-    define('NINJA_VERSION', '2.5.1.2');
+    define('NINJA_VERSION', '2.5.1.3');
     define('NINJA_DATE', '2000-01-01');
 
     define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja');

From 1ece4f5534954b9ee1a78e75ab035bd086c42c85 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 10 Apr 2016 10:09:46 +0300
Subject: [PATCH 016/111] Git update

---
 app/Http/routes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 59d22caf3e94..33c8db1c5f5c 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /*
 |--------------------------------------------------------------------------
 | Application Routes

From e5b414aca973b0f2e22df568261b1994352134ed Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 10 Apr 2016 22:54:48 +0300
Subject: [PATCH 017/111] Fixed payment list in client portal

---
 app/Http/Controllers/PublicClientController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php
index d067ff38a740..39b65b02e001 100644
--- a/app/Http/Controllers/PublicClientController.php
+++ b/app/Http/Controllers/PublicClientController.php
@@ -302,7 +302,7 @@ class PublicClientController extends BaseController
         $payments = $this->paymentRepo->findForContact($invitation->contact->id, Input::get('sSearch'));
 
         return Datatable::query($payments)
-                ->addColumn('invoice_number', function ($model) { return $model->invitation_key ? link_to('/view/'.$model->invitation_key, $model->invoice_number) : $model->invoice_number; })->toHtml()
+                ->addColumn('invoice_number', function ($model) { return $model->invitation_key ? link_to('/view/'.$model->invitation_key, $model->invoice_number)->toHtml() : $model->invoice_number; })
                 ->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : '<i>Manual entry</i>'; })
                 ->addColumn('payment_type', function ($model) { return $model->payment_type ? $model->payment_type : ($model->account_gateway_id ? '<i>Online payment</i>' : ''); })
                 ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); })

From f31aacbab8d69d0c91aaab09f90279a4da29384d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 10 Apr 2016 23:05:41 +0300
Subject: [PATCH 018/111] Separated out log messages

---
 bootstrap/app.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bootstrap/app.php b/bootstrap/app.php
index 71f392315f59..600e0fb5e9c8 100755
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -61,6 +61,8 @@ if (strstr($_SERVER['HTTP_USER_AGENT'], 'PhantomJS') && Utils::isNinjaDev()) {
 // Write info messages to a separate file
 $app->configureMonologUsing(function($monolog) {
     $monolog->pushHandler(new Monolog\Handler\StreamHandler(storage_path() . '/logs/laravel-info.log', Monolog\Logger::INFO, false));
+    $monolog->pushHandler(new Monolog\Handler\StreamHandler(storage_path() . '/logs/laravel-warning.log', Monolog\Logger::WARNING, false));
+    $monolog->pushHandler(new Monolog\Handler\StreamHandler(storage_path() . '/logs/laravel-error.log', Monolog\Logger::ERROR, false));
 });
 
 return $app;

From 13f5d80ee6434b91bad1e8896b072a353626c6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?A=C3=AFssa?= <github@installtech.fr>
Date: Tue, 26 Apr 2016 00:31:48 +0200
Subject: [PATCH 019/111] Added some french translations

---
 resources/lang/fr/texts.php | 378 ++++++++++++++++++------------------
 1 file changed, 189 insertions(+), 189 deletions(-)

diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php
index 6cd75a9f0efa..89f323a6f6e7 100644
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@@ -120,7 +120,7 @@ return array(
     'active_clients' => 'clients actifs',
     'invoices_past_due' => 'Date limite de paiement dépassée',
     'upcoming_invoices' => 'Factures à venir',
-    'average_invoice' => 'Moyenne de facturation',
+    'average_invoice' => 'Facture moyenne',
 
     // list pages
     'archive' => 'Archiver',
@@ -437,8 +437,8 @@ return array(
     'invalid_counter' => 'Pour éviter un éventuel conflit, merci de définir un préfixe pour le numéro de facture ou pour le numéro de devis',
     'mark_sent' => 'Marquer comme envoyé',
 
-    'gateway_help_1' => ':link to sign up for Authorize.net.',
-    'gateway_help_2' => ':link to sign up for Authorize.net.',
+    'gateway_help_1' => ':link pour vous inscrire à Authorize.net.',
+    'gateway_help_2' => ':link pour vous inscrire à Authorize.net.',
     'gateway_help_17' => ':link pour obtenir votre signature PayPal API.',
     'gateway_help_27' => ':link pour vous enregistrer sur TwoCheckout.',
 
@@ -503,10 +503,10 @@ return array(
     'approve' => 'Accepter',
 
     'token_billing_type_id' => 'Jeton de paiement',
-    'token_billing_help' => 'Enables you to store credit cards with your gateway, and charge them at a later date.',
+    'token_billing_help' => 'Permet de stocker des cartes de crédit avec votre passerelle, et de déclancher le paiement à une date ultérieure.',
     'token_billing_1' => 'Désactiver',
-    'token_billing_2' => 'Opt-in - checkbox is shown but not selected',
-    'token_billing_3' => 'Opt-out - checkbox is shown and selected',
+    'token_billing_2' => 'Opt-in - Case à cocher affichée mais non sélectionnée',
+    'token_billing_3' => 'Opt-out - Case à cocher affichée et sélectionné',
     'token_billing_4' => 'Toujours',
     'token_billing_checkbox' => 'Enregistrer les informations de paiement',
     'view_in_stripe' => 'Voir sur Stripe',
@@ -522,8 +522,8 @@ return array(
     'billing_address' => 'Adresse de facturation',
     'billing_method' => 'Méthode de facturation',
     'order_overview' => 'Résumé de la commande',
-    'match_address' => '*Address must match address associated with credit card.',
-    'click_once' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.',
+    'match_address' => '*L\'adresse doit correspondre à l\'adresse associée à la carte de crédit.',
+    'click_once' => '*S\'il vous plaît cliquer sur "PAYER MAINTENANT" une seule fois - la transaction peut prendre jusqu\'à 1 minute.',
 
     'default_invoice_footer' => 'Définir par défaut',
     'invoice_footer' => 'Pied de facture',
@@ -575,7 +575,7 @@ return array(
     'resend_confirmation' => 'Renvoyer l\'email de confirmation',
     'confirmation_resent' => 'L\'email de confirmation a été renvoyé',
 
-    'gateway_help_42' => ':link to sign up for BitPay.<br/>Note: use a Legacy API Key, not an API token.',
+    'gateway_help_42' => ':link pour vous inscrire à BitPay <br/> Remarque:. utiliser une clé API "Legacy", pas un jeton.',
     'payment_type_credit_card' => 'Carte de crédit',
     'payment_type_paypal' => 'PayPal',
     'payment_type_bitcoin' => 'Bitcoin',
@@ -588,7 +588,7 @@ return array(
     'client_name' => 'Nom du client',
     'pdf_settings' => 'Réglages PDF',
     'product_settings' => 'Réglages du produit',
-    'auto_wrap' => 'Auto Line Wrap',
+    'auto_wrap' => 'Retour à la ligne automatique',
     'duplicate_post' => 'Attention: la page précédente a été soumise deux fois. La deuxième soumission a été ignorée.',
     'view_documentation' => 'Voir documentation',
     'app_title' => 'Outil de facturation gratuit & Open-Source',
@@ -755,11 +755,11 @@ return array(
     'show_line_item_tax' => 'Display <b>line item taxes</b> inline',
 
     'iframe_url' => 'Site internet',
-    'iframe_url_help1' => 'Copy the following code to a page on your site.',
-    'iframe_url_help2' => 'You can test the feature by clicking \'View as recipient\' for an invoice.',
+    'iframe_url_help1' => 'Copiez le code suivant sur une page de votre site.',
+    'iframe_url_help2' => 'Vous pouvez tester la fonctionnalité en cliquant sur \'Voir en tant que destinataire\' pour une facture.',
 
     'auto_bill' => 'Facturation automatique',
-    'military_time' => '24 Hour Time',
+    'military_time' => '24H',
     'last_sent' => 'Dernier envoi',
 
     'reminder_emails' => 'Emails de rappel',
@@ -769,21 +769,21 @@ return array(
     'first_reminder' => 'Premier rappel',
     'second_reminder' => 'Second rappel',
     'third_reminder' => 'Troisième rappel',
-    'num_days_reminder' => 'Days after due date',
-    'reminder_subject' => 'Reminder: Invoice :invoice from :account',
+    'num_days_reminder' => 'Jours après la date d\'échéance',
+    'reminder_subject' => 'Rappel: Facture :invoice de :account',
     'reset' => 'Remettre à zéro',
     'invoice_not_found' => 'La facture demandée n\'est pas disponible',
 
-    'referral_program' => 'Referral Program',
-    'referral_code' => 'Referral Code',
-    'last_sent_on' => 'Last sent on :date',
+    'referral_program' => 'Programme de parrainage',
+    'referral_code' => 'Code de Parrainage',
+    'last_sent_on' => 'Dernier envoi le :date',
 
-    'page_expire' => 'This page will expire soon, :click_here to keep working',
+    'page_expire' => 'Cette page va bientôt expirer, :click_here pour continuer à travailler',
     'upcoming_quotes' => 'Devis à venir',
     'expired_quotes' => 'Devis expirés',
 
     'sign_up_using' => 'Connexion avec',
-    'invalid_credentials' => 'These credentials do not match our records',
+    'invalid_credentials' => 'Ces informations de connexion sont invalides',
     'show_all_options' => 'Voir toutes les options',
     'user_details' => 'Utilisateur',
     'oneclick_login' => 'Connexion en 1 clic',
@@ -801,19 +801,19 @@ return array(
     'notification_quote_bounced' => 'We were unable to deliver Quote :invoice to :contact.',
     'notification_quote_bounced_subject' => 'Unable to deliver Quote :invoice',
 
-    'custom_invoice_link' => 'Custom Invoice Link',
-    'total_invoiced' => 'Total Invoiced',
+    'custom_invoice_link' => 'Personnaliser le lien de la facture',
+    'total_invoiced' => 'Total facturé',
     'open_balance' => 'Open Balance',
     'verify_email' => 'Please visit the link in the account confirmation email to verify your email address.',
-    'basic_settings' => 'Basic Settings',
+    'basic_settings' => 'Paramètres généraux',
     'pro' => 'Pro',
     'gateways' => 'Passerelles de paiement',
-    'recurring_too_soon' => 'Il est trop tôt pour créer la prochaine facture récurrente, it\'s scheduled for :date',
+    'recurring_too_soon' => 'Il est trop tôt pour créer la prochaine facture récurrente, prévue pour le :date',
 
-    'next_send_on' => 'Send Next: :date',
+    'next_send_on' => 'Envoi suivant: :date',
     'no_longer_running' => 'This invoice is not scheduled to run',
     'general_settings' => 'Réglages généraux',
-    'customize' => 'Customiser',
+    'customize' => 'Personnaliser',
 
     'oneclick_login_help' => 'Connectez un compte pour vous connecter sans votre mot de passe',
     'referral_code_help' => 'Gagnez de l\'argent en partagent notre outil en ligne',
@@ -831,12 +831,12 @@ return array(
     'recurring_hour' => 'Recurring Hour',
     'pattern' => 'Pattern',
     'pattern_help_title' => 'Pattern Help',
-    'pattern_help_1' => 'Create custom invoice and quote numbers by specifying a pattern',
-    'pattern_help_2' => 'Available variables:',
-    'pattern_help_3' => 'For example, :example would be converted to :value',
+    'pattern_help_1' => 'Créer des numéros de facture et devis personnalisés selon un modèle',
+    'pattern_help_2' => 'Variables disponibles:',
+    'pattern_help_3' => 'Par exemple, :example sera converti en :value',
     'see_options' => 'Voir les options',
-    'invoice_counter' => 'Invoice Counter',
-    'quote_counter' => 'Quote Counter',
+    'invoice_counter' => 'Compteur de factures',
+    'quote_counter' => 'Compteur de devis',
     'type' => 'Type',
 
     'activity_1' => ':user a crée le client :client',
@@ -869,7 +869,7 @@ return array(
     'activity_28' => ':user a restauré le crédit :credit',
     'activity_29' => ':contact a approuvé le devis :quote',
 
-    'payment' => 'Paiment',
+    'payment' => 'Paiement',
     'system' => 'Système',
     'signature' => 'Signature email',
     'default_messages' => 'Messages par défaut',
@@ -908,51 +908,51 @@ return array(
     'include' => 'Inclure',
 
     'logo_too_large' => 'Your logo is :size, for better PDF performance we suggest uploading an image file less than 200KB',
-    'import_freshbooks' => 'Import From FreshBooks',
-    'import_data' => 'Import Data',
+    'import_freshbooks' => 'Importer depuis FreshBooks',
+    'import_data' => 'Importer des données',
     'source' => 'Source',
     'csv' => 'CSV',
-    'client_file' => 'Client File',
-    'invoice_file' => 'Invoice File',
-    'task_file' => 'Task File',
-    'no_mapper' => 'No valid mapping for file',
-    'invalid_csv_header' => 'Invalid CSV Header',
+    'client_file' => 'Fichier de clients',
+    'invoice_file' => 'Fichier de factures',
+    'task_file' => 'Fichier de tâches',
+    'no_mapper' => 'Mappage invalide pour ce fichier',
+    'invalid_csv_header' => 'En-tête du fichier CSV invalide',
 
     'email_errors' => [
-    'inactive_client' => 'Emails can not be sent to inactive clients',
-    'inactive_contact' => 'Emails can not be sent to inactive contacts',
-    'inactive_invoice' => 'Emails can not be sent to inactive invoices',
-    'user_unregistered' => 'Please register your account to send emails',
-    'user_unconfirmed' => 'Please confirm your account to send emails',
-    'invalid_contact_email' => 'Invalid contact email',
+    'inactive_client' => 'Les mails ne peuvent être envoyés aux clients inactifs',
+    'inactive_contact' => 'Les mails ne peuvent être envoyés aux contacts inactifs',
+    'inactive_invoice' => 'Les mails ne peuvent être envoyés aux factures inactives',
+    'user_unregistered' => 'Veuillez vous inscrire afin d\'envoyer des mails',
+    'user_unconfirmed' => 'Veuillez confirmer votre compte afin de permettre l\'envoi de mail',
+    'invalid_contact_email' => 'Adresse mail du contact invalide',
     ],
 
-    'client_portal' => 'Client Portal',
+    'client_portal' => 'Portail client',
     'admin' => 'Admin',
-    'disabled' => 'Disabled',
-    'show_archived_users' => 'Show archived users',
+    'disabled' => 'Désactivé',
+    'show_archived_users' => 'Afficher les utilisateurs archivés',
     'notes' => 'Notes',
     'invoice_will_create' => 'client will be created',
     'invoices_will_create' => 'invoices will be created',
     'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.',
 
-    'publishable_key' => 'Publishable Key',
-    'secret_key' => 'Secret Key',
-    'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process',
+    'publishable_key' => 'Clé publique',
+    'secret_key' => 'Clé secrète',
+    'missing_publishable_key' => 'Saisissez votre clé publique Stripe pour un processus de commande amélioré',
 
     'email_design' => 'Email Design',
-    'due_by' => 'Due by :date',
+    'due_by' => 'A échéanche du :date',
     'enable_email_markup' => 'Enable Markup',
     'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
     'template_help_title' => 'Templates Help',
-    'template_help_1' => 'Available variables:',
-    'email_design_id' => 'Email Style',
+    'template_help_1' => 'Variable disponibles :',
+    'email_design_id' => 'Style de mail',
     'email_design_help' => 'Make your emails look more professional with HTML layouts',
-    'plain' => 'Plain',
-    'light' => 'Light',
-    'dark' => 'Dark',
+    'plain' => 'Brut',
+    'light' => 'Clair',
+    'dark' => 'Sombre',
 
-    'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.',
+    'industry_help' => 'Utilisé dans le but de fournir des statistiques la taille et le secteur de l\'entreprise.',
     'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.',
     'invoice_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the invoice number.',
     'quote_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the quote number.',
@@ -962,36 +962,36 @@ return array(
     'custom_invoice_charges_helps' => 'Add a text input to the invoice create/edit page and include the charge in the invoice subtotals.',
     'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.',
 
-    'token_expired' => 'Validation token was expired. Please try again.',
-    'invoice_link' => 'Invoice Link',
-    'button_confirmation_message' => 'Click to confirm your email address.',
-    'confirm' => 'Confirm',
-    'email_preferences' => 'Email Preferences',
-    'created_invoices' => 'Successfully created :count invoice(s)',
-    'next_invoice_number' => 'The next invoice number is :number.',
-    'next_quote_number' => 'The next quote number is :number.',
+    'token_expired' => 'Validation jeton expiré. Veuillez réessayer.',
+    'invoice_link' => 'Lien vers la facture',
+    'button_confirmation_message' => 'Cliquez pour confirmer votre adresse e-mail.',
+    'confirm' => 'Confirmer',
+    'email_preferences' => 'Préférences de mail',
+    'created_invoices' => ':count factures(s) créées avec succès',
+    'next_invoice_number' => 'Le prochain numéro de facture est :number.',
+    'next_quote_number' => 'Le prochain numéro de devis est :number.',
 
     'days_before' => 'days before',
     'days_after' => 'days after',
-    'field_due_date' => 'due date',
-    'field_invoice_date' => 'invoice date',
+    'field_due_date' => 'date d\'échéance',
+    'field_invoice_date' => 'Date de la facture',
     'schedule' => 'Schedule',
     'email_designs' => 'Email Designs',
     'assigned_when_sent' => 'Assigned when sent',
 
     'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',
-    'white_label_purchase_link' => 'Purchase a white label license',
+    'white_label_purchase_link' => 'Acheter une licence marque blanche',
 
     // Expense / vendor
-    'expense' => 'Expense',
-    'expenses' => 'Expenses',
+    'expense' => 'Dépense',
+    'expenses' => 'Dépenses',
     'new_expense' => 'Enter Expense',
     'enter_expense' => 'Enter Expense',
-    'vendors' => 'Vendors',
-    'new_vendor' => 'New Vendor',
+    'vendors' => 'Fournisseurs',
+    'new_vendor' => 'Nouveau fournisseur',
     'payment_terms_net' => 'Net',
     'vendor' => 'Vendor',
-    'edit_vendor' => 'Edit Vendor',
+    'edit_vendor' => 'Editer le fournisseur',
     'archive_vendor' => 'Archive Vendor',
     'delete_vendor' => 'Delete Vendor',
     'view_vendor' => 'View Vendor',
@@ -1001,37 +1001,37 @@ return array(
     'archived_expenses' => 'Successfully archived expenses',
 
     // Expenses
-    'expense_amount' => 'Expense Amount',
+    'expense_amount' => 'Montant de la dépense',
     'expense_balance' => 'Expense Balance',
-    'expense_date' => 'Expense Date',
+    'expense_date' => 'Date de la dépense',
     'expense_should_be_invoiced' => 'Should this expense be invoiced?',
     'public_notes' => 'Public Notes',
-    'invoice_amount' => 'Invoice Amount',
-    'exchange_rate' => 'Exchange Rate',
-    'yes' => 'Yes',
-    'no' => 'No',
-    'should_be_invoiced' => 'Should be invoiced',
-    'view_expense' => 'View expense # :expense',
-    'edit_expense' => 'Edit Expense',
-    'archive_expense' => 'Archive Expense',
-    'delete_expense' => 'Delete Expense',
-    'view_expense_num' => 'Expense # :expense',
+    'invoice_amount' => 'Montant de la facture',
+    'exchange_rate' => 'Taux de change',
+    'yes' => 'Oui',
+    'no' => 'Non',
+    'should_be_invoiced' => 'Devrait être facturé',
+    'view_expense' => 'Voir la dépense # :expense',
+    'edit_expense' => 'Editer la dépensee',
+    'archive_expense' => 'Archiver le dépense',
+    'delete_expense' => 'supprimer la dépense',
+    'view_expense_num' => 'Dépense # :expense',
     'updated_expense' => 'Successfully updated expense',
     'created_expense' => 'Successfully created expense',
-    'enter_expense' => 'Enter Expense',
-    'view' => 'View',
-    'restore_expense' => 'Restore Expense',
+    'enter_expense' => 'Entrer la dépense',
+    'view' => 'Voir',
+    'restore_expense' => 'Restorer la dépense',
     'invoice_expense' => 'Invoice Expense',
     'expense_error_multiple_clients' => 'The expenses can\'t belong to different clients',
     'expense_error_invoiced' => 'Expense has already been invoiced',
     'convert_currency' => 'Convert currency',
 
     // Payment terms
-    'num_days' => 'Number of days',
-    'create_payment_term' => 'Create Payment Term',
-    'edit_payment_terms' => 'Edit Payment Term',
-    'edit_payment_term' => 'Edit Payment Term',
-    'archive_payment_term' => 'Archive Payment Term',
+    'num_days' => 'Nombre de jours',
+    'create_payment_term' => 'Créer une condition de paiement',
+    'edit_payment_terms' => 'Editer condition de paiement',
+    'edit_payment_term' => 'Editer la condition de paiement',
+    'archive_payment_term' => 'Archiver la condition de paiement',
 
     // recurring due dates
     'recurring_due_dates' => 'Recurring Invoice Due Dates',
@@ -1048,56 +1048,56 @@ return array(
           <li>Today is the Friday, due date is the 1st Friday after. The due date will be next Friday, not today.
     </li>
         </ul>',
-    'due' => 'Due',
-    'next_due_on' => 'Due Next: :date',
-    'use_client_terms' => 'Use client terms',
-    'day_of_month' => ':ordinal day of month',
-    'last_day_of_month' => 'Last day of month',
+    'due' => 'Dû',
+    'next_due_on' => 'Prochaine échéance: :date',
+    'use_client_terms' => 'Utiliser les conditions de paiement du client',
+    'day_of_month' => ':ordinal jour du mois',
+    'last_day_of_month' => 'Dernier jour du mois',
     'day_of_week_after' => ':ordinal :day after',
-    'sunday' => 'Sunday',
-    'monday' => 'Monday',
-    'tuesday' => 'Tuesday',
-    'wednesday' => 'Wednesday',
-    'thursday' => 'Thursday',
-    'friday' => 'Friday',
-    'saturday' => 'Saturday',
+    'sunday' => 'Dimanche',
+    'monday' => 'Lundi',
+    'tuesday' => 'Mardi',
+    'wednesday' => 'Mercredi',
+    'thursday' => 'Jeudi',
+    'friday' => 'Vendredi',
+    'saturday' => 'Samedi',
 
     // Fonts
     'header_font_id' => 'Header Font',
     'body_font_id' => 'Body Font',
     'color_font_help' => 'Note: the primary color and fonts are also used in the client portal and custom email designs.',
 
-    'live_preview' => 'Live Preview',
-    'invalid_mail_config' => 'Unable to send email, please check that the mail settings are correct.',
+    'live_preview' => 'Aperçu',
+    'invalid_mail_config' => 'Impossible d\'envoyer le mail, veuillez vérifier que les paramètres de messagerie sont corrects.',
 
-    'invoice_message_button' => 'To view your invoice for :amount, click the button below.',
-    'quote_message_button' => 'To view your quote for :amount, click the button below.',
-    'payment_message_button' => 'Thank you for your payment of :amount.',
-    'payment_type_direct_debit' => 'Direct Debit',
-    'bank_accounts' => 'Bank Accounts',
-    'add_bank_account' => 'Add Bank Account',
-    'setup_account' => 'Setup Account',
-    'import_expenses' => 'Import Expenses',
-    'bank_id' => 'bank',
+    'invoice_message_button' => 'Pour visionner votre facture de :amount, cliquer sur le lien ci-dessous',
+    'quote_message_button' => 'Pour visionner votre devis de :amount,  cliquer sur le lien ci-dessous',
+    'payment_message_button' => 'Merci pour votre paiement de :amount.',
+    'payment_type_direct_debit' => 'Prélèvement',
+    'bank_accounts' => 'Comptes bancaires',
+    'add_bank_account' => 'Ajouter un compte bancaire',
+    'setup_account' => 'Paraméter le compte',
+    'import_expenses' => 'Importer les dépenses',
+    'bank_id' => 'banque',
     'integration_type' => 'Integration Type',
-    'updated_bank_account' => 'Successfully updated bank account',
-    'edit_bank_account' => 'Edit Bank Account',
-    'archive_bank_account' => 'Archive Bank Account',
-    'archived_bank_account' => 'Successfully archived bank account',
-    'created_bank_account' => 'Successfully created bank account',
-    'validate_bank_account' => 'Validate Bank Account',
+    'updated_bank_account' => 'Compte bancaire mis à jour',
+    'edit_bank_account' => 'Editer le compte bancaire',
+    'archive_bank_account' => 'Archiver le compte bancaire',
+    'archived_bank_account' => 'Compte bancaire archivé',
+    'created_bank_account' => 'Compte bancaire créé',
+    'validate_bank_account' => 'Valider le compte bancaire',
     'bank_accounts_help' => 'Connect a bank account to automatically import expenses and create vendors. Supports American Express and <a href="'.OFX_HOME_URL.'" target="_blank">400+ US banks.</a>',
     'bank_password_help' => 'Note: your password is transmitted securely and never stored on our servers.',
-    'bank_password_warning' => 'Warning: your password may be transmitted in plain text, consider enabling HTTPS.',
-    'username' => 'Username',
-    'account_number' => 'Account Number',
-    'account_name' => 'Account Name',
+    'bank_password_warning' => 'Attention: votre mot de passe peut être transmis en clair, pensez à activer HTTPS.',
+    'username' => 'Nom d\'utilisateur',
+    'account_number' => 'N° de compte',
+    'account_name' => 'Nom du compte',
     'bank_account_error' => 'Failed to retreive account details, please check your credentials.',
-    'status_approved' => 'Approved',
-    'quote_settings' => 'Quote Settings',
-    'auto_convert_quote' => 'Auto convert quote',
-    'auto_convert_quote_help' => 'Automatically convert a quote to an invoice when approved by a client.',
-    'validate' => 'Validate',
+    'status_approved' => 'Approuvé',
+    'quote_settings' => 'Paramètres des devis',
+    'auto_convert_quote' => 'Convertir automatiquement les devis',
+    'auto_convert_quote_help' => 'Convertissez automatiquement un devis en facture dès qu\'il est approuvé par le client.',
+    'validate' => 'Valider',
     'info' => 'Info',
     'imported_expenses' => 'Successfully created :count_vendors vendor(s) and :count_expenses expense(s)',
 
@@ -1105,91 +1105,91 @@ return array(
     'expense_error_multiple_currencies' => 'The expenses can\'t have different currencies.',
     'expense_error_mismatch_currencies' => 'The client\'s currency does not match the expense currency.',
     'trello_roadmap' => 'Trello Roadmap',
-    'header_footer' => 'Header/Footer',
-    'first_page' => 'first page',
-    'all_pages' => 'all pages',
-    'last_page' => 'last page',
+    'header_footer' => 'En-tête/Pied de page',
+    'first_page' => 'première page',
+    'all_pages' => 'toutes les pages',
+    'last_page' => 'dernière page',
     'all_pages_header' => 'Show header on',
     'all_pages_footer' => 'Show footer on',
-    'invoice_currency' => 'Invoice Currency',
-    'enable_https' => 'We strongly recommend using HTTPS to accept credit card details online.',
-    'quote_issued_to' => 'Quote issued to',
-    'show_currency_code' => 'Currency Code',
+    'invoice_currency' => 'Devise de la facture',
+    'enable_https' => 'Nous vous recommandons fortement d\'activer le HTTPS si vous acceptez les paiements en ligne.',
+    'quote_issued_to' => 'Devis à l\'attention de',
+    'show_currency_code' => 'Code de la devise',
     'trial_message' => 'Your account will receive a free two week trial of our pro plan.',
     'trial_footer' => 'Your free trial lasts :count more days, :link to upgrade now.',
-    'trial_footer_last_day' => 'This is the last day of your free trial, :link to upgrade now.',
-    'trial_call_to_action' => 'Start Free Trial',
+    'trial_footer_last_day' => 'Ceci est le dernier jour de votre essai gratuit, :link pour mettre à niveau maintenant.',
+    'trial_call_to_action' => 'Commencer l\'essai gratuit',
     'trial_success' => 'Successfully enabled two week free pro plan trial',
-    'overdue' => 'Overdue',
+    'overdue' => 'Impayé',
     'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.',
 
     'navigation' => 'Navigation',
-    'list_invoices' => 'List Invoices',
-    'list_clients' => 'List Clients',
-    'list_quotes' => 'List Quotes',
-    'list_tasks' => 'List Tasks',
-    'list_expenses' => 'List Expenses',
-    'list_recurring_invoices' => 'List Recurring Invoices',
-    'list_payments' => 'List Payments',
+    'list_invoices' => 'Liste des factures',
+    'list_clients' => 'Liste des clients',
+    'list_quotes' => 'Liste des devis',
+    'list_tasks' => 'Liste des tâches',
+    'list_expenses' => 'Liste des dépenses',
+    'list_recurring_invoices' => 'Liste des factures récurrentes',
+    'list_payments' => 'Liste des paiements',
     'list_credits' => 'List Credits',
-    'tax_name' => 'Tax Name',
+    'tax_name' => 'Nom de la taxe',
     'report_settings' => 'Report Settings',
     'search_hotkey' => 'shortcut is /',
 
-    'new_user' => 'New User',
-    'new_product' => 'New Product',
-    'new_tax_rate' => 'New Tax Rate',
-    'invoiced_amount' => 'Invoiced Amount',
+    'new_user' => 'Nouvel utilisateur',
+    'new_product' => 'Nouvel article',
+    'new_tax_rate' => 'Nouveau taux de taxe',
+    'invoiced_amount' => 'Montant de la facture',
     'invoice_item_fields' => 'Invoice Item Fields',
     'custom_invoice_item_fields_help' => 'Add a field when creating an invoice item and display the label and value on the PDF.',
     'recurring_invoice_number' => 'Recurring Invoice Number',
     'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.',
-    'enable_client_portal' => 'Dashboard',
-    'enable_client_portal_help' => 'Show/hide the dashboard page in the client portal.',
+    'enable_client_portal' => 'Tableau de bord',
+    'enable_client_portal_help' => 'Afficher / masquer le tableau de bord sur le portail client.',
 
     // Client Passwords
-    'enable_portal_password'=>'Password protect invoices',
+    'enable_portal_password'=>'Protéger les factures avec un mot de passe',
     'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.',
-    'send_portal_password'=>'Generate password automatically',
+    'send_portal_password'=>'Générer un mot de passe automatiquement',
     'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.',
     
-    'expired' => 'Expired',
-    'invalid_card_number' => 'The credit card number is not valid.',
-    'invalid_expiry' => 'The expiration date is not valid.',
-    'invalid_cvv' => 'The CVV is not valid.',
-    'cost' => 'Cost',
+    'expired' => 'Expiré',
+    'invalid_card_number' => 'Le numéro de carte bancaire est invalide.',
+    'invalid_expiry' => 'La date d\'expiration est invalide.',
+    'invalid_cvv' => 'Le code de sécurité est incorrect.',
+    'cost' => 'Coût',
     'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.',
     
     // User Permissions
-    'owner' => 'Owner',
-    'administrator' => 'Administrator',
-    'administrator_help' => 'Allow user to manage users, change settings and modify all records',
-    'user_create_all' => 'Create clients, invoices, etc.',
-    'user_view_all' => 'View all clients, invoices, etc.',
-    'user_edit_all' => 'Edit all clients, invoices, etc.',
-    'gateway_help_20' => ':link to sign up for Sage Pay.',
-    'gateway_help_21' => ':link to sign up for Sage Pay.',
+    'owner' => 'Propriétaire',
+    'administrator' => 'Administrateur',
+    'administrator_help' => 'Permettre à l\'utilisateur de gérer les utilisateurs, modifier les paramètres et de modifier tous les enregistrements',
+    'user_create_all' => 'Créer des clients, des factures, etc.',
+    'user_view_all' => 'Voir tous les clients, les factures, etc.',
+    'user_edit_all' => 'Modifier tous les clients, les factures, etc.',
+    'gateway_help_20' => ':link pour vous inscrire à Sage Pay.',
+    'gateway_help_21' => ':link pour vous inscrire à Sage Pay.',
     'partial_due' => 'Partial Due',
-    'restore_vendor' => 'Restore Vendor',
-    'restored_vendor' => 'Successfully restored vendor',
-    'restored_expense' => 'Successfully restored expense',
+    'restore_vendor' => 'Restorer le fournisseur',
+    'restored_vendor' => 'Fournisseur restoré',
+    'restored_expense' => 'Dépense restorée',
     'permissions' => 'Permissions',
-    'create_all_help' => 'Allow user to create and modify records',
+    'create_all_help' => 'Autoriser l\'utilisateur à créer et éditer tous les enregistrements',
     'view_all_help' => 'Allow user to view records they didn\'t create',
     'edit_all_help' => 'Allow user to modify records they didn\'t create',
-    'view_payment' => 'View Payment', 
+    'view_payment' => 'Voir le paiement', 
    
-    'january' => 'January',
-    'february' => 'February',
-    'march' => 'March',
-    'april' => 'April',
-    'may' => 'May',
-    'june' => 'June',
-    'july' => 'July',
-    'august' => 'August',
-    'september' => 'September',
-    'october' => 'October',
-    'november' => 'November',
-    'december' => 'December',
+    'january' => 'Janvier',
+    'february' => 'Février',
+    'march' => 'Mars',
+    'april' => 'Avril',
+    'may' => 'Mai',
+    'june' => 'Juin',
+    'july' => 'Juillet',
+    'august' => 'Août',
+    'september' => 'Septembre',
+    'october' => 'Octobre',
+    'november' => 'Novembre',
+    'december' => 'Décembre',
 
 );

From 89cf0509d5f87c8cd7195d72f4f085409c96d14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <christian.gonzalez@nerdocs.at>
Date: Fri, 29 Apr 2016 06:04:04 +0200
Subject: [PATCH 020/111] Typo correction

---
 resources/lang/de/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index e8be6d98b63c..11051273e2f5 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -76,7 +76,7 @@ return array(
     "notmasked" => "Die Werte sind maskiert",
     "less_than" => ':attribute muss weniger als :value sein',
     "has_counter" => 'Der Wert muss {$counter} beinhalten',
-    "valid_contacts" => "Alle Kontake müssen entweder einen Namen oder eine E-Mail Adresse haben",
+    "valid_contacts" => "Alle Kontakte müssen entweder einen Namen oder eine E-Mail Adresse haben",
     "valid_invoice_items" => "Die Rechnung übersteigt den maximalen Betrag",
 
     /*

From 4bc95c4b98cc8230a48059d7d4bb96e0e760a597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= <christian.gonzalez@nerdocs.at>
Date: Fri, 29 Apr 2016 06:45:30 +0200
Subject: [PATCH 021/111] German translations

---
 resources/lang/de/texts.php | 70 ++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 08ffaf7b8a0b..16396181c8d0 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -936,30 +936,30 @@ return array(
         'invalid_contact_email' => 'Invalid contact email',
     ],
 
-    'client_portal' => 'Client Portal',
+    'client_portal' => 'Klientenportal',
     'admin' => 'Admin',
-    'disabled' => 'Disabled',
-    'show_archived_users' => 'Show archived users',
-    'notes' => 'Notes',
-    'invoice_will_create' => 'client will be created',
-    'invoices_will_create' => 'invoices will be created',
-    'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.',
+    'disabled' => 'Deaktiviert',
+    'show_archived_users' => 'Archivierte Benutzer anzeigen',
+    'notes' => 'Notizen',
+    'invoice_will_create' => 'Klient wird erstellt',
+    'invoices_will_create' => 'Rechnungen werden erstellt',
+    'failed_to_import' => 'Folgende Einträge konnten nicht importiert werden, weil sie entweder schon existierten, oder ein Pflichtfeld nicht beinhalten.',
 
-    'publishable_key' => 'Publishable Key',
-    'secret_key' => 'Secret Key',
-    'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process',
+    'publishable_key' => 'Öffentlicher Schlüssel',
+    'secret_key' => 'Geheimer Schlüssel',
+    'missing_publishable_key' => 'Benutze deinen öffentlichen Stripe-Schlüssel für einen verbesserten Kassiervorgang',
 
-    'email_design' => 'Email Design',
-    'due_by' => 'Due by :date',
-    'enable_email_markup' => 'Enable Markup',
-    'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
-    'template_help_title' => 'Templates Help',
-    'template_help_1' => 'Available variables:',
-    'email_design_id' => 'Email Style',
-    'email_design_help' => 'Make your emails look more professional with HTML layouts',
-    'plain' => 'Plain',
-    'light' => 'Light',
-    'dark' => 'Dark',
+    'email_design' => 'Email-Design',
+    'due_by' => 'Fällig bis :date',
+    'enable_email_markup' => 'Textauszeichnung aktivieren',
+    'enable_email_markup_help' => 'Mache es Klienten einfacher zu bezahlen, indem du schema.org Textauszeichnung zu deinen Emails hinzufügst.',
+    'template_help_title' => 'Vorlagen-Hilfe',
+    'template_help_1' => 'Verfügbare Variablen:',
+    'email_design_id' => 'Email-Stil',
+    'email_design_help' => 'Lass deine Mails proffessioneller aussehen mit HTML-Layouts',
+    'plain' => 'Einfach',
+    'light' => 'Hell',
+    'dark' => 'Dunkel',
 
     'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.',
     'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.',
@@ -971,21 +971,21 @@ return array(
     'custom_invoice_charges_helps' => 'Add a text input to the invoice create/edit page and include the charge in the invoice subtotals.',
     'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.',
 
-    'token_expired' => 'Validation token was expired. Please try again.',
-    'invoice_link' => 'Invoice Link',
-    'button_confirmation_message' => 'Click to confirm your email address.',
-    'confirm' => 'Confirm',
-    'email_preferences' => 'Email Preferences',
-    'created_invoices' => 'Successfully created :count invoice(s)',
-    'next_invoice_number' => 'The next invoice number is :number.',
-    'next_quote_number' => 'The next quote number is :number.',
+    'token_expired' => 'Bestätigungss-Token ist abgelaufen. Bitte nochmals probieren.',
+    'invoice_link' => 'Rechnungs-Link',
+    'button_confirmation_message' => 'Klicken, um Ihre Email-Adresse zu bestätigen.',
+    'confirm' => 'Bestätigen',
+    'email_preferences' => 'Email-Einstellungen',
+    'created_invoices' => ':count Rechnung(en) erfolgreich erstellt',
+    'next_invoice_number' => 'Die nächste Rechnungsnummer ist :number.',
+    'next_quote_number' => 'Die nächste Angebotsnummer ist :number.',
 
-    'days_before' => 'days before',
-    'days_after' => 'days after',
-    'field_due_date' => 'due date',
-    'field_invoice_date' => 'invoice date',
-    'schedule' => 'Schedule',
-    'email_designs' => 'Email Designs',
+    'days_before' => 'Tage vor',
+    'days_after' => 'Tage nach',
+    'field_due_date' => 'Fälligkeit',
+    'field_invoice_date' => 'Rechnungsdatum',
+    'schedule' => 'Zeitplan',
+    'email_designs' => 'Email-Designs',
     'assigned_when_sent' => 'Assigned when sent',
 
     'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',

From 5fde7a520790d5d34a8084564f5a96064840a658 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 30 Apr 2016 21:02:17 +0300
Subject: [PATCH 022/111] Revert "German translations"

---
 resources/lang/de/texts.php | 70 ++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php
index 16396181c8d0..08ffaf7b8a0b 100644
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@@ -936,30 +936,30 @@ return array(
         'invalid_contact_email' => 'Invalid contact email',
     ],
 
-    'client_portal' => 'Klientenportal',
+    'client_portal' => 'Client Portal',
     'admin' => 'Admin',
-    'disabled' => 'Deaktiviert',
-    'show_archived_users' => 'Archivierte Benutzer anzeigen',
-    'notes' => 'Notizen',
-    'invoice_will_create' => 'Klient wird erstellt',
-    'invoices_will_create' => 'Rechnungen werden erstellt',
-    'failed_to_import' => 'Folgende Einträge konnten nicht importiert werden, weil sie entweder schon existierten, oder ein Pflichtfeld nicht beinhalten.',
+    'disabled' => 'Disabled',
+    'show_archived_users' => 'Show archived users',
+    'notes' => 'Notes',
+    'invoice_will_create' => 'client will be created',
+    'invoices_will_create' => 'invoices will be created',
+    'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.',
 
-    'publishable_key' => 'Öffentlicher Schlüssel',
-    'secret_key' => 'Geheimer Schlüssel',
-    'missing_publishable_key' => 'Benutze deinen öffentlichen Stripe-Schlüssel für einen verbesserten Kassiervorgang',
+    'publishable_key' => 'Publishable Key',
+    'secret_key' => 'Secret Key',
+    'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process',
 
-    'email_design' => 'Email-Design',
-    'due_by' => 'Fällig bis :date',
-    'enable_email_markup' => 'Textauszeichnung aktivieren',
-    'enable_email_markup_help' => 'Mache es Klienten einfacher zu bezahlen, indem du schema.org Textauszeichnung zu deinen Emails hinzufügst.',
-    'template_help_title' => 'Vorlagen-Hilfe',
-    'template_help_1' => 'Verfügbare Variablen:',
-    'email_design_id' => 'Email-Stil',
-    'email_design_help' => 'Lass deine Mails proffessioneller aussehen mit HTML-Layouts',
-    'plain' => 'Einfach',
-    'light' => 'Hell',
-    'dark' => 'Dunkel',
+    'email_design' => 'Email Design',
+    'due_by' => 'Due by :date',
+    'enable_email_markup' => 'Enable Markup',
+    'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.',
+    'template_help_title' => 'Templates Help',
+    'template_help_1' => 'Available variables:',
+    'email_design_id' => 'Email Style',
+    'email_design_help' => 'Make your emails look more professional with HTML layouts',
+    'plain' => 'Plain',
+    'light' => 'Light',
+    'dark' => 'Dark',
 
     'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.',
     'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.',
@@ -971,21 +971,21 @@ return array(
     'custom_invoice_charges_helps' => 'Add a text input to the invoice create/edit page and include the charge in the invoice subtotals.',
     'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.',
 
-    'token_expired' => 'Bestätigungss-Token ist abgelaufen. Bitte nochmals probieren.',
-    'invoice_link' => 'Rechnungs-Link',
-    'button_confirmation_message' => 'Klicken, um Ihre Email-Adresse zu bestätigen.',
-    'confirm' => 'Bestätigen',
-    'email_preferences' => 'Email-Einstellungen',
-    'created_invoices' => ':count Rechnung(en) erfolgreich erstellt',
-    'next_invoice_number' => 'Die nächste Rechnungsnummer ist :number.',
-    'next_quote_number' => 'Die nächste Angebotsnummer ist :number.',
+    'token_expired' => 'Validation token was expired. Please try again.',
+    'invoice_link' => 'Invoice Link',
+    'button_confirmation_message' => 'Click to confirm your email address.',
+    'confirm' => 'Confirm',
+    'email_preferences' => 'Email Preferences',
+    'created_invoices' => 'Successfully created :count invoice(s)',
+    'next_invoice_number' => 'The next invoice number is :number.',
+    'next_quote_number' => 'The next quote number is :number.',
 
-    'days_before' => 'Tage vor',
-    'days_after' => 'Tage nach',
-    'field_due_date' => 'Fälligkeit',
-    'field_invoice_date' => 'Rechnungsdatum',
-    'schedule' => 'Zeitplan',
-    'email_designs' => 'Email-Designs',
+    'days_before' => 'days before',
+    'days_after' => 'days after',
+    'field_due_date' => 'due date',
+    'field_invoice_date' => 'invoice date',
+    'schedule' => 'Schedule',
+    'email_designs' => 'Email Designs',
     'assigned_when_sent' => 'Assigned when sent',
 
     'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.',

From 6a86764dee9c3f323d549314d03bddf4ac9e42e3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 12 May 2016 12:45:36 +0300
Subject: [PATCH 023/111] Fix for #859

---
 app/Http/Controllers/ReportController.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index a63b16d9fcc4..4f162f260d37 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -248,11 +248,13 @@ class ReportController extends BaseController
                         ->withArchived()
                         ->with('contacts')
                         ->with(['invoices' => function($query) use ($startDate, $endDate, $dateField) {
-                            $query->withArchived();
-                            if ($dateField == FILTER_PAYMENT_DATE) {
+                            $query->with('invoice_items')->withArchived();
+                            if ($dateField == FILTER_INVOICE_DATE) {
                                 $query->where('invoice_date', '>=', $startDate)
                                       ->where('invoice_date', '<=', $endDate)
-                                      ->whereHas('payments', function($query) use ($startDate, $endDate) {
+                                      ->with('payments');
+                            } else {
+                                $query->whereHas('payments', function($query) use ($startDate, $endDate) {
                                             $query->where('payment_date', '>=', $startDate)
                                                   ->where('payment_date', '<=', $endDate)
                                                   ->withArchived();
@@ -260,9 +262,8 @@ class ReportController extends BaseController
                                         ->with(['payments' => function($query) use ($startDate, $endDate) {
                                             $query->where('payment_date', '>=', $startDate)
                                                   ->where('payment_date', '<=', $endDate)
-                                                  ->withArchived()
-                                                  ->with('payment_type', 'account_gateway.gateway');
-                                  }, 'invoice_items']);
+                                                  ->withArchived();
+                                        }]);
                             }
                         }]);
 

From d72b54bb6104de3d945897fb5dda16785e36ef2b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 12 May 2016 12:46:04 +0300
Subject: [PATCH 024/111] Fix problem with migration

---
 database/migrations/2016_03_22_168362_add_documents.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2016_03_22_168362_add_documents.php b/database/migrations/2016_03_22_168362_add_documents.php
index 3d0a44f20c25..233f420c198b 100644
--- a/database/migrations/2016_03_22_168362_add_documents.php
+++ b/database/migrations/2016_03_22_168362_add_documents.php
@@ -19,7 +19,7 @@ class AddDocuments extends Migration {
 			$table->boolean('document_email_attachment')->default(1);
 		});
 		
-		DB::table('accounts')->update(array('logo' => ''));
+		\DB::table('accounts')->update(array('logo' => ''));
 		Schema::dropIfExists('documents');
 		Schema::create('documents', function($t)
         {

From 2933ec97caa825a58bdb62697d30157e690c78d7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 12 May 2016 20:29:33 +0300
Subject: [PATCH 025/111] Fix for saving client portal setting in self host

---
 app/Http/Controllers/AccountController.php | 105 +++++++++++----------
 1 file changed, 53 insertions(+), 52 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index b3bd13fad409..e67c0908f003 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -117,21 +117,21 @@ class AccountController extends BaseController
         if (Auth::user()->isPro() && ! Auth::user()->isTrial()) {
             return false;
         }
-        
+
         $invitation = $this->accountRepo->enablePlan();
 
         return $invitation->invitation_key;
     }
-    
+
     public function changePlan() {
         $user = Auth::user();
         $account = $user->account;
-        
+
         $plan = Input::get('plan');
         $term = Input::get('plan_term');
-        
+
         $planDetails = $account->getPlanDetails(false, false);
-        
+
         $credit = 0;
         if ($planDetails) {
             if ($planDetails['plan'] == PLAN_PRO && $plan == PLAN_ENTERPRISE) {
@@ -141,7 +141,7 @@ class AccountController extends BaseController
                     $pending_monthly = true;
                     $term = PLAN_TERM_YEARLY;
                 }
-                
+
                 $new_plan = array(
                     'plan' => PLAN_ENTERPRISE,
                     'term' => $term,
@@ -169,7 +169,7 @@ class AccountController extends BaseController
                 // Downgrade
                 $refund_deadline = clone $planDetails['started'];
                 $refund_deadline->modify('+30 days');
-                
+
                 if ($plan == PLAN_FREE && $refund_deadline >= date_create()) {
                     // Refund
                     $account->company->plan = null;
@@ -179,10 +179,10 @@ class AccountController extends BaseController
                     $account->company->plan_paid = null;
                     $account->company->pending_plan = null;
                     $account->company->pending_term = null;
-                    
+
                     if ($account->company->payment) {
                         $payment = $account->company->payment;
-                        
+
                         $gateway = $this->paymentService->createGateway($payment->account_gateway);
                         $refund = $gateway->refund(array(
                             'transactionReference' => $payment->transaction_reference,
@@ -195,9 +195,9 @@ class AccountController extends BaseController
                     } else {
                         Session::flash('message', trans('texts.updated_plan'));
                     }
-                    
+
                     $account->company->save();
-                    
+
                 } else {
                     $pending_change = array(
                         'plan' => $plan,
@@ -205,18 +205,18 @@ class AccountController extends BaseController
                     );
                 }
             }
-            
+
             if (!empty($new_plan)) {
                 $time_used = $planDetails['paid']->diff(date_create());
                 $days_used = $time_used->days;
-                
+
                 if ($time_used->invert) {
                     // They paid in advance
                     $days_used *= -1;
                 }
-                
+
                 $days_total = $planDetails['paid']->diff($planDetails['expires'])->days;
-                
+
                 $percent_used = $days_used / $days_total;
                 $old_plan_price = Account::$plan_prices[$planDetails['plan']][$planDetails['term']];
                 $credit = $old_plan_price * (1 - $percent_used);
@@ -227,20 +227,20 @@ class AccountController extends BaseController
                 'term' => $term,
             );
         }
-        
+
         if (!empty($pending_change) && empty($new_plan)) {
             $account->company->pending_plan = $pending_change['plan'];
             $account->company->pending_term = $pending_change['term'];
             $account->company->save();
-            
+
             Session::flash('message', trans('texts.updated_plan'));
         }
-        
+
         if (!empty($new_plan)) {
             $invitation = $this->accountRepo->enablePlan($new_plan['plan'], $new_plan['term'], $credit, !empty($pending_monthly));
             return Redirect::to('view/'.$invitation->invitation_key);
         }
-        
+
         return Redirect::to('/settings/'.ACCOUNT_MANAGEMENT, 301);
     }
 
@@ -499,7 +499,7 @@ class AccountController extends BaseController
         $client->postal_code = trans('texts.postal_code');
         $client->work_phone = trans('texts.work_phone');
         $client->work_email = trans('texts.work_id');
-        
+
         $invoice->invoice_number = '0000';
         $invoice->invoice_date = Utils::fromSqlDate(date('Y-m-d'));
         $invoice->account = json_decode($account->toJson());
@@ -517,7 +517,7 @@ class AccountController extends BaseController
         $invoiceItem->product_key = 'Item';
 
         $document->base64 = 'data:image/jpeg;base64,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';
-        
+
         $invoice->client = $client;
         $invoice->invoice_items = [$invoiceItem];
         //$invoice->documents = $account->hasFeature(FEATURE_DOCUMENTS) ? [$document] : [];
@@ -530,7 +530,7 @@ class AccountController extends BaseController
         $data['invoiceDesigns'] = InvoiceDesign::getDesigns();
         $data['invoiceFonts'] = Cache::get('fonts');
         $data['section'] = $section;
-        
+
         $pageSizes = [
             'A0',
             'A1',
@@ -708,6 +708,13 @@ class AccountController extends BaseController
 
     private function saveClientPortal()
     {
+        $account = Auth::user()->account;
+
+        $account->enable_client_portal = !!Input::get('enable_client_portal');
+        $account->enable_client_portal_dashboard = !!Input::get('enable_client_portal_dashboard');
+        $account->enable_portal_password = !!Input::get('enable_portal_password');
+        $account->send_portal_password = !!Input::get('send_portal_password');
+
         // Only allowed for pro Invoice Ninja users or white labeled self-hosted users
         if (Auth::user()->account->hasFeature(FEATURE_CLIENT_PORTAL_CSS)) {
             $input_css = Input::get('client_view_css');
@@ -742,22 +749,16 @@ class AccountController extends BaseController
                 $sanitized_css = $input_css;
             }
 
-            $account = Auth::user()->account;
             $account->client_view_css = $sanitized_css;
-
-            $account->enable_client_portal = !!Input::get('enable_client_portal');
-            $account->enable_client_portal_dashboard = !!Input::get('enable_client_portal_dashboard');
-            $account->enable_portal_password = !!Input::get('enable_portal_password');
-            $account->send_portal_password = !!Input::get('send_portal_password');
-
-            $account->save();
-
-            Session::flash('message', trans('texts.updated_settings'));
         }
 
+        $account->save();
+
+        Session::flash('message', trans('texts.updated_settings'));
+
         return Redirect::to('settings/'.ACCOUNT_CLIENT_PORTAL);
     }
-
+    
     private function saveEmailTemplates()
     {
         if (Auth::user()->account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
@@ -1010,15 +1011,15 @@ class AccountController extends BaseController
         /* Logo image file */
         if ($uploaded = Input::file('logo')) {
             $path = Input::file('logo')->getRealPath();
-            
+
             $disk = $account->getLogoDisk();
             if ($account->hasLogo()) {
                 $disk->delete($account->logo);
             }
-            
+
             $extension = strtolower($uploaded->getClientOriginalExtension());
             if(empty(Document::$types[$extension]) && !empty(Document::$extraExtensions[$extension])){
-                $documentType = Document::$extraExtensions[$extension];            
+                $documentType = Document::$extraExtensions[$extension];
             }
             else{
                 $documentType = $extension;
@@ -1037,19 +1038,19 @@ class AccountController extends BaseController
                 } else {
                     if ($documentType != 'gif') {
                         $account->logo = $account->account_key.'.'.$documentType;
-                        
+
                         $imageSize = getimagesize($filePath);
                         $account->logo_width = $imageSize[0];
                         $account->logo_height = $imageSize[1];
                         $account->logo_size = $size;
-                        
+
                         // make sure image isn't interlaced
                         if (extension_loaded('fileinfo')) {
                             $image = Image::make($path);
                             $image->interlace(false);
                             $imageStr = (string) $image->encode($documentType);
                             $disk->put($account->logo, $imageStr);
-                            
+
                             $account->logo_size = strlen($imageStr);
                         } else {
                             $stream = fopen($filePath, 'r');
@@ -1062,12 +1063,12 @@ class AccountController extends BaseController
                             $image->resize(200, 120, function ($constraint) {
                                 $constraint->aspectRatio();
                             });
-                            
+
                             $account->logo = $account->account_key.'.png';
                             $image = Image::canvas($image->width(), $image->height(), '#FFFFFF')->insert($image);
                             $imageStr = (string) $image->encode('png');
                             $disk->put($account->logo, $imageStr);
-                                
+
                             $account->logo_size = strlen($imageStr);
                             $account->logo_width = $image->width();
                             $account->logo_height = $image->height();
@@ -1077,7 +1078,7 @@ class AccountController extends BaseController
                     }
                 }
             }
-            
+
             $account->save();
         }
 
@@ -1147,7 +1148,7 @@ class AccountController extends BaseController
         $account = Auth::user()->account;
         if ($account->hasLogo()) {
             $account->getLogoDisk()->delete($account->logo);
-            
+
             $account->logo = null;
             $account->logo_size = null;
             $account->logo_width = null;
@@ -1252,7 +1253,7 @@ class AccountController extends BaseController
 
         $this->accountRepo->unlinkAccount($account);
         if ($account->company->accounts->count() == 1) {
-            $account->company->forceDelete();    
+            $account->company->forceDelete();
         }
         $account->forceDelete();
 
@@ -1300,7 +1301,7 @@ class AccountController extends BaseController
 
         return Redirect::to("/settings/$section/", 301);
     }
-    
+
     public function previewEmail(\App\Services\TemplateService $templateService)
     {
         $template = Input::get('template');
@@ -1308,29 +1309,29 @@ class AccountController extends BaseController
                     ->invoices()
                     ->withTrashed()
                     ->first();
-        
+
         if ( ! $invoice) {
             return trans('texts.create_invoice_for_sample');
         }
-        
+
         $account = Auth::user()->account;
-        
+
         // replace the variables with sample data
         $data = [
             'account' => $account,
             'invoice' => $invoice,
             'invitation' => $invoice->invitations->first(),
             'client' => $invoice->client,
-            'amount' => $invoice->amount 
+            'amount' => $invoice->amount
         ];
-        
-        // create the email view 
+
+        // create the email view
         $view = 'emails.' . $account->getTemplateView(ENTITY_INVOICE) . '_html';
         $data = array_merge($data, [
             'body' => $templateService->processVariables($template, $data),
             'entityType' => ENTITY_INVOICE,
         ]);
-        
+
         return Response::view($view, $data);
     }
 }

From 6b203fcd5e2d3e7bc423b79586e0df8a29b02274 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 15 May 2016 14:07:04 +0300
Subject: [PATCH 026/111] Fix for creating vendors when importing OFX
 transactions

---
 app/Services/BankAccountService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/BankAccountService.php b/app/Services/BankAccountService.php
index 72aada6e3ff9..4a3551c782fa 100644
--- a/app/Services/BankAccountService.php
+++ b/app/Services/BankAccountService.php
@@ -178,7 +178,7 @@ class BankAccountService extends BaseService
                     $field => $info,
                     'name' => $vendorName,
                     'transaction_name' => $transaction['vendor_orig'],
-                    'vendorcontact' => [],
+                    'vendor_contact' => [],
                 ]);
                 $vendorMap[$key] = $vendor;
                 $vendorMap[$transaction['vendor_orig']] = $vendor;

From dea596566f0d0149cea677300074f288ef7763e2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 16 May 2016 21:07:08 +0300
Subject: [PATCH 027/111] Fix for #867

---
 resources/views/payments/payment.blade.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/resources/views/payments/payment.blade.php b/resources/views/payments/payment.blade.php
index 949723e7f17a..556695b69460 100644
--- a/resources/views/payments/payment.blade.php
+++ b/resources/views/payments/payment.blade.php
@@ -13,7 +13,6 @@
 
                 var data = {
                     name: $('#first_name').val() + ' ' + $('#last_name').val(),
-                    email: $('#email').val(),
                     address_line1: $('#address1').val(),
                     address_line2: $('#address2').val(),
                     address_city: $('#city').val(),
@@ -24,7 +23,7 @@
                     exp_month: $('#expiration_month').val(),
                     exp_year: $('#expiration_year').val()
                 };
-                
+
                 // allow space until there's a setting to disable
                 if ($('#cvv').val() != ' ') {
                     data.cvc = $('#cvv').val();
@@ -39,16 +38,16 @@
                     $('#js-error-message').html('{{ trans('texts.invalid_expiry') }}').fadeIn();
                     return false;
                 }
-                
+
                 if (data.hasOwnProperty('cvc') && !Stripe.card.validateCVC(data.cvc)) {
                     $('#js-error-message').html('{{ trans('texts.invalid_cvv') }}').fadeIn();
                     return false;
                 }
-                
+
                 // Disable the submit button to prevent repeated clicks
                 $form.find('button').prop('disabled', true);
                 $('#js-error-message').hide();
-                
+
                 Stripe.card.createToken(data, stripeResponseHandler);
 
                 // Prevent the form from submitting with the default action
@@ -324,9 +323,9 @@
             {!! Button::success(strtoupper(trans('texts.pay_now') . ' - ' . $account->formatMoney($amount, $client, true)  ))
                             ->submit()
                             ->large() !!}
-        </center>        
+        </center>
         <p>&nbsp;</p>
-        
+
         <div id="js-error-message" style="display:none" class="alert alert-danger"></div>
     </div>
 
@@ -354,4 +353,4 @@
 
 </script>
 
-@stop
\ No newline at end of file
+@stop

From 88ffc4f08ce97034baadaaaaf0c991fe5a9bfb68 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 11:49:18 +0300
Subject: [PATCH 028/111] Added support for GAE filesystem

---
 composer.json          |   7 +-
 composer.lock          | 247 +++++++++++++++++++++++++++++++----------
 config/app.php         |   4 +-
 config/filesystems.php |  11 +-
 4 files changed, 204 insertions(+), 65 deletions(-)

diff --git a/composer.json b/composer.json
index 9bb49326b1f8..56b8c0d1aaca 100644
--- a/composer.json
+++ b/composer.json
@@ -72,14 +72,15 @@
         "asgrim/ofxparser": "^1.1",
         "league/flysystem-aws-s3-v3": "~1.0",
         "league/flysystem-rackspace": "~1.0",
-        "barracudanetworks/archivestream-php": "^1.0"
+        "barracudanetworks/archivestream-php": "^1.0",
+        "websight/l5-google-cloud-storage": "^1.0",
+        "fzaninotto/faker": "^1.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "phpspec/phpspec": "~2.1",
         "codeception/codeception": "*",
         "codeception/c3": "~2.0",
-        "fzaninotto/faker": "^1.5",
         "symfony/dom-crawler": "~3.0"
     },
     "autoload": {
@@ -122,4 +123,4 @@
     "config": {
         "preferred-install": "dist"
     }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 4dd6f3db14ed..e9649ae9fcb3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "cf82d2ddb25cb1a7d6b4867bcc8692b8",
-    "content-hash": "481a95753b873249aebceb99e7426421",
+    "hash": "959e373ec2049b8d396f90b313da08b5",
+    "content-hash": "0a191e645db4d3edd709ec706c26503d",
     "packages": [
         {
             "name": "agmscode/omnipay-agms",
@@ -127,7 +127,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/formers/former/zipball/78ae8c65b1f8134e2db1c9491c251c03638823ca",
+                "url": "https://api.github.com/repos/formers/former/zipball/37f6876a5d211427b5c445cd64f0eb637f42f685",
                 "reference": "d97f907741323b390f43954a90a227921ecc6b96",
                 "shasum": ""
             },
@@ -505,7 +505,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e97ed532f09e290b91ff7713b785ed7ab11d0812",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4",
                 "reference": "e97ed532f09e290b91ff7713b785ed7ab11d0812",
                 "shasum": ""
             },
@@ -1964,6 +1964,97 @@
             ],
             "time": "2015-01-16 08:41:13"
         },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3|^7.0"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2016-04-29 12:21:54"
+        },
+        {
+            "name": "google/apiclient",
+            "version": "1.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/google/google-api-php-client.git",
+                "reference": "400f250a30ae1dd4c4a0a4f750fe973fc70e6311"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/google/google-api-php-client/zipball/400f250a30ae1dd4c4a0a4f750fe973fc70e6311",
+                "reference": "400f250a30ae1dd4c4a0a4f750fe973fc70e6311",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "squizlabs/php_codesniffer": "~2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "Client library for Google APIs",
+            "homepage": "http://developers.google.com/api-client-library/php",
+            "keywords": [
+                "google"
+            ],
+            "time": "2016-02-02 18:50:42"
+        },
         {
             "name": "guzzle/guzzle",
             "version": "v3.8.1",
@@ -2338,7 +2429,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/e368d262887dbb2fdfaf710880571ede51e9c0e6",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/22088b04728a039bd1fc32f7e79a89a118b78698",
                 "reference": "e368d262887dbb2fdfaf710880571ede51e9c0e6",
                 "shasum": ""
             },
@@ -2727,7 +2818,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
+                "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/c8d80c3b48bae2bab071f283f75b1cd8624ed3c7",
                 "reference": "40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
                 "shasum": ""
             },
@@ -6489,6 +6580,53 @@
             ],
             "time": "2015-08-12 08:09:37"
         },
+        {
+            "name": "superbalist/flysystem-google-storage",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Superbalist/flysystem-google-storage.git",
+                "reference": "441a8529680986a2d2063a268ee2918f51db1b79"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Superbalist/flysystem-google-storage/zipball/441a8529680986a2d2063a268ee2918f51db1b79",
+                "reference": "441a8529680986a2d2063a268ee2918f51db1b79",
+                "shasum": ""
+            },
+            "require": {
+                "google/apiclient": "~1.1|^2.0.0@RC",
+                "league/flysystem": "~1.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "0.9.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Superbalist\\Flysystem\\GoogleStorage\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Superbalist.com a division of Takealot Online (Pty) Ltd",
+                    "email": "info@superbalist.com"
+                }
+            ],
+            "description": "Flysystem adapter for Google Cloud Storage",
+            "time": "2016-04-12 14:56:22"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v5.4.1",
@@ -7936,6 +8074,49 @@
             ],
             "time": "2016-02-25 10:29:59"
         },
+        {
+            "name": "websight/l5-google-cloud-storage",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/websightgmbh/l5-google-cloud-storage.git",
+                "reference": "c1cac9985dfce60010234c9dca127f3543d2d594"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/websightgmbh/l5-google-cloud-storage/zipball/c1cac9985dfce60010234c9dca127f3543d2d594",
+                "reference": "c1cac9985dfce60010234c9dca127f3543d2d594",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "~5.0.17|5.1.*|5.2.*",
+                "superbalist/flysystem-google-storage": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Websight\\GcsProvider\\": "src/Websight/GcsProvider/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cedric Ziel",
+                    "email": "ziel@websight.de"
+                }
+            ],
+            "description": "Laravel 5 Flysystem Google Cloud Storage  Service Provider",
+            "homepage": "https://github.com/websightgmbh/l5-google-cloud-storage",
+            "keywords": [
+                "Flysystem",
+                "laravel",
+                "laravel5"
+            ],
+            "time": "2016-03-04 11:57:00"
+        },
         {
             "name": "wildbit/laravel-postmark-provider",
             "version": "3.0.0",
@@ -8740,58 +8921,6 @@
             ],
             "time": "2015-12-31 15:58:49"
         },
-        {
-            "name": "fzaninotto/faker",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
-                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
-            },
-            "suggest": {
-                "ext-intl": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "François Zaninotto"
-                }
-            ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "time": "2015-05-29 06:29:14"
-        },
         {
             "name": "phpspec/php-diff",
             "version": "v1.0.2",
@@ -9900,4 +10029,4 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": []
-}
\ No newline at end of file
+}
diff --git a/config/app.php b/config/app.php
index 4a75f65f9e5f..d9b9aa916b30 100644
--- a/config/app.php
+++ b/config/app.php
@@ -139,7 +139,7 @@ return [
         'Illuminate\Validation\ValidationServiceProvider',
         'Illuminate\View\ViewServiceProvider',
         'Illuminate\Broadcasting\BroadcastServiceProvider',
-        
+
         /*
          * Additional Providers
          */
@@ -153,6 +153,7 @@ return [
         'Laravel\Socialite\SocialiteServiceProvider',
         'Jlapp\Swaggervel\SwaggervelServiceProvider',
         'Maatwebsite\Excel\ExcelServiceProvider',
+        Websight\GcsProvider\CloudStorageServiceProvider::class,
 
         /*
          * Application Service Providers...
@@ -211,6 +212,7 @@ return [
         'Schema'          => 'Illuminate\Support\Facades\Schema',
         'Seeder'          => 'Illuminate\Database\Seeder',
         'Session'         => 'Illuminate\Support\Facades\Session',
+        'Storage'         => 'Illuminate\Support\Facades\Storage',
         'Str'             => 'Illuminate\Support\Str',
         'URL'             => 'Illuminate\Support\Facades\URL',
         'Validator'       => 'Illuminate\Support\Facades\Validator',
diff --git a/config/filesystems.php b/config/filesystems.php
index da16e0e16766..68e35a498670 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -47,12 +47,12 @@ return [
 			'driver' => 'local',
 			'root'   => storage_path().'/app',
 		],
-		
+
 		'logos' => [
 			'driver' => 'local',
 			'root'   => env('LOGO_PATH', public_path().'/logo'),
 		],
-		
+
 		'documents' => [
 			'driver' => 'local',
 			'root'   => storage_path().'/documents',
@@ -76,6 +76,13 @@ return [
 			'url_type'  => env('RACKSPACE_URL_TYPE', 'publicURL')
 		],
 
+        'gcs' => [
+           'driver'                               => 'gcs',
+           'service_account'                      => env('GCS_USERNAME', ''),
+           'service_account_certificate'          => storage_path() . '/credentials.p12',
+           'service_account_certificate_password' => env('GCS_PASSWORD', ''),
+           'bucket'                               => env('GCS_BUCKET', 'cloud-storage-bucket'),
+        ],
 	],
 
 ];

From 3ed5fdf09f262fc8643c4b9bcbf8ee50901a36df Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 14:36:12 +0300
Subject: [PATCH 029/111] Disabled iOS push notifications by default

---
 app/Http/routes.php                     | 27 ++++++++++++-------------
 app/Ninja/Notifications/PushFactory.php |  7 +++----
 app/Services/PushService.php            |  6 +++++-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 15f0b247a144..1785c18772ca 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -52,7 +52,7 @@ Route::group(['middleware' => 'auth:client'], function() {
     Route::get('client/documents/js/{documents}/{filename}', 'PublicClientController@getDocumentVFSJS');
     Route::get('client/documents/{invitation_key}/{documents}/{filename?}', 'PublicClientController@getDocument');
     Route::get('client/documents/{invitation_key}/{filename?}', 'PublicClientController@getInvoiceDocumentsZip');
-    
+
     Route::get('api/client.quotes', array('as'=>'api.client.quotes', 'uses'=>'PublicClientController@quoteDatatable'));
     Route::get('api/client.invoices', array('as'=>'api.client.invoices', 'uses'=>'PublicClientController@invoiceDatatable'));
     Route::get('api/client.documents', array('as'=>'api.client.documents', 'uses'=>'PublicClientController@documentDatatable'));
@@ -112,7 +112,7 @@ Route::group(['middleware' => 'auth:user'], function() {
     Route::get('hide_message', 'HomeController@hideMessage');
     Route::get('force_inline_pdf', 'UserController@forcePDFJS');
     Route::get('account/getSearchData', array('as' => 'getSearchData', 'uses' => 'AccountController@getSearchData'));
-    
+
     Route::get('settings/user_details', 'AccountController@showUserDetails');
     Route::post('settings/user_details', 'AccountController@saveUserDetails');
     Route::post('users/change_password', 'UserController@changePassword');
@@ -145,7 +145,7 @@ Route::group(['middleware' => 'auth:user'], function() {
     Route::get('documents/js/{documents}/{filename}', 'DocumentController@getVFSJS');
     Route::get('documents/preview/{documents}/{filename?}', 'DocumentController@getPreview');
     Route::post('document', 'DocumentController@postUpload');
-    
+
     Route::get('quotes/create/{client_id?}', 'QuoteController@create');
     Route::get('quotes/{invoices}/clone', 'InvoiceController@cloneInvoice');
     Route::get('quotes/{invoices}/edit', 'InvoiceController@edit');
@@ -600,9 +600,8 @@ if (!defined('CONTACT_EMAIL')) {
     define('DEFAULT_API_PAGE_SIZE', 15);
     define('MAX_API_PAGE_SIZE', 100);
 
-    define('IOS_PRODUCTION_PUSH', env('IOS_PRODUCTION_PUSH', 'ninjaIOS'));
-    define('IOS_DEV_PUSH', env('IOS_DEV_PUSH', 'devNinjaIOS'));
-
+    define('IOS_PUSH_CERTIFICATE', env('IOS_PUSH_CERTIFICATE', ''));
+    
     define('TOKEN_BILLING_DISABLED', 1);
     define('TOKEN_BILLING_OPT_IN', 2);
     define('TOKEN_BILLING_OPT_OUT', 3);
@@ -651,7 +650,7 @@ if (!defined('CONTACT_EMAIL')) {
 
     define('RESELLER_REVENUE_SHARE', 'A');
     define('RESELLER_LIMITED_USERS', 'B');
-    
+
     // These must be lowercase
     define('PLAN_FREE', 'free');
     define('PLAN_PRO', 'pro');
@@ -659,7 +658,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('PLAN_WHITE_LABEL', 'white_label');
     define('PLAN_TERM_MONTHLY', 'month');
     define('PLAN_TERM_YEARLY', 'year');
-    
+
     // Pro
     define('FEATURE_CUSTOMIZE_INVOICE_DESIGN', 'customize_invoice_design');
     define('FEATURE_REMOVE_CREATED_BY', 'remove_created_by');
@@ -674,23 +673,23 @@ if (!defined('CONTACT_EMAIL')) {
     define('FEATURE_API', 'api');
     define('FEATURE_CLIENT_PORTAL_PASSWORD', 'client_portal_password');
     define('FEATURE_CUSTOM_URL', 'custom_url');
-    
+
     define('FEATURE_MORE_CLIENTS', 'more_clients'); // No trial allowed
-    
+
     // Whitelabel
     define('FEATURE_CLIENT_PORTAL_CSS', 'client_portal_css');
     define('FEATURE_WHITE_LABEL', 'feature_white_label');
 
     // Enterprise
     define('FEATURE_DOCUMENTS', 'documents');
-    
+
     // No Trial allowed
     define('FEATURE_USERS', 'users');// Grandfathered for old Pro users
     define('FEATURE_USER_PERMISSIONS', 'user_permissions');
-    
+
     // Pro users who started paying on or before this date will be able to manage users
     define('PRO_USERS_GRANDFATHER_DEADLINE', '2016-05-15');
-    
+
     $creditCards = [
                 1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],
                 2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'],
@@ -746,4 +745,4 @@ if (Utils::isNinjaDev())
   //ini_set('memory_limit','1024M');
   //Auth::loginUsingId(1);
 }
-*/
\ No newline at end of file
+*/
diff --git a/app/Ninja/Notifications/PushFactory.php b/app/Ninja/Notifications/PushFactory.php
index 7f882ff1d0a0..723ff824debe 100644
--- a/app/Ninja/Notifications/PushFactory.php
+++ b/app/Ninja/Notifications/PushFactory.php
@@ -19,13 +19,12 @@ class PushFactory
      *
      * Static variables defined in routes.php
      *
-     * IOS_PRODUCTION_PUSH
-     * IOS_DEV_PUSH
+     * IOS_PUSH_CERTIFICATE
      */
 
     public function __construct()
     {
-        $this->certificate = IOS_DEV_PUSH;
+        $this->certificate = IOS_PUSH_CERTIFICATE;
     }
 
     /**
@@ -93,4 +92,4 @@ class PushFactory
         return $feedback->getFeedback();
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/PushService.php b/app/Services/PushService.php
index 17151f93af3f..a96042b92419 100644
--- a/app/Services/PushService.php
+++ b/app/Services/PushService.php
@@ -41,6 +41,10 @@ class PushService
 
     public function sendNotification($invoice, $type)
     {
+        if (! IOS_PUSH_CERTIFICATE) {
+            return;
+        }
+
         //check user has registered for push notifications
         if(!$this->checkDeviceExists($invoice->account))
             return;
@@ -168,4 +172,4 @@ class PushService
 
 
 
-}
\ No newline at end of file
+}

From 861672e9e935d4c3269f89483780d7ffbfbc3cff Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 15:05:07 +0300
Subject: [PATCH 030/111] Fix for deleting account

---
 app/Http/Controllers/AccountController.php    |  5 +-
 .../2016_04_16_103943_enterprise_plan.php     | 48 +++++++++----------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index e67c0908f003..d7ccfd1dc995 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -758,7 +758,7 @@ class AccountController extends BaseController
 
         return Redirect::to('settings/'.ACCOUNT_CLIENT_PORTAL);
     }
-    
+
     private function saveEmailTemplates()
     {
         if (Auth::user()->account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
@@ -1254,8 +1254,9 @@ class AccountController extends BaseController
         $this->accountRepo->unlinkAccount($account);
         if ($account->company->accounts->count() == 1) {
             $account->company->forceDelete();
+        } else {
+            $account->forceDelete();
         }
-        $account->forceDelete();
 
         Auth::logout();
         Session::flush();
diff --git a/database/migrations/2016_04_16_103943_enterprise_plan.php b/database/migrations/2016_04_16_103943_enterprise_plan.php
index 8a3a63717367..fa86ef19a15f 100644
--- a/database/migrations/2016_04_16_103943_enterprise_plan.php
+++ b/database/migrations/2016_04_16_103943_enterprise_plan.php
@@ -19,10 +19,10 @@ class EnterprisePlan extends Migration
         }
         $timeout = max($timeout - 10, $timeout * .9);
         $startTime = time();
-        
+
         if (!Schema::hasTable('companies')) {
             Schema::create('companies', function($table)
-            {           
+            {
                 $table->increments('id');
 
                 $table->enum('plan', array('pro', 'enterprise', 'white_label'))->nullable();
@@ -44,15 +44,15 @@ class EnterprisePlan extends Migration
                 $table->softDeletes();
             });
         }
-        
+
         if (!Schema::hasColumn('accounts', 'company_id')) {
             Schema::table('accounts', function($table)
             {
                 $table->unsignedInteger('company_id')->nullable();
-                $table->foreign('company_id')->references('id')->on('companies');
+                $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             });
-        }        
-    
+        }
+
         $single_account_ids = \DB::table('users')
             ->leftJoin('user_accounts', function ($join) {
                 $join->on('user_accounts.user_id1', '=', 'users.id');
@@ -69,14 +69,14 @@ class EnterprisePlan extends Migration
                 $query->orWhere('users.public_id', '=', 0);
             })
             ->lists('users.account_id');
-        
+
         if (count($single_account_ids)) {
             foreach (Account::find($single_account_ids) as $account) {
                 $this->upAccounts($account);
                 $this->checkTimeout($timeout, $startTime);
             }
         }
-        
+
         $group_accounts = \DB::select(
             'SELECT u1.account_id as account1, u2.account_id as account2, u3.account_id as account3, u4.account_id as account4, u5.account_id as account5 FROM `user_accounts`
             LEFT JOIN users u1 ON (u1.public_id IS NULL OR u1.public_id = 0) AND user_accounts.user_id1 = u1.id
@@ -94,14 +94,14 @@ class EnterprisePlan extends Migration
             OR (a3.id IS NOT NULL AND a3.company_id IS NULL)
             OR (a4.id IS NOT NULL AND a4.company_id IS NULL)
             OR (a5.id IS NOT NULL AND a5.company_id IS NULL)');
-        
+
         if (count($group_accounts)) {
             foreach ($group_accounts as $group_account) {
                 $this->upAccounts(null, Account::find(get_object_vars($group_account)));
                 $this->checkTimeout($timeout, $startTime);
             }
         }
-        
+
         if (Schema::hasColumn('accounts', 'pro_plan_paid')) {
             Schema::table('accounts', function($table)
             {
@@ -110,16 +110,16 @@ class EnterprisePlan extends Migration
             });
         }
 	}
-    
+
     private function upAccounts($primaryAccount, $otherAccounts = array()) {
         if(!$primaryAccount) {
             $primaryAccount = $otherAccounts->first();
         }
-        
+
         if (empty($primaryAccount)) {
             return;
         }
-        
+
         $company = Company::create();
         if ($primaryAccount->pro_plan_paid && $primaryAccount->pro_plan_paid != '0000-00-00') {
             $company->plan = 'pro';
@@ -145,7 +145,7 @@ class EnterprisePlan extends Migration
                 }
             } elseif ($company->plan_paid != NINJA_DATE) {
                 $company->plan_expires = $expires;
-            } 
+            }
         }
 
         if ($primaryAccount->pro_plan_trial && $primaryAccount->pro_plan_trial != '0000-00-00') {
@@ -157,7 +157,7 @@ class EnterprisePlan extends Migration
 
         $primaryAccount->company_id = $company->id;
         $primaryAccount->save();
-        
+
         if (!empty($otherAccounts)) {
            foreach ($otherAccounts as $account) {
                if ($account && $account->id != $primaryAccount->id) {
@@ -167,13 +167,13 @@ class EnterprisePlan extends Migration
            }
         }
     }
-    
+
     protected function checkTimeout($timeout, $startTime) {
         if (time() - $startTime >= $timeout) {
             exit('Migration reached time limit; please run again to continue');
         }
     }
-    
+
 	/**
 	 * Reverse the migrations.
 	 *
@@ -187,7 +187,7 @@ class EnterprisePlan extends Migration
         }
         $timeout = max($timeout - 10, $timeout * .9);
         $startTime = time();
-        
+
         if (!Schema::hasColumn('accounts', 'pro_plan_paid')) {
             Schema::table('accounts', function($table)
             {
@@ -195,7 +195,7 @@ class EnterprisePlan extends Migration
                 $table->date('pro_plan_trial')->nullable();
             });
         }
-        
+
         $company_ids = \DB::table('companies')
             ->leftJoin('accounts', 'accounts.company_id', '=', 'companies.id')
             ->whereNull('accounts.pro_plan_paid')
@@ -205,9 +205,9 @@ class EnterprisePlan extends Migration
                 $query->orWhereNotNull('companies.trial_started');
             })
             ->lists('companies.id');
-        
+
         $company_ids = array_unique($company_ids);
-        
+
         if (count($company_ids)) {
             foreach (Company::find($company_ids) as $company) {
                 foreach ($company->accounts as $account) {
@@ -218,7 +218,7 @@ class EnterprisePlan extends Migration
                 $this->checkTimeout($timeout, $startTime);
             }
         }
-        
+
         if (Schema::hasColumn('accounts', 'company_id')) {
             Schema::table('accounts', function($table)
             {
@@ -226,7 +226,7 @@ class EnterprisePlan extends Migration
                 $table->dropColumn('company_id');
             });
         }
-        
+
         Schema::dropIfExists('companies');
 	}
-}
\ No newline at end of file
+}

From 29616b292758255eb1fbaf134f12cbf22fbccb80 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 22:06:15 +0300
Subject: [PATCH 031/111] Added initial CONTRIBUTING.md

---
 readme.md => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename readme.md => README.md (100%)

diff --git a/readme.md b/README.md
similarity index 100%
rename from readme.md
rename to README.md

From 49b26152eab2d9cf298365b9f8d3b2a2afba4a76 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 22:09:20 +0300
Subject: [PATCH 032/111] Added initial CONTRIBUTING.md

---
 CONTRIBUTING.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000000..1e26492d5d83
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# Contributing to Invoice Ninja
+
+We welcome contributions! We'll improve this guide over time...
+
+*Please note: although our application is open-source we run a for-profit hosted service at [invoiceninja.com](https://www.invoiceninja.com).*
+
+Guidelines
+- Please try to follow [PSR-2 guidlines](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
+- Add translations in our [Transifex](https://www.transifex.com/invoice-ninja/) project

From 26e4fadbec446baf06188b136d3626e86836dd14 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 17 May 2016 23:45:00 +0300
Subject: [PATCH 033/111] Updated readme

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 54057e1a3782..bc8085eec9c0 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@
 [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+**To update the translations please use [Transifex](https://www.transifex.com/invoice-ninja/invoice-ninja/dashboard/)**
+
 ### Affiliates Programs
 * Referral program (we pay you): $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)
 * White-label reseller (you pay us): 10% of revenue with a $100 sign up fee

From 17ea888e9013bca556d6e8abb3b26cab95171cbc Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 18 May 2016 10:12:58 +0300
Subject: [PATCH 034/111] Bumped version number

---
 app/Http/routes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 1785c18772ca..29ad336a00d9 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -553,7 +553,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com'));
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '2.5.2' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '2.5.2.1' . env('NINJA_VERSION_SUFFIX'));
 
     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
     define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));
@@ -601,7 +601,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('MAX_API_PAGE_SIZE', 100);
 
     define('IOS_PUSH_CERTIFICATE', env('IOS_PUSH_CERTIFICATE', ''));
-    
+
     define('TOKEN_BILLING_DISABLED', 1);
     define('TOKEN_BILLING_OPT_IN', 2);
     define('TOKEN_BILLING_OPT_OUT', 3);

From 4aa11be28f9dc612f516cbe3ed3064f91a622fbf Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 22 May 2016 22:02:42 +0300
Subject: [PATCH 035/111] Added user permission to tranformer

---
 app/Ninja/Transformers/UserTransformer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Ninja/Transformers/UserTransformer.php b/app/Ninja/Transformers/UserTransformer.php
index 532c1f6fa4f2..1619deb1f2c2 100644
--- a/app/Ninja/Transformers/UserTransformer.php
+++ b/app/Ninja/Transformers/UserTransformer.php
@@ -26,6 +26,8 @@ class UserTransformer extends EntityTransformer
             'notify_viewed' => (bool) $user->notify_viewed,
             'notify_paid' => (bool) $user->notify_paid,
             'notify_approved' => (bool) $user->notify_approved,
+            'is_admin' => (bool) $user->is_admin,
+            'permissions' => (int) $user->getOriginal('permissions'),
         ];
     }
-}
\ No newline at end of file
+}

From 05903d413aebbdb16ee54779e7c6ba91e6b81b1f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 22 May 2016 22:17:57 +0300
Subject: [PATCH 036/111] Open document when clicked

---
 resources/views/expenses/edit.blade.php | 24 ++++++++++-------
 resources/views/invoices/edit.blade.php | 36 ++++++++++++++-----------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 49e3b9e379d3..920162e67dd2 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -14,7 +14,7 @@
 @stop
 
 @section('content')
-	
+
 	{!! Former::open($url)->addClass('warn-on-exit main-form')->method($method) !!}
     <div style="display:none">
         {!! Former::text('action') !!}
@@ -216,13 +216,13 @@
             @else
                 $('#amount').focus();
             @endif
-            
+
             @if (Auth::user()->account->isPro())
             $('.main-form').submit(function(){
                 if($('#document-upload .fallback input').val())$(this).attr('enctype', 'multipart/form-data')
                 else $(this).removeAttr('enctype')
             })
-            
+
             // Initialize document upload
             dropzone = new Dropzone('#document-upload', {
                 url:{!! json_encode(url('document')) !!},
@@ -286,7 +286,7 @@
                     }
                 }
             }
-            
+
             if (data) {
                 ko.mapping.fromJS(data, self.mapping, this);
             }
@@ -327,11 +327,11 @@
                 }
                 var expenseCurrencyId = self.expense_currency_id() || self.account_currency_id();
                 var invoiceCurrencyId = self.invoice_currency_id() || self.account_currency_id();
-                return expenseCurrencyId != invoiceCurrencyId 
+                return expenseCurrencyId != invoiceCurrencyId
                     || invoiceCurrencyId != self.account_currency_id()
                     || expenseCurrencyId != self.account_currency_id();
             })
-            
+
             self.addDocument = function() {
                 var documentModel = new DocumentModel();
                 self.documents.push(documentModel);
@@ -359,11 +359,17 @@
 
             if (data) {
                 self.update(data);
-            }    
+            }
         }
-        
+
         @if (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
         function handleDocumentAdded(file){
+            // open document when clicked
+            if (file.url) {
+                file.previewElement.addEventListener("click", function() {
+                    window.open(file.url, '_blank');
+                });
+            }
             if(file.mock)return;
             file.index = model.documents().length;
             model.addDocument({name:file.name, size:file.size, type:file.type});
@@ -384,4 +390,4 @@
         @endif
     </script>
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 09be1ed4134e..4f1d96f20ad6 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -17,7 +17,7 @@
         label.control-label[for=invoice_number] {
             font-weight: normal !important;
         }
-        
+
         select.tax-select {
             width: 50%;
             float: left;
@@ -79,7 +79,7 @@
                                 &nbsp;&nbsp;<div class="label label-danger">{{ trans('texts.deleted') }}</div>
                             @endif
                         </h4>
-                        
+
                         @can('view', $invoice->client)
                             @can('edit', $invoice->client)
                                 <a id="editClientLink" class="pointer" data-bind="click: $root.showClientForm">{{ trans('texts.edit_client') }}</a> |
@@ -90,7 +90,7 @@
 				</div>
 				<div style="display:none">
     		@endif
-            
+
             {!! Former::select('client')->addOption('', '')->data_bind("dropdown: client")->addClass('client-input')->addGroupClass('client_select closer-row') !!}
 
 			<div class="form-group" style="margin-bottom: 8px">
@@ -419,7 +419,7 @@
                             ->options($taxRateOptions)
                             ->addClass('tax-select')
                             ->data_bind('value: tax1')
-                            ->raw() !!}                    
+                            ->raw() !!}
                     <input type="text" name="tax_name1" data-bind="value: tax_name1" style="display:none">
                     <input type="text" name="tax_rate1" data-bind="value: tax_rate1" style="display:none">
                     {!! Former::select('')
@@ -427,7 +427,7 @@
                             ->options($taxRateOptions)
                             ->addClass('tax-select')
                             ->data_bind('value: tax2')
-                            ->raw() !!}                    
+                            ->raw() !!}
                     <input type="text" name="tax_name2" data-bind="value: tax_name2" style="display:none">
                     <input type="text" name="tax_rate2" data-bind="value: tax_rate2" style="display:none">
                 </td>
@@ -569,7 +569,7 @@
                     {!! Former::text('client[work_phone]')
                             ->label('work_phone')
                             ->data_bind("value: work_phone, valueUpdate: 'afterkeydown'") !!}
-				
+
                 </span>
 
                 @if (Auth::user()->hasFeature(FEATURE_INVOICE_SETTINGS))
@@ -756,7 +756,7 @@
     var $clientSelect = $('select#client');
     var invoiceDesigns = {!! $invoiceDesigns !!};
     var invoiceFonts = {!! $invoiceFonts !!};
-    
+
 	$(function() {
         // create client dictionary
         for (var i=0; i<clients.length; i++) {
@@ -844,7 +844,7 @@
             }
 
         @endif
-        
+
         // display blank instead of '0'
         if (!NINJA.parseFloat(model.invoice().discount())) model.invoice().discount('');
         if (!NINJA.parseFloat(model.invoice().partial())) model.invoice().partial('');
@@ -966,13 +966,13 @@
         @endif
 
         applyComboboxListeners();
-        
+
         @if (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
         $('.main-form').submit(function(){
             if($('#document-upload .dropzone .fallback input').val())$(this).attr('enctype', 'multipart/form-data')
             else $(this).removeAttr('enctype')
         })
-        
+
         // Initialize document upload
         dropzone = new Dropzone('#document-upload .dropzone', {
             url:{!! json_encode(url('document')) !!},
@@ -1224,7 +1224,7 @@
         }
 
         onPartialChange(true);
-        
+
         return true;
     }
 
@@ -1379,24 +1379,30 @@
         number = number.replace('{$custom2}', client.custom_value2 ? client.custom_value1 : '');
         model.invoice().invoice_number(number);
     }
-        
+
     @if ($account->hasFeature(FEATURE_DOCUMENTS))
     function handleDocumentAdded(file){
+        // open document when clicked
+        if (file.url) {
+            file.previewElement.addEventListener("click", function() {
+                window.open(file.url, '_blank');
+            });
+        }
         if(file.mock)return;
         file.index = model.invoice().documents().length;
         model.invoice().addDocument({name:file.name, size:file.size, type:file.type});
     }
-        
+
     function handleDocumentRemoved(file){
         model.invoice().removeDocument(file.public_id);
         refreshPDF(true);
     }
-        
+
     function handleDocumentUploaded(file, response){
         file.public_id = response.document.public_id
         model.invoice().documents()[file.index].update(response.document);
         refreshPDF(true);
-        
+
         if(response.document.preview_url){
             dropzone.emit('thumbnail', file, response.document.preview_url);
         }

From 15cf3671049c5c42064c656f89a8cfafd1133b87 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 24 May 2016 09:58:27 +0300
Subject: [PATCH 037/111] Updated Postmark driver to fix #891

---
 composer.lock | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index e9649ae9fcb3..894c25f76d27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -127,7 +127,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/formers/former/zipball/37f6876a5d211427b5c445cd64f0eb637f42f685",
+                "url": "https://api.github.com/repos/formers/former/zipball/d97f907741323b390f43954a90a227921ecc6b96",
                 "reference": "d97f907741323b390f43954a90a227921ecc6b96",
                 "shasum": ""
             },
@@ -505,7 +505,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/35ebf3a2ba9443e11fbdb9066cc363ec7b2245e4",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/e97ed532f09e290b91ff7713b785ed7ab11d0812",
                 "reference": "e97ed532f09e290b91ff7713b785ed7ab11d0812",
                 "shasum": ""
             },
@@ -657,7 +657,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/546e8768d7987b0d9a8501e67432309349ef5504",
+                "url": "https://api.github.com/repos/Chumper/Datatable/zipball/04ef2bf",
                 "reference": "04ef2bf",
                 "shasum": ""
             },
@@ -2429,7 +2429,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/22088b04728a039bd1fc32f7e79a89a118b78698",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/e368d262887dbb2fdfaf710880571ede51e9c0e6",
                 "reference": "e368d262887dbb2fdfaf710880571ede51e9c0e6",
                 "shasum": ""
             },
@@ -2818,7 +2818,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/c8d80c3b48bae2bab071f283f75b1cd8624ed3c7",
+                "url": "https://api.github.com/repos/labs7in0/omnipay-wechat/zipball/40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
                 "reference": "40c9f86df6573ad98ae1dd0d29712ccbc789a74e",
                 "shasum": ""
             },
@@ -3539,6 +3539,7 @@
                 "php",
                 "url"
             ],
+            "abandoned": "league/uri",
             "time": "2015-07-15 08:24:12"
         },
         {
@@ -4202,7 +4203,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/b27d2823d052f5c227eeb29324bb564cfdb8f9af",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-2checkout/zipball/e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
                 "reference": "e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",
                 "shasum": ""
             },
@@ -4320,7 +4321,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-bitpay/zipball/9cadfb7955bd361d1a00ac8f0570aee4c05c6bb4",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-bitpay/zipball/cf813f1d5436a1d2f942d3df6666695d1e2b5280",
                 "reference": "cf813f1d5436a1d2f942d3df6666695d1e2b5280",
                 "shasum": ""
             },
@@ -5011,7 +5012,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/efd491fdac7d1243e2dd1da5a964514e3aab2a5a",
+                "url": "https://api.github.com/repos/thephpleague/omnipay-mollie/zipball/22956c1a62a9662afa5f5d119723b413770ac525",
                 "reference": "22956c1a62a9662afa5f5d119723b413770ac525",
                 "shasum": ""
             },
@@ -8150,16 +8151,16 @@
         },
         {
             "name": "wildbit/swiftmailer-postmark",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wildbit/swiftmailer-postmark.git",
-                "reference": "3673ace0473ec72de31bc7e62d78e8b8f95d15f0"
+                "reference": "4032d3336ff97761edad3d0a88769820fb84e56f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wildbit/swiftmailer-postmark/zipball/3673ace0473ec72de31bc7e62d78e8b8f95d15f0",
-                "reference": "3673ace0473ec72de31bc7e62d78e8b8f95d15f0",
+                "url": "https://api.github.com/repos/wildbit/swiftmailer-postmark/zipball/4032d3336ff97761edad3d0a88769820fb84e56f",
+                "reference": "4032d3336ff97761edad3d0a88769820fb84e56f",
                 "shasum": ""
             },
             "require": {
@@ -8189,7 +8190,7 @@
                 }
             ],
             "description": "A Swiftmailer Transport for Postmark.",
-            "time": "2015-11-30 18:23:03"
+            "time": "2016-04-18 14:38:52"
         },
         {
             "name": "zendframework/zend-escaper",

From 0b643b4741d9f5a6c3740b9958524934c203c442 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 24 May 2016 10:17:03 +0300
Subject: [PATCH 038/111] Fixes for initial setup

---
 ...11_05_180133_confide_setup_users_table.php | 148 +++++++++---------
 ...2016_01_04_175228_create_vendors_table.php |   4 +-
 ...2016_01_24_112646_add_bank_subaccounts.php |   8 +-
 ..._01_27_173015_add_header_footer_option.php |  20 ++-
 ...135956_add_source_currency_to_expenses.php |   8 +-
 ...214710_add_support_three_decimal_taxes.php |   4 +-
 ...3_23_215049_support_multiple_tax_rates.php |  34 ++--
 7 files changed, 121 insertions(+), 105 deletions(-)

diff --git a/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index 6bd69f503980..e9c10da1ad1e 100644
--- a/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -9,37 +9,37 @@ class ConfideSetupUsersTable extends Migration {
      * @return void
      */
     public function up()
-    {   
-        Schema::dropIfExists('payment_terms');             
-        Schema::dropIfExists('themes');        
-        Schema::dropIfExists('credits');        
+    {
+        Schema::dropIfExists('payment_terms');
+        Schema::dropIfExists('themes');
+        Schema::dropIfExists('credits');
         Schema::dropIfExists('activities');
         Schema::dropIfExists('invitations');
         Schema::dropIfExists('payments');
         Schema::dropIfExists('account_gateways');
         Schema::dropIfExists('invoice_items');
         Schema::dropIfExists('products');
-        Schema::dropIfExists('tax_rates');        
+        Schema::dropIfExists('tax_rates');
         Schema::dropIfExists('contacts');
         Schema::dropIfExists('invoices');
         Schema::dropIfExists('password_reminders');
         Schema::dropIfExists('clients');
         Schema::dropIfExists('users');
         Schema::dropIfExists('accounts');
-        Schema::dropIfExists('currencies');        
+        Schema::dropIfExists('currencies');
         Schema::dropIfExists('invoice_statuses');
         Schema::dropIfExists('countries');
-        Schema::dropIfExists('timezones');        
-        Schema::dropIfExists('frequencies');        
-        Schema::dropIfExists('date_formats');        
-        Schema::dropIfExists('datetime_formats');                
+        Schema::dropIfExists('timezones');
+        Schema::dropIfExists('frequencies');
+        Schema::dropIfExists('date_formats');
+        Schema::dropIfExists('datetime_formats');
         Schema::dropIfExists('sizes');
         Schema::dropIfExists('industries');
         Schema::dropIfExists('gateways');
         Schema::dropIfExists('payment_types');
 
         Schema::create('countries', function($table)
-        {           
+        {
             $table->increments('id');
             $table->string('capital', 255)->nullable();
             $table->string('citizenship', 255)->nullable();
@@ -53,7 +53,7 @@ class ConfideSetupUsersTable extends Migration {
             $table->string('name', 255)->default('');
             $table->string('region_code', 3)->default('');
             $table->string('sub_region_code', 3)->default('');
-            $table->boolean('eea')->default(0);                        
+            $table->boolean('eea')->default(0);
         });
 
         Schema::create('themes', function($t)
@@ -85,21 +85,21 @@ class ConfideSetupUsersTable extends Migration {
         Schema::create('date_formats', function($t)
         {
             $t->increments('id');
-            $t->string('format');    
-            $t->string('picker_format');                    
-            $t->string('label');            
+            $t->string('format');
+            $t->string('picker_format');
+            $t->string('label');
         });
 
         Schema::create('datetime_formats', function($t)
         {
             $t->increments('id');
-            $t->string('format');            
-            $t->string('label');            
+            $t->string('format');
+            $t->string('label');
         });
 
         Schema::create('currencies', function($t)
         {
-            $t->increments('id');            
+            $t->increments('id');
 
             $t->string('name');
             $t->string('symbol');
@@ -107,20 +107,20 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('thousand_separator');
             $t->string('decimal_separator');
             $t->string('code');
-        });  
+        });
 
         Schema::create('sizes', function($t)
         {
             $t->increments('id');
             $t->string('name');
-        });        
+        });
 
         Schema::create('industries', function($t)
         {
             $t->increments('id');
             $t->string('name');
-        });        
-        
+        });
+
         Schema::create('accounts', function($t)
         {
             $t->increments('id');
@@ -136,13 +136,13 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('ip');
             $t->string('account_key')->unique();
             $t->timestamp('last_login')->nullable();
-            
+
             $t->string('address1')->nullable();
             $t->string('address2')->nullable();
             $t->string('city')->nullable();
             $t->string('state')->nullable();
             $t->string('postal_code')->nullable();
-            $t->unsignedInteger('country_id')->nullable();     
+            $t->unsignedInteger('country_id')->nullable();
             $t->text('invoice_terms')->nullable();
             $t->text('email_footer')->nullable();
             $t->unsignedInteger('industry_id')->nullable();
@@ -158,17 +158,17 @@ class ConfideSetupUsersTable extends Migration {
             $t->foreign('currency_id')->references('id')->on('currencies');
             $t->foreign('industry_id')->references('id')->on('industries');
             $t->foreign('size_id')->references('id')->on('sizes');
-        });     
-        
+        });
+
         Schema::create('gateways', function($t)
         {
             $t->increments('id');
-            $t->timestamps();            
+            $t->timestamps();
 
             $t->string('name');
             $t->string('provider');
             $t->boolean('visible')->default(true);
-        });  
+        });
 
         Schema::create('users', function($t)
         {
@@ -206,31 +206,31 @@ class ConfideSetupUsersTable extends Migration {
             $t->unsignedInteger('gateway_id');
             $t->timestamps();
             $t->softDeletes();
-            
+
             $t->text('config');
 
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('gateway_id')->references('id')->on('gateways');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-            
+
             $t->unsignedInteger('public_id')->index();
             $t->unique( array('account_id','public_id') );
-        }); 
+        });
 
 
         Schema::create('password_reminders', function($t)
         {
             $t->string('email');
             $t->timestamps();
-            
+
             $t->string('token');
-        });        
+        });
 
         Schema::create('clients', function($t)
         {
             $t->increments('id');
             $t->unsignedInteger('user_id');
-            $t->unsignedInteger('account_id')->index();            
+            $t->unsignedInteger('account_id')->index();
             $t->unsignedInteger('currency_id')->nullable();
             $t->timestamps();
             $t->softDeletes();
@@ -255,14 +255,14 @@ class ConfideSetupUsersTable extends Migration {
 
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-            $t->foreign('country_id')->references('id')->on('countries');       
-            $t->foreign('industry_id')->references('id')->on('industries');       
-            $t->foreign('size_id')->references('id')->on('sizes');      
+            $t->foreign('country_id')->references('id')->on('countries');
+            $t->foreign('industry_id')->references('id')->on('industries');
+            $t->foreign('size_id')->references('id')->on('sizes');
             $t->foreign('currency_id')->references('id')->on('currencies');
-            
+
             $t->unsignedInteger('public_id')->index();
             $t->unique( array('account_id','public_id') );
-        });     
+        });
 
         Schema::create('contacts', function($t)
         {
@@ -279,14 +279,14 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('last_name')->nullable();
             $t->string('email')->nullable();
             $t->string('phone')->nullable();
-            $t->timestamp('last_login')->nullable();            
+            $t->timestamp('last_login')->nullable();
 
-            $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); 
+            $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
 
             $t->unsignedInteger('public_id')->nullable();
             $t->unique( array('account_id','public_id') );
-        });     
+        });
 
         Schema::create('invoice_statuses', function($t)
         {
@@ -325,15 +325,15 @@ class ConfideSetupUsersTable extends Migration {
             $t->timestamp('last_sent_date')->nullable();
             $t->unsignedInteger('recurring_invoice_id')->index()->nullable();
 
-            $t->string('tax_name');
-            $t->decimal('tax_rate', 13, 2);
+            $t->string('tax_name1');
+            $t->decimal('tax_rate1', 13, 3);
 
             $t->decimal('amount', 13, 2);
             $t->decimal('balance', 13, 2);
-        
+
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
-            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); 
-            $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); 
+            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
+            $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $t->foreign('invoice_status_id')->references('id')->on('invoice_statuses');
             $t->foreign('recurring_invoice_id')->references('id')->on('invoices')->onDelete('cascade');
 
@@ -375,11 +375,11 @@ class ConfideSetupUsersTable extends Migration {
             $t->softDeletes();
 
             $t->string('name');
-            $t->decimal('rate', 13, 2);
-            
-            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); 
+            $t->decimal('rate', 13, 3);
+
+            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
-            
+
             $t->unsignedInteger('public_id');
             $t->unique( array('account_id','public_id') );
         });
@@ -396,10 +396,10 @@ class ConfideSetupUsersTable extends Migration {
             $t->text('notes');
             $t->decimal('cost', 13, 2);
             $t->decimal('qty', 13, 2)->nullable();
-            
-            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); 
+
+            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
-            
+
             $t->unsignedInteger('public_id');
             $t->unique( array('account_id','public_id') );
         });
@@ -420,8 +420,8 @@ class ConfideSetupUsersTable extends Migration {
             $t->decimal('cost', 13, 2);
             $t->decimal('qty', 13, 2)->nullable();
 
-            $t->string('tax_name')->nullable();
-            $t->decimal('tax_rate', 13, 2)->nullable();
+            $t->string('tax_name1')->nullable();
+            $t->decimal('tax_rate1', 13, 3)->nullable();
 
             $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $t->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
@@ -458,10 +458,10 @@ class ConfideSetupUsersTable extends Migration {
             $t->foreign('account_gateway_id')->references('id')->on('account_gateways')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
             $t->foreign('payment_type_id')->references('id')->on('payment_types');
-            
+
             $t->unsignedInteger('public_id')->index();
             $t->unique( array('account_id','public_id') );
-        });     
+        });
 
         Schema::create('credits', function($t)
         {
@@ -471,21 +471,21 @@ class ConfideSetupUsersTable extends Migration {
             $t->unsignedInteger('user_id');
             $t->timestamps();
             $t->softDeletes();
-            
+
             $t->boolean('is_deleted')->default(false);
             $t->decimal('amount', 13, 2);
             $t->decimal('balance', 13, 2);
             $t->date('credit_date')->nullable();
             $t->string('credit_number')->nullable();
             $t->text('private_notes');
-            
+
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
-            
+
             $t->unsignedInteger('public_id')->index();
             $t->unique( array('account_id','public_id') );
-        });     
+        });
 
         Schema::create('activities', function($t)
         {
@@ -500,13 +500,13 @@ class ConfideSetupUsersTable extends Migration {
             $t->unsignedInteger('invoice_id')->nullable();
             $t->unsignedInteger('credit_id')->nullable();
             $t->unsignedInteger('invitation_id')->nullable();
-            
+
             $t->text('message')->nullable();
             $t->text('json_backup')->nullable();
-            $t->integer('activity_type_id');            
+            $t->integer('activity_type_id');
             $t->decimal('adjustment', 13, 2)->nullable();
             $t->decimal('balance', 13, 2)->nullable();
-            
+
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
         });
@@ -519,9 +519,9 @@ class ConfideSetupUsersTable extends Migration {
      */
     public function down()
     {
-        Schema::dropIfExists('payment_terms');             
-        Schema::dropIfExists('themes');        
-        Schema::dropIfExists('credits');        
+        Schema::dropIfExists('payment_terms');
+        Schema::dropIfExists('themes');
+        Schema::dropIfExists('credits');
         Schema::dropIfExists('activities');
         Schema::dropIfExists('invitations');
         Schema::dropIfExists('payments');
@@ -535,16 +535,16 @@ class ConfideSetupUsersTable extends Migration {
         Schema::dropIfExists('clients');
         Schema::dropIfExists('users');
         Schema::dropIfExists('accounts');
-        Schema::dropIfExists('currencies');        
+        Schema::dropIfExists('currencies');
         Schema::dropIfExists('invoice_statuses');
         Schema::dropIfExists('countries');
-        Schema::dropIfExists('timezones');        
-        Schema::dropIfExists('frequencies');        
-        Schema::dropIfExists('date_formats');        
-        Schema::dropIfExists('datetime_formats');                      
+        Schema::dropIfExists('timezones');
+        Schema::dropIfExists('frequencies');
+        Schema::dropIfExists('date_formats');
+        Schema::dropIfExists('datetime_formats');
         Schema::dropIfExists('sizes');
         Schema::dropIfExists('industries');
-        Schema::dropIfExists('gateways');        
+        Schema::dropIfExists('gateways');
         Schema::dropIfExists('payment_types');
     }
 }
diff --git a/database/migrations/2016_01_04_175228_create_vendors_table.php b/database/migrations/2016_01_04_175228_create_vendors_table.php
index 1295748b0801..5e8551004c20 100644
--- a/database/migrations/2016_01_04_175228_create_vendors_table.php
+++ b/database/migrations/2016_01_04_175228_create_vendors_table.php
@@ -57,7 +57,7 @@ class CreateVendorsTable extends Migration
             $table->foreign('vendor_id')->references('id')->on('vendors')->onDelete('cascade');
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-            
+
             $table->unsignedInteger('public_id')->nullable();
             $table->unique(array('account_id', 'public_id'));
         });
@@ -79,7 +79,7 @@ class CreateVendorsTable extends Migration
             $table->date('expense_date')->nullable();
             $table->text('private_notes');
             $table->text('public_notes');
-            $table->unsignedInteger('currency_id')->nullable();
+            $table->unsignedInteger('invoice_currency_id')->nullable(false);
             $table->boolean('should_be_invoiced')->default(true);
 
             // Relations
diff --git a/database/migrations/2016_01_24_112646_add_bank_subaccounts.php b/database/migrations/2016_01_24_112646_add_bank_subaccounts.php
index 92b283a52662..5c01fdd5de8b 100644
--- a/database/migrations/2016_01_24_112646_add_bank_subaccounts.php
+++ b/database/migrations/2016_01_24_112646_add_bank_subaccounts.php
@@ -35,13 +35,13 @@ class AddBankSubaccounts extends Migration {
 
         Schema::table('expenses', function($table)
         {
-            $table->string('transaction_id');
-            $table->unsignedInteger('bank_id');
+            $table->string('transaction_id')->nullable();
+            $table->unsignedInteger('bank_id')->nullable();
         });
 
         Schema::table('vendors', function($table)
         {
-            $table->string('transaction_name');
+            $table->string('transaction_name')->nullable();
         });
 	}
 
@@ -53,7 +53,7 @@ class AddBankSubaccounts extends Migration {
 	public function down()
 	{
         Schema::drop('bank_subaccounts');
-        
+
         Schema::table('expenses', function($table)
         {
             $table->dropColumn('transaction_id');
diff --git a/database/migrations/2016_01_27_173015_add_header_footer_option.php b/database/migrations/2016_01_27_173015_add_header_footer_option.php
index 0cb690a17383..d840b31e8f13 100644
--- a/database/migrations/2016_01_27_173015_add_header_footer_option.php
+++ b/database/migrations/2016_01_27_173015_add_header_footer_option.php
@@ -25,20 +25,24 @@ class AddHeaderFooterOption extends Migration {
             $table->boolean('is_offsite');
             $table->boolean('is_secure');
         });
-        
+
         Schema::table('expenses', function($table)
         {
-            $table->string('transaction_id')->nullable()->change();
-            $table->unsignedInteger('bank_id')->nullable()->change();
-        });        
+						if (Schema::hasColumn('expenses', 'transaction_id')) {
+                $table->string('transaction_id')->nullable()->change();
+                $table->unsignedInteger('bank_id')->nullable()->change();
+					  }
+        });
 
         Schema::table('vendors', function($table)
         {
-            $table->string('transaction_name')->nullable()->change();
-        });        
-        
+						if (Schema::hasColumn('vendors', 'transaction_name')) {
+            		$table->string('transaction_name')->nullable()->change();
+						}
+        });
+
     }
-    
+
 	/**
 	 * Reverse the migrations.
 	 *
diff --git a/database/migrations/2016_02_01_135956_add_source_currency_to_expenses.php b/database/migrations/2016_02_01_135956_add_source_currency_to_expenses.php
index 4fcfa367d6be..a4b1fa62436b 100644
--- a/database/migrations/2016_02_01_135956_add_source_currency_to_expenses.php
+++ b/database/migrations/2016_02_01_135956_add_source_currency_to_expenses.php
@@ -16,10 +16,12 @@ class AddSourceCurrencyToExpenses extends Migration
 
             $table->dropColumn('foreign_amount');
 
-            $table->unsignedInteger('currency_id')->nullable(false)->change();
-            $table->renameColumn('currency_id', 'invoice_currency_id');
-            $table->unsignedInteger('expense_currency_id');
+            if (Schema::hasColumn('expenses', 'currency_id')) {
+                $table->unsignedInteger('currency_id')->nullable(false)->change();
+                $table->renameColumn('currency_id', 'invoice_currency_id');
+            }
 
+            $table->unsignedInteger('expense_currency_id');
         });
 
         Schema::table('expenses', function (Blueprint $table) {
diff --git a/database/migrations/2016_03_14_214710_add_support_three_decimal_taxes.php b/database/migrations/2016_03_14_214710_add_support_three_decimal_taxes.php
index af35fc927564..339a29b521b7 100644
--- a/database/migrations/2016_03_14_214710_add_support_three_decimal_taxes.php
+++ b/database/migrations/2016_03_14_214710_add_support_three_decimal_taxes.php
@@ -11,7 +11,9 @@ class AddSupportThreeDecimalTaxes extends Migration {
 	public function up()
 	{
 		Schema::table('tax_rates', function($table) {
-			$table->decimal('rate', 13, 3)->change();
+				if (Schema::hasColumn('tax_rates', 'rate')) {
+						$table->decimal('rate', 13, 3)->change();
+				}
 		});
 	}
 	/**
diff --git a/database/migrations/2016_03_23_215049_support_multiple_tax_rates.php b/database/migrations/2016_03_23_215049_support_multiple_tax_rates.php
index 4c2d8a29b931..cda2aef7b428 100644
--- a/database/migrations/2016_03_23_215049_support_multiple_tax_rates.php
+++ b/database/migrations/2016_03_23_215049_support_multiple_tax_rates.php
@@ -13,30 +13,38 @@ class SupportMultipleTaxRates extends Migration
 	public function up()
 	{
 		Schema::table('invoices', function($table) {
-			$table->decimal('tax_rate', 13, 3)->change();
-        });
+        if (Schema::hasColumn('invoices', 'tax_rate')) {
+		        $table->decimal('tax_rate', 13, 3)->change();
+        }
+    });
 
 		Schema::table('invoice_items', function($table) {
-			$table->decimal('tax_rate', 13, 3)->change();
-        });
-        
+        if (Schema::hasColumn('invoice_items', 'tax_rate')) {
+		        $table->decimal('tax_rate', 13, 3)->change();
+        }
+    });
+
 		Schema::table('invoices', function($table) {
+        if (Schema::hasColumn('invoices', 'tax_rate')) {
             $table->renameColumn('tax_rate', 'tax_rate1');
             $table->renameColumn('tax_name', 'tax_name1');
-            $table->string('tax_name2')->nullable();
-            $table->decimal('tax_rate2', 13, 3);
+        }
+        $table->string('tax_name2')->nullable();
+        $table->decimal('tax_rate2', 13, 3);
 		});
 
 		Schema::table('invoice_items', function($table) {
+        if (Schema::hasColumn('invoice_items', 'tax_rate')) {
             $table->renameColumn('tax_rate', 'tax_rate1');
             $table->renameColumn('tax_name', 'tax_name1');
-            $table->string('tax_name2')->nullable();
-            $table->decimal('tax_rate2', 13, 3);
+        }
+        $table->string('tax_name2')->nullable();
+        $table->decimal('tax_rate2', 13, 3);
 		});
 
-        Schema::table('accounts', function($table) {
-            $table->boolean('enable_client_portal_dashboard')->default(true);
-        });
+    Schema::table('accounts', function($table) {
+        $table->boolean('enable_client_portal_dashboard')->default(true);
+    });
 	}
 	/**
 	 * Reverse the migrations.
@@ -65,4 +73,4 @@ class SupportMultipleTaxRates extends Migration
             $table->dropColumn('enable_client_portal_dashboard');
         });
 	}
-}
\ No newline at end of file
+}

From e201651aa69dbbf21b6af3ca2613696fc064b625 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 24 May 2016 10:17:53 +0300
Subject: [PATCH 039/111] Bumped version

---
 app/Http/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index 29ad336a00d9..81a44b5ee930 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -553,7 +553,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('NINJA_WEB_URL', env('NINJA_WEB_URL', 'https://www.invoiceninja.com'));
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '2.5.2.1' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '2.5.2.2' . env('NINJA_VERSION_SUFFIX'));
 
     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
     define('SOCIAL_LINK_TWITTER', env('SOCIAL_LINK_TWITTER', 'https://twitter.com/invoiceninja'));

From f502e5952e5db816afe3b1aa5d14af466ec80978 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 12:00:37 +0300
Subject: [PATCH 040/111] Lazy load invoice documents

---
 resources/views/invoices/edit.blade.php | 92 ++++++++++++++-----------
 1 file changed, 52 insertions(+), 40 deletions(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 4f1d96f20ad6..723d2e5c3a6b 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -974,47 +974,59 @@
         })
 
         // Initialize document upload
-        dropzone = new Dropzone('#document-upload .dropzone', {
-            url:{!! json_encode(url('document')) !!},
-            params:{
-                _token:"{{ Session::getToken() }}"
-            },
-            acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
-            addRemoveLinks:true,
-            @foreach(trans('texts.dropzone') as $key=>$text)
-            "dict{{strval($key)}}":"{{strval($text)}}",
-            @endforeach
-            maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
-        });
-        if(dropzone instanceof Dropzone){
-            dropzone.on("addedfile",handleDocumentAdded);
-            dropzone.on("removedfile",handleDocumentRemoved);
-            dropzone.on("success",handleDocumentUploaded);
-            for (var i=0; i<model.invoice().documents().length; i++) {
-                var document = model.invoice().documents()[i];
-                var mockFile = {
-                    name:document.name(),
-                    size:document.size(),
-                    type:document.type(),
-                    public_id:document.public_id(),
-                    status:Dropzone.SUCCESS,
-                    accepted:true,
-                    url:document.preview_url()||document.url(),
-                    mock:true,
-                    index:i
-                };
-
-                dropzone.emit('addedfile', mockFile);
-                dropzone.emit('complete', mockFile);
-                if(document.preview_url()){
-                    dropzone.emit('thumbnail', mockFile, document.preview_url()||document.url());
-                }
-                else if(document.type()=='jpeg' || document.type()=='png' || document.type()=='svg'){
-                    dropzone.emit('thumbnail', mockFile, document.url());
-                }
-                dropzone.files.push(mockFile);
+        window.dropzone = false;
+        $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+            if (window.dropzone) {
+                return;
             }
-        }
+
+            var target = $(e.target).attr('href') // activated tab
+            if (target != '#attached-documents') {
+                return;
+            }
+
+            window.dropzone = new Dropzone('#document-upload .dropzone', {
+                url:{!! json_encode(url('document')) !!},
+                params:{
+                    _token:"{{ Session::getToken() }}"
+                },
+                acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
+                addRemoveLinks:true,
+                @foreach(['default_message', 'fallback_message', 'fallback_text', 'file_too_big', 'invalid_file_type', 'response_error', 'cancel_upload', 'cancel_upload_confirmation', 'remove_file'] as $key)
+                    "dict{{Utils::toClassCase($key)}}":"{{trans('texts.dropzone_'.$key)}}",
+                @endforeach
+                maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
+            });
+            if(dropzone instanceof Dropzone){
+                dropzone.on("addedfile",handleDocumentAdded);
+                dropzone.on("removedfile",handleDocumentRemoved);
+                dropzone.on("success",handleDocumentUploaded);
+                for (var i=0; i<model.invoice().documents().length; i++) {
+                    var document = model.invoice().documents()[i];
+                    var mockFile = {
+                        name:document.name(),
+                        size:document.size(),
+                        type:document.type(),
+                        public_id:document.public_id(),
+                        status:Dropzone.SUCCESS,
+                        accepted:true,
+                        url:document.preview_url()||document.url(),
+                        mock:true,
+                        index:i
+                    };
+
+                    dropzone.emit('addedfile', mockFile);
+                    dropzone.emit('complete', mockFile);
+                    if(document.preview_url()){
+                        dropzone.emit('thumbnail', mockFile, document.preview_url());
+                    }
+                    else if(document.type()=='jpeg' || document.type()=='png' || document.type()=='svg'){
+                        dropzone.emit('thumbnail', mockFile, document.url());
+                    }
+                    dropzone.files.push(mockFile);
+                }
+            }
+        });
         @endif
 	});
 

From 280b8e46a7ec6f265090c68dabd8d1308101de3e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 12:11:18 +0300
Subject: [PATCH 041/111] Prevent setting pdfstring when saving an invoice

---
 resources/views/invoices/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 723d2e5c3a6b..f3fcba28e598 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1186,7 +1186,7 @@
 				submitAction('');
 			}
 		} else {
-            preparePdfData('');
+            submitAction('');
 		}
 	}
 

From 62af653121a1aae9ee67c8a5dccad3541279449b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 14:43:34 +0300
Subject: [PATCH 042/111] Prevent clicking save while document is still
 uploading

---
 resources/views/invoices/edit.blade.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index f3fcba28e598..1fe288fa2304 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1222,6 +1222,10 @@
 	}
 
     function onFormSubmit(event) {
+        if (window.countUploadingDocuments > 0) {
+            return false;
+        }
+
         if (!isSaveValid()) {
             model.showClientForm();
             return false;
@@ -1392,6 +1396,7 @@
         model.invoice().invoice_number(number);
     }
 
+    window.countUploadingDocuments = 0;
     @if ($account->hasFeature(FEATURE_DOCUMENTS))
     function handleDocumentAdded(file){
         // open document when clicked
@@ -1403,6 +1408,7 @@
         if(file.mock)return;
         file.index = model.invoice().documents().length;
         model.invoice().addDocument({name:file.name, size:file.size, type:file.type});
+        window.countUploadingDocuments++;
     }
 
     function handleDocumentRemoved(file){
@@ -1413,6 +1419,7 @@
     function handleDocumentUploaded(file, response){
         file.public_id = response.document.public_id
         model.invoice().documents()[file.index].update(response.document);
+        window.countUploadingDocuments--;
         refreshPDF(true);
 
         if(response.document.preview_url){

From 2fa471ab81fc23fcf545ee41cd7a753ec4cc24fe Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 15:19:15 +0300
Subject: [PATCH 043/111] Change document to click to full size

---
 resources/views/expenses/edit.blade.php | 2 +-
 resources/views/invoices/edit.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 920162e67dd2..a4e2700b8c63 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -249,7 +249,7 @@
                         public_id:document.public_id(),
                         status:Dropzone.SUCCESS,
                         accepted:true,
-                        url:document.preview_url()||document.url(),
+                        url:document.url(),
                         mock:true,
                         index:i
                     };
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 1fe288fa2304..7c66d3eeecf1 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1010,7 +1010,7 @@
                         public_id:document.public_id(),
                         status:Dropzone.SUCCESS,
                         accepted:true,
-                        url:document.preview_url()||document.url(),
+                        url:document.url(),
                         mock:true,
                         index:i
                     };

From c8794a401e839eeff2fc15de320c69da1e76f8b7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 16:16:56 +0300
Subject: [PATCH 044/111] Fix for cancelled accounts

---
 .../2016_03_22_168362_add_documents.php          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/database/migrations/2016_03_22_168362_add_documents.php b/database/migrations/2016_03_22_168362_add_documents.php
index 233f420c198b..b5e9da2deb1a 100644
--- a/database/migrations/2016_03_22_168362_add_documents.php
+++ b/database/migrations/2016_03_22_168362_add_documents.php
@@ -18,7 +18,7 @@ class AddDocuments extends Migration {
 			$table->boolean('invoice_embed_documents')->default(1);
 			$table->boolean('document_email_attachment')->default(1);
 		});
-		
+
 		\DB::table('accounts')->update(array('logo' => ''));
 		Schema::dropIfExists('documents');
 		Schema::create('documents', function($t)
@@ -41,14 +41,14 @@ class AddDocuments extends Migration {
 
             $t->timestamps();
 
-            $t->foreign('account_id')->references('id')->on('accounts');
-			$t->foreign('user_id')->references('id')->on('users');
-			$t->foreign('invoice_id')->references('id')->on('invoices');
-			$t->foreign('expense_id')->references('id')->on('expenses');
-			
+            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
+			$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+			$t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
+			$t->foreign('expense_id')->references('id')->on('expenses')->onDelete('cascade');
 			
+
             $t->unique( array('account_id','public_id') );
-        });     
+        });
 	}
 	/**
 	 * Reverse the migrations.
@@ -65,7 +65,7 @@ class AddDocuments extends Migration {
 			$table->dropColumn('invoice_embed_documents');
 			$table->dropColumn('document_email_attachment');
 		});
-		
+
 		Schema::dropIfExists('documents');
 	}
 }

From fc981c0604a63f0a413af494f741ab650caa7bcf Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 16:28:24 +0300
Subject: [PATCH 045/111] Fix for lazy load change

---
 resources/views/expenses/edit.blade.php | 2 +-
 resources/views/invoices/edit.blade.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index a4e2700b8c63..fdeac3cf2293 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -232,7 +232,7 @@
                 acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
                 addRemoveLinks:true,
                 @foreach(trans('texts.dropzone') as $key=>$text)
-                "dict{{strval($key)}}":"{{strval($text)}}",
+    	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
                 maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
             });
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 7c66d3eeecf1..300b1dcb148c 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -992,8 +992,8 @@
                 },
                 acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
                 addRemoveLinks:true,
-                @foreach(['default_message', 'fallback_message', 'fallback_text', 'file_too_big', 'invalid_file_type', 'response_error', 'cancel_upload', 'cancel_upload_confirmation', 'remove_file'] as $key)
-                    "dict{{Utils::toClassCase($key)}}":"{{trans('texts.dropzone_'.$key)}}",
+                @foreach(trans('texts.dropzone') as $key=>$text)
+    	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
                 maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
             });

From afd7b7ed38ca15543d63b1d5f9326a6e189daeda Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 21:44:06 +0300
Subject: [PATCH 046/111] check document completed upload before user submitted
 form

---
 app/Ninja/Repositories/ExpenseRepository.php | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php
index 442af74bd32b..8836cd65dac9 100644
--- a/app/Ninja/Repositories/ExpenseRepository.php
+++ b/app/Ninja/Repositories/ExpenseRepository.php
@@ -12,7 +12,7 @@ use Session;
 class ExpenseRepository extends BaseRepository
 {
     protected $documentRepo;
-    
+
     // Expenses
     public function getClassName()
     {
@@ -23,7 +23,7 @@ class ExpenseRepository extends BaseRepository
     {
         $this->documentRepo = $documentRepo;
     }
-    
+
     public function all()
     {
         return Expense::scope()
@@ -156,20 +156,23 @@ class ExpenseRepository extends BaseRepository
         $rate = isset($input['exchange_rate']) ? Utils::parseFloat($input['exchange_rate']) : 1;
         $expense->exchange_rate = round($rate, 4);
         $expense->amount = round(Utils::parseFloat($input['amount']), 2);
-        
+
         $expense->save();
 
         // Documents
         $document_ids = !empty($input['document_ids'])?array_map('intval', $input['document_ids']):array();;
         foreach ($document_ids as $document_id){
-            $document = Document::scope($document_id)->first();
-            if($document && Auth::user()->can('edit', $document)){
-                $document->invoice_id = null;
-                $document->expense_id = $expense->id;
-                $document->save();
+            // check document completed upload before user submitted form
+            if ($document_id) {
+                $document = Document::scope($document_id)->first();
+                if($document && Auth::user()->can('edit', $document)){
+                    $document->invoice_id = null;
+                    $document->expense_id = $expense->id;
+                    $document->save();
+                }
             }
         }
-        
+
         if(!empty($input['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
             // Fallback upload
             $doc_errors = array();
@@ -188,7 +191,7 @@ class ExpenseRepository extends BaseRepository
                 Session::flash('error', implode('<br>',array_map('htmlentities',$doc_errors)));
             }
         }
-        
+
         foreach ($expense->documents as $document){
             if(!in_array($document->public_id, $document_ids)){
                 // Not checking permissions; deleting a document is just editing the invoice

From 537034d2150bf2ebf79d3ea8c4df303a052f0ba7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 25 May 2016 22:04:39 +0300
Subject: [PATCH 047/111] Prevent saving expense before documents have uploaded

---
 resources/views/expenses/edit.blade.php | 24 ++++++++++++++++++++++--
 resources/views/invoices/edit.blade.php |  7 ++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index fdeac3cf2293..343e11ed7179 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -15,7 +15,10 @@
 
 @section('content')
 
-	{!! Former::open($url)->addClass('warn-on-exit main-form')->method($method) !!}
+    {!! Former::open($url)
+        ->addClass('warn-on-exit main-form')
+        ->onsubmit('return onFormSubmit(event)')
+        ->method($method) !!}
     <div style="display:none">
         {!! Former::text('action') !!}
     </div>
@@ -154,6 +157,15 @@
             clientMap[client.public_id] = client;
         }
 
+        function onFormSubmit(event) {
+            if (window.countUploadingDocuments > 0) {
+                alert("{!! trans('texts.wait_for_upload') !!}");
+                return false;
+            }
+
+            return true;
+        }
+
         function onClientChange() {
             var clientId = $('select#client_id').val();
             var client = clientMap[clientId];
@@ -240,6 +252,7 @@
                 dropzone.on("addedfile",handleDocumentAdded);
                 dropzone.on("removedfile",handleDocumentRemoved);
                 dropzone.on("success",handleDocumentUploaded);
+                dropzone.on("canceled",handleDocumentCanceled);
                 for (var i=0; i<model.documents().length; i++) {
                     var document = model.documents()[i];
                     var mockFile = {
@@ -362,6 +375,7 @@
             }
         }
 
+        window.countUploadingDocuments = 0;
         @if (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
         function handleDocumentAdded(file){
             // open document when clicked
@@ -373,6 +387,7 @@
             if(file.mock)return;
             file.index = model.documents().length;
             model.addDocument({name:file.name, size:file.size, type:file.type});
+            window.countUploadingDocuments++;
         }
 
         function handleDocumentRemoved(file){
@@ -382,11 +397,16 @@
         function handleDocumentUploaded(file, response){
             file.public_id = response.document.public_id
             model.documents()[file.index].update(response.document);
-
+            window.countUploadingDocuments--;
             if(response.document.preview_url){
                 dropzone.emit('thumbnail', file, response.document.preview_url);
             }
         }
+
+        function handleDocumentCanceled()
+        {
+            window.countUploadingDocuments--;
+        }
         @endif
     </script>
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 300b1dcb148c..1cba75934a7b 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1001,6 +1001,7 @@
                 dropzone.on("addedfile",handleDocumentAdded);
                 dropzone.on("removedfile",handleDocumentRemoved);
                 dropzone.on("success",handleDocumentUploaded);
+                dropzone.on("canceled",handleDocumentCanceled);
                 for (var i=0; i<model.invoice().documents().length; i++) {
                     var document = model.invoice().documents()[i];
                     var mockFile = {
@@ -1421,11 +1422,15 @@
         model.invoice().documents()[file.index].update(response.document);
         window.countUploadingDocuments--;
         refreshPDF(true);
-
         if(response.document.preview_url){
             dropzone.emit('thumbnail', file, response.document.preview_url);
         }
     }
+
+    function handleDocumentCanceled()
+    {
+        window.countUploadingDocuments--;
+    }
     @endif
 
 	</script>

From 26b0169ae91dafe831e81d4cd3c9c0331e36c728 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 May 2016 15:51:13 +0300
Subject: [PATCH 048/111] Fix permission issue with quotes

---
 app/Http/Controllers/QuoteController.php | 12 ++++++------
 app/Models/EntityModel.php               | 13 +++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index a8ea0beaa476..58807ba4a9eb 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -113,16 +113,16 @@ class QuoteController extends BaseController
         $rates = TaxRate::scope()->orderBy('name')->get();
         $options = [];
         $defaultTax = false;
-        
+
         foreach ($rates as $rate) {
-            $options[$rate->rate . ' ' . $rate->name] = $rate->name . ' ' . ($rate->rate+0) . '%';            
-        
+            $options[$rate->rate . ' ' . $rate->name] = $rate->name . ' ' . ($rate->rate+0) . '%';
+
             // load default invoice tax
             if ($rate->id == $account->default_tax_rate_id) {
                 $defaultTax = $rate;
             }
-        }     
-        
+        }
+
         return [
           'entityType' => ENTITY_QUOTE,
           'account' => Auth::user()->account,
@@ -130,7 +130,7 @@ class QuoteController extends BaseController
           'taxRateOptions' => $options,
           'defaultTax' => $defaultTax,
           'countries' => Cache::get('countries'),
-          'clients' => Client::scope()->with('contacts', 'country')->orderBy('name')->get(),
+          'clients' => Client::scope()->viewable()->with('contacts', 'country')->orderBy('name')->get(),
           'taxRates' => TaxRate::scope()->orderBy('name')->get(),
           'currencies' => Cache::get('currencies'),
           'sizes' => Cache::get('sizes'),
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index 95e85e6acef4..4b724d3953ee 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -30,7 +30,7 @@ class EntityModel extends Eloquent
         } else {
             $lastEntity = $className::scope(false, $entity->account_id);
         }
-        
+
         $lastEntity = $lastEntity->orderBy('public_id', 'DESC')
                         ->first();
 
@@ -86,6 +86,15 @@ class EntityModel extends Eloquent
         return $query;
     }
 
+    public function scopeViewable($query)
+    {
+        if (Auth::check() && ! Auth::user()->hasPermission('view_all')) {
+            $query->where($this->getEntityType(). 's.user_id', '=', Auth::user()->id);
+        }
+
+        return $query;
+    }
+
     public function scopeWithArchived($query)
     {
         return $query->withTrashed()->where('is_deleted', '=', false);
@@ -110,7 +119,7 @@ class EntityModel extends Eloquent
     {
         return 'App\\Ninja\\Transformers\\' . ucwords(Utils::toCamelCase($entityType)) . 'Transformer';
     }
-    
+
     public function setNullValues()
     {
         foreach ($this->fillable as $field) {

From 94331c2858fe771629a2cb2ef39369cd763a9b82 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 May 2016 16:05:38 +0300
Subject: [PATCH 049/111] Show permissions if not enabled

---
 resources/views/users/edit.blade.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 94b74664a7e3..6770760fd18e 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,6 +1,6 @@
 @extends('header')
 
-@section('content') 
+@section('content')
   @parent
   @include('accounts.nav', ['selected' => ACCOUNT_USER_MANAGEMENT])
 
@@ -31,13 +31,19 @@
 </div>
 </div>
 
-@if (Utils::hasFeature(FEATURE_USER_PERMISSIONS))
 <div class="panel panel-default">
 <div class="panel-heading">
     <h3 class="panel-title">{!! trans('texts.permissions') !!}</h3>
 </div>
 <div class="panel-body form-padding-right">
 
+    @if ( ! Utils::hasFeature(FEATURE_USER_PERMISSIONS))
+      <script>
+          $(function() {
+              $('input[type=checkbox]').prop('disabled', true);
+          })
+      </script>
+    @endif
 
   {!! Former::checkbox('is_admin')
       ->label('&nbsp;')
@@ -61,12 +67,11 @@
       ->id('permissions_edit_all')
       ->text(trans('texts.user_edit_all'))
       ->help(trans('texts.edit_all_help')) !!}
-    
-</div>
-</div>
-@endif
 
-  {!! Former::actions( 
+</div>
+</div>
+
+  {!! Former::actions(
       Button::normal(trans('texts.cancel'))->asLinkTo(URL::to('/settings/user_management'))->appendIcon(Icon::create('remove-circle'))->large(),
       Button::success(trans($user && $user->confirmed ? 'texts.save' : 'texts.send_invite'))->submit()->large()->appendIcon(Icon::create($user && $user->confirmed ? 'floppy-disk' : 'send'))
   )!!}
@@ -88,4 +93,4 @@
         if(!viewChecked)$('#permissions_edit_all').prop('checked',false)
 	}
 	fixCheckboxes();
-@stop
\ No newline at end of file
+@stop

From 7599edbc8cdf35bcaee2285eb2befc43f07dc466 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 May 2016 18:28:36 +0300
Subject: [PATCH 050/111] Fixed date formatting in document list

---
 app/Ninja/Repositories/DocumentRepository.php | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/Ninja/Repositories/DocumentRepository.php b/app/Ninja/Repositories/DocumentRepository.php
index 094b4848ebe0..a2278b1843ae 100644
--- a/app/Ninja/Repositories/DocumentRepository.php
+++ b/app/Ninja/Repositories/DocumentRepository.php
@@ -61,31 +61,31 @@ class DocumentRepository extends BaseRepository
     {
         $extension = strtolower($uploaded->getClientOriginalExtension());
         if(empty(Document::$types[$extension]) && !empty(Document::$extraExtensions[$extension])){
-            $documentType = Document::$extraExtensions[$extension];            
+            $documentType = Document::$extraExtensions[$extension];
         }
         else{
             $documentType = $extension;
         }
-        
+
         if(empty(Document::$types[$documentType])){
             return 'Unsupported file type';
         }
-           
+
         $documentTypeData = Document::$types[$documentType];
-           
+
         $filePath = $uploaded->path();
         $name = $uploaded->getClientOriginalName();
         $size = filesize($filePath);
-        
+
         if($size/1000 > MAX_DOCUMENT_SIZE){
             return 'File too large';
         }
-        
-        
-        
+
+
+
         $hash = sha1_file($filePath);
         $filename = \Auth::user()->account->account_key.'/'.$hash.'.'.$documentType;
-                
+
         $document = Document::createNew();
         $disk = $document->getDisk();
         if(!$disk->exists($filename)){// Have we already stored the same file
@@ -93,7 +93,7 @@ class DocumentRepository extends BaseRepository
             $disk->getDriver()->putStream($filename, $stream, ['mimetype'=>$documentTypeData['mime']]);
             fclose($stream);
         }
-        
+
         // This is an image; check if we need to create a preview
         if(in_array($documentType, array('jpeg','png','gif','bmp','tiff','psd'))){
             $makePreview = false;
@@ -105,32 +105,32 @@ class DocumentRepository extends BaseRepository
                 // Needs to be converted
                 $makePreview = true;
             } else if($width > DOCUMENT_PREVIEW_SIZE || $height > DOCUMENT_PREVIEW_SIZE){
-                $makePreview = true;              
+                $makePreview = true;
             }
-            
+
             if(in_array($documentType,array('bmp','tiff','psd'))){
                 if(!class_exists('Imagick')){
                     // Cant't read this
                     $makePreview = false;
                 } else {
                     $imgManagerConfig['driver'] = 'imagick';
-                }                
+                }
             }
-            
+
             if($makePreview){
                 $previewType = 'jpeg';
                 if(in_array($documentType, array('png','gif','tiff','psd'))){
                     // Has transparency
                     $previewType = 'png';
                 }
-                    
+
                 $document->preview = \Auth::user()->account->account_key.'/'.$hash.'.'.$documentType.'.x'.DOCUMENT_PREVIEW_SIZE.'.'.$previewType;
                 if(!$disk->exists($document->preview)){
                     // We haven't created a preview yet
                     $imgManager = new ImageManager($imgManagerConfig);
-                    
+
                     $img = $imgManager->make($filePath);
-                    
+
                     if($width <= DOCUMENT_PREVIEW_SIZE && $height <= DOCUMENT_PREVIEW_SIZE){
                         $previewWidth = $width;
                         $previewHeight = $height;
@@ -141,9 +141,9 @@ class DocumentRepository extends BaseRepository
                         $previewHeight = DOCUMENT_PREVIEW_SIZE;
                         $previewWidth = $width * DOCUMENT_PREVIEW_SIZE / $height;
                     }
-                    
+
                     $img->resize($previewWidth, $previewHeight);
-                    
+
                     $previewContent = (string) $img->encode($previewType);
                     $disk->put($document->preview, $previewContent);
                     $base64 = base64_encode($previewContent);
@@ -153,23 +153,23 @@ class DocumentRepository extends BaseRepository
                 }
             }else{
                 $base64 = base64_encode(file_get_contents($filePath));
-            }      
+            }
         }
-        
+
         $document->path = $filename;
         $document->type = $documentType;
         $document->size = $size;
         $document->hash = $hash;
         $document->name = substr($name, -255);
-        
+
         if(!empty($imageSize)){
             $document->width = $imageSize[0];
             $document->height = $imageSize[1];
         }
-        
+
         $document->save();
         $doc_array = $document->toArray();
-        
+
         if(!empty($base64)){
             $mime = Document::$types[!empty($previewType)?$previewType:$documentType]['mime'];
             $doc_array['base64'] = 'data:'.$mime.';base64,'.$base64;
@@ -177,10 +177,10 @@ class DocumentRepository extends BaseRepository
 
         return $document;
     }
-    
+
     public function getClientDatatable($contactId, $entityType, $search)
     {
-        
+
        $query = DB::table('invitations')
           ->join('accounts', 'accounts.id', '=', 'invitations.account_id')
           ->join('invoices', 'invoices.id', '=', 'invitations.invoice_id')
@@ -192,7 +192,7 @@ class DocumentRepository extends BaseRepository
           ->where('clients.deleted_at', '=', null)
           ->where('invoices.is_recurring', '=', false)
           // This needs to be a setting to also hide the activity on the dashboard page
-          //->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT) 
+          //->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT)
           ->select(
                 'invitations.invitation_key',
                 'invoices.invoice_number',
@@ -205,22 +205,22 @@ class DocumentRepository extends BaseRepository
         $table = \Datatable::query($query)
             ->addColumn('invoice_number', function ($model) {
                 return link_to(
-                    '/view/'.$model->invitation_key, 
+                    '/view/'.$model->invitation_key,
                     $model->invoice_number
-                )->toHtml(); 
+                )->toHtml();
             })
             ->addColumn('name', function ($model) {
                 return link_to(
-                    '/client/documents/'.$model->invitation_key.'/'.$model->public_id.'/'.$model->name, 
+                    '/client/documents/'.$model->invitation_key.'/'.$model->public_id.'/'.$model->name,
                     $model->name,
                     ['target'=>'_blank']
-                )->toHtml(); 
+                )->toHtml();
             })
             ->addColumn('document_date', function ($model) {
-                return Utils::fromSqlDate($model->created_at);
+                return Utils::dateToString($model->created_at);
             })
             ->addColumn('document_size', function ($model) {
-                return Form::human_filesize($model->size); 
+                return Form::human_filesize($model->size);
             });
 
         return $table->make();

From b32a9110c7cc86f43f654725d8095381cf3fc008 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 May 2016 19:04:43 +0300
Subject: [PATCH 051/111] Fix for deleting documents

---
 app/Http/Controllers/DocumentController.php | 44 ++++++++++++---------
 app/Http/Requests/UpdateDocumentRequest.php | 26 ++++++++++++
 app/Http/routes.php                         |  1 +
 resources/views/expenses/edit.blade.php     |  8 ++++
 resources/views/invoices/edit.blade.php     |  8 ++++
 5 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 app/Http/Requests/UpdateDocumentRequest.php

diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index d597ba004474..e4ea605d57a0 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -14,6 +14,7 @@ use App\Ninja\Repositories\DocumentRepository;
 
 use App\Http\Requests\DocumentRequest;
 use App\Http\Requests\CreateDocumentRequest;
+use App\Http\Requests\UpdateDocumentRequest;
 
 class DocumentController extends BaseController
 {
@@ -26,20 +27,20 @@ class DocumentController extends BaseController
 
         $this->documentRepo = $documentRepo;
     }
-    
+
     public function get(DocumentRequest $request)
     {
         return static::getDownloadResponse($request->entity());
     }
-    
+
     public static function getDownloadResponse($document){
         $direct_url = $document->getDirectUrl();
         if($direct_url){
             return redirect($direct_url);
         }
-        
+
         $stream = $document->getStream();
-        
+
         if($stream){
             $headers = [
                 'Content-Type'        => Document::$types[$document->type]['mime'],
@@ -54,59 +55,59 @@ class DocumentController extends BaseController
             $response = Response::make($document->getRaw(), 200);
             $response->header('content-type', Document::$types[$document->type]['mime']);
         }
-            
+
         return $response;
     }
-    
+
     public function getPreview(DocumentRequest $request)
     {
         $document = $request->entity();
-        
+
         if(empty($document->preview)){
             return Response::view('error', array('error'=>'Preview does not exist!'), 404);
         }
-        
+
         $direct_url = $document->getDirectPreviewUrl();
         if($direct_url){
             return redirect($direct_url);
         }
-        
+
         $previewType = pathinfo($document->preview, PATHINFO_EXTENSION);
         $response = Response::make($document->getRawPreview(), 200);
         $response->header('content-type', Document::$types[$previewType]['mime']);
-        
+
         return $response;
     }
-    
+
     public function getVFSJS(DocumentRequest $request, $publicId, $name)
     {
         $document = $request->entity();
-        
+
         if(substr($name, -3)=='.js'){
             $name = substr($name, 0, -3);
         }
-        
+
         if(!$document->isPDFEmbeddable()){
             return Response::view('error', array('error'=>'Image does not exist!'), 404);
         }
-        
+
         $content = $document->preview?$document->getRawPreview():$document->getRaw();
         $content = 'ninjaAddVFSDoc('.json_encode(intval($publicId).'/'.strval($name)).',"'.base64_encode($content).'")';
         $response = Response::make($content, 200);
         $response->header('content-type', 'text/javascript');
         $response->header('cache-control', 'max-age=31536000');
-        
+
         return $response;
     }
-    
+
     public function postUpload(CreateDocumentRequest $request)
     {
         if (!Utils::hasFeature(FEATURE_DOCUMENTS)) {
             return;
         }
-        
+
         $result = $this->documentRepo->upload(Input::all()['file'], $doc_array);
-                
+
         if(is_string($result)){
              return Response::json([
                 'error' => $result,
@@ -120,4 +121,11 @@ class DocumentController extends BaseController
             ], 200);
         }
     }
+
+    public function delete(UpdateDocumentRequest $request)
+    {
+        $request->entity()->delete();
+
+        return RESULT_SUCCESS;
+    }
 }
diff --git a/app/Http/Requests/UpdateDocumentRequest.php b/app/Http/Requests/UpdateDocumentRequest.php
new file mode 100644
index 000000000000..3a950c9f3475
--- /dev/null
+++ b/app/Http/Requests/UpdateDocumentRequest.php
@@ -0,0 +1,26 @@
+<?php namespace App\Http\Requests;
+
+class UpdateDocumentRequest extends DocumentRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return $this->user()->can('edit', $this->entity());
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+
+        ];
+    }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 81a44b5ee930..2c3fba6fec4b 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -145,6 +145,7 @@ Route::group(['middleware' => 'auth:user'], function() {
     Route::get('documents/js/{documents}/{filename}', 'DocumentController@getVFSJS');
     Route::get('documents/preview/{documents}/{filename?}', 'DocumentController@getPreview');
     Route::post('document', 'DocumentController@postUpload');
+    Route::delete('documents/{documents}', 'DocumentController@delete');
 
     Route::get('quotes/create/{client_id?}', 'QuoteController@create');
     Route::get('quotes/{invoices}/clone', 'InvoiceController@cloneInvoice');
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 343e11ed7179..f0b44e700e7c 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -243,6 +243,7 @@
                 },
                 acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
                 addRemoveLinks:true,
+                dictRemoveFileConfirmation:"{{trans('texts.are_you_sure')}}",
                 @foreach(trans('texts.dropzone') as $key=>$text)
     	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
@@ -392,6 +393,13 @@
 
         function handleDocumentRemoved(file){
             model.removeDocument(file.public_id);
+            $.ajax({
+                url: '{{ '/documents/' }}' + file.public_id,
+                type: 'DELETE',
+                success: function(result) {
+                    // Do something with the result
+                }
+            });
         }
 
         function handleDocumentUploaded(file, response){
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 1cba75934a7b..51736e2ec8c9 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -992,6 +992,7 @@
                 },
                 acceptedFiles:{!! json_encode(implode(',',\App\Models\Document::$allowedMimes)) !!},
                 addRemoveLinks:true,
+                dictRemoveFileConfirmation:"{{trans('texts.are_you_sure')}}",
                 @foreach(trans('texts.dropzone') as $key=>$text)
     	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
@@ -1415,6 +1416,13 @@
     function handleDocumentRemoved(file){
         model.invoice().removeDocument(file.public_id);
         refreshPDF(true);
+        $.ajax({
+            url: '{{ '/documents/' }}' + file.public_id,
+            type: 'DELETE',
+            success: function(result) {
+                // Do something with the result
+            }
+        });
     }
 
     function handleDocumentUploaded(file, response){

From 145c394e6b681b82b0fe10394333800743deef85 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 26 May 2016 20:48:45 +0300
Subject: [PATCH 052/111] Ensure all files are deleted with the account

---
 app/Http/Controllers/AccountController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index d7ccfd1dc995..67bb78ca844a 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1251,6 +1251,10 @@ class AccountController extends BaseController
         $account = Auth::user()->account;
         \Log::info("Canceled Account: {$account->name} - {$user->email}");
 
+        Document::scope()->each(function($item, $key) {
+            $item->delete();
+        });
+
         $this->accountRepo->unlinkAccount($account);
         if ($account->company->accounts->count() == 1) {
             $account->company->forceDelete();

From 8885ae293963e3defc73b26f31d4324b1e3e52b4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 16:46:21 +0300
Subject: [PATCH 053/111] Fix for cloning quote

---
 resources/views/invoices/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 51736e2ec8c9..7db80f69089c 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -824,7 +824,7 @@
                 model.invoice().has_tasks(true);
             @endif
 
-            if(model.invoice().expenses() && !model.invoice().public_id()){
+            if(model.invoice().expenses().length && !model.invoice().public_id()){
                 model.expense_currency_id({{ isset($expenseCurrencyId) ? $expenseCurrencyId : 0 }});
 
                 // move the blank invoice line item to the end

From 7650870902555a33917e6a8550fc78fff5c64e7a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 17:21:07 +0300
Subject: [PATCH 054/111] Improved footer images

---
 public/images/report_logo1.jpg | Bin 5234 -> 16547 bytes
 public/images/report_logo2.jpg | Bin 13504 -> 25009 bytes
 public/images/report_logo3.jpg | Bin 31804 -> 37848 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/images/report_logo1.jpg b/public/images/report_logo1.jpg
index c1bf4aae1108232778be346c561d71a342a60d8a..92a6c3f4d0a51dacfd542151e338cc21687d59dd 100644
GIT binary patch
literal 16547
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

literal 5234
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

diff --git a/public/images/report_logo2.jpg b/public/images/report_logo2.jpg
index e4b5ba66ddd7c80b63044bcf7c33d466402b083f..453c3acda16c22da7551eb0e1d4130703fc9bad2 100644
GIT binary patch
literal 25009
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

literal 13504
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
VN|Iy7?FR%=cD6v#2UmCLzW{#JF#rGn

diff --git a/public/images/report_logo3.jpg b/public/images/report_logo3.jpg
index 8696d0535fa2c89da2c8877239466683a47f9edc..4e0c2ebec1b2f8479a186d20ccb50894a746939f 100644
GIT binary patch
literal 37848
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

literal 31804
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
NlVbUU+aUg}{XgT{QIP-u


From 2f1d53d9b37eea83505106c927f1469b578ccc1d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 17:32:08 +0300
Subject: [PATCH 055/111] Enable mobile app for non-pro users

---
 app/Http/Middleware/ApiCheck.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Middleware/ApiCheck.php b/app/Http/Middleware/ApiCheck.php
index b20b19841fcb..5200c3264a96 100644
--- a/app/Http/Middleware/ApiCheck.php
+++ b/app/Http/Middleware/ApiCheck.php
@@ -23,10 +23,11 @@ class ApiCheck {
     {
         $loggingIn = $request->is('api/v1/login') || $request->is('api/v1/register');
         $headers = Utils::getApiHeaders();
+        $hasApiSecret = hash_equals($request->api_secret ?: '', env(API_SECRET));
 
         if ($loggingIn) {
             // check API secret
-            if ( ! $request->api_secret || ! env(API_SECRET) || ! hash_equals($request->api_secret, env(API_SECRET))) {
+            if ( ! $hasApiSecret) {
                 sleep(ERROR_DELAY);
                 return Response::json('Invalid secret', 403, $headers);
             }
@@ -48,7 +49,7 @@ class ApiCheck {
             return $next($request);
         }
 
-        if (!Utils::hasFeature(FEATURE_API) && !$loggingIn) {
+        if (!Utils::hasFeature(FEATURE_API) && !$hasApiSecret) {
             return Response::json('API requires pro plan', 403, $headers);
         } else {
             $key = Auth::check() ? Auth::user()->account->id : $request->getClientIp();
@@ -59,7 +60,7 @@ class ApiCheck {
             $hour_throttle = Cache::get("hour_throttle:{$key}", null);
             $last_api_request = Cache::get("last_api_request:{$key}", 0);
             $last_api_diff = time() - $last_api_request;
-            
+
             if (is_null($hour_throttle)) {
                 $new_hour_throttle = 0;
             } else {
@@ -83,4 +84,4 @@ class ApiCheck {
         return $next($request);
     }
 
-}
\ No newline at end of file
+}

From c1029dfb69f5b58ee774803208c5b16221bb54d7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 17:37:32 +0300
Subject: [PATCH 056/111] Fix for rollback

---
 database/migrations/2014_05_17_175626_add_quotes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2014_05_17_175626_add_quotes.php b/database/migrations/2014_05_17_175626_add_quotes.php
index 96ae916cafae..332d6295612d 100644
--- a/database/migrations/2014_05_17_175626_add_quotes.php
+++ b/database/migrations/2014_05_17_175626_add_quotes.php
@@ -14,9 +14,9 @@ class AddQuotes extends Migration {
 	{
 		Schema::table('invoices', function($table)
 		{
-			$table->boolean('is_quote')->default(0);			
+			$table->boolean('is_quote')->default(0);
 			$table->unsignedInteger('quote_id')->nullable();
-			$table->unsignedInteger('quote_invoice_id')->nullable();			
+			$table->unsignedInteger('quote_invoice_id')->nullable();
 		});
 	}
 
@@ -29,7 +29,7 @@ class AddQuotes extends Migration {
 	{
 		Schema::table('invoices', function($table)
 		{
-			$table->dropColumn('is_quote');
+			$table->dropColumn('invoice_type_id');
 			$table->dropColumn('quote_id');
 			$table->dropColumn('quote_invoice_id');
 		});

From 7c13b5c9bf2d79149069a9c6aef66a53638b2c21 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 17:38:45 +0300
Subject: [PATCH 057/111] Fix for rollback

---
 database/migrations/2014_05_17_175626_add_quotes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2014_05_17_175626_add_quotes.php b/database/migrations/2014_05_17_175626_add_quotes.php
index 332d6295612d..ae26c640fc81 100644
--- a/database/migrations/2014_05_17_175626_add_quotes.php
+++ b/database/migrations/2014_05_17_175626_add_quotes.php
@@ -29,7 +29,7 @@ class AddQuotes extends Migration {
 	{
 		Schema::table('invoices', function($table)
 		{
-			$table->dropColumn('invoice_type_id');
+			$table->dropColumn('is_quote');
 			$table->dropColumn('quote_id');
 			$table->dropColumn('quote_invoice_id');
 		});

From ced3daf9c6fd0b6e15e8acf9af0301e4652a9807 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 17:49:09 +0300
Subject: [PATCH 058/111] Added clear commands when updating

---
 app/Http/Controllers/AppController.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php
index a602ae7ecb85..d776f7224692 100644
--- a/app/Http/Controllers/AppController.php
+++ b/app/Http/Controllers/AppController.php
@@ -262,6 +262,12 @@ class AppController extends BaseController
         if (!Utils::isNinjaProd()) {
             try {
                 set_time_limit(60 * 5);
+                Artisan::call('clear-compiled');
+                Artisan::call('cache:clear');
+                Artisan::call('debugbar:clear');
+                Artisan::call('route:clear');
+                Artisan::call('view:clear');
+                Artisan::call('config:clear');
                 Artisan::call('optimize', array('--force' => true));
                 Cache::flush();
                 Session::flush();

From 2cd1517dd63c0c2e15c90a7be8d2aaac2d7a99ea Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 18:40:01 +0300
Subject: [PATCH 059/111] Fix for max file size

---
 resources/views/expenses/edit.blade.php | 2 +-
 resources/views/invoices/edit.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index f0b44e700e7c..7fb96d2793f1 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -247,7 +247,7 @@
                 @foreach(trans('texts.dropzone') as $key=>$text)
     	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
-                maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
+                maxFilesize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
             });
             if(dropzone instanceof Dropzone){
                 dropzone.on("addedfile",handleDocumentAdded);
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 7db80f69089c..ccf2d35f359c 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -996,7 +996,7 @@
                 @foreach(trans('texts.dropzone') as $key=>$text)
     	            "dict{{strval($key)}}":"{{strval($text)}}",
                 @endforeach
-                maxFileSize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
+                maxFilesize:{{floatval(MAX_DOCUMENT_SIZE/1000)}},
             });
             if(dropzone instanceof Dropzone){
                 dropzone.on("addedfile",handleDocumentAdded);

From da860c0d07c09888bd4426141f3f53e1f4ed70e8 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 18:43:57 +0300
Subject: [PATCH 060/111] Fix for when document is too large

---
 resources/views/expenses/edit.blade.php | 8 ++++++--
 resources/views/invoices/edit.blade.php | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 7fb96d2793f1..5c0f05b8ab35 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -254,6 +254,7 @@
                 dropzone.on("removedfile",handleDocumentRemoved);
                 dropzone.on("success",handleDocumentUploaded);
                 dropzone.on("canceled",handleDocumentCanceled);
+                dropzone.on("error",handleDocumentError);
                 for (var i=0; i<model.documents().length; i++) {
                     var document = model.documents()[i];
                     var mockFile = {
@@ -411,8 +412,11 @@
             }
         }
 
-        function handleDocumentCanceled()
-        {
+        function handleDocumentCanceled() {
+            window.countUploadingDocuments--;
+        }
+
+        function handleDocumentError() {
             window.countUploadingDocuments--;
         }
         @endif
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index ccf2d35f359c..0de42f092dea 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1003,6 +1003,7 @@
                 dropzone.on("removedfile",handleDocumentRemoved);
                 dropzone.on("success",handleDocumentUploaded);
                 dropzone.on("canceled",handleDocumentCanceled);
+                dropzone.on("error",handleDocumentError);
                 for (var i=0; i<model.invoice().documents().length; i++) {
                     var document = model.invoice().documents()[i];
                     var mockFile = {
@@ -1435,8 +1436,11 @@
         }
     }
 
-    function handleDocumentCanceled()
-    {
+    function handleDocumentCanceled() {
+        window.countUploadingDocuments--;
+    }
+
+    function handleDocumentError() {
         window.countUploadingDocuments--;
     }
     @endif

From 2c56c4e7bf552176d5b9a9893dd81a45205afd00 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 May 2016 22:12:26 +0300
Subject: [PATCH 061/111] Changed attach defaults

---
 database/migrations/2016_03_22_168362_add_documents.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2016_03_22_168362_add_documents.php b/database/migrations/2016_03_22_168362_add_documents.php
index b5e9da2deb1a..29fa07a6cbc1 100644
--- a/database/migrations/2016_03_22_168362_add_documents.php
+++ b/database/migrations/2016_03_22_168362_add_documents.php
@@ -15,8 +15,8 @@ class AddDocuments extends Migration {
 			$table->unsignedInteger('logo_width');
 			$table->unsignedInteger('logo_height');
 			$table->unsignedInteger('logo_size');
-			$table->boolean('invoice_embed_documents')->default(1);
-			$table->boolean('document_email_attachment')->default(1);
+			$table->boolean('invoice_embed_documents')->default(0);
+			$table->boolean('document_email_attachment')->default(0);
 		});
 
 		\DB::table('accounts')->update(array('logo' => ''));
@@ -45,7 +45,7 @@ class AddDocuments extends Migration {
 			$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
 			$t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
 			$t->foreign('expense_id')->references('id')->on('expenses')->onDelete('cascade');
-			
+
 
             $t->unique( array('account_id','public_id') );
         });

From 1760d0e0e4643e609ca85df73a7bee25297cd375 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Jun 2016 10:58:03 +0300
Subject: [PATCH 062/111] Prevent converting a qoute from incrementing the
 counter

---
 app/Models/Account.php                       | 218 ++++++++++---------
 app/Ninja/Repositories/InvoiceRepository.php |  42 ++--
 2 files changed, 131 insertions(+), 129 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index d3c2f2426062..b0fc07cb79f6 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -18,7 +18,7 @@ class Account extends Eloquent
 {
     use PresentableTrait;
     use SoftDeletes;
-    
+
     public static $plan_prices = array(
         PLAN_PRO => array(
             PLAN_TERM_MONTHLY => PLAN_PRICE_PRO_MONTHLY,
@@ -388,7 +388,7 @@ class Account extends Eloquent
                 return $gateway;
             }
         }
-        
+
         return false;
     }
 
@@ -408,27 +408,27 @@ class Account extends Eloquent
         if($this->logo == ''){
             $this->calculateLogoDetails();
         }
-        
+
         return !empty($this->logo);
     }
-    
+
     public function getLogoDisk(){
         return Storage::disk(env('LOGO_FILESYSTEM', 'logos'));
     }
-    
+
     protected function calculateLogoDetails(){
         $disk = $this->getLogoDisk();
-                
+
         if($disk->exists($this->account_key.'.png')){
             $this->logo = $this->account_key.'.png';
         } else if($disk->exists($this->account_key.'.jpg')) {
             $this->logo = $this->account_key.'.jpg';
         }
-                
+
         if(!empty($this->logo)){
             $image = imagecreatefromstring($disk->get($this->logo));
             $this->logo_width = imagesx($image);
-            $this->logo_height = imagesy($image);            
+            $this->logo_height = imagesy($image);
             $this->logo_size = $disk->size($this->logo);
         } else {
             $this->logo = null;
@@ -440,33 +440,33 @@ class Account extends Eloquent
         if(!$this->hasLogo()){
             return null;
         }
-        
+
         $disk = $this->getLogoDisk();
         return $disk->get($this->logo);
     }
-    
+
     public function getLogoURL($cachebuster = false)
     {
         if(!$this->hasLogo()){
             return null;
         }
-        
+
         $disk = $this->getLogoDisk();
         $adapter = $disk->getAdapter();
-        
+
         if($adapter instanceof \League\Flysystem\Adapter\Local) {
             // Stored locally
             $logo_url = str_replace(public_path(), url('/'), $adapter->applyPathPrefix($this->logo), $count);
-            
+
             if ($cachebuster) {
                $logo_url .= '?no_cache='.time();
             }
-            
+
             if($count == 1){
                 return str_replace(DIRECTORY_SEPARATOR, '/', $logo_url);
             }
         }
-        
+
         return Document::getDirectFileUrl($this->logo, $this->getLogoDisk());
     }
 
@@ -516,7 +516,7 @@ class Account extends Eloquent
         $invoice->start_date = Utils::today();
         $invoice->invoice_design_id = $this->invoice_design_id;
         $invoice->client_id = $clientId;
-        
+
         if ($entityType === ENTITY_RECURRING_INVOICE) {
             $invoice->invoice_number = microtime(true);
             $invoice->is_recurring = true;
@@ -531,7 +531,7 @@ class Account extends Eloquent
                 $invoice->invoice_number = $this->getNextInvoiceNumber($invoice);
             }
         }
-        
+
         if (!$clientId) {
             $invoice->client = Client::createNew();
             $invoice->client->public_id = 0;
@@ -561,7 +561,7 @@ class Account extends Eloquent
     public function hasClientNumberPattern($invoice)
     {
         $pattern = $invoice->is_quote ? $this->quote_number_pattern : $this->invoice_number_pattern;
-        
+
         return strstr($pattern, '$custom');
     }
 
@@ -633,31 +633,35 @@ class Account extends Eloquent
 
     public function getNextInvoiceNumber($invoice)
     {
-        if ($this->hasNumberPattern($invoice->is_quote)) {
-            return $this->getNumberPattern($invoice);
+        if ($this->hasNumberPattern($invoice->invoice_type_id)) {
+            $number = $this->getNumberPattern($invoice);
+        } else {
+            $counter = $this->getCounter($invoice->invoice_type_id);
+            $prefix = $this->getNumberPrefix($invoice->invoice_type_id);
+            $counterOffset = 0;
+
+            // confirm the invoice number isn't already taken
+            do {
+                $number = $prefix . str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT);
+                $check = Invoice::scope(false, $this->id)->whereInvoiceNumber($number)->withTrashed()->first();
+                $counter++;
+                $counterOffset++;
+            } while ($check);
+
+            // update the invoice counter to be caught up
+            if ($counterOffset > 1) {
+                if ($invoice->isType(INVOICE_TYPE_QUOTE) && !$this->share_counter) {
+                    $this->quote_number_counter += $counterOffset - 1;
+                } else {
+                    $this->invoice_number_counter += $counterOffset - 1;
+                }
+
+                $this->save();
+            }
         }
 
-        $counter = $this->getCounter($invoice->is_quote);
-        $prefix = $this->getNumberPrefix($invoice->is_quote);
-        $counterOffset = 0;
-
-        // confirm the invoice number isn't already taken 
-        do {
-            $number = $prefix . str_pad($counter, $this->invoice_number_padding, '0', STR_PAD_LEFT);
-            $check = Invoice::scope(false, $this->id)->whereInvoiceNumber($number)->withTrashed()->first();
-            $counter++;
-            $counterOffset++;
-        } while ($check);
-
-        // update the invoice counter to be caught up
-        if ($counterOffset > 1) {
-            if ($invoice->is_quote && !$this->share_counter) {
-                $this->quote_number_counter += $counterOffset - 1;
-            } else {
-                $this->invoice_number_counter += $counterOffset - 1;
-            }
-
-            $this->save();
+        if ($invoice->recurring_invoice_id) {
+            $number = $this->recurring_invoice_number_prefix . $number;
         }
 
         return $number;
@@ -665,19 +669,17 @@ class Account extends Eloquent
 
     public function incrementCounter($invoice)
     {
-        if ($invoice->is_quote && !$this->share_counter) {
+        // if they didn't use the counter don't increment it
+        if ($invoice->invoice_number != $this->getNextInvoiceNumber($invoice)) {
+            return;
+        }
+
+        if ($invoice->isType(INVOICE_TYPE_QUOTE) && !$this->share_counter) {
             $this->quote_number_counter += 1;
         } else {
-            $default = $this->invoice_number_counter;
-            $actual = Utils::parseInt($invoice->invoice_number);
-
-            if ( ! $this->hasFeature(FEATURE_INVOICE_SETTINGS) && $default != $actual) {
-                $this->invoice_number_counter = $actual + 1;
-            } else {
-                $this->invoice_number_counter += 1;
-            }
+            $this->invoice_number_counter += 1;
         }
-        
+
         $this->save();
     }
 
@@ -700,7 +702,7 @@ class Account extends Eloquent
                     $query->where('updated_at', '>=', $updatedAt);
                 }
             }]);
-        }        
+        }
     }
 
     public function loadLocalizationSettings($client = false)
@@ -713,8 +715,8 @@ class Account extends Eloquent
         Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
         Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
 
-        $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY; 
-        $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE); 
+        $currencyId = ($client && $client->currency_id) ? $client->currency_id : $this->currency_id ?: DEFAULT_CURRENCY;
+        $locale = ($client && $client->language_id) ? $client->language->locale : ($this->language_id ? $this->Language->locale : DEFAULT_LOCALE);
 
         Session::put(SESSION_CURRENCY, $currencyId);
         Session::put(SESSION_LOCALE, $locale);
@@ -797,7 +799,7 @@ class Account extends Eloquent
         if ( ! Utils::isNinja()) {
             return;
         }
-        
+
         $this->company->trial_plan = $plan;
         $this->company->trial_started = date_create()->format('Y-m-d');
         $this->company->save();
@@ -808,18 +810,18 @@ class Account extends Eloquent
         if (Utils::isNinjaDev()) {
             return true;
         }
-        
+
         $planDetails = $this->getPlanDetails();
         $selfHost = !Utils::isNinjaProd();
-        
+
         if (!$selfHost && function_exists('ninja_account_features')) {
             $result = ninja_account_features($this, $feature);
-            
+
             if ($result != null) {
                 return $result;
             }
         }
-        
+
         switch ($feature) {
             // Pro
             case FEATURE_CUSTOMIZE_INVOICE_DESIGN:
@@ -836,7 +838,7 @@ class Account extends Eloquent
             case FEATURE_CLIENT_PORTAL_PASSWORD:
             case FEATURE_CUSTOM_URL:
                 return $selfHost || !empty($planDetails);
-                
+
             // Pro; No trial allowed, unless they're trialing enterprise with an active pro plan
             case FEATURE_MORE_CLIENTS:
                 return $selfHost || !empty($planDetails) && (!$planDetails['trial'] || !empty($this->getPlanDetails(false, false)));
@@ -849,26 +851,26 @@ class Account extends Eloquent
                 // Fallthrough
             case FEATURE_CLIENT_PORTAL_CSS:
                 return !empty($planDetails);// A plan is required even for self-hosted users
-                
+
             // Enterprise; No Trial allowed; grandfathered for old pro users
             case FEATURE_USERS:// Grandfathered for old Pro users
                 if($planDetails && $planDetails['trial']) {
                     // Do they have a non-trial plan?
                     $planDetails = $this->getPlanDetails(false, false);
                 }
-                
+
                 return $selfHost || !empty($planDetails) && ($planDetails['plan'] == PLAN_ENTERPRISE || $planDetails['started'] <= date_create(PRO_USERS_GRANDFATHER_DEADLINE));
-                
+
             // Enterprise; No Trial allowed
             case FEATURE_DOCUMENTS:
             case FEATURE_USER_PERMISSIONS:
                 return $selfHost || !empty($planDetails) && $planDetails['plan'] == PLAN_ENTERPRISE && !$planDetails['trial'];
-            
+
             default:
                 return false;
         }
     }
-    
+
     public function isPro(&$plan_details = null)
     {
         if (!Utils::isNinjaProd()) {
@@ -880,7 +882,7 @@ class Account extends Eloquent
         }
 
         $plan_details = $this->getPlanDetails();
-        
+
         return !empty($plan_details);
     }
 
@@ -895,36 +897,36 @@ class Account extends Eloquent
         }
 
         $plan_details = $this->getPlanDetails();
-        
+
         return $plan_details && $plan_details['plan'] == PLAN_ENTERPRISE;
     }
-    
+
     public function getPlanDetails($include_inactive = false, $include_trial = true)
     {
         if (!$this->company) {
             return null;
         }
-        
+
         $plan = $this->company->plan;
         $trial_plan = $this->company->trial_plan;
-        
+
         if(!$plan && (!$trial_plan || !$include_trial)) {
             return null;
-        }        
-        
+        }
+
         $trial_active = false;
         if ($trial_plan && $include_trial) {
             $trial_started = DateTime::createFromFormat('Y-m-d', $this->company->trial_started);
             $trial_expires = clone $trial_started;
             $trial_expires->modify('+2 weeks');
-            
+
             if ($trial_expires >= date_create()) {
                $trial_active = true;
             }
         }
-        
+
         $plan_active = false;
-        if ($plan) {            
+        if ($plan) {
             if ($this->company->plan_expires == null) {
                 $plan_active = true;
                 $plan_expires = false;
@@ -935,11 +937,11 @@ class Account extends Eloquent
                 }
             }
         }
-        
+
         if (!$include_inactive && !$plan_active && !$trial_active) {
             return null;
         }
-        
+
         // Should we show plan details or trial details?
         if (($plan && !$trial_plan) || !$include_trial) {
             $use_plan = true;
@@ -966,7 +968,7 @@ class Account extends Eloquent
                 $use_plan = $plan_expires >= $trial_expires;
             }
         }
-        
+
         if ($use_plan) {
             return array(
                 'trial' => false,
@@ -993,7 +995,7 @@ class Account extends Eloquent
         if (!Utils::isNinjaProd()) {
             return false;
         }
-        
+
         $plan_details = $this->getPlanDetails();
 
         return $plan_details && $plan_details['trial'];
@@ -1008,7 +1010,7 @@ class Account extends Eloquent
                 return array(PLAN_PRO, PLAN_ENTERPRISE);
             }
         }
-        
+
         if ($this->company->trial_plan == PLAN_PRO) {
             if ($plan) {
                 return $plan != PLAN_PRO;
@@ -1016,28 +1018,28 @@ class Account extends Eloquent
                 return array(PLAN_ENTERPRISE);
             }
         }
-        
+
         return false;
     }
 
     public function getCountTrialDaysLeft()
     {
         $planDetails = $this->getPlanDetails(true);
-        
+
         if(!$planDetails || !$planDetails['trial']) {
             return 0;
         }
-        
+
         $today = new DateTime('now');
         $interval = $today->diff($planDetails['expires']);
-        
+
         return $interval ? $interval->d : 0;
     }
 
     public function getRenewalDate()
     {
         $planDetails = $this->getPlanDetails();
-        
+
         if ($planDetails) {
             $date = $planDetails['expires'];
             $date = max($date, date_create());
@@ -1167,7 +1169,7 @@ class Account extends Eloquent
             $field = "email_template_{$entityType}";
             $template = $this->$field;
         }
-        
+
         if (!$template) {
             $template = $this->getDefaultEmailTemplate($entityType, $message);
         }
@@ -1236,7 +1238,7 @@ class Account extends Eloquent
     {
         $url = SITE_URL;
         $iframe_url = $this->iframe_url;
-                
+
         if ($iframe_url) {
             return "{$iframe_url}/?";
         } else if ($this->subdomain) {
@@ -1271,10 +1273,10 @@ class Account extends Eloquent
         if (!$entity) {
             return false;
         }
-        
+
         // convert (for example) 'custom_invoice_label1' to 'invoice.custom_value1'
         $field = str_replace(['invoice_', 'label'], ['', 'value'], $field);
-        
+
         return Utils::isEmpty($entity->$field) ? false : true;
     }
 
@@ -1282,7 +1284,7 @@ class Account extends Eloquent
     {
         return $this->hasFeature(FEATURE_PDF_ATTACHMENT) && $this->pdf_email_attachment;
     }
-    
+
     public function getEmailDesignId()
     {
         return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->email_design_id : EMAIL_DESIGN_PLAIN;
@@ -1290,11 +1292,11 @@ class Account extends Eloquent
 
     public function clientViewCSS(){
         $css = '';
-        
+
         if ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN)) {
             $bodyFont = $this->getBodyFontCss();
             $headerFont = $this->getHeaderFontCss();
-            
+
             $css = 'body{'.$bodyFont.'}';
             if ($headerFont != $bodyFont) {
                 $css .= 'h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{'.$headerFont.'}';
@@ -1304,17 +1306,17 @@ class Account extends Eloquent
             // For self-hosted users, a white-label license is required for custom CSS
             $css .= $this->client_view_css;
         }
-        
+
         return $css;
     }
-    
+
     public function getFontsUrl($protocol = ''){
         $bodyFont = $this->getHeaderFontId();
         $headerFont = $this->getBodyFontId();
 
         $bodyFontSettings = Utils::getFromCache($bodyFont, 'fonts');
         $google_fonts = array($bodyFontSettings['google_font']);
-        
+
         if($headerFont != $bodyFont){
             $headerFontSettings = Utils::getFromCache($headerFont, 'fonts');
             $google_fonts[] = $headerFontSettings['google_font'];
@@ -1322,7 +1324,7 @@ class Account extends Eloquent
 
         return ($protocol?$protocol.':':'').'//fonts.googleapis.com/css?family='.implode('|',$google_fonts);
     }
-    
+
     public function getHeaderFontId() {
         return ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) && $this->header_font_id) ? $this->header_font_id : DEFAULT_HEADER_FONT;
     }
@@ -1334,47 +1336,47 @@ class Account extends Eloquent
     public function getHeaderFontName(){
         return Utils::getFromCache($this->getHeaderFontId(), 'fonts')['name'];
     }
-    
+
     public function getBodyFontName(){
         return Utils::getFromCache($this->getBodyFontId(), 'fonts')['name'];
     }
-    
+
     public function getHeaderFontCss($include_weight = true){
         $font_data = Utils::getFromCache($this->getHeaderFontId(), 'fonts');
         $css = 'font-family:'.$font_data['css_stack'].';';
-            
+
         if($include_weight){
             $css .= 'font-weight:'.$font_data['css_weight'].';';
         }
-            
+
         return $css;
     }
-    
+
     public function getBodyFontCss($include_weight = true){
         $font_data = Utils::getFromCache($this->getBodyFontId(), 'fonts');
         $css = 'font-family:'.$font_data['css_stack'].';';
-            
+
         if($include_weight){
             $css .= 'font-weight:'.$font_data['css_weight'].';';
         }
-            
+
         return $css;
     }
-    
+
     public function getFonts(){
         return array_unique(array($this->getHeaderFontId(), $this->getBodyFontId()));
     }
-    
+
     public function getFontsData(){
         $data = array();
-        
+
         foreach($this->getFonts() as $font){
             $data[] = Utils::getFromCache($font, 'fonts');
         }
-        
+
         return $data;
     }
-    
+
     public function getFontFolders(){
         return array_map(function($item){return $item['folder'];}, $this->getFontsData());
     }
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 91ffddfea138..5d09ec2d7432 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -163,7 +163,7 @@ class InvoiceRepository extends BaseRepository
           ->where('contacts.is_primary', '=', true)
           ->where('invoices.is_recurring', '=', false)
           // This needs to be a setting to also hide the activity on the dashboard page
-          //->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT) 
+          //->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT)
           ->select(
                 DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
                 DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
@@ -240,7 +240,7 @@ class InvoiceRepository extends BaseRepository
                 $account->invoice_footer = trim($data['invoice_footer']);
             }
             $account->save();
-        }        
+        }
 
         if (isset($data['invoice_number']) && !$invoice->is_recurring) {
             $invoice->invoice_number = trim($data['invoice_number']);
@@ -277,7 +277,7 @@ class InvoiceRepository extends BaseRepository
             $invoice->start_date = Utils::toSqlDate($data['start_date']);
             $invoice->end_date = Utils::toSqlDate($data['end_date']);
             $invoice->auto_bill = isset($data['auto_bill']) && $data['auto_bill'] ? true : false;
-            
+
             if (isset($data['recurring_due_date'])) {
                 $invoice->due_date = $data['recurring_due_date'];
             } elseif (isset($data['due_date'])) {
@@ -299,7 +299,7 @@ class InvoiceRepository extends BaseRepository
         } else {
             $invoice->terms = '';
         }
-        
+
         $invoice->invoice_footer = (isset($data['invoice_footer']) && trim($data['invoice_footer'])) ? trim($data['invoice_footer']) : (!$publicId && $account->invoice_footer ? $account->invoice_footer : '');
         $invoice->public_notes = isset($data['public_notes']) ? trim($data['public_notes']) : null;
 
@@ -318,8 +318,8 @@ class InvoiceRepository extends BaseRepository
 
         // provide backwards compatability
         if (isset($data['tax_name']) && isset($data['tax_rate'])) {
-            $data['tax_name1'] = $data['tax_name']; 
-            $data['tax_rate1'] = $data['tax_rate']; 
+            $data['tax_name1'] = $data['tax_name'];
+            $data['tax_rate1'] = $data['tax_rate'];
         }
 
         $total = 0;
@@ -353,11 +353,11 @@ class InvoiceRepository extends BaseRepository
             }
 
             if (isset($item['tax_rate1']) && Utils::parseFloat($item['tax_rate1']) > 0) {
-                $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate1']);            
+                $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate1']);
                 $itemTax += round($lineTotal * $invoiceItemTaxRate / 100, 2);
             }
             if (isset($item['tax_rate2']) && Utils::parseFloat($item['tax_rate2']) > 0) {
-                $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate2']);            
+                $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate2']);
                 $itemTax += round($lineTotal * $invoiceItemTaxRate / 100, 2);
             }
         }
@@ -401,7 +401,7 @@ class InvoiceRepository extends BaseRepository
 
         $taxAmount1 = round($total * $invoice->tax_rate1 / 100, 2);
         $taxAmount2 = round($total * $invoice->tax_rate2 / 100, 2);
-        $total = round($total + $taxAmount1 + $taxAmount2, 2);        
+        $total = round($total + $taxAmount1 + $taxAmount2, 2);
         $total += $itemTax;
 
         // custom fields not charged taxes
@@ -424,24 +424,24 @@ class InvoiceRepository extends BaseRepository
         if ($publicId) {
             $invoice->invoice_items()->forceDelete();
         }
-        
+
         $document_ids = !empty($data['document_ids'])?array_map('intval', $data['document_ids']):array();;
         foreach ($document_ids as $document_id){
             $document = Document::scope($document_id)->first();
             if($document && Auth::user()->can('edit', $document)){
-                
+
                 if($document->invoice_id && $document->invoice_id != $invoice->id){
                     // From a clone
                     $document = $document->cloneDocument();
                     $document_ids[] = $document->public_id;// Don't remove this document
                 }
-                
+
                 $document->invoice_id = $invoice->id;
                 $document->expense_id = null;
                 $document->save();
             }
         }
-        
+
         if(!empty($data['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
             // Fallback upload
             $doc_errors = array();
@@ -460,7 +460,7 @@ class InvoiceRepository extends BaseRepository
                 Session::flash('error', implode('<br>',array_map('htmlentities',$doc_errors)));
             }
         }
-        
+
         foreach ($invoice->documents as $document){
             if(!in_array($document->public_id, $document_ids)){
                 // Removed
@@ -534,12 +534,12 @@ class InvoiceRepository extends BaseRepository
 
             // provide backwards compatability
             if (isset($item['tax_name']) && isset($item['tax_rate'])) {
-                $item['tax_name1'] = $item['tax_name']; 
-                $item['tax_rate1'] = $item['tax_rate']; 
+                $item['tax_name1'] = $item['tax_name'];
+                $item['tax_rate1'] = $item['tax_rate'];
             }
 
             $invoiceItem->fill($item);
-            
+
             $invoice->invoice_items()->save($invoiceItem);
         }
 
@@ -623,9 +623,9 @@ class InvoiceRepository extends BaseRepository
                 'cost',
                 'qty',
                 'tax_name1',
-                'tax_rate1', 
+                'tax_rate1',
                 'tax_name2',
-                'tax_rate2', 
+                'tax_rate2',
             ] as $field) {
                 $cloneItem->$field = $item->$field;
             }
@@ -634,7 +634,7 @@ class InvoiceRepository extends BaseRepository
         }
 
         foreach ($invoice->documents as $document) {
-            $cloneDocument = $document->cloneDocument();            
+            $cloneDocument = $document->cloneDocument();
             $invoice->documents()->save($cloneDocument);
         }
 
@@ -708,7 +708,7 @@ class InvoiceRepository extends BaseRepository
         $invoice = Invoice::createNew($recurInvoice);
         $invoice->client_id = $recurInvoice->client_id;
         $invoice->recurring_invoice_id = $recurInvoice->id;
-        $invoice->invoice_number = $recurInvoice->account->recurring_invoice_number_prefix . $recurInvoice->account->getNextInvoiceNumber($recurInvoice);
+        $invoice->invoice_number = $recurInvoice->account->getNextInvoiceNumber($invoice);
         $invoice->amount = $recurInvoice->amount;
         $invoice->balance = $recurInvoice->amount;
         $invoice->invoice_date = date_create()->format('Y-m-d');

From e08e8c1962102c653e3132c68d64b6bec8d38fa5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Jun 2016 12:56:59 +0300
Subject: [PATCH 063/111] Support downloading PDF through the API

---
 app/Http/Controllers/InvoiceApiController.php | 23 +++++++++++++++----
 app/Http/routes.php                           |  1 +
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 667690395eb2..6d68573cdb42 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -183,7 +183,7 @@ class InvoiceApiController extends BaseAPIController
         $invoice = Invoice::scope($invoice->public_id)
                         ->with('client', 'invoice_items', 'invitations')
                         ->first();
-                        
+
         return $this->itemResponse($invoice);
     }
 
@@ -270,7 +270,7 @@ class InvoiceApiController extends BaseAPIController
                 $item[$key] = $val;
             }
         }
-        
+
         return $item;
     }
 
@@ -309,7 +309,7 @@ class InvoiceApiController extends BaseAPIController
     public function update(UpdateInvoiceAPIRequest $request, $publicId)
     {
         if ($request->action == ACTION_CONVERT) {
-            $quote = $request->entity();            
+            $quote = $request->entity();
             $invoice = $this->invoiceRepo->cloneInvoice($quote, $quote->id);
             return $this->itemResponse($invoice);
         } elseif ($request->action) {
@@ -323,7 +323,7 @@ class InvoiceApiController extends BaseAPIController
         $invoice = Invoice::scope($publicId)
                         ->with('client', 'invoice_items', 'invitations')
                         ->firstOrFail();
-                        
+
         return $this->itemResponse($invoice);
     }
 
@@ -352,10 +352,23 @@ class InvoiceApiController extends BaseAPIController
     public function destroy(UpdateInvoiceAPIRequest $request)
     {
         $invoice = $request->entity();
-        
+
         $this->invoiceRepo->delete($invoice);
 
         return $this->itemResponse($invoice);
     }
 
+    public function download(InvoiceRequest $request)
+    {
+        $invoice = $request->entity();
+        $pdfString = $invoice->getPDFString();
+
+        header('Content-Type: application/pdf');
+        header('Content-Length: ' . strlen($pdfString));
+        header('Content-disposition: attachment; filename="' . $invoice->getFileName() . '"');
+        header('Cache-Control: public, must-revalidate, max-age=0');
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+        return $pdfString;
+    }
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 2c3fba6fec4b..be5972c0d1d2 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -255,6 +255,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
     //Route::get('quotes', 'QuoteApiController@index');
     //Route::resource('quotes', 'QuoteApiController');
     Route::get('invoices', 'InvoiceApiController@index');
+    Route::get('download/{invoice_id}', 'InvoiceApiController@download');
     Route::resource('invoices', 'InvoiceApiController');
     Route::get('payments', 'PaymentApiController@index');
     Route::resource('payments', 'PaymentApiController');

From 53eb0cb127b759e669995c8671df80af7a654b9f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Jun 2016 13:26:59 +0300
Subject: [PATCH 064/111] Fixed is_quote reference

---
 app/Models/Account.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index b0fc07cb79f6..7f6218462536 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -650,7 +650,7 @@ class Account extends Eloquent
 
             // update the invoice counter to be caught up
             if ($counterOffset > 1) {
-                if ($invoice->isType(INVOICE_TYPE_QUOTE) && !$this->share_counter) {
+                if ($invoice->is_quote && !$this->share_counter) {
                     $this->quote_number_counter += $counterOffset - 1;
                 } else {
                     $this->invoice_number_counter += $counterOffset - 1;
@@ -674,7 +674,7 @@ class Account extends Eloquent
             return;
         }
 
-        if ($invoice->isType(INVOICE_TYPE_QUOTE) && !$this->share_counter) {
+        if ($invoice->is_quote && !$this->share_counter) {
             $this->quote_number_counter += 1;
         } else {
             $this->invoice_number_counter += 1;

From e392ed1921f546a3c24dd2598ad67fc7e0ab82c7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Jun 2016 16:50:10 +0300
Subject: [PATCH 065/111] Display number of documents

---
 resources/views/invoices/edit.blade.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 0de42f092dea..e4d0ba7dc431 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -304,7 +304,12 @@
                         <li role="presentation"><a href="#terms" aria-controls="terms" role="tab" data-toggle="tab">{{ trans("texts.terms") }}</a></li>
                         <li role="presentation"><a href="#footer" aria-controls="footer" role="tab" data-toggle="tab">{{ trans("texts.footer") }}</a></li>
                         @if ($account->hasFeature(FEATURE_DOCUMENTS))
-                            <li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">{{ trans("texts.invoice_documents") }}</a></li>
+                            <li role="presentation"><a href="#attached-documents" aria-controls="attached-documents" role="tab" data-toggle="tab">
+                                {{ trans("texts.invoice_documents") }}
+                                @if (count($invoice->documents))
+                                    ({{ count($invoice->documents) }})
+                                @endif
+                            </a></li>
                         @endif
                     </ul>
 

From 0c2bd4414d8ce4835124223d9ffd082c0969a1ea Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 1 Jun 2016 17:33:16 +0300
Subject: [PATCH 066/111] Don't refresh PDF after file uploaded

---
 resources/views/invoices/edit.blade.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index e4d0ba7dc431..94245c508959 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -1435,7 +1435,9 @@
         file.public_id = response.document.public_id
         model.invoice().documents()[file.index].update(response.document);
         window.countUploadingDocuments--;
-        refreshPDF(true);
+        @if ($account->invoice_embed_documents)
+            refreshPDF(true);
+        @endif
         if(response.document.preview_url){
             dropzone.emit('thumbnail', file, response.document.preview_url);
         }

From a2f9daf1906149aebf5af34b5c497ffca5dfa0df Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 4 Jun 2016 21:56:25 +0300
Subject: [PATCH 067/111] Hide 2nd tax rate until option is available

---
 resources/views/invoices/edit.blade.php | 38 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 94245c508959..1a65353f7e37 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -18,7 +18,7 @@
             font-weight: normal !important;
         }
 
-        select.tax-select {
+        select.xtax-select {
             width: 50%;
             float: left;
         }
@@ -271,14 +271,16 @@
                             ->raw() !!}
                     <input type="text" data-bind="value: tax_name1, attr: {name: 'invoice_items[' + $index() + '][tax_name1]'}" style="display:none">
                     <input type="text" data-bind="value: tax_rate1, attr: {name: 'invoice_items[' + $index() + '][tax_rate1]'}" style="display:none">
-                    {!! Former::select('')
-                            ->addOption('', '')
-                            ->options($taxRateOptions)
-                            ->data_bind('value: tax2')
-                            ->addClass('tax-select')
-                            ->raw() !!}
-                    <input type="text" data-bind="value: tax_name2, attr: {name: 'invoice_items[' + $index() + '][tax_name2]'}" style="display:none">
-                    <input type="text" data-bind="value: tax_rate2, attr: {name: 'invoice_items[' + $index() + '][tax_rate2]'}" style="display:none">
+                    <div style="display:none">
+                        {!! Former::select('')
+                                ->addOption('', '')
+                                ->options($taxRateOptions)
+                                ->data_bind('value: tax2')
+                                ->addClass('tax-select')
+                                ->raw() !!}
+                        <input type="text" data-bind="value: tax_name2, attr: {name: 'invoice_items[' + $index() + '][tax_name2]'}" style="display:none">
+                        <input type="text" data-bind="value: tax_rate2, attr: {name: 'invoice_items[' + $index() + '][tax_rate2]'}" style="display:none">
+                    </div>
 				</td>
 				<td style="text-align:right;padding-top:9px !important" nowrap>
 					<div class="line-total" data-bind="text: totals.total"></div>
@@ -427,14 +429,16 @@
                             ->raw() !!}
                     <input type="text" name="tax_name1" data-bind="value: tax_name1" style="display:none">
                     <input type="text" name="tax_rate1" data-bind="value: tax_rate1" style="display:none">
-                    {!! Former::select('')
-                            ->addOption('', '')
-                            ->options($taxRateOptions)
-                            ->addClass('tax-select')
-                            ->data_bind('value: tax2')
-                            ->raw() !!}
-                    <input type="text" name="tax_name2" data-bind="value: tax_name2" style="display:none">
-                    <input type="text" name="tax_rate2" data-bind="value: tax_rate2" style="display:none">
+                    <div style="display:none">
+                        {!! Former::select('')
+                                ->addOption('', '')
+                                ->options($taxRateOptions)
+                                ->addClass('tax-select')
+                                ->data_bind('value: tax2')
+                                ->raw() !!}
+                        <input type="text" name="tax_name2" data-bind="value: tax_name2" style="display:none">
+                        <input type="text" name="tax_rate2" data-bind="value: tax_rate2" style="display:none">
+                    </div>
                 </td>
 				<td style="text-align: right"><span data-bind="text: totals.taxAmount"/></td>
 			</tr>

From 02a6213e346db89dac399da9789ab035406f2427 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sat, 4 Jun 2016 23:22:27 +0300
Subject: [PATCH 068/111] Updated grandfathered user date

---
 app/Http/routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index be5972c0d1d2..b5d52c56b497 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -690,7 +690,7 @@ if (!defined('CONTACT_EMAIL')) {
     define('FEATURE_USER_PERMISSIONS', 'user_permissions');
 
     // Pro users who started paying on or before this date will be able to manage users
-    define('PRO_USERS_GRANDFATHER_DEADLINE', '2016-05-15');
+    define('PRO_USERS_GRANDFATHER_DEADLINE', '2016-06-04');
 
     $creditCards = [
                 1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'],

From 4c8414f616693a787a6fcaba952c47cb87e2c0d2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 5 Jun 2016 08:24:16 +0300
Subject: [PATCH 069/111] git update

---
 app/Http/routes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index b5d52c56b497..5921285cf600 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /*
 |--------------------------------------------------------------------------
 | Application Routes

From d472fcc93d56947592e429d9dccf3338a556664c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 5 Jun 2016 18:47:51 +0300
Subject: [PATCH 070/111] Check for blank api secret

---
 app/Http/Middleware/ApiCheck.php        |  5 +-
 app/Http/routes.php                     |  5 +-
 app/Models/Document.php                 | 79 ++++++++++++-------------
 resources/views/expenses/edit.blade.php |  4 +-
 resources/views/invoices/edit.blade.php |  5 +-
 resources/views/master.blade.php        | 47 +++++++++------
 6 files changed, 78 insertions(+), 67 deletions(-)

diff --git a/app/Http/Middleware/ApiCheck.php b/app/Http/Middleware/ApiCheck.php
index 5200c3264a96..524b718cc44f 100644
--- a/app/Http/Middleware/ApiCheck.php
+++ b/app/Http/Middleware/ApiCheck.php
@@ -23,7 +23,10 @@ class ApiCheck {
     {
         $loggingIn = $request->is('api/v1/login') || $request->is('api/v1/register');
         $headers = Utils::getApiHeaders();
-        $hasApiSecret = hash_equals($request->api_secret ?: '', env(API_SECRET));
+
+        if ($secret = env(API_SECRET)) {
+            $hasApiSecret = hash_equals($request->api_secret ?: '', $secret);
+        }
 
         if ($loggingIn) {
             // check API secret
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 5921285cf600..cf396c3de9e2 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -303,11 +303,10 @@ Route::get('/testimonials', function() {
 Route::get('/compare-online-invoicing{sites?}', function() {
     return Redirect::to(NINJA_WEB_URL, 301);
 });
-Route::get('/forgot_password', function() {
-    return Redirect::to(NINJA_APP_URL.'/forgot', 301);
+Route::get('/forgot', function() {
+    return Redirect::to(NINJA_APP_URL.'/recover_password', 301);
 });
 
-
 if (!defined('CONTACT_EMAIL')) {
     define('CONTACT_EMAIL', Config::get('mail.from.address'));
     define('CONTACT_NAME', Config::get('mail.from.name'));
diff --git a/app/Models/Document.php b/app/Models/Document.php
index 6d9c24857143..f1d6d6b9c5bd 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -10,16 +10,16 @@ class Document extends EntityModel
         'jpg' => 'jpeg',
         'tif' => 'tiff',
     );
-    
+
     public static $allowedMimes = array(// Used by Dropzone.js; does not affect what the server accepts
         'image/png', 'image/jpeg', 'image/tiff', 'application/pdf', 'image/gif', 'image/vnd.adobe.photoshop', 'text/plain',
-        'application/zip', 'application/msword',
-        'application/excel', 'application/vnd.ms-excel', 'application/x-excel', 'application/x-msexcel', 
+        'application/msword',
+        'application/excel', 'application/vnd.ms-excel', 'application/x-excel', 'application/x-msexcel',
         'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/postscript', 'image/svg+xml',
         'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.ms-powerpoint',
     );
-    
+
     public static $types = array(
         'png' => array(
             'mime' => 'image/png',
@@ -48,9 +48,6 @@ class Document extends EntityModel
         'txt' => array(
             'mime' => 'text/plain',
         ),
-        'zip' => array(
-            'mime' => 'application/zip',
-        ),
         'doc' => array(
             'mime' => 'application/msword',
         ),
@@ -70,18 +67,18 @@ class Document extends EntityModel
             'mime' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
         ),
     );
-    
+
     public function fill(array $attributes)
     {
         parent::fill($attributes);
-        
+
         if(empty($this->attributes['disk'])){
             $this->attributes['disk'] = env('DOCUMENT_FILESYSTEM', 'documents');
         }
-        
+
         return $this;
     }
-    
+
     public function account()
     {
         return $this->belongsTo('App\Models\Account');
@@ -101,7 +98,7 @@ class Document extends EntityModel
     {
         return $this->belongsTo('App\Models\Invoice')->withTrashed();
     }
-    
+
     public function getDisk(){
         return Storage::disk(!empty($this->disk)?$this->disk:env('DOCUMENT_FILESYSTEM', 'documents'));
     }
@@ -110,19 +107,19 @@ class Document extends EntityModel
     {
         $this->attributes['disk'] = $value?$value:env('DOCUMENT_FILESYSTEM', 'documents');
     }
-    
+
     public function getDirectUrl(){
         return static::getDirectFileUrl($this->path, $this->getDisk());
     }
-    
+
     public function getDirectPreviewUrl(){
         return $this->preview?static::getDirectFileUrl($this->preview, $this->getDisk(), true):null;
     }
-    
+
     public static function getDirectFileUrl($path, $disk, $prioritizeSpeed = false){
         $adapter = $disk->getAdapter();
         $fullPath = $adapter->applyPathPrefix($path);
-        
+
         if($adapter instanceof \League\Flysystem\AwsS3v3\AwsS3Adapter) {
             $client = $adapter->getClient();
             $command = $client->getCommand('GetObject', [
@@ -136,12 +133,12 @@ class Document extends EntityModel
             $secret = env('RACKSPACE_TEMP_URL_SECRET');
             if($secret){
                 $object = $adapter->getContainer()->getObject($fullPath);
-                
+
                 if(env('RACKSPACE_TEMP_URL_SECRET_SET')){
                     // Go ahead and set the secret too
                     $object->getService()->getAccount()->setTempUrlSecret($secret);
-                }            
-                
+                }
+
                 $url = $object->getUrl();
                 $expiry = strtotime('+10 minutes');
                 $urlPath = urldecode($url->getPath());
@@ -150,64 +147,64 @@ class Document extends EntityModel
                 return sprintf('%s?temp_url_sig=%s&temp_url_expires=%d', $url, $hash, $expiry);
             }
         }
-        
+
         return null;
     }
-    
+
     public function getRaw(){
         $disk = $this->getDisk();
-        
+
         return $disk->get($this->path);
     }
-    
+
     public function getStream(){
         $disk = $this->getDisk();
-        
+
         return $disk->readStream($this->path);
     }
-    
+
     public function getRawPreview(){
         $disk = $this->getDisk();
-        
+
         return $disk->get($this->preview);
     }
-    
+
     public function getUrl(){
         return url('documents/'.$this->public_id.'/'.$this->name);
     }
-    
+
     public function getClientUrl($invitation){
         return url('client/documents/'.$invitation->invitation_key.'/'.$this->public_id.'/'.$this->name);
     }
-    
+
     public function isPDFEmbeddable(){
         return $this->type == 'jpeg' || $this->type == 'png' || $this->preview;
     }
-    
+
     public function getVFSJSUrl(){
         if(!$this->isPDFEmbeddable())return null;
         return url('documents/js/'.$this->public_id.'/'.$this->name.'.js');
     }
-    
+
     public function getClientVFSJSUrl(){
         if(!$this->isPDFEmbeddable())return null;
         return url('client/documents/js/'.$this->public_id.'/'.$this->name.'.js');
     }
-    
+
     public function getPreviewUrl(){
         return $this->preview?url('documents/preview/'.$this->public_id.'/'.$this->name.'.'.pathinfo($this->preview, PATHINFO_EXTENSION)):null;
     }
-    
+
     public function toArray()
     {
         $array = parent::toArray();
-        
+
         if(empty($this->visible) || in_array('url', $this->visible))$array['url'] = $this->getUrl();
         if(empty($this->visible) || in_array('preview_url', $this->visible))$array['preview_url'] = $this->getPreviewUrl();
-        
+
         return $array;
     }
-    
+
     public function cloneDocument(){
         $document = Document::createNew($this);
         $document->path = $this->path;
@@ -219,7 +216,7 @@ class Document extends EntityModel
         $document->size = $this->size;
         $document->width = $this->width;
         $document->height = $this->height;
-        
+
         return $document;
     }
 }
@@ -230,11 +227,11 @@ Document::deleted(function ($document) {
         ->where('documents.path', '=', $document->path)
         ->where('documents.disk', '=', $document->disk)
         ->count();
-    
+
     if(!$same_path_count){
         $document->getDisk()->delete($document->path);
     }
-    
+
     if($document->preview){
         $same_preview_count = DB::table('documents')
             ->where('documents.account_id', '=', $document->account_id)
@@ -245,5 +242,5 @@ Document::deleted(function ($document) {
             $document->getDisk()->delete($document->preview);
         }
     }
-    
-});
\ No newline at end of file
+
+});
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 5c0f05b8ab35..0f1175d9f971 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -378,7 +378,7 @@
         }
 
         window.countUploadingDocuments = 0;
-        @if (Auth::user()->account->hasFeature(FEATURE_DOCUMENTS))
+
         function handleDocumentAdded(file){
             // open document when clicked
             if (file.url) {
@@ -419,7 +419,7 @@
         function handleDocumentError() {
             window.countUploadingDocuments--;
         }
-        @endif
+        
     </script>
 
 @stop
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 1a65353f7e37..404f4a8338f6 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -222,7 +222,7 @@
                 @endif
 				<th style="min-width:120px" data-bind="text: costLabel">{{ $invoiceLabels['unit_cost'] }}</th>
 				<th style="{{ $account->hide_quantity ? 'display:none' : 'min-width:120px' }}" data-bind="text: qtyLabel">{{ $invoiceLabels['quantity'] }}</th>
-				<th style="min-width:180px;display:none;" data-bind="visible: $root.invoice_item_taxes.show">{{ trans('texts.tax') }}</th>
+				<th style="min-width:120px;display:none;" data-bind="visible: $root.invoice_item_taxes.show">{{ trans('texts.tax') }}</th>
 				<th style="min-width:120px;">{{ trans('texts.line_total') }}</th>
 				<th style="min-width:32px;" class="hide-border"></th>
 			</tr>
@@ -1409,7 +1409,7 @@
     }
 
     window.countUploadingDocuments = 0;
-    @if ($account->hasFeature(FEATURE_DOCUMENTS))
+
     function handleDocumentAdded(file){
         // open document when clicked
         if (file.url) {
@@ -1454,7 +1454,6 @@
     function handleDocumentError() {
         window.countUploadingDocuments--;
     }
-    @endif
 
 	</script>
     @if ($account->hasFeature(FEATURE_DOCUMENTS) && $account->invoice_embed_documents)
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index b0d59cc90254..19bb607ce612 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -4,7 +4,7 @@
     @if (isset($hideLogo) && $hideLogo)
         <title>{{ trans('texts.client_portal') }}</title>
     @else
-        <title>{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}</title> 
+        <title>{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}</title>
         <meta name="description" content="{{ isset($description) ? $description : trans('texts.app_description') }}" />
         <link href="{{ asset('favicon-v2.png') }}" rel="shortcut icon" type="image/png">
     @endif
@@ -22,24 +22,37 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="msapplication-config" content="none"/> 
+    <meta name="msapplication-config" content="none"/>
+
+    <!-- http://stackoverflow.com/questions/19012698/browser-cache-issues-in-laravel-4-application -->
+    <meta http-equiv="cache-control" content="max-age=0" />
+    <meta http-equiv="cache-control" content="no-cache" />
+    <meta http-equiv="cache-control" content="no-store" />
+    <meta http-equiv="cache-control" content="must-revalidate" />
+    <meta http-equiv="expires" content="0" />
+    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
+    <meta http-equiv="pragma" content="no-cache" />
 
     <link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}" />
 
-    <script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>    
+    <script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
 
     <script type="text/javascript">
         var NINJA = NINJA || {};
         NINJA.fontSize = 9;
         NINJA.isRegistered = {{ \Utils::isRegistered() ? 'true' : 'false' }};
-        
+
         window.onerror = function (errorMsg, url, lineNumber, column, error) {
             if (errorMsg.indexOf('Script error.') > -1) {
                 return;
             }
 
+            if (errorMsg.indexOf('No unicode cmap for font') > -1) {
+                alert("Please force refresh the page to update the font cache.\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5");
+            }
+
             try {
-                // Use StackTraceJS to parse the error context 
+                // Use StackTraceJS to parse the error context
                 if (error) {
                     var message = error.message ? error.message : error;
                     StackTrace.fromError(error).then(function(result) {
@@ -51,7 +64,7 @@
                 } else {
                     logError(errorMsg);
                 }
-                
+
                 trackEvent('/error', errorMsg);
             } catch(err) {}
 
@@ -78,7 +91,7 @@
                 'sSearch': ''
             }
         } );
-        
+
         /* This causes problems with some languages. ie, fr_CA
 		var appLocale = '{{App::getLocale()}}';
         $.extend( true, $.fn.datepicker.defaults, {
@@ -108,7 +121,7 @@
                 _fbq.loaded = true;
              }
             })();
-            
+
         @else
             function fbq() {
                 // do nothing
@@ -116,7 +129,7 @@
         @endif
 
         window._fbq = window._fbq || [];
-            
+
     </script>
 
 
@@ -132,7 +145,7 @@
 
 <body class="body">
 
-    @if (isset($_ENV['TAG_MANAGER_KEY']) && $_ENV['TAG_MANAGER_KEY'])  
+    @if (isset($_ENV['TAG_MANAGER_KEY']) && $_ENV['TAG_MANAGER_KEY'])
     <!-- Google Tag Manager -->
     <noscript><iframe src="//www.googletagmanager.com/ns.html?id={{ $_ENV['TAG_MANAGER_KEY'] }}"
         height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
@@ -140,20 +153,20 @@
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
         j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','{{ $_ENV['TAG_MANAGER_KEY'] }}');</script>      
+    })(window,document,'script','dataLayer','{{ $_ENV['TAG_MANAGER_KEY'] }}');</script>
     <!-- End Google Tag Manager -->
 
     <script>
         function trackEvent(category, action) {}
     </script>
-    @elseif (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])  
+    @elseif (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])
     <script>
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
             (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
             m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
         })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-        ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}', 'auto');        
+        ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}', 'auto');
         ga('send', 'pageview');
 
         function trackEvent(category, action) {
@@ -165,7 +178,7 @@
         function trackEvent(category, action) {}
     </script>
     @endif
-    
+
 @yield('body')
 
 <script type="text/javascript">
@@ -174,7 +187,7 @@
     $(function() {
         $('form.warn-on-exit input, form.warn-on-exit textarea, form.warn-on-exit select').change(function() {
             NINJA.formIsChanged = true;
-        }); 
+        });
 
         @if (Session::has('trackEventCategory') && Session::has('trackEventAction'))
             @if (Session::get('trackEventAction') === '/buy_pro_plan')
@@ -195,12 +208,12 @@
         } else {
             return undefined;
         }
-    }); 
+    });
     function openUrl(url, track) {
         trackEvent('/view_link', track ? track : url);
         window.open(url, '_blank');
     }
-</script> 
+</script>
 
 </body>
 

From 85d94b5a36178c1cca464b400206cf30058f9287 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 5 Jun 2016 19:11:37 +0300
Subject: [PATCH 071/111] Minor fixes

---
 app/Http/routes.php                           |  3 +++
 app/Ninja/Repositories/ReferralRepository.php |  6 ++---
 resources/lang/en/texts.php                   | 24 ++++++++++---------
 resources/views/master.blade.php              |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/Http/routes.php b/app/Http/routes.php
index cf396c3de9e2..f6574b9762c9 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -306,6 +306,9 @@ Route::get('/compare-online-invoicing{sites?}', function() {
 Route::get('/forgot', function() {
     return Redirect::to(NINJA_APP_URL.'/recover_password', 301);
 });
+Route::get('/feed', function() {
+    return Redirect::to(NINJA_WEB_URL.'/feed', 301);
+});
 
 if (!defined('CONTACT_EMAIL')) {
     define('CONTACT_EMAIL', Config::get('mail.from.address'));
diff --git a/app/Ninja/Repositories/ReferralRepository.php b/app/Ninja/Repositories/ReferralRepository.php
index f96475c72ddc..f6170af296e3 100644
--- a/app/Ninja/Repositories/ReferralRepository.php
+++ b/app/Ninja/Repositories/ReferralRepository.php
@@ -7,7 +7,7 @@ class ReferralRepository
 {
     public function getCounts($userId)
     {
-        $accounts = Account::where('referral_user_id', $userId);
+        $accounts = Account::where('referral_user_id', $userId)->get();
 
         $counts = [
             'free' => 0,
@@ -18,7 +18,7 @@ class ReferralRepository
         foreach ($accounts as $account) {
             $counts['free']++;
             $plan = $account->getPlanDetails(false, false);
-            
+
             if ($plan) {
                 $counts['pro']++;
                 if ($plan['plan'] == PLAN_ENTERPRISE) {
@@ -29,4 +29,4 @@ class ReferralRepository
 
         return $counts;
     }
-}
\ No newline at end of file
+}
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 624a472f8ac9..571d2b518a00 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1054,14 +1054,14 @@ $LANG = array(
     'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.',
     'send_portal_password'=>'Generate password automatically',
     'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.',
-    
+
     'expired' => 'Expired',
     'invalid_card_number' => 'The credit card number is not valid.',
     'invalid_expiry' => 'The expiration date is not valid.',
     'invalid_cvv' => 'The CVV is not valid.',
     'cost' => 'Cost',
     'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.',
-    
+
     // User Permissions
     'owner' => 'Owner',
     'administrator' => 'Administrator',
@@ -1079,8 +1079,8 @@ $LANG = array(
     'create_all_help' => 'Allow user to create and modify records',
     'view_all_help' => 'Allow user to view records they didn\'t create',
     'edit_all_help' => 'Allow user to modify records they didn\'t create',
-    'view_payment' => 'View Payment', 
-   
+    'view_payment' => 'View Payment',
+
     'january' => 'January',
     'february' => 'February',
     'march' => 'March',
@@ -1093,7 +1093,7 @@ $LANG = array(
     'october' => 'October',
     'november' => 'November',
     'december' => 'December',
-    
+
     // Documents
     'documents_header' => 'Documents:',
     'email_documents_header' => 'Documents:',
@@ -1125,11 +1125,11 @@ $LANG = array(
     'enable_client_portal_help' => 'Show/hide the client portal.',
     'enable_client_portal_dashboard' => 'Dashboard',
     'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.',
-        
+
     // Plans
     'account_management' => 'Account Management',
     'plan_status' => 'Plan Status',
-    
+
     'plan_upgrade' => 'Upgrade',
     'plan_change' => 'Change Plan',
     'pending_change_to' => 'Changes To',
@@ -1159,9 +1159,9 @@ $LANG = array(
     'plan_paid' => 'Term Started',
     'plan_started' => 'Plan Started',
     'plan_expires' => 'Plan Expires',
-    
+
     'white_label_button' => 'White Label',
-    
+
     'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.',
     'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.',
     'enterprise_plan_product' => 'Enterprise Plan',
@@ -1181,9 +1181,11 @@ $LANG = array(
     'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.',
     'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.',
     'return_to_app' => 'Return to app',
-    
+
+    'update_font_cache' => 'Please force refresh the page to update the font cache.',
+
 );
 
 return $LANG;
 
-?>.
\ No newline at end of file
+?>.
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 19bb607ce612..3d4ee77e0cfb 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -48,7 +48,7 @@
             }
 
             if (errorMsg.indexOf('No unicode cmap for font') > -1) {
-                alert("Please force refresh the page to update the font cache.\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5");
+                alert("{{ trans('texts.update_font_cache') }}\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5");
             }
 
             try {

From d5669fdbf9f81e2c70a5ddf7e604faf9bc73532e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 5 Jun 2016 21:08:41 +0300
Subject: [PATCH 072/111] Minor fixes

---
 app/Http/Controllers/AccountController.php    |   6 +-
 .../Controllers/AccountGatewayController.php  |   7 +
 app/Http/routes.php                           |   4 +
 resources/views/accounts/management.blade.php |  32 +++--
 resources/views/header.blade.php              | 128 +++++++++---------
 5 files changed, 97 insertions(+), 80 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 67bb78ca844a..57f581e3df11 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -206,7 +206,7 @@ class AccountController extends BaseController
                 }
             }
 
-            if (!empty($new_plan)) {
+            if (!empty($new_plan) && $new_plan['plan'] != PLAN_FREE) {
                 $time_used = $planDetails['paid']->diff(date_create());
                 $days_used = $time_used->days;
 
@@ -1320,12 +1320,14 @@ class AccountController extends BaseController
         }
 
         $account = Auth::user()->account;
+        $invitation = $invoice->invitations->first();
 
         // replace the variables with sample data
         $data = [
             'account' => $account,
             'invoice' => $invoice,
-            'invitation' => $invoice->invitations->first(),
+            'invitation' => $invitation,
+            'link' => $invitation->getLink(),
             'client' => $invoice->client,
             'amount' => $invoice->amount
         ];
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 0bc730129fe1..968fac50e6cd 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -39,6 +39,13 @@ class AccountGatewayController extends BaseController
         return $this->accountGatewayService->getDatatable(Auth::user()->account_id);
     }
 
+    public function show($publicId)
+    {
+        Session::reflash();
+
+        return Redirect::to("gateways/$publicId/edit");
+    }
+
     public function edit($publicId)
     {
         $accountGateway = AccountGateway::scope($publicId)->firstOrFail();
diff --git a/app/Http/routes.php b/app/Http/routes.php
index f6574b9762c9..d9e4b2964b7e 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -309,6 +309,10 @@ Route::get('/forgot', function() {
 Route::get('/feed', function() {
     return Redirect::to(NINJA_WEB_URL.'/feed', 301);
 });
+Route::get('/comments/feed', function() {
+    return Redirect::to(NINJA_WEB_URL.'/comments/feed', 301);
+});
+
 
 if (!defined('CONTACT_EMAIL')) {
     define('CONTACT_EMAIL', Config::get('mail.from.address'));
diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php
index ac57cf737dd6..97ea6079df82 100644
--- a/resources/views/accounts/management.blade.php
+++ b/resources/views/accounts/management.blade.php
@@ -1,6 +1,6 @@
 @extends('header')
 
-@section('content')	
+@section('content')
 @parent
 
 @include('accounts.nav', ['selected' => ACCOUNT_MANAGEMENT])
@@ -134,10 +134,10 @@
 						<div class="modal-footer" style="margin-top: 0px">
 							<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
 							@if ($planDetails && $planDetails['active'])
-								<button type="button" class="btn btn-primary" onclick="confirmChangePlan()">{{ trans('texts.plan_change') }}</button>         
+								<button type="button" class="btn btn-primary" onclick="confirmChangePlan()">{{ trans('texts.plan_change') }}</button>
 							@else
-								<button type="button" class="btn btn-success" onclick="confirmChangePlan()">{{ trans('texts.plan_upgrade') }}</button>         
-							@endif						
+								<button type="button" class="btn btn-success" onclick="confirmChangePlan()">{{ trans('texts.plan_upgrade') }}</button>
+							@endif
 						</div>
 					</div>
 				</div>
@@ -165,12 +165,12 @@
 
 					<div style="background-color: #fff; padding-left: 16px; padding-right: 16px">
 						&nbsp;<p>{{ trans('texts.cancel_account_message') }}</p>&nbsp;
-						&nbsp;<p>{!! Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() !!}</p>&nbsp;        
+						&nbsp;<p>{!! Former::textarea('reason')->placeholder(trans('texts.reason_for_canceling'))->raw() !!}</p>&nbsp;
 					</div>
 
 					<div class="modal-footer" style="margin-top: 0px">
 						<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
-						<button type="button" class="btn btn-danger" onclick="confirmCancel()">{{ trans('texts.cancel_account') }}</button>         
+						<button type="button" class="btn btn-danger" onclick="confirmCancel()">{{ trans('texts.cancel_account') }}</button>
 					</div>
 
 				</div>
@@ -182,7 +182,7 @@
 
 <script type="text/javascript">
 	function showChangePlan() {
-		$('#changePlanModel').modal('show'); 
+		$('#changePlanModel').modal('show');
 	}
 
 	function confirmChangePlan() {
@@ -190,13 +190,13 @@
 	}
 
 	function showConfirm() {
-		$('#confirmCancelModal').modal('show'); 
+		$('#confirmCancelModal').modal('show');
 	}
 
 	function confirmCancel() {
 		$('form.cancel-account').submit();
-	} 
-	
+	}
+
 	@if ($account->company->pending_plan)
 	function cancelPendingChange(){
 		$('#plan').val('{{ $planDetails['plan'] }}')
@@ -205,12 +205,12 @@
 		return false;
 	}
 	@endif
-  	
+
   	jQuery(document).ready(function($){
 		function updatePlanModal() {
 			var plan = $('#plan').val();
 	 		$('#plan_term').closest('.form-group').toggle(plan!='free');
-			
+
 			if(plan=='{{PLAN_PRO}}'){
 				$('#plan_term option[value=month]').text({!! json_encode(trans('texts.plan_price_monthly', ['price'=>PLAN_PRICE_PRO_MONTHLY])) !!});
 				$('#plan_term option[value=year]').text({!! json_encode(trans('texts.plan_price_yearly', ['price'=>PLAN_PRICE_PRO_YEARLY])) !!});
@@ -221,11 +221,15 @@
   	  	}
 		$('#plan_term, #plan').change(updatePlanModal);
 	  	updatePlanModal();
-		
+
 		if(window.location.hash) {
 			var hash = window.location.hash;
 			$(hash).modal('toggle');
 	  	}
+
+        @if (Request::input('upgrade'))
+          showChangePlan();
+        @endif
   	});
 </script>
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 7b4fe014e71f..284bacba33f6 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -4,25 +4,25 @@
 @section('head')
 
   <link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100|Roboto+Slab:400,300,700&subset=latin,latin-ext" rel="stylesheet" type="text/css">
-  <link href="{{ asset('css/built.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>    
+  <link href="{{ asset('css/built.css') }}?no_cache={{ NINJA_VERSION }}" rel="stylesheet" type="text/css"/>
 
   <style type="text/css">
 
     body {
       background-color: #EEEEEE;
-      padding-top: 114px; 
+      padding-top: 114px;
     }
 
     /* Fix for header covering stuff when the screen is narrower */
     @media screen and (min-width: 1200px) {
       body {
-        padding-top: 56px; 
+        padding-top: 56px;
       }
     }
 
     @media screen and (max-width: 768px) {
       body {
-        padding-top: 56px; 
+        padding-top: 56px;
       }
     }
 
@@ -53,12 +53,12 @@
   }
 
   @if (!Auth::check() || !Auth::user()->registered)
-  function validateSignUp(showError) 
+  function validateSignUp(showError)
   {
     var isFormValid = true;
     $(['first_name','last_name','email','password']).each(function(i, field) {
       var $input = $('form.signUpForm #new_'+field),
-      val = $.trim($input.val());      
+      val = $.trim($input.val());
       var isValid = val && val.length >= (field == 'password' ? 6 : 1);
       if (isValid && field == 'email') {
         isValid = isValidEmailAddress(val);
@@ -96,8 +96,8 @@
       type: 'POST',
       url: '{{ URL::to('signup/validate') }}',
       data: 'email=' + $('form.signUpForm #new_email').val(),
-      success: function(result) { 
-        if (result == 'available') {                        
+      success: function(result) {
+        if (result == 'available') {
           submitSignUp();
         } else {
           $('#errorTaken').show();
@@ -106,19 +106,19 @@
           $('#working').hide();
         }
       }
-    });         
+    });
   }
 
   function submitSignUp() {
     $.ajax({
       type: 'POST',
       url: '{{ URL::to('signup/submit') }}',
-      data: 'new_email=' + encodeURIComponent($('form.signUpForm #new_email').val()) + 
-      '&new_password=' + encodeURIComponent($('form.signUpForm #new_password').val()) + 
-      '&new_first_name=' + encodeURIComponent($('form.signUpForm #new_first_name').val()) + 
+      data: 'new_email=' + encodeURIComponent($('form.signUpForm #new_email').val()) +
+      '&new_password=' + encodeURIComponent($('form.signUpForm #new_password').val()) +
+      '&new_first_name=' + encodeURIComponent($('form.signUpForm #new_first_name').val()) +
       '&new_last_name=' + encodeURIComponent($('form.signUpForm #new_last_name').val()) +
       '&go_pro=' + $('#go_pro').val(),
-      success: function(result) { 
+      success: function(result) {
         if (result) {
           handleSignedUp();
           NINJA.isRegistered = true;
@@ -142,7 +142,7 @@
   function checkForEnter(event)
   {
     if (event.keyCode === 13){
-      event.preventDefault();               
+      event.preventDefault();
       validateServerSignUp();
       return false;
     }
@@ -154,10 +154,10 @@
       NINJA.formIsChanged = false;
     }
 
-    if (force || NINJA.isRegistered) {            
+    if (force || NINJA.isRegistered) {
       window.location = '{{ URL::to('logout') }}';
     } else {
-      $('#logoutModal').modal('show');  
+      $('#logoutModal').modal('show');
     }
   }
 
@@ -197,7 +197,7 @@
         window.location = '/settings/account_management#changePlanModel';
       }
     } else {
-      $('#proPlanModal').modal('hide');    
+      $('#proPlanModal').modal('hide');
       $('#go_pro').val('true');
       showSignUp();
     }
@@ -262,7 +262,7 @@
     $('#navbar-options').hide();
     $('#search-form').show();
     $('#search').focus();
-    
+
     if (!window.loadedSearchData) {
         trackEvent('/activity', '/search');
         $.get('{{ URL::route('getSearchData') }}', function(data) {
@@ -279,7 +279,7 @@
             templates: {
               header: '&nbsp;<span style="font-weight:600;font-size:16px">{{ Auth::user()->account->custom_client_label1 }}</span>'
             }
-          }          
+          }
           @endif
           @if (Auth::check() && Auth::user()->account->custom_client_label2)
           ,{
@@ -290,7 +290,7 @@
             templates: {
               header: '&nbsp;<span style="font-weight:600;font-size:16px">{{ Auth::user()->account->custom_client_label2 }}</span>'
             }
-          }          
+          }
           @endif
           @foreach (['clients', 'contacts', 'invoices', 'quotes', 'navigation'] as $type)
           ,{
@@ -305,19 +305,19 @@
           @endforeach
           ).on('typeahead:selected', function(element, datum, name) {
             window.location = datum.url;
-          }).focus(); 
+          }).focus();
           window.loadedSearchData = true;
         });
     }
   }
-  
+
   function hideSearch() {
     $('#search-form').hide();
     $('#navbar-options').show();
   }
 
   $(function() {
-    window.setTimeout(function() { 
+    window.setTimeout(function() {
         $(".alert-hide").fadeOut();
     }, 3000);
 
@@ -341,7 +341,7 @@
       $(['first_name','last_name','email','password']).each(function(i, field) {
         var $input = $('form.signUpForm #new_'+field);
         if (!$input.val()) {
-          $input.focus();                       
+          $input.focus();
           return false;
         }
       });
@@ -350,7 +350,7 @@
 
     @if (Auth::check() && !Utils::isNinja() && !Auth::user()->registered)
       $('#closeSignUpButton').hide();
-      showSignUp(); 
+      showSignUp();
     @elseif(Session::get('sign_up') || Input::get('sign_up'))
       showSignUp();
     @endif
@@ -385,7 +385,7 @@
 
   });
 
-</script>  
+</script>
 
 @stop
 
@@ -404,7 +404,7 @@
       <a href="{{ URL::to(NINJA_WEB_URL) }}" class='navbar-brand' target="_blank">
         {{-- Per our license, please do not remove or modify this link. --}}
         <img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:20px;width:auto;padding-right:10px"/>
-      </a>	    
+      </a>
     </div>
 
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
@@ -423,7 +423,7 @@
           @if (!Auth::user()->registered)
             {!! Button::success(trans('texts.sign_up'))->withAttributes(array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal', 'style' => 'max-width:100px;;overflow:hidden'))->small() !!} &nbsp;
           @elseif (Utils::isNinjaProd() && (!Auth::user()->isPro() || Auth::user()->isTrial()))
-            {!! Button::success(trans('texts.go_pro'))->withAttributes(array('id' => 'proPlanButton', 'onclick' => 'showProPlan("")', 'style' => 'max-width:100px;overflow:hidden'))->small() !!} &nbsp;
+            {!! Button::success(trans('texts.plan_upgrade'))->asLinkTo(url('/settings/account_management?upgrade=true'))->withAttributes(array('style' => 'max-width:100px;overflow:hidden'))->small() !!} &nbsp;
           @endif
         @endif
 
@@ -437,9 +437,9 @@
                 @endif
               <span class="caret"></span>
             </div>
-            <span class="glyphicon glyphicon-user nav-account-icon" style="padding-left:0px" 
-                title="{{ Auth::user()->account->getDisplayName() }}"/>            
-          </button>			
+            <span class="glyphicon glyphicon-user nav-account-icon" style="padding-left:0px"
+                title="{{ Auth::user()->account->getDisplayName() }}"/>
+          </button>
           <ul class="dropdown-menu user-accounts">
             @if (session(SESSION_USER_ACCOUNTS))
                 @foreach (session(SESSION_USER_ACCOUNTS) as $item)
@@ -468,12 +468,12 @@
                 @endforeach
             @else
                 @include('user_account', [
-                    'account_name' => Auth::user()->account->name ?: trans('texts.untitled'), 
+                    'account_name' => Auth::user()->account->name ?: trans('texts.untitled'),
                     'user_name' => Auth::user()->getDisplayName(),
                     'logo_url' => Auth::user()->account->getLogoURL(),
                     'selected' => true,
                 ])
-            @endif            
+            @endif
             <li class="divider"></li>
             @if (Utils::isAdmin())
               @if (count(session(SESSION_USER_ACCOUNTS)) > 1)
@@ -486,9 +486,9 @@
           </ul>
         </div>
 
-      </div>	
-      
-      <ul class="nav navbar-nav navbar-right navbar-settings"> 
+      </div>
+
+      <ul class="nav navbar-nav navbar-right navbar-settings">
         <li class="dropdown">
           @if (Utils::isAdmin())
             <a href="{{ URL::to('/settings') }}" class="dropdown-toggle">
@@ -509,18 +509,18 @@
       </ul>
 
 
-      <ul class="nav navbar-nav navbar-right navbar-search"> 
+      <ul class="nav navbar-nav navbar-right navbar-search">
         <li class="dropdown">
           <a href="#" onclick="showSearch()">
             <span class="glyphicon glyphicon-search" title="{{ trans('texts.search') }}"/>
           </a>
-          <ul class="dropdown-menu">	        		        	
+          <ul class="dropdown-menu">
             @if (count(Session::get(RECENTLY_VIEWED)) == 0)
                 <li><a href="#">{{ trans('texts.no_items') }}</a></li>
             @else
                 @foreach (Session::get(RECENTLY_VIEWED) as $link)
                     @if (property_exists($link, 'accountId') && $link->accountId == Auth::user()->account_id)
-                        <li><a href="{{ $link->url }}">{{ $link->name }}</a></li>	
+                        <li><a href="{{ $link->url }}">{{ $link->name }}</a></li>
                     @endif
                 @endforeach
             @endif
@@ -531,12 +531,12 @@
 
       <form id="search-form" class="navbar-form navbar-right" role="search" style="display:none">
         <div class="form-group">
-          <input type="text" id="search" style="width: 240px;padding-top:0px;padding-bottom:0px" 
+          <input type="text" id="search" style="width: 240px;padding-top:0px;padding-bottom:0px"
             class="form-control" placeholder="{{ trans('texts.search') . ': ' . trans('texts.search_hotkey')}}">
         </div>
       </form>
-      
-      
+
+
     </div><!-- /.navbar-collapse -->
 
 
@@ -545,7 +545,7 @@
 
 <br/>
 <div class="container">
-  
+
   @include('partials.warn_session', ['redirectTo' => '/dashboard'])
 
   @if (Session::has('warning'))
@@ -558,8 +558,8 @@
     </div>
   @elseif (Session::has('news_feed_message'))
     <div class="alert alert-info">
-      {!! Session::get('news_feed_message') !!}      
-      <a href="#" onclick="hideMessage()" class="pull-right">{{ trans('texts.hide') }}</a>      
+      {!! Session::get('news_feed_message') !!}
+      <a href="#" onclick="hideMessage()" class="pull-right">{{ trans('texts.hide') }}</a>
     </div>
   @endif
 
@@ -571,7 +571,7 @@
     {!! Form::breadcrumbs(isset($entityStatus) ? $entityStatus : '') !!}
   @endif
 
-  @yield('content')		
+  @yield('content')
 
 </div>
 
@@ -600,7 +600,7 @@
           {!! Former::text('go_pro') !!}
         </div>
 
-        
+
         <div class="row signup-form">
             <div class="col-md-11 col-md-offset-1">
                 {!! Former::checkbox('terms_checkbox')->label(' ')->text(trans('texts.agree_to_terms', ['terms' => '<a href="'.URL::to('terms').'" target="_blank">'.trans('texts.terms_of_service').'</a>']))->raw() !!}
@@ -610,7 +610,7 @@
                 <div class="col-md-4 col-md-offset-1">
                     <h4>{{ trans('texts.sign_up_using') }}</h4><br/>
                     @foreach (App\Services\AuthService::$providers as $provider)
-                    <a href="{{ URL::to('auth/' . $provider) }}" class="btn btn-primary btn-block" 
+                    <a href="{{ URL::to('auth/' . $provider) }}" class="btn btn-primary btn-block"
                         onclick="setSocialLoginProvider('{{ strtolower($provider) }}')" id="{{ strtolower($provider) }}LoginButton">
                         <i class="fa fa-{{ strtolower($provider) }}"></i> &nbsp;
                         {{ $provider }}
@@ -623,12 +623,12 @@
                     <div style="border-right:thin solid #CCCCCC;height:110px;width:8px;margin-top:10px;"></div>
                 </div>
                 <div class="col-md-6">
-            @else 
+            @else
                 <div class="col-md-12">
             @endif
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.large', 1) }}
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.small', 1) }}
-                
+
                 {!! Former::text('new_first_name')
                         ->placeholder(trans('texts.first_name'))
                         ->autocomplete('given-name')
@@ -644,7 +644,7 @@
                 {!! Former::password('new_password')
                         ->placeholder(trans('texts.password'))
                         ->label(' ') !!}
-                
+
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.large', 4) }}
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.small', 4) }}
             </div>
@@ -655,9 +655,9 @@
         </div>
 
         {!! Former::close() !!}
-        
-        
-        
+
+
+
         <center><div id="errorTaken" style="display:none">&nbsp;<br/>{{ trans('texts.email_taken') }}</div></center>
         <br/>
 
@@ -679,7 +679,7 @@
         <br/>&nbsp;
       </div>
 
-      <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">	      	
+      <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">
         <button type="button" class="btn btn-default" id="closeSignUpButton" data-dismiss="modal">{{ trans('texts.close') }} <i class="glyphicon glyphicon-remove-circle"></i></button>
         <button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()" disabled>{{ trans('texts.save') }} <i class="glyphicon glyphicon-floppy-disk"></i></button>
       </div>
@@ -696,14 +696,14 @@
         <h4 class="modal-title" id="myModalLabel">{{ trans('texts.logout') }}</h4>
       </div>
 
-      <div class="container">	     
+      <div class="container">
         <h3>{{ trans('texts.are_you_sure') }}</h3>
-        <p>{{ trans('texts.erase_data') }}</p>	      	
+        <p>{{ trans('texts.erase_data') }}</p>
       </div>
 
-      <div class="modal-footer" id="signUpFooter">	      	
+      <div class="modal-footer" id="signUpFooter">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.cancel') }}</button>
-        <button type="button" class="btn btn-primary" onclick="logout(true)">{{ trans('texts.logout') }}</button>	      	
+        <button type="button" class="btn btn-primary" onclick="logout(true)">{{ trans('texts.logout') }}</button>
       </div>
     </div>
   </div>
@@ -717,7 +717,7 @@
 
         <div class="pull-right">
             <img onclick="hideProPlan()" class="close" src="{{ asset('images/pro_plan/close.png') }}"/>
-        </div>        
+        </div>
         <div class="row">
 
             <div class="col-md-7 left-side">
@@ -758,7 +758,7 @@
 @if (Utils::isNinjaProd())
   @if (Auth::check() && Auth::user()->isTrial())
     {!! trans(Auth::user()->account->getCountTrialDaysLeft() == 0 ? 'texts.trial_footer_last_day' : 'texts.trial_footer', [
-            'count' => Auth::user()->account->getCountTrialDaysLeft(), 
+            'count' => Auth::user()->account->getCountTrialDaysLeft(),
             'link' => '<a href="javascript:submitProPlan()">' . trans('texts.click_here') . '</a>'
         ]) !!}
   @endif
@@ -766,8 +766,8 @@
   {{ trans('texts.powered_by') }}
   {{-- Per our license, please do not remove or modify this section. --}}
   {!! link_to('https://www.invoiceninja.com/?utm_source=powered_by', 'InvoiceNinja.com', ['target' => '_blank', 'title' => 'invoiceninja.com']) !!} -
-  {!! link_to(RELEASES_URL, 'v' . NINJA_VERSION, ['target' => '_blank', 'title' => trans('texts.trello_roadmap')]) !!} | 
-  @if (Auth::user()->account->hasFeature(FEATURE_WHITE_LABEL))  
+  {!! link_to(RELEASES_URL, 'v' . NINJA_VERSION, ['target' => '_blank', 'title' => trans('texts.trello_roadmap')]) !!} |
+  @if (Auth::user()->account->hasFeature(FEATURE_WHITE_LABEL))
     {{ trans('texts.white_labeled') }}
   @else
     <a href="#" onclick="loadImages('#whiteLabelModal');$('#whiteLabelModal').modal('show');">{{ trans('texts.white_label_link') }}</a>
@@ -794,7 +794,7 @@
             </div>
           </div>
 
-          <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">          
+          <div class="modal-footer" id="signUpFooter" style="margin-top: 0px">
             <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }} </button>
             {{-- DropdownButton::success_lg(trans('texts.buy'), [
                 ['url' => URL::to(""), 'label' => trans('texts.pay_with_paypal')],

From 44dfa56c317463ddbc3422ad35be0a74e7724943 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 5 Jun 2016 22:56:45 +0300
Subject: [PATCH 073/111] Minor fixes

---
 resources/lang/en/texts.php                   |  2 +-
 .../views/accounts/customize_design.blade.php | 46 +++++++--------
 .../views/accounts/invoice_design.blade.php   | 56 +++++++++----------
 resources/views/accounts/management.blade.php |  2 +-
 resources/views/invoices/edit.blade.php       |  2 +-
 resources/views/invoices/history.blade.php    | 18 +++---
 resources/views/invoices/view.blade.php       | 20 +++----
 7 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 571d2b518a00..a6532a6eb9fd 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -1179,7 +1179,7 @@ $LANG = array(
     'preview' => 'Preview',
     'list_vendors' => 'List Vendors',
     'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.',
-    'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.',
+    'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments, :link to see the full list of features.',
     'return_to_app' => 'Return to app',
 
     'update_font_cache' => 'Please force refresh the page to update the font cache.',
diff --git a/resources/views/accounts/customize_design.blade.php b/resources/views/accounts/customize_design.blade.php
index 9c9fff51121c..f4eb56a79a30 100644
--- a/resources/views/accounts/customize_design.blade.php
+++ b/resources/views/accounts/customize_design.blade.php
@@ -10,16 +10,16 @@
     @foreach ($account->getFontFolders() as $font)
         <script src="{{ asset('js/vfs_fonts/'.$font.'.js') }}" type="text/javascript"></script>
     @endforeach
-        <script src="{{ asset('pdf.built.js') }}" type="text/javascript"></script>
+        <script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
 
       <style type="text/css">
 
         select.form-control {
-            background: #FFFFFF !important;        
+            background: #FFFFFF !important;
             margin-right: 12px;
         }
         table {
-            background: #FFFFFF !important;        
+            background: #FFFFFF !important;
         }
 
         /* http://stackoverflow.com/questions/4810841/how-can-i-pretty-print-json-using-javascript */
@@ -34,13 +34,13 @@
 
 @stop
 
-@section('content')	
+@section('content')
     @parent
 
   <script>
     var invoiceDesigns = {!! $invoiceDesigns !!};
     var invoiceFonts = {!! $invoiceFonts !!};
-    var invoice = {!! json_encode($invoice) !!};      
+    var invoice = {!! json_encode($invoice) !!};
     var sections = ['content', 'styles', 'defaultStyle', 'pageMargins', 'header', 'footer'];
     var customDesign = origCustomDesign = {!! $customDesign ?: 'JSON.parse(invoiceDesigns[0].javascript);' !!};
 
@@ -66,9 +66,9 @@
     function getDesignJavascript() {
       var id = $('#invoice_design_id').val();
       if (id == '-1') {
-        showMoreDesigns(); 
+        showMoreDesigns();
         $('#invoice_design_id').val(1);
-        return invoiceDesigns[0].javascript;        
+        return invoiceDesigns[0].javascript;
       } else if (customDesign) {
         return JSON.stringify(customDesign);
       } else {
@@ -83,12 +83,12 @@
 
         // the function throws an error if the editor is in code view
         try {
-            editor.expandAll();            
+            editor.expandAll();
         } catch(err) {}
-    }    
+    }
 
     function saveEditor(data)
-    {        
+    {
         setTimeout(function() {
             customDesign[editorSection] = editor.get();
             clearError();
@@ -98,7 +98,7 @@
 
     function onSelectChange()
     {
-        var id = $('#invoice_design_id').val();        
+        var id = $('#invoice_design_id').val();
         if (parseInt(id)) {
             var design = _.find(invoiceDesigns, function(design){ return design.id == id});
             customDesign = JSON.parse(design.javascript);
@@ -135,7 +135,7 @@
 
     $(function() {
        clearError();
-      
+
         var container = document.getElementById("jsoneditor");
           var options = {
             mode: 'form',
@@ -146,7 +146,7 @@
           };
         window.editor = new JSONEditor(container, options);
         loadEditor('content');
-        
+
         $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
           var target = $(e.target).attr("href") // activated tab
           target = target.substring(1); // strip leading #
@@ -161,13 +161,13 @@
         @endif
     });
 
-  </script> 
+  </script>
 
 
   <div class="row">
     <div class="col-md-6">
 
-      {!! Former::open()->addClass('warn-on-exit') !!}      
+      {!! Former::open()->addClass('warn-on-exit') !!}
       {!! Former::populateField('invoice_design_id', $account->invoice_design_id) !!}
 
         <div style="display:none">
@@ -199,16 +199,16 @@
 
       <script>
       @if (!Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN))
-        $(function() {   
+        $(function() {
             $('form.warn-on-exit input, .save-button').prop('disabled', true);
         });
       @endif
 
-        function showHelp() {            
-            $('#helpModal').modal('show');   
-        }   
+        function showHelp() {
+            $('#helpModal').modal('show');
+        }
 
-      </script> 
+      </script>
 
       {!! Former::close() !!}
 
@@ -231,9 +231,9 @@
           </div>
 
          <div class="modal-footer" style="margin-top: 0px">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>            
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>
          </div>
-            
+
         </div>
       </div>
     </div>
@@ -249,4 +249,4 @@
     </div>
   </div>
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index 308bad225081..28a550e7030a 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -7,28 +7,28 @@
     @foreach ($account->getFontFolders() as $font)
         <script src="{{ asset('js/vfs_fonts/'.$font.'.js') }}" type="text/javascript"></script>
     @endforeach
-    <script src="{{ asset('pdf.built.js') }}" type="text/javascript"></script>
+    <script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
     <script src="{{ asset('js/lightbox.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/lightbox.css') }}" rel="stylesheet" type="text/css"/>
 
 @stop
 
-@section('content')	
+@section('content')
 	@parent
     @include('accounts.nav', ['selected' => ACCOUNT_INVOICE_DESIGN, 'advanced' => true])
 
   <script>
     var invoiceDesigns = {!! $invoiceDesigns !!};
     var invoiceFonts = {!! $invoiceFonts !!};
-    var invoice = {!! json_encode($invoice) !!};      
-      
+    var invoice = {!! json_encode($invoice) !!};
+
     function getDesignJavascript() {
       var id = $('#invoice_design_id').val();
       if (id == '-1') {
-        showMoreDesigns(); 
+        showMoreDesigns();
         $('#invoice_design_id').val(1);
         return invoiceDesigns[0].javascript;
-      } else {        
+      } else {
         var design = _.find(invoiceDesigns, function(design){ return design.id == id});
         return design ? design.javascript : '';
       }
@@ -44,7 +44,7 @@
         jQuery.getScript({!! json_encode(asset('js/vfs_fonts/%s.js')) !!}.replace('%s', fontFolder), function(){window.loadingFonts=false;ninjaLoadFontVfs();refreshPDF()})
       }
     }
-    
+
     function getPDFString(cb) {
       invoice.features = {
           customize_invoice_design:{{ Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) ? 'true' : 'false' }},
@@ -56,21 +56,21 @@
       invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked");
       invoice.invoice_design_id = $('#invoice_design_id').val();
       invoice.account.page_size = $('#page_size option:selected').text();
-      
+
       NINJA.primaryColor = $('#primary_color').val();
       NINJA.secondaryColor = $('#secondary_color').val();
       NINJA.fontSize = parseInt($('#font_size').val());
       NINJA.headerFont = $('#header_font_id option:selected').text();
       NINJA.bodyFont = $('#body_font_id option:selected').text();
-      
+
       var fields = [
-          'item', 
-          'description', 
-          'unit_cost', 
-          'quantity', 
-          'line_total', 
-          'terms', 
-          'balance_due', 
+          'item',
+          'description',
+          'unit_cost',
+          'quantity',
+          'line_total',
+          'terms',
+          'balance_due',
           'partial_due'
       ];
       invoiceLabels.old = {};
@@ -88,7 +88,7 @@
       generatePDF(invoice, getDesignJavascript(), true, cb);
     }
 
-    $(function() {   
+    $(function() {
       var options = {
         preferredFormat: 'hex',
         disabled: {!! Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) ? 'false' : 'true' !!},
@@ -102,19 +102,19 @@
       $('#secondary_color').spectrum(options);
       $('#header_font_id').change(function(){loadFont($('#header_font_id').val())});
       $('#body_font_id').change(function(){loadFont($('#body_font_id').val())});
-      
-      
+
+
       refreshPDF();
     });
 
-  </script> 
+  </script>
 
 
   <div class="row">
     <div class="col-md-12">
 
       {!! Former::open()->addClass('warn-on-exit')->onchange('if(!window.loadingFonts)refreshPDF()') !!}
-      
+
       {!! Former::populateField('invoice_design_id', $account->invoice_design_id) !!}
       {!! Former::populateField('body_font_id', $account->body_font_id) !!}
       {!! Former::populateField('header_font_id', $account->header_font_id) !!}
@@ -158,7 +158,7 @@
                             {!! Former::select('invoice_design_id')
                                     ->fromQuery($invoiceDesigns, 'name', 'id')
                                     ->addOption(trans('texts.more_designs') . '...', '-1') !!}
-                          @else 
+                          @else
                             {!! Former::select('invoice_design_id')
                                     ->fromQuery($invoiceDesigns, 'name', 'id') !!}
                           @endif
@@ -167,7 +167,7 @@
                           {!! Former::select('header_font_id')
                                   ->fromQuery($invoiceFonts, 'name', 'id') !!}
 
-                          {!! Former::checkbox('live_preview')->text(trans('texts.enable')) !!}                        
+                          {!! Former::checkbox('live_preview')->text(trans('texts.enable')) !!}
 
                         </div>
                         <div class="col-md-6">
@@ -177,7 +177,7 @@
 
                           {!! Former::select('page_size')
                                   ->options($pageSizes) !!}
-                                  
+
                           {!! Former::text('font_size')
                                 ->type('number')
                                 ->min('0')
@@ -253,7 +253,7 @@
 
 
     <br/>
-    {!! Former::actions( 
+    {!! Former::actions(
             Button::primary(trans('texts.customize'))
                 ->appendIcon(Icon::create('edit'))
                 ->asLinkTo(URL::to('/settings/customize_design'))
@@ -267,10 +267,10 @@
 
       @if (!Auth::user()->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN))
         <script>
-              $(function() {   
+              $(function() {
                 $('form.warn-on-exit input, .save-button').prop('disabled', true);
               });
-          </script> 
+          </script>
       @endif
 
       {!! Former::close() !!}
@@ -282,4 +282,4 @@
       @include('invoices.pdf', ['account' => Auth::user()->account, 'pdfHeight' => 800])
 
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php
index 97ea6079df82..da3b42a8b185 100644
--- a/resources/views/accounts/management.blade.php
+++ b/resources/views/accounts/management.blade.php
@@ -129,7 +129,7 @@
 							{!! Former::select('plan_term')
 								->addOption(trans('texts.plan_term_yearly'), PLAN_TERM_YEARLY)
 								->addOption(trans('texts.plan_term_monthly'), PLAN_TERM_MONTHLY)
-                                ->inlineHelp(trans('texts.enterprise_plan_features')) !!}
+                                ->inlineHelp(trans('texts.enterprise_plan_features', ['link' => link_to(NINJA_WEB_URL . '/plans-pricing', trans('texts.click_here'), ['target' => '_blank'])])) !!}
 						</div>
 						<div class="modal-footer" style="margin-top: 0px">
 							<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 404f4a8338f6..7fb4fdce716c 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -8,7 +8,7 @@
     @foreach ($account->getFontFolders() as $font)
         <script src="{{ asset('js/vfs_fonts/'.$font.'.js') }}" type="text/javascript"></script>
     @endforeach
-	<script src="{{ asset('pdf.built.js') }}" type="text/javascript"></script>
+	<script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
     <script src="{{ asset('js/lightbox.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/lightbox.css') }}" rel="stylesheet" type="text/css"/>
 
diff --git a/resources/views/invoices/history.blade.php b/resources/views/invoices/history.blade.php
index 18fedecc6b27..5330f9d8c9d6 100644
--- a/resources/views/invoices/history.blade.php
+++ b/resources/views/invoices/history.blade.php
@@ -7,7 +7,7 @@
 @foreach (Auth::user()->account->getFontFolders() as $font)
   <script src="{{ asset('js/vfs_fonts/'.$font.'.js') }}" type="text/javascript"></script>
 @endforeach
-  <script src="{{ asset('pdf.built.js') }}" type="text/javascript"></script>
+  <script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
 
   <script>
 
@@ -15,7 +15,7 @@
     var invoiceFonts = {!! $invoiceFonts !!};
     var currentInvoice = {!! $invoice !!};
     var versionsJson = {!! $versionsJson !!};
-    
+
     function getPDFString(cb) {
 
         var version = $('#version').val();
@@ -34,15 +34,15 @@
         if (!invoiceDesign) {
             invoiceDesign = invoiceDesigns[0];
         }
-        
-        generatePDF(invoice, invoiceDesign.javascript, true, cb);        
+
+        generatePDF(invoice, invoiceDesign.javascript, true, cb);
     }
 
-    $(function() {   
+    $(function() {
       refreshPDF();
     });
 
-  </script> 
+  </script>
 
 @stop
 
@@ -50,13 +50,13 @@
 
     {!! Former::open()->addClass('form-inline')->onchange('refreshPDF()') !!}
     {!! Former::select('version')->options($versionsSelect)->label(trans('select_version'))->style('background-color: white !important') !!}
-    {!! Button::primary(trans('texts.edit_' . $invoice->getEntityType()))->asLinkTo(URL::to('/' . $invoice->getEntityType() . 's/' . $invoice->public_id . '/edit'))->withAttributes(array('class' => 'pull-right')) !!}    
+    {!! Button::primary(trans('texts.edit_' . $invoice->getEntityType()))->asLinkTo(URL::to('/' . $invoice->getEntityType() . 's/' . $invoice->public_id . '/edit'))->withAttributes(array('class' => 'pull-right')) !!}
     {!! Former::close() !!}
 
     <br/>&nbsp;<br/>
 
     @include('invoices.pdf', ['account' => Auth::user()->account, 'pdfHeight' => 800])
-    
+
     @if (Utils::hasFeature(FEATURE_DOCUMENTS) && $invoice->account->invoice_embed_documents)
         @foreach ($invoice->documents as $document)
             @if($document->isPDFEmbeddable())
@@ -71,4 +71,4 @@
             @endforeach
         @endforeach
     @endif
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index 3e5310ea40a6..e6ba3e16fc03 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -4,15 +4,15 @@
 	@parent
 
 		@include('money_script')
-		
+
 		@foreach ($invoice->client->account->getFontFolders() as $font)
         <script src="{{ asset('js/vfs_fonts/'.$font.'.js') }}" type="text/javascript"></script>
     	@endforeach
-        <script src="{{ asset('pdf.built.js') }}" type="text/javascript"></script>
-        
+        <script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
+
 		<style type="text/css">
 			body {
-				background-color: #f8f8f8;		
+				background-color: #f8f8f8;
 			}
 		</style>
 @stop
@@ -39,8 +39,8 @@
                     {!! DropdownButton::success(trans('texts.pay_now'))->withContents($paymentTypes)->large() !!}
                 @else
                     <a href='{!! $paymentURL !!}' class="btn btn-success btn-lg">{{ trans('texts.pay_now') }}</a>
-                @endif            
-    		@else 
+                @endif
+    		@else
     			{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
     		@endif
     		</div>
@@ -67,7 +67,7 @@
             </ul>
             </div>
         @endif
-        
+
         @if ($account->hasFeature(FEATURE_DOCUMENTS) && $account->invoice_embed_documents)
             @foreach ($invoice->documents as $document)
                 @if($document->isPDFEmbeddable())
@@ -107,16 +107,16 @@
                     doc.getDataUrl(function(pdfString) {
                         document.write(pdfString);
                         document.close();
-                        
+
                         if (window.hasOwnProperty('pjsc_meta')) {
                             window['pjsc_meta'].remainingTasks--;
                         }
                     });
-                @else 
+                @else
                     refreshPDF();
                 @endif
 			});
-			
+
 			function onDownloadClick() {
 				var doc = generatePDF(invoice, invoice.invoice_design.javascript, true);
                 var fileName = invoice.is_quote ? invoiceLabels.quote : invoiceLabels.invoice;

From 80202b6d92254c78d8489cda81f7d118cd415f0f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 6 Jun 2016 19:04:57 +0300
Subject: [PATCH 074/111] Added support for searching by invoice number in the
 API

---
 app/Http/Requests/InvoiceRequest.php         | 16 +++++++++++++---
 app/Ninja/Transformers/EntityTransformer.php | 10 +++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/Http/Requests/InvoiceRequest.php b/app/Http/Requests/InvoiceRequest.php
index 5e2d93139003..edf43203c695 100644
--- a/app/Http/Requests/InvoiceRequest.php
+++ b/app/Http/Requests/InvoiceRequest.php
@@ -1,5 +1,7 @@
 <?php namespace App\Http\Requests;
 
+use App\Models\Invoice;
+
 class InvoiceRequest extends EntityRequest {
 
     protected $entityType = ENTITY_INVOICE;
@@ -7,13 +9,21 @@ class InvoiceRequest extends EntityRequest {
     public function entity()
     {
         $invoice = parent::entity();
-        
+
+        // support loading an invoice by its invoice number
+        if ($this->invoice_number && ! $invoice) {
+            $invoice = Invoice::scope()
+                        ->whereInvoiceNumber($this->invoice_number)
+                        ->withTrashed()
+                        ->firstOrFail();
+        }
+
         // eager load the invoice items
         if ($invoice && ! $invoice->relationLoaded('invoice_items')) {
             $invoice->load('invoice_items');
         }
-         
+
         return $invoice;
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Ninja/Transformers/EntityTransformer.php b/app/Ninja/Transformers/EntityTransformer.php
index d2d02bd0b6ee..691e6ff67f20 100644
--- a/app/Ninja/Transformers/EntityTransformer.php
+++ b/app/Ninja/Transformers/EntityTransformer.php
@@ -38,23 +38,23 @@ class EntityTransformer extends TransformerAbstract
     {
         return $date ? $date->getTimestamp() : null;
     }
-    
+
     public function getDefaultIncludes()
     {
         return $this->defaultIncludes;
     }
-    
+
     protected function getDefaults($entity)
     {
         $data = [
             'account_key' => $this->account->account_key,
-            'is_owner' => (bool) Auth::user()->owns($entity),
+            'is_owner' => (bool) (Auth::check() && Auth::user()->owns($entity)),
         ];
-        
+
         if ($entity->relationLoaded('user')) {
             $data['user_id'] = (int) $entity->user->public_id + 1;
         }
-        
+
         return $data;
     }
 }

From 1eb334f3b4fed4553c1ffa449f27d362984c8483 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 6 Jun 2016 22:18:15 +0300
Subject: [PATCH 075/111] Added back API route for quotes

---
 app/Http/Controllers/QuoteApiController.php | 52 +++++++++++++++++++++
 app/Http/routes.php                         |  3 +-
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 app/Http/Controllers/QuoteApiController.php

diff --git a/app/Http/Controllers/QuoteApiController.php b/app/Http/Controllers/QuoteApiController.php
new file mode 100644
index 000000000000..9acd645ed799
--- /dev/null
+++ b/app/Http/Controllers/QuoteApiController.php
@@ -0,0 +1,52 @@
+<?php namespace App\Http\Controllers;
+
+use Auth;
+use Input;
+use Utils;
+use Response;
+use App\Models\Invoice;
+use App\Ninja\Repositories\InvoiceRepository;
+use App\Http\Controllers\BaseAPIController;
+use App\Ninja\Transformers\QuoteTransformer;
+
+class QuoteApiController extends BaseAPIController
+{
+    protected $invoiceRepo;
+
+    protected $entityType = ENTITY_INVOICE;
+
+    public function __construct(InvoiceRepository $invoiceRepo)
+    {
+        parent::__construct();
+
+        $this->invoiceRepo = $invoiceRepo;
+    }
+
+    /**
+     * @SWG\Get(
+     *   path="/quotes",
+     *   tags={"quote"},
+     *   summary="List of quotes",
+     *   @SWG\Response(
+     *     response=200,
+     *     description="A list with quotes",
+     *      @SWG\Schema(type="array", @SWG\Items(ref="#/definitions/Invoice"))
+     *   ),
+     *   @SWG\Response(
+     *     response="default",
+     *     description="an ""unexpected"" error"
+     *   )
+     * )
+     */
+     public function index()
+     {
+         $invoices = Invoice::scope()
+                         ->withTrashed()
+                         ->where('is_quote', '=', '1')
+                         ->with('invoice_items', 'client')
+                         ->orderBy('created_at', 'desc');
+
+         return $this->listResponse($invoices);
+     }
+
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index d9e4b2964b7e..4955f9d159fe 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -251,8 +251,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'api/v1'], function()
     Route::get('accounts', 'AccountApiController@show');
     Route::put('accounts', 'AccountApiController@update');
     Route::resource('clients', 'ClientApiController');
-    //Route::get('quotes', 'QuoteApiController@index');
-    //Route::resource('quotes', 'QuoteApiController');
+    Route::get('quotes', 'QuoteApiController@index');
     Route::get('invoices', 'InvoiceApiController@index');
     Route::get('download/{invoice_id}', 'InvoiceApiController@download');
     Route::resource('invoices', 'InvoiceApiController');

From 5489ade5ff7fec64603c129422aab602b979273a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 14:40:54 +0300
Subject: [PATCH 076/111] Fix for tests

---
 app/Ninja/Mailers/UserMailer.php   | 8 ++++----
 database/seeds/UserTableSeeder.php | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php
index b08d50d7838f..0435a9af62d1 100644
--- a/app/Ninja/Mailers/UserMailer.php
+++ b/app/Ninja/Mailers/UserMailer.php
@@ -36,10 +36,10 @@ class UserMailer extends Mailer
 
     public function sendNotification(User $user, Invoice $invoice, $notificationType, Payment $payment = null)
     {
-        if (!$user->email) {
+        if (! $user->email || $user->cannot('view', $invoice)) {
             return;
         }
-        
+
         $entityType = $invoice->getEntityType();
         $view = ($notificationType == 'approved' ? ENTITY_QUOTE : ENTITY_INVOICE) . "_{$notificationType}";
         $account = $user->account;
@@ -64,7 +64,7 @@ class UserMailer extends Mailer
             'invoice' => $invoice->invoice_number,
             'client' => $client->getDisplayName()
         ]);
-        
+
         $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
     }
 
@@ -88,7 +88,7 @@ class UserMailer extends Mailer
             'contactName' => $invitation->contact->getDisplayName(),
             'invoiceNumber' => $invoice->invoice_number,
         ];
-        
+
         $this->sendTo($user->email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
     }
 }
diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php
index dbaba660b75c..e86bbe4e1443 100644
--- a/database/seeds/UserTableSeeder.php
+++ b/database/seeds/UserTableSeeder.php
@@ -20,7 +20,7 @@ class UserTableSeeder extends Seeder
 
         $faker = Faker\Factory::create();
         $company = Company::create();
-        
+
         $account = Account::create([
             'name' => $faker->name,
             'address1' => $faker->streetAddress,
@@ -28,7 +28,7 @@ class UserTableSeeder extends Seeder
             'city' => $faker->city,
             'state' => $faker->state,
             'postal_code' => $faker->postcode,
-            'country_id' => Country::all()->random()->id, 
+            'country_id' => Country::all()->random()->id,
             'account_key' => str_random(RANDOM_KEY_LENGTH),
             'invoice_terms' => $faker->text($faker->numberBetween(50, 300)),
             'work_phone' => $faker->phoneNumber,
@@ -50,12 +50,13 @@ class UserTableSeeder extends Seeder
             'confirmed' => true,
             'notify_sent' => false,
             'notify_paid' => false,
+	        'is_admin' => 1,
         ]);
 
         Affiliate::create([
             'affiliate_key' => SELF_HOST_AFFILIATE_KEY
         ]);
-        
+
 	}
 
-}
\ No newline at end of file
+}

From db2e5f56425c186e2d908dedc5ee0fb83dcb32fe Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 15:15:46 +0300
Subject: [PATCH 077/111] Working on tests

---
 .travis.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f66f7aa29f7..b9ab5042baf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,19 +64,19 @@ before_script:
   - curl -L http://ninja.dev:8000/update
 
 script:
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
   - php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance ExpenseCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance QuoteCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
-  - php ./vendor/codeception/codeception/codecept run acceptance OnlinePaymentCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance ExpenseCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance QuoteCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance InvoiceDesignCest.php
+  #- php ./vendor/codeception/codeception/codecept run acceptance OnlinePaymentCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance TaxRatesCest.php
 
   #- sed -i 's/NINJA_DEV=true/NINJA_PROD=true/g' .env
   #- php ./vendor/codeception/codeception/codecept run acceptance GoProCest.php
@@ -96,4 +96,4 @@ after_script:
 notifications:
   email:
     on_success: never
-    on_failure: change
\ No newline at end of file
+    on_failure: change

From 40f18ed19f9418c3a36d7e08803b571f3fba48ef Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 16:16:25 +0300
Subject: [PATCH 078/111] Working on tests

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b9ab5042baf4..5068eb042f5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -92,6 +92,8 @@ after_script:
   - mysql -u root -e 'select * from credits;' ninja
   - cat storage/logs/laravel-error.log
   - cat storage/logs/laravel-info.log
+  - FILES=$(find tests/_output -type f -name '*.png')
+  - for i in $FILES; do echo $i; base64 "$i"; echo "EOF"; done
 
 notifications:
   email:

From bef4e5faeae7944a4ba42ce40c767ddee763b92a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 16:45:21 +0300
Subject: [PATCH 079/111] Fix for quote number prefix

---
 app/Models/Account.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 7f6218462536..b86dcfeacd44 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -633,11 +633,11 @@ class Account extends Eloquent
 
     public function getNextInvoiceNumber($invoice)
     {
-        if ($this->hasNumberPattern($invoice->invoice_type_id)) {
+        if ($this->hasNumberPattern($invoice->is_quote)) {
             $number = $this->getNumberPattern($invoice);
         } else {
-            $counter = $this->getCounter($invoice->invoice_type_id);
-            $prefix = $this->getNumberPrefix($invoice->invoice_type_id);
+            $counter = $this->getCounter($invoice->is_quote);
+            $prefix = $this->getNumberPrefix($invoice->is_quote);
             $counterOffset = 0;
 
             // confirm the invoice number isn't already taken

From 73ab6a308b3bdc2a881db4edc1ee8668e48e477d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 16:45:38 +0300
Subject: [PATCH 080/111] Only show last screenshot

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5068eb042f5d..d71b4345a9df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,7 +93,7 @@ after_script:
   - cat storage/logs/laravel-error.log
   - cat storage/logs/laravel-info.log
   - FILES=$(find tests/_output -type f -name '*.png')
-  - for i in $FILES; do echo $i; base64 "$i"; echo "EOF"; done
+  - for i in $FILES; do echo $i; base64 "$i"; break; done
 
 notifications:
   email:

From a1f0461e02a0c1aec518694be24144b2d68d89ec Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 17:07:28 +0300
Subject: [PATCH 081/111] Working on tests

---
 tests/acceptance/CheckBalanceCest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php
index 68cae45c3154..0cdb36362b36 100644
--- a/tests/acceptance/CheckBalanceCest.php
+++ b/tests/acceptance/CheckBalanceCest.php
@@ -17,7 +17,7 @@ class CheckBalanceCest
     public function checkBalance(AcceptanceTester $I)
     {
         $I->wantTo('ensure the balance is correct');
-        
+
         $clientEmail = $this->faker->safeEmail;
         $productKey = $this->faker->text(10);
         $productPrice = $this->faker->numberBetween(1, 20);
@@ -30,7 +30,7 @@ class CheckBalanceCest
         $I->see($clientEmail);
 
         $clientId = $I->grabFromCurrentUrl('~clients/(\d+)~');
-        
+
         // create product
         $I->amOnPage('/products/create');
         $I->fillField(['name' => 'product_key'], $productKey);
@@ -39,7 +39,7 @@ class CheckBalanceCest
         $I->click('Save');
         $I->wait(1);
         $I->see($productKey);
-        
+
         // create invoice
         $I->amOnPage('/invoices/create');
         $I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
@@ -51,7 +51,7 @@ class CheckBalanceCest
         $invoiceId = $I->grabFromCurrentUrl('~invoices/(\d+)~');
         $I->amOnPage("/clients/{$clientId}");
         $I->see('Balance $' . $productPrice);
-        
+
         // update the invoice
         $I->amOnPage('/invoices/' . $invoiceId);
         $I->fillField(['name' => 'invoice_items[0][qty]'], 2);
@@ -67,6 +67,7 @@ class CheckBalanceCest
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
 
+        /*
         // archive the invoice
         $I->amOnPage('/invoices/' . $invoiceId);
         $I->executeJS('submitBulkAction("archive")');
@@ -74,7 +75,8 @@ class CheckBalanceCest
         $I->amOnPage("/clients/{$clientId}");
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
-
+        */
+        
         // delete the invoice
         $I->amOnPage('/invoices/' . $invoiceId);
         $I->executeJS('submitBulkAction("delete")');
@@ -91,4 +93,4 @@ class CheckBalanceCest
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
     }
-}
\ No newline at end of file
+}

From 6b7542085aa0f6be8289a9bc39d9963d87e2a5c2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 17:18:52 +0300
Subject: [PATCH 082/111] Working on tests

---
 tests/acceptance/CheckBalanceCest.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php
index 0cdb36362b36..6d37f01c98bc 100644
--- a/tests/acceptance/CheckBalanceCest.php
+++ b/tests/acceptance/CheckBalanceCest.php
@@ -67,18 +67,16 @@ class CheckBalanceCest
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
 
-        /*
         // archive the invoice
-        $I->amOnPage('/invoices/' . $invoiceId);
+        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
         $I->executeJS('submitBulkAction("archive")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");
         $I->see('Balance $0.00');
         $I->see('Paid to Date $' . ($productPrice * 2));
-        */
-        
+
         // delete the invoice
-        $I->amOnPage('/invoices/' . $invoiceId);
+        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
         $I->executeJS('submitBulkAction("delete")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");
@@ -86,7 +84,7 @@ class CheckBalanceCest
         $I->see('Paid to Date $0.00');
 
         // restore the invoice
-        $I->amOnPage('/invoices/' . $invoiceId);
+        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
         $I->executeJS('submitBulkAction("restore")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");

From cc55cdc1b5f90623ff0472883d966e9f9cf2c503 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 17:29:26 +0300
Subject: [PATCH 083/111] Working on tests

---
 app/Http/Requests/InvoiceRequest.php  | 4 +++-
 tests/acceptance/CheckBalanceCest.php | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/InvoiceRequest.php b/app/Http/Requests/InvoiceRequest.php
index edf43203c695..88366937e91f 100644
--- a/app/Http/Requests/InvoiceRequest.php
+++ b/app/Http/Requests/InvoiceRequest.php
@@ -10,6 +10,7 @@ class InvoiceRequest extends EntityRequest {
     {
         $invoice = parent::entity();
 
+        /*
         // support loading an invoice by its invoice number
         if ($this->invoice_number && ! $invoice) {
             $invoice = Invoice::scope()
@@ -17,7 +18,8 @@ class InvoiceRequest extends EntityRequest {
                         ->withTrashed()
                         ->firstOrFail();
         }
-
+        */
+        
         // eager load the invoice items
         if ($invoice && ! $invoice->relationLoaded('invoice_items')) {
             $invoice->load('invoice_items');
diff --git a/tests/acceptance/CheckBalanceCest.php b/tests/acceptance/CheckBalanceCest.php
index 6d37f01c98bc..2dfa8e7f35a8 100644
--- a/tests/acceptance/CheckBalanceCest.php
+++ b/tests/acceptance/CheckBalanceCest.php
@@ -68,7 +68,7 @@ class CheckBalanceCest
         $I->see('Paid to Date $' . ($productPrice * 2));
 
         // archive the invoice
-        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
+        $I->amOnPage('/invoices/' . $invoiceId);
         $I->executeJS('submitBulkAction("archive")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");
@@ -76,7 +76,7 @@ class CheckBalanceCest
         $I->see('Paid to Date $' . ($productPrice * 2));
 
         // delete the invoice
-        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
+        $I->amOnPage('/invoices/' . $invoiceId);
         $I->executeJS('submitBulkAction("delete")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");
@@ -84,7 +84,7 @@ class CheckBalanceCest
         $I->see('Paid to Date $0.00');
 
         // restore the invoice
-        $I->amOnPage('/invoices/' . $invoiceId . '/edit');
+        $I->amOnPage('/invoices/' . $invoiceId);
         $I->executeJS('submitBulkAction("restore")');
         $I->wait(1);
         $I->amOnPage("/clients/{$clientId}");

From be11054b31c22747caab6bd472394b8de33253ab Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 17:39:18 +0300
Subject: [PATCH 084/111] Working on tests

---
 app/Http/Requests/EntityRequest.php  | 14 +++++++-------
 app/Http/Requests/InvoiceRequest.php |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Http/Requests/EntityRequest.php b/app/Http/Requests/EntityRequest.php
index 8679d3ca4195..87a877e4eae3 100644
--- a/app/Http/Requests/EntityRequest.php
+++ b/app/Http/Requests/EntityRequest.php
@@ -9,7 +9,7 @@ class EntityRequest extends Request {
     protected $entityType;
     private $entity;
 
-    public function entity() 
+    public function entity()
     {
         if ($this->entity) {
             return $this->entity;
@@ -20,24 +20,24 @@ class EntityRequest extends Request {
         foreach (['_id', 's'] as $suffix) {
             $field = $this->entityType . $suffix;
             if ($this->$field) {
-                $publicId= $this->$field; 
-            } 
+                $publicId= $this->$field;
+            }
         }
         if ( ! $publicId) {
             $publicId = Input::get('public_id') ?: Input::get('id');
         }
         if ( ! $publicId) {
             return null;
-        } 
-        
+        }
+
         $class = Utils::getEntityClass($this->entityType);
-        
+        \Log::info('entity ' . $this->entityType . ' - ' . $publicId);
         if (method_exists($class, 'withTrashed')) {
             $this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
         } else {
             $this->entity = $class::scope($publicId)->firstOrFail();
         }
-        
+        \Log::info($this->entity);
         return $this->entity;
     }
 
diff --git a/app/Http/Requests/InvoiceRequest.php b/app/Http/Requests/InvoiceRequest.php
index 88366937e91f..edf43203c695 100644
--- a/app/Http/Requests/InvoiceRequest.php
+++ b/app/Http/Requests/InvoiceRequest.php
@@ -10,7 +10,6 @@ class InvoiceRequest extends EntityRequest {
     {
         $invoice = parent::entity();
 
-        /*
         // support loading an invoice by its invoice number
         if ($this->invoice_number && ! $invoice) {
             $invoice = Invoice::scope()
@@ -18,8 +17,7 @@ class InvoiceRequest extends EntityRequest {
                         ->withTrashed()
                         ->firstOrFail();
         }
-        */
-        
+
         // eager load the invoice items
         if ($invoice && ! $invoice->relationLoaded('invoice_items')) {
             $invoice->load('invoice_items');

From 7e1a0634f5efa17ef9d7aa474a48d81efa83ce99 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 17:55:52 +0300
Subject: [PATCH 085/111] Working on tests

---
 app/Http/Requests/EntityRequest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Http/Requests/EntityRequest.php b/app/Http/Requests/EntityRequest.php
index 87a877e4eae3..d379578c41eb 100644
--- a/app/Http/Requests/EntityRequest.php
+++ b/app/Http/Requests/EntityRequest.php
@@ -33,8 +33,10 @@ class EntityRequest extends Request {
         $class = Utils::getEntityClass($this->entityType);
         \Log::info('entity ' . $this->entityType . ' - ' . $publicId);
         if (method_exists($class, 'withTrashed')) {
+            \Log::info('has withTrashed')
             $this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
         } else {
+            \Log::info('does not have withTrashed')
             $this->entity = $class::scope($publicId)->firstOrFail();
         }
         \Log::info($this->entity);

From 2a109cbfbc192e1f4407661fe66bb05cb9106bed Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 18:00:30 +0300
Subject: [PATCH 086/111] Removing log messages

---
 app/Http/Requests/EntityRequest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Http/Requests/EntityRequest.php b/app/Http/Requests/EntityRequest.php
index d379578c41eb..e1daf5c68d69 100644
--- a/app/Http/Requests/EntityRequest.php
+++ b/app/Http/Requests/EntityRequest.php
@@ -31,15 +31,13 @@ class EntityRequest extends Request {
         }
 
         $class = Utils::getEntityClass($this->entityType);
-        \Log::info('entity ' . $this->entityType . ' - ' . $publicId);
+        
         if (method_exists($class, 'withTrashed')) {
-            \Log::info('has withTrashed')
             $this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
         } else {
-            \Log::info('does not have withTrashed')
             $this->entity = $class::scope($publicId)->firstOrFail();
         }
-        \Log::info($this->entity);
+
         return $this->entity;
     }
 

From 1d3efda4ea859545b0d5327101708f8b808587d6 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 21:13:47 +0300
Subject: [PATCH 087/111] Fix for tests

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d71b4345a9df..b27c9d02af7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,9 +64,9 @@ before_script:
   - curl -L http://ninja.dev:8000/update
 
 script:
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
-  #- php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
-  - php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php
+  #- php ./vendor/codeception/codeception/codecept run --debug acceptance CheckBalanceCest.php
   #- php ./vendor/codeception/codeception/codecept run --debug acceptance ClientCest.php
   #- php ./vendor/codeception/codeception/codecept run --debug acceptance ExpenseCest.php
   #- php ./vendor/codeception/codeception/codecept run --debug acceptance CreditCest.php

From 13fbb880e1080d79a887403c6bccf2a76f8fef66 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 21:49:20 +0300
Subject: [PATCH 088/111] Fix for invoice report totals

---
 app/Http/Controllers/ReportController.php | 30 +++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 4f162f260d37..349cda291817 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -299,7 +299,7 @@ class ReportController extends BaseController
                         $account->formatMoney($tax['paid'], $client)
                     ];
                 }
-    
+
                 $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'amount', $tax['amount']);
                 $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'paid', $tax['paid']);
             }
@@ -320,7 +320,7 @@ class ReportController extends BaseController
         $account = Auth::user()->account;
         $displayData = [];
         $reportTotals = [];
-        
+
         $payments = Payment::scope()
                         ->withTrashed()
                         ->where('is_deleted', '=', false)
@@ -350,7 +350,7 @@ class ReportController extends BaseController
             $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'amount', $invoice->amount);
             $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'paid', $payment->amount);
         }
-        
+
         return [
             'columns' => $columns,
             'displayData' => $displayData,
@@ -361,11 +361,11 @@ class ReportController extends BaseController
     private function generateInvoiceReport($startDate, $endDate, $isExport)
     {
         $columns = ['client', 'invoice_number', 'invoice_date', 'amount', 'payment_date', 'paid', 'method'];
-        
+
         $account = Auth::user()->account;
         $displayData = [];
         $reportTotals = [];
-        
+
         $clients = Client::scope()
                         ->withTrashed()
                         ->with('contacts')
@@ -383,10 +383,10 @@ class ReportController extends BaseController
                                   }, 'invoice_items'])
                                   ->withTrashed();
                         }]);
-        
+
         foreach ($clients->get() as $client) {
-            foreach ($client->invoices as $invoice) {               
-                
+            foreach ($client->invoices as $invoice) {
+
                 $payments = count($invoice->payments) ? $invoice->payments : [false];
                 foreach ($payments as $payment) {
                     $displayData[] = [
@@ -397,10 +397,8 @@ class ReportController extends BaseController
                         $payment ? $payment->present()->payment_date : '',
                         $payment ? $account->formatMoney($payment->amount, $client) : '',
                         $payment ? $payment->present()->method : '',
-                    ];          
-                    if ($payment) {
-                        $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'paid', $payment->amount);
-                    }
+                    ];
+                    $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'paid', $payment ? $payment->amount : 0);
                 }
 
                 $reportTotals = $this->addToTotals($reportTotals, $client->currency_id, 'amount', $invoice->amount);
@@ -491,7 +489,7 @@ class ReportController extends BaseController
 
             $reportTotals = $this->addToTotals($reportTotals, $expense->expense_currency_id, 'amount', $amount);
             $reportTotals = $this->addToTotals($reportTotals, $expense->invoice_currency_id, 'amount', 0);
-            
+
             $reportTotals = $this->addToTotals($reportTotals, $expense->invoice_currency_id, 'invoiced', $invoiced);
             $reportTotals = $this->addToTotals($reportTotals, $expense->expense_currency_id, 'invoiced', 0);
         }
@@ -518,14 +516,14 @@ class ReportController extends BaseController
     private function export($reportType, $data, $columns, $totals)
     {
         $output = fopen('php://output', 'w') or Utils::fatalError();
-        $reportType = trans("texts.{$reportType}s"); 
+        $reportType = trans("texts.{$reportType}s");
         $date = date('Y-m-d');
-        
+
         header('Content-Type:application/csv');
         header("Content-Disposition:attachment;filename={$date}_Ninja_{$reportType}.csv");
 
         Utils::exportData($output, $data, Utils::trans($columns));
-        
+
         fwrite($output, trans('texts.totals'));
         foreach ($totals as $currencyId => $fields) {
             foreach ($fields as $key => $value) {

From 9ddb2f5680377b4715a66c522db1bd5c9c8a3a84 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 22:01:21 +0300
Subject: [PATCH 089/111] Updated readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc8085eec9c0..e8ea86167065 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-**To update the translations please use [Transifex](https://www.transifex.com/invoice-ninja/invoice-ninja/dashboard/)**
+We're often asked to recommend PHP developers, email us at contact@invoiceninja.com if you'd like us to consider you for the work.
 
 ### Affiliates Programs
 * Referral program (we pay you): $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)

From d9af83fd546776d95bb7cdb093045f10dbc90ea0 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 7 Jun 2016 22:03:07 +0300
Subject: [PATCH 090/111] Updated readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e8ea86167065..79024cd8c173 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=master)](https://travis-ci.org/invoiceninja/invoiceninja)
 [![Join the chat at https://gitter.im/hillelcoren/invoice-ninja](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hillelcoren/invoice-ninja?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-We're often asked to recommend PHP developers, email us at contact@invoiceninja.com if you'd like us to consider you for the work.
+We're often asked to recommend PHP developers to help setup our app and make small adjustments, email us at contact@invoiceninja.com if you're interested in taking on the work.
 
 ### Affiliates Programs
 * Referral program (we pay you): $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)

From 44d46a01ab3a549c58c3361e78b25d247ce1e485 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 08:11:48 +0300
Subject: [PATCH 091/111] Always load user even if they're deleted

---
 app/Models/AccountToken.php  | 2 +-
 app/Models/Contact.php       | 2 +-
 app/Models/Credit.php        | 8 ++++----
 app/Models/Document.php      | 2 +-
 app/Models/Expense.php       | 8 ++++----
 app/Models/Task.php          | 4 ++--
 app/Models/Vendor.php        | 2 +-
 app/Models/VendorContact.php | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/Models/AccountToken.php b/app/Models/AccountToken.php
index 87728b37016e..55781aabb95e 100644
--- a/app/Models/AccountToken.php
+++ b/app/Models/AccountToken.php
@@ -19,6 +19,6 @@ class AccountToken extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 }
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index 9c86c4ce5b84..54610e93f049 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -33,7 +33,7 @@ class Contact extends EntityModel implements AuthenticatableContract, CanResetPa
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function client()
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index c46095e80ee3..340417e7d424 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -8,7 +8,7 @@ class Credit extends EntityModel
 {
     use SoftDeletes;
     use PresentableTrait;
-    
+
     protected $dates = ['deleted_at'];
     protected $presenter = 'App\Ninja\Presenters\CreditPresenter';
 
@@ -19,7 +19,7 @@ class Credit extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function invoice()
@@ -59,9 +59,9 @@ class Credit extends EntityModel
 }
 
 Credit::creating(function ($credit) {
-    
+
 });
 
 Credit::created(function ($credit) {
     event(new CreditWasCreated($credit));
-});
\ No newline at end of file
+});
diff --git a/app/Models/Document.php b/app/Models/Document.php
index f1d6d6b9c5bd..efa9426e9581 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -86,7 +86,7 @@ class Document extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function expense()
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 316491a5356b..ccb4ccb684ac 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -35,7 +35,7 @@ class Expense extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function vendor()
@@ -90,13 +90,13 @@ class Expense extends EntityModel
     {
         return round($this->amount * $this->exchange_rate, 2);
     }
-    
+
     public function toArray()
     {
         $array = parent::toArray();
-        
+
         if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount();
-        
+
         return $array;
     }
 }
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 17b667558c49..3aa2f8b2f8d7 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -24,7 +24,7 @@ class Task extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function client()
@@ -91,4 +91,4 @@ class Task extends EntityModel
     {
         return round($this->getDuration() / (60 * 60), 2);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 6fcd10f14092..d537b1ca9d00 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -87,7 +87,7 @@ class Vendor extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function payments()
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index 5546b27d2adb..6b2ad12c8025 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -9,7 +9,7 @@ class VendorContact extends EntityModel
     use SoftDeletes;
     protected $dates = ['deleted_at'];
     protected $table = 'vendor_contacts';
-    
+
     protected $fillable = [
         'first_name',
         'last_name',
@@ -30,7 +30,7 @@ class VendorContact extends EntityModel
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\Models\User')->withTrashed();
     }
 
     public function vendor()

From 956c672711a0d0947339d7930bfb2e426cdf8785 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 08:44:12 +0300
Subject: [PATCH 092/111] Fix payments for clients w/o an email address

---
 resources/views/payments/payment.blade.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/views/payments/payment.blade.php b/resources/views/payments/payment.blade.php
index 556695b69460..49445dcb20a9 100644
--- a/resources/views/payments/payment.blade.php
+++ b/resources/views/payments/payment.blade.php
@@ -179,15 +179,16 @@
                         ->label('') !!}
             </div>
         </div>
-        <div class="row" style="display:{{ isset($paymentTitle) ? 'block' : 'none' }}">
-            <div class="col-md-12">
-                {!! Former::text('email')
-                        ->placeholder(trans('texts.email'))
-                        ->autocomplete('email')
-                        ->label('') !!}
+        @if (isset($paymentTitle) || ! empty($contact->email))
+            <div class="row" style="display:{{ isset($paymentTitle) ? 'block' : 'none' }}">
+                <div class="col-md-12">
+                    {!! Former::text('email')
+                            ->placeholder(trans('texts.email'))
+                            ->autocomplete('email')
+                            ->label('') !!}
+                </div>
             </div>
-        </div>
-
+        @endif
         <p>&nbsp;<br/>&nbsp;</p>
 
         @if ($showAddress)

From 08c01f59d6edd17e1e77be7074845598feac9743 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 16:06:48 +0300
Subject: [PATCH 093/111] Fix for analytics

---
 app/Listeners/AnalyticsListener.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Listeners/AnalyticsListener.php b/app/Listeners/AnalyticsListener.php
index 92c81205ab79..dd574368c462 100644
--- a/app/Listeners/AnalyticsListener.php
+++ b/app/Listeners/AnalyticsListener.php
@@ -11,30 +11,30 @@ class AnalyticsListener
         if ( ! Utils::isNinja() || ! env('ANALYTICS_KEY')) {
             return;
         }
-        
+
         $payment = $event->payment;
         $invoice = $payment->invoice;
         $account = $payment->account;
-        
+
         if ($account->account_key != NINJA_ACCOUNT_KEY) {
             return;
         }
-        
+
         $analyticsId = env('ANALYTICS_KEY');
         $client = $payment->client;
         $amount = $payment->amount;
-        
-        $base = "v=1&tid={$analyticsId}&cid{$client->public_id}&cu=USD&ti={$invoice->invoice_number}";
-        
-        $url = $base . "&t=transaction&ta=ninja&tr={$amount}"; 
+
+        $base = "v=1&tid={$analyticsId}&cid={$client->public_id}&cu=USD&ti={$invoice->invoice_number}";
+
+        $url = $base . "&t=transaction&ta=ninja&tr={$amount}";
         $this->sendAnalytics($url);
         //Log::info($url);
 
-        $url = $base . "&t=item&in=plan&ip={$amount}&iq=1"; 
+        $url = $base . "&t=item&in=plan&ip={$amount}&iq=1";
         $this->sendAnalytics($url);
         //Log::info($url);
     }
-    
+
     private function sendAnalytics($data)
     {
         $data = json_encode($data);

From 3c9e2769fb76852f77bbff6b446a9117f06a02b5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 17:21:02 +0300
Subject: [PATCH 094/111] Merge fix for outstanding balance on dashboard

---
 app/Http/Controllers/DashboardController.php | 41 +++++++++++---------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 5daa8827883a..718d73c67d42 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -13,7 +13,7 @@ class DashboardController extends BaseController
     {
         $view_all = Auth::user()->hasPermission('view_all');
         $user_id = Auth::user()->id;
-            
+
         // total_income, billed_clients, invoice_sent and active_clients
         $select = DB::raw('COUNT(DISTINCT CASE WHEN invoices.id IS NOT NULL THEN clients.id ELSE null END) billed_clients,
                         SUM(CASE WHEN invoices.invoice_status_id >= '.INVOICE_STATUS_SENT.' THEN 1 ELSE 0 END) invoices_sent,
@@ -27,17 +27,17 @@ class DashboardController extends BaseController
             ->where('invoices.is_deleted', '=', false)
             ->where('invoices.is_recurring', '=', false)
             ->where('invoices.is_quote', '=', false);
-            
+
         if(!$view_all){
             $metrics = $metrics->where(function($query) use($user_id){
                 $query->where('invoices.user_id', '=', $user_id);
                 $query->orwhere(function($query) use($user_id){
-                    $query->where('invoices.user_id', '=', null); 
+                    $query->where('invoices.user_id', '=', null);
                     $query->where('clients.user_id', '=', $user_id);
                 });
             });
         }
-            
+
         $metrics = $metrics->groupBy('accounts.id')
             ->first();
 
@@ -47,11 +47,11 @@ class DashboardController extends BaseController
             ->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
             ->where('accounts.id', '=', Auth::user()->account_id)
             ->where('clients.is_deleted', '=', false);
-            
+
         if(!$view_all){
             $paidToDate = $paidToDate->where('clients.user_id', '=', $user_id);
         }
-        
+
         $paidToDate = $paidToDate->groupBy('accounts.id')
             ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'))
             ->get();
@@ -66,11 +66,11 @@ class DashboardController extends BaseController
             ->where('invoices.is_deleted', '=', false)
             ->where('invoices.is_quote', '=', false)
             ->where('invoices.is_recurring', '=', false);
-            
+
         if(!$view_all){
             $averageInvoice = $averageInvoice->where('invoices.user_id', '=', $user_id);
         }
-        
+
         $averageInvoice = $averageInvoice->groupBy('accounts.id')
             ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'))
             ->get();
@@ -82,16 +82,21 @@ class DashboardController extends BaseController
             ->where('accounts.id', '=', Auth::user()->account_id)
             ->where('clients.is_deleted', '=', false)
             ->groupBy('accounts.id')
-            ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'))
-            ->get();
+            ->groupBy(DB::raw('CASE WHEN clients.currency_id IS NULL THEN CASE WHEN accounts.currency_id IS NULL THEN 1 ELSE accounts.currency_id END ELSE clients.currency_id END'));
+
+        if (!$view_all) {
+            $balances->where('clients.user_id', '=', $user_id);
+        }
+
+        $balances = $balances->get();
 
         $activities = Activity::where('activities.account_id', '=', Auth::user()->account_id)
                 ->where('activities.activity_type_id', '>', 0);
-        
+
         if(!$view_all){
             $activities = $activities->where('activities.user_id', '=', $user_id);
         }
-                
+
         $activities = $activities->orderBy('activities.created_at', 'desc')
                 ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account')
                 ->take(50)
@@ -111,11 +116,11 @@ class DashboardController extends BaseController
                     ->where('invoices.deleted_at', '=', null)
                     ->where('contacts.is_primary', '=', true)
                     ->where('invoices.due_date', '<', date('Y-m-d'));
-            
+
         if(!$view_all){
             $pastDue = $pastDue->where('invoices.user_id', '=', $user_id);
         }
-            
+
         $pastDue = $pastDue->select(['invoices.due_date', 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'is_quote'])
                     ->orderBy('invoices.due_date', 'asc')
                     ->take(50)
@@ -136,11 +141,11 @@ class DashboardController extends BaseController
                     ->where('contacts.is_primary', '=', true)
                     ->where('invoices.due_date', '>=', date('Y-m-d'))
                     ->orderBy('invoices.due_date', 'asc');
-            
+
         if(!$view_all){
             $upcoming = $upcoming->where('invoices.user_id', '=', $user_id);
         }
-            
+
         $upcoming = $upcoming->take(50)
                     ->select(['invoices.due_date', 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'is_quote'])
                     ->get();
@@ -155,11 +160,11 @@ class DashboardController extends BaseController
                     ->where('clients.is_deleted', '=', false)
                     ->where('contacts.deleted_at', '=', null)
                     ->where('contacts.is_primary', '=', true);
-            
+
         if(!$view_all){
             $payments = $payments->where('payments.user_id', '=', $user_id);
         }
-            
+
         $payments = $payments->select(['payments.payment_date', 'payments.amount', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id'])
                     ->orderBy('payments.payment_date', 'desc')
                     ->take(50)

From 40241cbf384af9f20edc69dfd5a411dab17780f4 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Jun 2016 17:56:48 +0300
Subject: [PATCH 095/111] Restrict client list

---
 app/Http/Controllers/CreditController.php  |  8 ++++----
 app/Http/Controllers/PaymentController.php | 11 ++++++-----
 app/Http/Controllers/TaskController.php    | 12 ++++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index c4250903fd32..ff1257d4456c 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -64,7 +64,7 @@ class CreditController extends BaseController
             'method' => 'POST',
             'url' => 'credits',
             'title' => trans('texts.new_credit'),
-            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), 
+            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(), 
         );
 
         return View::make('credits.edit', $data);
@@ -74,9 +74,9 @@ class CreditController extends BaseController
     public function edit($publicId)
     {
         $credit = Credit::scope($publicId)->firstOrFail();
-        
+
         $this->authorize('edit', $credit);
-        
+
         $credit->credit_date = Utils::fromSqlDate($credit->credit_date);
 
         $data = array(
@@ -90,7 +90,7 @@ class CreditController extends BaseController
         return View::make('credit.edit', $data);
     }
     */
-    
+
     public function store(CreateCreditRequest $request)
     {
         $credit = $this->creditRepo->save($request->input());
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 0b93d45374b0..2054b65bafcb 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -32,7 +32,7 @@ use App\Http\Requests\UpdatePaymentRequest;
 class PaymentController extends BaseController
 {
     protected $entityType = ENTITY_PAYMENT;
-    
+
     public function __construct(PaymentRepository $paymentRepo, InvoiceRepository $invoiceRepo, AccountRepository $accountRepo, ContactMailer $contactMailer, PaymentService $paymentService)
     {
         // parent::__construct();
@@ -71,6 +71,7 @@ class PaymentController extends BaseController
     public function create(PaymentRequest $request)
     {
         $invoices = Invoice::scope()
+                    ->viewable()
                     ->where('is_recurring', '=', false)
                     ->where('is_quote', '=', false)
                     ->where('invoices.balance', '>', 0)
@@ -88,7 +89,7 @@ class PaymentController extends BaseController
             'title' => trans('texts.new_payment'),
             'paymentTypes' => Cache::get('paymentTypes'),
             'paymentTypeId' => Input::get('paymentTypeId'),
-            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(), );
+            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(), );
 
         return View::make('payments.edit', $data);
     }
@@ -96,7 +97,7 @@ class PaymentController extends BaseController
     public function edit(PaymentRequest $request)
     {
         $payment = $request->entity();
-                
+
         $payment->payment_date = Utils::fromSqlDate($payment->payment_date);
 
         $data = array(
@@ -565,7 +566,7 @@ class PaymentController extends BaseController
                     Session::flash('error', $message);
                 }
                 return Redirect::to($invitation->getLink());
-            } elseif (method_exists($gateway, 'completePurchase') 
+            } elseif (method_exists($gateway, 'completePurchase')
                 && !$accountGateway->isGateway(GATEWAY_TWO_CHECKOUT)
                 && !$accountGateway->isGateway(GATEWAY_CHECKOUT_COM)) {
                 $details = $this->paymentService->getPaymentDetails($invitation, $accountGateway);
@@ -597,7 +598,7 @@ class PaymentController extends BaseController
     public function store(CreatePaymentRequest $request)
     {
         $input = $request->input();
-                
+
         $input['invoice_id'] = Invoice::getPrivateId($input['invoice']);
         $input['client_id'] = Client::getPrivateId($input['client']);
         $payment = $this->paymentRepo->save($input);
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 229a4751116e..8eb90df15944 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -117,7 +117,7 @@ class TaskController extends BaseController
         $this->checkTimezone();
 
         $task = $request->entity();
-        
+
         $actions = [];
         if ($task->invoice) {
             $actions[] = ['url' => URL::to("invoices/{$task->invoice->public_id}/edit"), 'label' => trans("texts.view_invoice")];
@@ -167,14 +167,14 @@ class TaskController extends BaseController
     public function update(UpdateTaskRequest $request)
     {
         $task = $request->entity();
-        
+
         return $this->save($task->public_id);
     }
 
     private static function getViewModel()
     {
         return [
-            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
+            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(),
             'account' => Auth::user()->account,
         ];
     }
@@ -182,7 +182,7 @@ class TaskController extends BaseController
     private function save($publicId = null)
     {
         $action = Input::get('action');
-        
+
         if (in_array($action, ['archive', 'delete', 'restore'])) {
             return self::bulk();
         }
@@ -210,7 +210,7 @@ class TaskController extends BaseController
             $tasks = Task::scope($ids)->with('client')->get();
             $clientPublicId = false;
             $data = [];
-            
+
             foreach ($tasks as $task) {
                 if ($task->client) {
                     if (!$clientPublicId) {
@@ -228,7 +228,7 @@ class TaskController extends BaseController
                     Session::flash('error', trans('texts.task_error_invoiced'));
                     return Redirect::to('tasks');
                 }
-                
+
                 $account = Auth::user()->account;
                 $data[] = [
                     'publicId' => $task->public_id,

From fc0a7cfbf01c92cc561515e1fa020227bc34733e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 21 Jun 2016 21:02:01 +0300
Subject: [PATCH 096/111] Merge fixes from develop

---
 app/Http/Controllers/ClientApiController.php | 12 ++--
 app/Models/Invoice.php                       | 62 ++++++++++----------
 resources/views/expenses/edit.blade.php      |  4 +-
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php
index dd82e9116131..2b135b70438b 100644
--- a/app/Http/Controllers/ClientApiController.php
+++ b/app/Http/Controllers/ClientApiController.php
@@ -53,7 +53,7 @@ class ClientApiController extends BaseAPIController
                 $query->where('email', $email);
             });
         }
-        
+
         return $this->listResponse($clients);
     }
 
@@ -112,11 +112,13 @@ class ClientApiController extends BaseAPIController
         if ($request->action) {
             return $this->handleAction($request);
         }
-        
+
         $data = $request->input();
         $data['public_id'] = $publicId;
         $client = $this->clientRepo->save($data, $request->entity());
 
+        $client->load(['contacts']);
+
         return $this->itemResponse($client);
     }
 
@@ -146,10 +148,10 @@ class ClientApiController extends BaseAPIController
     public function destroy(UpdateClientRequest $request)
     {
         $client = $request->entity();
-        
+
         $this->clientRepo->delete($client);
 
         return $this->itemResponse($client);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 5c006ecd9eaa..db0cae513f37 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -29,9 +29,9 @@ class Invoice extends EntityModel implements BalanceAffecting
         'tax_name1',
         'tax_rate1',
         'tax_name2',
-        'tax_rate2',    
+        'tax_rate2',
     ];
-    
+
     protected $casts = [
         'is_recurring' => 'boolean',
         'has_tasks' => 'boolean',
@@ -515,12 +515,12 @@ class Invoice extends EntityModel implements BalanceAffecting
                 'name',
             ]);
         }
-        
+
         foreach ($this->expenses as $expense) {
             $expense->setVisible([
                 'documents',
             ]);
-            
+
             foreach ($expense->documents as $document) {
                 $document->setVisible([
                     'public_id',
@@ -579,12 +579,12 @@ class Invoice extends EntityModel implements BalanceAffecting
 
         return $schedule[1]->getStart();
     }
-    
+
     public function getDueDate($invoice_date = null){
         if(!$this->is_recurring) {
             return $this->due_date ? $this->due_date : null;
         }
-        else{ 
+        else{
             $now = time();
             if($invoice_date) {
                 // If $invoice_date is specified, all calculations are based on that date
@@ -598,7 +598,7 @@ class Invoice extends EntityModel implements BalanceAffecting
                     $now = $invoice_date->getTimestamp();
                 }
             }
-            
+
             if($this->due_date && $this->due_date != '0000-00-00'){
                 // This is a recurring invoice; we're using a custom format here.
                 // The year is always 1998; January is 1st, 2nd, last day of the month.
@@ -607,7 +607,7 @@ class Invoice extends EntityModel implements BalanceAffecting
                 $monthVal = (int)date('n', $dueDateVal);
                 $dayVal = (int)date('j', $dueDateVal);
                 $dueDate = false;
-                
+
                 if($monthVal == 1) {// January; day of month
                     $currentDay = (int)date('j', $now);
                     $lastDayOfMonth = (int)date('t', $now);
@@ -634,7 +634,7 @@ class Invoice extends EntityModel implements BalanceAffecting
                         if($dueDay > $lastDayOfMonth){
                             // No later than the end of the month
                             $dueDay = $lastDayOfMonth;
-                        }                    
+                        }
                     }
 
                     $dueDate = mktime(0, 0, 0, $dueMonth, $dueDay, $dueYear);
@@ -663,7 +663,7 @@ class Invoice extends EntityModel implements BalanceAffecting
                 return date('Y-m-d', strtotime('+'.$days.' day', $now));
             }
         }
-        
+
         // Couldn't calculate one
         return null;
     }
@@ -681,11 +681,11 @@ class Invoice extends EntityModel implements BalanceAffecting
             $dateStart = $date->getStart();
             $date = $this->account->formatDate($dateStart);
             $dueDate = $this->getDueDate($dateStart);
-            
+
             if($dueDate) {
                 $date .= ' <small>(' . trans('texts.due') . ' ' . $this->account->formatDate($dueDate) . ')</small>';
             }
-            
+
             $dates[] = $date;
         }
 
@@ -799,16 +799,16 @@ class Invoice extends EntityModel implements BalanceAffecting
         $invitation = $this->invitations[0];
         $link = $invitation->getLink('view', true);
         $key = env('PHANTOMJS_CLOUD_KEY');
-        
+
         if (Utils::isNinjaDev()) {
             $link = env('TEST_LINK');
         }
 
         $url = "http://api.phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$link}?phantomjs=true%22,renderType:%22html%22%7D";
-        
+
         $pdfString = file_get_contents($url);
         $pdfString = strip_tags($pdfString);
-        
+
         if ( ! $pdfString || strlen($pdfString) < 200) {
             Utils::logError("PhantomJSCloud - failed to create pdf: {$pdfString}");
             return false;
@@ -861,55 +861,55 @@ class Invoice extends EntityModel implements BalanceAffecting
         return $total;
     }
 
-    // if $calculatePaid is true we'll loop through each payment to  
+    // if $calculatePaid is true we'll loop through each payment to
     // determine the sum, otherwise we'll use the cached paid_to_date amount
     public function getTaxes($calculatePaid = false)
     {
         $taxes = [];
         $taxable = $this->getTaxable();
         $paidAmount = $this->getAmountPaid($calculatePaid);
-                
+
         if ($this->tax_name1) {
             $invoiceTaxAmount = round($taxable * ($this->tax_rate1 / 100), 2);
-            $invoicePaidAmount = $this->amount && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
+            $invoicePaidAmount = floatVal($this->amount) && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
             $this->calculateTax($taxes, $this->tax_name1, $this->tax_rate1, $invoiceTaxAmount, $invoicePaidAmount);
         }
 
         if ($this->tax_name2) {
             $invoiceTaxAmount = round($taxable * ($this->tax_rate2 / 100), 2);
-            $invoicePaidAmount = $this->amount && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
+            $invoicePaidAmount = floatVal($this->amount) && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
             $this->calculateTax($taxes, $this->tax_name2, $this->tax_rate2, $invoiceTaxAmount, $invoicePaidAmount);
         }
 
         foreach ($this->invoice_items as $invoiceItem) {
             $itemTaxAmount = $this->getItemTaxable($invoiceItem, $taxable);
-            
+
             if ($invoiceItem->tax_name1) {
                 $itemTaxAmount = round($taxable * ($invoiceItem->tax_rate1 / 100), 2);
-                $itemPaidAmount = $this->amount && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
+                $itemPaidAmount = floatVal($this->amount) && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
                 $this->calculateTax($taxes, $invoiceItem->tax_name1, $invoiceItem->tax_rate1, $itemTaxAmount, $itemPaidAmount);
             }
 
             if ($invoiceItem->tax_name2) {
                 $itemTaxAmount = round($taxable * ($invoiceItem->tax_rate2 / 100), 2);
-                $itemPaidAmount = $this->amount && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
+                $itemPaidAmount = floatVal($this->amount) && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
                 $this->calculateTax($taxes, $invoiceItem->tax_name2, $invoiceItem->tax_rate2, $itemTaxAmount, $itemPaidAmount);
             }
         }
-        
+
         return $taxes;
     }
     
-    private function calculateTax(&$taxes, $name, $rate, $amount, $paid) 
-    {    
+    private function calculateTax(&$taxes, $name, $rate, $amount, $paid)
+    {
         if ( ! $amount) {
             return;
-        } 
-        
+        }
+
         $amount = round($amount, 2);
         $paid = round($paid, 2);
         $key = $rate . ' ' . $name;
-        
+
         if ( ! isset($taxes[$key])) {
             $taxes[$key] = [
                 'name' => $name,
@@ -920,14 +920,14 @@ class Invoice extends EntityModel implements BalanceAffecting
         }
 
         $taxes[$key]['amount'] += $amount;
-        $taxes[$key]['paid'] += $paid;        
+        $taxes[$key]['paid'] += $paid;
     }
-    
+
     public function hasDocuments(){
         if(count($this->documents))return true;
         return $this->hasExpenseDocuments();
     }
-    
+
     public function hasExpenseDocuments(){
         foreach($this->expenses as $expense){
             if(count($expense->documents))return true;
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 0f1175d9f971..f2ee2d872ab3 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -108,7 +108,7 @@
 
                 </div>
             </div>
-            @if ($account->isPro())
+            @if ($account->hasFeature(FEATURE_DOCUMENTS))
             <div clas="row">
                 <div class="col-md-2 col-sm-4"><div class="control-label" style="margin-bottom:10px;">{{trans('texts.expense_documents')}}</div></div>
                 <div class="col-md-12 col-sm-8">
@@ -419,7 +419,7 @@
         function handleDocumentError() {
             window.countUploadingDocuments--;
         }
-        
+
     </script>
 
 @stop

From e36d23fcdcae9ca3247d4143c506d66eb0b987cd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 23 Jun 2016 12:39:07 +0300
Subject: [PATCH 097/111] API changes for Zapier

---
 app/Http/Controllers/BaseAPIController.php    | 43 ++++++++++++-------
 app/Http/Controllers/InvoiceApiController.php | 13 +++---
 app/Ninja/Transformers/PaymentTransformer.php |  5 ++-
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php
index 0718e95b91e4..4531afc2525e 100644
--- a/app/Http/Controllers/BaseAPIController.php
+++ b/app/Http/Controllers/BaseAPIController.php
@@ -61,40 +61,40 @@ class BaseAPIController extends Controller
         }
 
         $this->serializer = Request::get('serializer') ?: API_SERIALIZER_ARRAY;
-        
+
         if ($this->serializer === API_SERIALIZER_JSON) {
             $this->manager->setSerializer(new JsonApiSerializer());
         } else {
             $this->manager->setSerializer(new ArraySerializer());
         }
-        
+
         if (Utils::isNinjaDev()) {
             \DB::enableQueryLog();
         }
     }
 
     protected function handleAction($request)
-    { 
+    {
         $entity = $request->entity();
         $action = $request->action;
-        
+
         $repo = Utils::toCamelCase($this->entityType) . 'Repo';
-        
+
         $this->$repo->$action($entity);
-        
+
         return $this->itemResponse($entity);
     }
 
     protected function listResponse($query)
     {
         $transformerClass = EntityModel::getTransformerName($this->entityType);
-        $transformer = new $transformerClass(Auth::user()->account, Input::get('serializer'));        
+        $transformer = new $transformerClass(Auth::user()->account, Input::get('serializer'));
 
         $includes = $transformer->getDefaultIncludes();
         $includes = $this->getRequestIncludes($includes);
 
         $query->with($includes);
-        
+
         if ($updatedAt = Input::get('updated_at')) {
             $updatedAt = date('Y-m-d H:i:s', $updatedAt);
             $query->where(function($query) use ($includes, $updatedAt) {
@@ -106,14 +106,14 @@ class BaseAPIController extends Controller
                 }
             });
         }
-        
+
         if ($clientPublicId = Input::get('client_id')) {
             $filter = function($query) use ($clientPublicId) {
                 $query->where('public_id', '=', $clientPublicId);
             };
             $query->whereHas('client', $filter);
         }
-        
+
         if ( ! Utils::hasPermission('view_all')){
             if ($this->entityType == ENTITY_USER) {
                 $query->where('id', '=', Auth::user()->id);
@@ -121,7 +121,7 @@ class BaseAPIController extends Controller
                 $query->where('user_id', '=', Auth::user()->id);
             }
         }
-        
+
         $data = $this->createCollection($query, $transformer, $this->entityType);
 
         return $this->response($data);
@@ -130,10 +130,10 @@ class BaseAPIController extends Controller
     protected function itemResponse($item)
     {
         $transformerClass = EntityModel::getTransformerName($this->entityType);
-        $transformer = new $transformerClass(Auth::user()->account, Input::get('serializer'));        
+        $transformer = new $transformerClass(Auth::user()->account, Input::get('serializer'));
 
         $data = $this->createItem($item, $transformer, $this->entityType);
-        
+
         return $this->response($data);
     }
 
@@ -160,7 +160,7 @@ class BaseAPIController extends Controller
         } else {
             $resource = new Collection($query, $transformer, $entityType);
         }
-        
+
         return $this->manager->createData($resource)->toArray();
     }
 
@@ -171,7 +171,7 @@ class BaseAPIController extends Controller
             Log::info(Request::method() . ' - ' . Request::url() . ": $count queries");
             Log::info(json_encode(\DB::getQueryLog()));
         }
-        
+
         $index = Request::get('index') ?: 'data';
 
         if ($index == 'none') {
@@ -222,7 +222,18 @@ class BaseAPIController extends Controller
                 $data[] = $include;
             }
         }
-        
+
+        return $data;
+    }
+
+    protected function fileReponse($name, $data)
+    {
+        header('Content-Type: application/pdf');
+        header('Content-Length: ' . strlen($data));
+        header('Content-disposition: attachment; filename="' . $name . '"');
+        header('Cache-Control: public, must-revalidate, max-age=0');
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
         return $data;
     }
 }
diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 6d68573cdb42..a9b819cd1e0b 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -184,6 +184,10 @@ class InvoiceApiController extends BaseAPIController
                         ->with('client', 'invoice_items', 'invitations')
                         ->first();
 
+        if (isset($data['download_invoice']) && boolval($data['download_invoice'])) {
+            return $this->fileReponse($invoice->getFileName(), $invoice->getPDFString());
+        }
+
         return $this->itemResponse($invoice);
     }
 
@@ -361,14 +365,7 @@ class InvoiceApiController extends BaseAPIController
     public function download(InvoiceRequest $request)
     {
         $invoice = $request->entity();
-        $pdfString = $invoice->getPDFString();
 
-        header('Content-Type: application/pdf');
-        header('Content-Length: ' . strlen($pdfString));
-        header('Content-disposition: attachment; filename="' . $invoice->getFileName() . '"');
-        header('Cache-Control: public, must-revalidate, max-age=0');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-
-        return $pdfString;
+        return $this->fileReponse($invoice->getFileName(), $invoice->getPDFString());
     }
 }
diff --git a/app/Ninja/Transformers/PaymentTransformer.php b/app/Ninja/Transformers/PaymentTransformer.php
index c4e4328cb845..9f3ef3212863 100644
--- a/app/Ninja/Transformers/PaymentTransformer.php
+++ b/app/Ninja/Transformers/PaymentTransformer.php
@@ -29,7 +29,7 @@ class PaymentTransformer extends EntityTransformer
     public function __construct($account = null, $serializer = null, $invoice = null)
     {
         parent::__construct($account, $serializer);
-        
+
         $this->invoice = $invoice;
     }
 
@@ -57,6 +57,7 @@ class PaymentTransformer extends EntityTransformer
             'is_deleted' => (bool) $payment->is_deleted,
             'payment_type_id' => (int) $payment->payment_type_id,
             'invoice_id' => (int) ($this->invoice ? $this->invoice->public_id : $payment->invoice->public_id),
+            'invoice_number' => $this->invoice ? $this->invoice->invoice_number : $payment->invoice->invoice_number,
         ]);
     }
-}
\ No newline at end of file
+}

From 1fc1c11663626a397156fb2e03b73454fd585e13 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 23 Jun 2016 12:58:28 +0300
Subject: [PATCH 098/111] API changes for Zapier

---
 app/Http/Controllers/InvoiceApiController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index a9b819cd1e0b..cdaea65af93a 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -22,6 +22,7 @@ use App\Http\Requests\InvoiceRequest;
 use App\Http\Requests\CreateInvoiceAPIRequest;
 use App\Http\Requests\UpdateInvoiceAPIRequest;
 use App\Services\InvoiceService;
+use App\Services\PaymentService;
 
 class InvoiceApiController extends BaseAPIController
 {
@@ -29,7 +30,7 @@ class InvoiceApiController extends BaseAPIController
 
     protected $entityType = ENTITY_INVOICE;
 
-    public function __construct(InvoiceService $invoiceService, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, PaymentRepository $paymentRepo, Mailer $mailer)
+    public function __construct(InvoiceService $invoiceService, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, PaymentRepository $paymentRepo, Mailer $mailer, PaymentService $paymentService)
     {
         parent::__construct();
 
@@ -38,6 +39,7 @@ class InvoiceApiController extends BaseAPIController
         $this->paymentRepo = $paymentRepo;
         $this->invoiceService = $invoiceService;
         $this->mailer = $mailer;
+        $this->paymentService = $paymentService;
     }
 
     /**
@@ -163,8 +165,9 @@ class InvoiceApiController extends BaseAPIController
         $invoice = $this->invoiceService->save($data);
         $payment = false;
 
-        // Optionally create payment with invoice
-        if (isset($data['paid']) && $data['paid']) {
+        if (isset($data['auto_bill']) && boolval($data['auto_bill'])) {
+            $payment = $this->paymentService->autoBillInvoice($invoice);
+        } else if (isset($data['paid']) && $data['paid']) {
             $payment = $this->paymentRepo->save([
                 'invoice_id' => $invoice->id,
                 'client_id' => $client->id,

From 3410043b0ad20129bb34e4847c9fdf29e702781e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20Lo=CC=88sken?= <holger.loesken@codedge.de>
Date: Mon, 4 Jul 2016 22:30:27 +0200
Subject: [PATCH 099/111] Add code climate config

---
 codeclimate.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 codeclimate.yml

diff --git a/codeclimate.yml b/codeclimate.yml
new file mode 100644
index 000000000000..f006734c5893
--- /dev/null
+++ b/codeclimate.yml
@@ -0,0 +1,6 @@
+exclude_paths:
+  - "bootstrap/cache"
+  - "resources/"
+  - "storage/"
+  - "tests/"
+  - "**.md"
\ No newline at end of file

From 386e026dbbf12444e8b6325a07dc4c9d1b2d01b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20L=C3=B6sken?= <holger.loesken@codedge.de>
Date: Mon, 4 Jul 2016 20:32:07 +0000
Subject: [PATCH 100/111] Renamed config for codeclimate

---
 codeclimate.yml => .codeclimate.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename codeclimate.yml => .codeclimate.yml (100%)

diff --git a/codeclimate.yml b/.codeclimate.yml
similarity index 100%
rename from codeclimate.yml
rename to .codeclimate.yml

From 1adffcae37dff2aa1685cb90fade6db729a8e47e Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 5 Jul 2016 15:08:42 +0300
Subject: [PATCH 101/111] Updated reseller pricing to match develop

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79024cd8c173..240cc58403ef 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ We're often asked to recommend PHP developers to help setup our app and make sma
 
 ### Affiliates Programs
 * Referral program (we pay you): $100 per signup paid over 3 years - [Learn more](https://www.invoiceninja.com/referral-program/)
-* White-label reseller (you pay us): 10% of revenue with a $100 sign up fee
+* White-label reseller (you pay us): 10% of revenue with a $500 sign up fee
 
 ### Installation Options
 * [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free

From 9aa140011a54868ea7412286e09ac5ca9597013f Mon Sep 17 00:00:00 2001
From: Abby Armada <abby@codeclimate.com>
Date: Tue, 5 Jul 2016 14:24:44 -0400
Subject: [PATCH 102/111] Update .codeclimate.yml

- Add nodes for engines and ratings
- Fix spacing
---
 .codeclimate.yml | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index f006734c5893..ba99e864e512 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,6 +1,33 @@
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+  phpmd:
+    enabled: true
+ratings:
+  paths:
+  - "**.css"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
 exclude_paths:
-  - "bootstrap/cache"
-  - "resources/"
-  - "storage/"
-  - "tests/"
-  - "**.md"
\ No newline at end of file
+- "bootstrap/cache"
+- "resources/"
+- "storage/"
+- "tests/"
+- "**.md"

From af41cc2cb5d5c34e97206f4f50d173bebf5370ef Mon Sep 17 00:00:00 2001
From: Abby Armada <abby@codeclimate.com>
Date: Tue, 5 Jul 2016 14:43:35 -0400
Subject: [PATCH 103/111] Update .codeclimate.yml

- Duplication engine time out test
---
 .codeclimate.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index ba99e864e512..0fdb26b84dbf 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -31,3 +31,5 @@ exclude_paths:
 - "storage/"
 - "tests/"
 - "**.md"
+- "**.min.js"
+- "**.min.php"

From 3afc29a57146c5a3e6587e38e04b78e1b1fc7b3b Mon Sep 17 00:00:00 2001
From: Abby Armada <abby@codeclimate.com>
Date: Tue, 5 Jul 2016 15:22:40 -0400
Subject: [PATCH 104/111] Update .codeclimate.yml

Testing ESLint
---
 .codeclimate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 0fdb26b84dbf..66df79274d96 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -10,7 +10,7 @@ engines:
       - python
       - php
   eslint:
-    enabled: true
+    enabled: false
   fixme:
     enabled: true
   phpmd:

From 6d3d7c725b0ac6898b71c4f5e42dadab817b313a Mon Sep 17 00:00:00 2001
From: Abby Armada <abby@codeclimate.com>
Date: Tue, 5 Jul 2016 15:42:06 -0400
Subject: [PATCH 105/111] Update .codeclimate.yml

- add more exclusions.
---
 .codeclimate.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 66df79274d96..390a5217b1ef 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -33,3 +33,4 @@ exclude_paths:
 - "**.md"
 - "**.min.js"
 - "**.min.php"
+- "**.min.css"

From 316284b7e2e55ac2ffaab6a355836c561fc4d28f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 11 Jul 2016 23:36:51 +0300
Subject: [PATCH 106/111] Bug fixes

---
 app/Http/Controllers/QuoteController.php | 2 +-
 app/Http/Controllers/TaskController.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index 2efd429be52b..a9719798a1b2 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -119,7 +119,7 @@ class QuoteController extends BaseController
           'taxRateOptions' => $options,
           'defaultTax' => $defaultTax,
           'countries' => Cache::get('countries'),
-          'clients' => Client::scope()->viewable()->with('contacts', 'country')->orderBy('name')->get(),
+          'clients' => Client::scope()->with('contacts', 'country')->orderBy('name')->get(),
           'taxRates' => TaxRate::scope()->orderBy('name')->get(),
           'currencies' => Cache::get('currencies'),
           'sizes' => Cache::get('sizes'),
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 49def0aae85d..839c06395bcf 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -213,7 +213,7 @@ class TaskController extends BaseController
     private static function getViewModel()
     {
         return [
-            'clients' => Client::scope()->viewable()->with('contacts')->orderBy('name')->get(),
+            'clients' => Client::scope()->with('contacts')->orderBy('name')->get(),
             'account' => Auth::user()->account,
         ];
     }

From a32e372d400f51ed59eb2eb577bd6b2a666579ff Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 12 Jul 2016 08:05:26 +0300
Subject: [PATCH 107/111] Bug fix

---
 app/Http/Controllers/BaseAPIController.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php
index 2561a1c57b02..05ea89f89a0b 100644
--- a/app/Http/Controllers/BaseAPIController.php
+++ b/app/Http/Controllers/BaseAPIController.php
@@ -63,10 +63,6 @@ class BaseAPIController extends Controller
         } else {
             $this->manager->setSerializer(new ArraySerializer());
         }
-
-        if (Utils::isNinjaDev()) {
-            \DB::enableQueryLog();
-        }
     }
 
     protected function handleAction($request)
@@ -162,12 +158,6 @@ class BaseAPIController extends Controller
 
     protected function response($response)
     {
-        if (Utils::isNinjaDev()) {
-            $count = count(\DB::getQueryLog());
-            Log::info(Request::method() . ' - ' . Request::url() . ": $count queries");
-            //Log::info(json_encode(\DB::getQueryLog()));
-        }
-
         $index = Request::get('index') ?: 'data';
 
         if ($index == 'none') {

From 92043afb9c2f62b414328ec293e4c0fcb94c8984 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Jul 2016 16:35:56 +0300
Subject: [PATCH 108/111] WePay fixes

---
 app/Ninja/PaymentDrivers/WePayPaymentDriver.php | 17 -----------------
 .../views/payments/braintree/paypal.blade.php   |  2 ++
 .../payments/wepay/bank_transfer.blade.php      |  2 ++
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/Ninja/PaymentDrivers/WePayPaymentDriver.php b/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
index c8865e74d103..a88cc1ac51af 100644
--- a/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/WePayPaymentDriver.php
@@ -7,8 +7,6 @@ use Exception;
 
 class WePayPaymentDriver extends BasePaymentDriver
 {
-    protected $sourceReferenceParam = 'accessToken';
-
     public function gatewayTypes()
     {
         $types =  [
@@ -23,21 +21,6 @@ class WePayPaymentDriver extends BasePaymentDriver
         return $types;
     }
 
-    /*
-    public function startPurchase($input = false, $sourceId = false)
-    {
-        $data = parent::startPurchase($input, $sourceId);
-
-        if ($this->isGatewayType(GATEWAY_TYPE_BANK_TRANSFER)) {
-            if ( ! $sourceId) {
-                throw new Exception();
-            }
-        }
-
-        return $data;
-    }
-    */
-
     public function tokenize()
     {
         return true;
diff --git a/resources/views/payments/braintree/paypal.blade.php b/resources/views/payments/braintree/paypal.blade.php
index 711124f6ecf9..3009d27f14be 100644
--- a/resources/views/payments/braintree/paypal.blade.php
+++ b/resources/views/payments/braintree/paypal.blade.php
@@ -39,4 +39,6 @@
         @endif
     </center>
 
+    {!! Former::close() !!}
+
 @stop
diff --git a/resources/views/payments/wepay/bank_transfer.blade.php b/resources/views/payments/wepay/bank_transfer.blade.php
index cfca52b94a88..22ea75be4136 100644
--- a/resources/views/payments/wepay/bank_transfer.blade.php
+++ b/resources/views/payments/wepay/bank_transfer.blade.php
@@ -39,4 +39,6 @@
         @endif
     </center>
 
+    {!! Former::close() !!}
+
 @stop

From f472950ed0643c3e110f81f6cf802a47267887f7 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Jul 2016 21:10:43 +0300
Subject: [PATCH 109/111] Fix for [Object] problem with certain designs

---
 public/built.js          | 2 --
 public/js/pdf.pdfmake.js | 2 --
 2 files changed, 4 deletions(-)

diff --git a/public/built.js b/public/built.js
index 6e96fb8e2408..f72e47d0968e 100644
--- a/public/built.js
+++ b/public/built.js
@@ -31773,8 +31773,6 @@ NINJA.processItem = function(item, section) {
 
 NINJA.parseMarkdownText = function(val, groupText)
 {
-    val = val + "\n";
-
     var rules = [
         ['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value**
         ['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value*
diff --git a/public/js/pdf.pdfmake.js b/public/js/pdf.pdfmake.js
index a9624c5f3b50..4a7a54849932 100644
--- a/public/js/pdf.pdfmake.js
+++ b/public/js/pdf.pdfmake.js
@@ -737,8 +737,6 @@ NINJA.processItem = function(item, section) {
 
 NINJA.parseMarkdownText = function(val, groupText)
 {
-    val = val + "\n";
-
     var rules = [
         ['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value**
         ['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value*

From f47b6dc5ac9cf6d98eb44a78093fe21f98c45183 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Jul 2016 21:11:26 +0300
Subject: [PATCH 110/111] Added dwolla to text files

---
 resources/lang/en/texts.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 4038ee96a24e..3029357cf526 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2028,6 +2028,7 @@ $LANG = array(
     'apply_taxes' => 'Apply taxes',
     'min_to_max_users' => ':min to :max users',
     'max_users_reached' => 'The maximum number of users has been reached.'
+    'dwolla' => 'Dwolla',
 
 );
 

From 09e06703ea426dfb1415818b8b0199270185614d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 13 Jul 2016 21:49:10 +0300
Subject: [PATCH 111/111] Added dwolla to text files

---
 resources/lang/en/texts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 3029357cf526..fc2689c4582d 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2027,7 +2027,7 @@ $LANG = array(
     'restored_expense_category' => 'Successfully restored expense category',
     'apply_taxes' => 'Apply taxes',
     'min_to_max_users' => ':min to :max users',
-    'max_users_reached' => 'The maximum number of users has been reached.'
+    'max_users_reached' => 'The maximum number of users has been reached.',
     'dwolla' => 'Dwolla',
 
 );