From 303de7a0b6c5bc8e2492456dfd0219a9bd840fc0 Mon Sep 17 00:00:00 2001
From: Adam Engebretson <adam@enge.me>
Date: Thu, 5 Nov 2015 12:39:33 -0600
Subject: [PATCH 1/4] Allow zero-costs

Currently, the `parepareItem` method checks to see if the cost and notes evaluate to false. If so, it checks from the product list.

However, we need the ability to set cost to zero explicitly through the API. This allows a user to pass null, which will use the default. Otherwise, passing 0 will persist.
---
 app/Http/Controllers/InvoiceApiController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index 2a9bae80eab8..b0d7aede0710 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -214,13 +214,13 @@ class InvoiceApiController extends Controller
         }
 
         // if only the product key is set we'll load the cost and notes
-        if ($item['product_key'] && (!$item['cost'] || !$item['notes'])) {
+        if ($item['product_key'] && (is_null($item['cost']) || is_null($item['notes']))) {
             $product = Product::findProductByKey($item['product_key']);
             if ($product) {
-                if (!$item['cost']) {
+                if (is_null($item['cost'])) {
                     $item['cost'] = $product->cost;
                 }
-                if (!$item['notes']) {
+                if (is_null($item['notes'])) {
                     $item['notes'] = $product->notes;
                 }
             }

From a30b9039decdc21597d03fa39b497924b920a517 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 6 Nov 2015 09:54:29 +0200
Subject: [PATCH 2/4] Bug fixes

---
 app/Models/Contact.php                  | 14 --------------
 resources/views/invoices/edit.blade.php |  5 +++--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/Models/Contact.php b/app/Models/Contact.php
index 731900e35840..782a7e47424a 100644
--- a/app/Models/Contact.php
+++ b/app/Models/Contact.php
@@ -32,20 +32,6 @@ class Contact extends EntityModel
         return PERSON_CONTACT;
     }
 
-    /*
-    public function getLastLogin()
-    {
-        if ($this->last_login == '0000-00-00 00:00:00')
-        {
-            return '---';
-        }
-        else
-        {
-            return $this->last_login->format('m/d/y h:i a');
-        }
-    }
-    */
-
     public function getName()
     {
         return $this->getDisplayName();
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index d4e1ad2055fb..a2c90a1d9d81 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -77,7 +77,8 @@
 				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
 					<div class="col-lg-8 col-lg-offset-4">
 						<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)">
-							<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check'}">
+                            <input type="hidden" value="0" data-bind="attr: {name: 'client[contacts][' + $index() + '][send_invoice]'}">
+							<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">
 							<span data-bind="html: email.display"></span> 
                         </label>
                         <span data-bind="html: $data.view_as_recipient"></span>&nbsp;&nbsp;
@@ -612,7 +613,7 @@
             for (var j=0; j<client.contacts.length; j++) {
                 var contact = client.contacts[j];
                 var contactName = getContactDisplayName(contact);
-                if (contact.is_primary) {
+                if (contact.is_primary === '1') {
                     contact.send_invoice = true;
                 }
                 if (clientName != contactName) {

From aa69a1723243eb3a60874d2fd75f1857d32f3ffd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 6 Nov 2015 10:21:45 +0200
Subject: [PATCH 3/4] Check for duplicate invoice number when approving a quote

---
 app/Models/Account.php                       |  9 +++++++++
 app/Ninja/Repositories/InvoiceRepository.php | 16 ++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 16cdd8673f13..2784e40ff119 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -132,6 +132,15 @@ class Account extends Eloquent
         return !$this->language_id || $this->language_id == DEFAULT_LANGUAGE;
     }
 
+    public function hasInvoicePrefix()
+    {
+        if ( ! $this->invoice_number_prefix && ! $this->quote_number_prefix) {
+            return false;
+        }
+
+        return $this->invoice_number_prefix != $this->quote_number_prefix;
+    }
+
     public function getDisplayName()
     {
         if ($this->name) {
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 24e808c3f922..44ce5d4c9a4c 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -348,19 +348,19 @@ class InvoiceRepository extends BaseRepository
         $clone = Invoice::createNew($invoice);
         $clone->balance = $invoice->amount;
 
-        // if the invoice prefix is diff than quote prefix, use the same number for the invoice
-        if (($account->invoice_number_prefix || $account->quote_number_prefix) 
-            && $account->invoice_number_prefix != $account->quote_number_prefix
-            && $account->share_counter) {
-
+        // if the invoice prefix is diff than quote prefix, use the same number for the invoice (if it's available)
+        $invoiceNumber = false;
+        if ($account->hasInvoicePrefix() && $account->share_counter) {
             $invoiceNumber = $invoice->invoice_number;
             if ($account->quote_number_prefix && strpos($invoiceNumber, $account->quote_number_prefix) === 0) {
                 $invoiceNumber = substr($invoiceNumber, strlen($account->quote_number_prefix));
             }
-            $clone->invoice_number = $account->invoice_number_prefix.$invoiceNumber;
-        } else {
-            $clone->invoice_number = $account->getNextInvoiceNumber($invoice);
+            $invoiceNumber = $account->invoice_number_prefix . $invoiceNumber;
+            if (Invoice::scope()->withTrashed()->whereInvoiceNumber($invoiceNumber)->first()) {
+                $invoiceNumber = false;
+            }
         }
+        $clone->invoice_number = $invoiceNumber ?: $account->getNextInvoiceNumber($clone);
 
         foreach ([
           'client_id',

From 15b17dfeedfdab3707908a4a2f76e3ff7af0c15a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 6 Nov 2015 12:59:53 +0200
Subject: [PATCH 4/4] Added view presenters

---
 app/Models/Account.php                        |  4 +
 app/Ninja/Mailers/ContactMailer.php           |  6 +-
 app/Ninja/Presenters/AccountPresenter.php     | 12 +++
 app/Ninja/Transformers/AccountTransformer.php |  2 +-
 .../Transformers/UserAccountTransformer.php   |  2 +-
 composer.json                                 |  3 +-
 composer.lock                                 | 83 +++++++++++++++----
 database/seeds/UserTableSeeder.php            |  2 +-
 resources/lang/en/texts.php                   |  1 +
 resources/views/emails/view_action.blade.php  |  6 +-
 10 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 app/Ninja/Presenters/AccountPresenter.php

diff --git a/app/Models/Account.php b/app/Models/Account.php
index 2784e40ff119..506f00a6e2d1 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -8,10 +8,14 @@ use Event;
 use App;
 use App\Events\UserSettingsChanged;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Laracasts\Presenter\PresentableTrait;
 
 class Account extends Eloquent
 {
+    use PresentableTrait;
     use SoftDeletes;
+
+    protected $presenter = 'App\Ninja\Presenters\AccountPresenter';
     protected $dates = ['deleted_at'];
     protected $hidden = ['ip'];
 
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index cce2b5fc167b..9858ee66ccfc 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -91,6 +91,7 @@ class ContactMailer extends Mailer
             'entityType' => $invoice->getEntityType(),
             'invoiceId' => $invoice->id,
             'invitation' => $invitation,
+            'account' => $account,
         ];
 
         if ($account->attatchPDF()) {
@@ -137,11 +138,12 @@ class ContactMailer extends Mailer
             'account' => $account,
             'client' => $client,
             'invitation' => $invitation,
-            'amount' => $payment->amount
+            'amount' => $payment->amount,
         ];
 
         $data = [
-            'body' => $this->processVariables($emailTemplate, $variables)
+            'body' => $this->processVariables($emailTemplate, $variables),
+            'account' => $account,
         ];
 
         if ($account->attatchPDF()) {
diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php
new file mode 100644
index 000000000000..a53f9f20c1a6
--- /dev/null
+++ b/app/Ninja/Presenters/AccountPresenter.php
@@ -0,0 +1,12 @@
+<?php namespace App\Ninja\Presenters;
+
+use Laracasts\Presenter\Presenter;
+
+class AccountPresenter extends Presenter {
+
+    public function name()
+    {
+        return $this->entity->name ?: trans('texts.untitled_account');
+    }
+
+}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index b81e8847bd1d..e10938ebe235 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -26,7 +26,7 @@ class AccountTransformer extends TransformerAbstract
     {
         return [
             'account_key' => $account->account_key,
-            'name' => $account->name,
+            'name' => $account->present()->name,
         ];
     }
 }
\ No newline at end of file
diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php
index fee2c14816e8..2b3724a2f601 100644
--- a/app/Ninja/Transformers/UserAccountTransformer.php
+++ b/app/Ninja/Transformers/UserAccountTransformer.php
@@ -27,7 +27,7 @@ class UserAccountTransformer extends TransformerAbstract
     {
         return [
             'account_key' => $user->account->account_key,
-            'name' => $user->account->name,
+            'name' => $user->account->present()->name,
             'token' => $user->account->getToken($this->tokenName),
         ];
     }
diff --git a/composer.json b/composer.json
index 7ce195f974c1..20c80fd00036 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,8 @@
         "meebio/omnipay-secure-trading": "dev-master",
         "justinbusschau/omnipay-secpay": "~2.0",
         "labs7in0/omnipay-wechat": "dev-master",
-        "collizo4sky/omnipay-wepay": "~1.0"
+        "collizo4sky/omnipay-wepay": "~1.0",
+        "laracasts/presenter": "dev-master"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.0",
diff --git a/composer.lock b/composer.lock
index 2ec1b88aa5fa..dc3c86d86fa1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9b0cd6db7a2a2e16ffb1711043005f2b",
+    "hash": "4c2d5d48a648e380f3acf2943b91e6bc",
     "packages": [
         {
             "name": "agmscode/omnipay-agms",
@@ -176,12 +176,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/formers/former.git",
-                "reference": "9e75217536bf6c377318e5a6f68d4c1f96a8ae3b"
+                "reference": "795f7b9b200a4ff4a33b37a96eaaab0229e36325"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/formers/former/zipball/9e75217536bf6c377318e5a6f68d4c1f96a8ae3b",
-                "reference": "9e75217536bf6c377318e5a6f68d4c1f96a8ae3b",
+                "url": "https://api.github.com/repos/formers/former/zipball/795f7b9b200a4ff4a33b37a96eaaab0229e36325",
+                "reference": "795f7b9b200a4ff4a33b37a96eaaab0229e36325",
                 "shasum": ""
             },
             "require": {
@@ -227,7 +227,7 @@
                 "foundation",
                 "laravel"
             ],
-            "time": "2015-09-24 15:56:30"
+            "time": "2015-11-05 15:53:52"
         },
         {
             "name": "anahkiasen/html-object",
@@ -2221,12 +2221,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Intervention/image.git",
-                "reference": "33f848674c96b82b050fde2806ba4e55ee88078f"
+                "reference": "2d8de6577b86c8b3bf49b6578d659ba9ee21fcc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Intervention/image/zipball/33f848674c96b82b050fde2806ba4e55ee88078f",
-                "reference": "33f848674c96b82b050fde2806ba4e55ee88078f",
+                "url": "https://api.github.com/repos/Intervention/image/zipball/2d8de6577b86c8b3bf49b6578d659ba9ee21fcc1",
+                "reference": "2d8de6577b86c8b3bf49b6578d659ba9ee21fcc1",
                 "shasum": ""
             },
             "require": {
@@ -2275,7 +2275,7 @@
                 "thumbnail",
                 "watermark"
             ],
-            "time": "2015-11-04 14:06:13"
+            "time": "2015-11-05 18:30:26"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -2608,6 +2608,52 @@
             ],
             "time": "2015-10-27 05:12:08"
         },
+        {
+            "name": "laracasts/presenter",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laracasts/Presenter.git",
+                "reference": "b284f3137f990efd6e95df49d254f1ccc4541e92"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laracasts/Presenter/zipball/b284f3137f990efd6e95df49d254f1ccc4541e92",
+                "reference": "b284f3137f990efd6e95df49d254f1ccc4541e92",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "~5.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9",
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Laracasts\\Presenter": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jeffrey Way",
+                    "email": "jeffrey@laracasts.com"
+                }
+            ],
+            "description": "Simple view presenters",
+            "keywords": [
+                "laravel",
+                "presenter",
+                "view"
+            ],
+            "time": "2014-09-13 13:18:07"
+        },
         {
             "name": "laravel/framework",
             "version": "v5.0.33",
@@ -3501,16 +3547,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.20.0",
+            "version": "1.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "bfd3eaba109c9a2405c92174c8e17f20c2b9caf3"
+                "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bfd3eaba109c9a2405c92174c8e17f20c2b9caf3",
-                "reference": "bfd3eaba109c9a2405c92174c8e17f20c2b9caf3",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
+                "reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
                 "shasum": ""
             },
             "require": {
@@ -3518,12 +3564,12 @@
                 "symfony/translation": "~2.6|~3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "~4.0|~5.0"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Carbon": "src"
+                "psr-4": {
+                    "Carbon\\": "src/Carbon/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3544,7 +3590,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2015-06-25 04:19:39"
+            "time": "2015-11-04 20:07:17"
         },
         {
             "name": "nikic/php-parser",
@@ -8330,7 +8376,8 @@
         "descubraomundo/omnipay-pagarme": 20,
         "dercoder/omnipay-paysafecard": 20,
         "meebio/omnipay-secure-trading": 20,
-        "labs7in0/omnipay-wechat": 20
+        "labs7in0/omnipay-wechat": 20,
+        "laracasts/presenter": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/database/seeds/UserTableSeeder.php b/database/seeds/UserTableSeeder.php
index 2d6c32796d1c..2f27b9479304 100644
--- a/database/seeds/UserTableSeeder.php
+++ b/database/seeds/UserTableSeeder.php
@@ -14,7 +14,7 @@ class UserTableSeeder extends Seeder
         Eloquent::unguard();
 
         $account = Account::create([
-            'name' => 'Test Account',
+            //'name' => 'Test Account',
             'account_key' => str_random(RANDOM_KEY_LENGTH),
             'timezone_id' => 1,
         ]);
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 154b23025bce..2a0ffc3986db 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -907,5 +907,6 @@ return array(
     'restore_recurring_invoice' => 'Restore Recurring Invoice',
     'restored_recurring_invoice' => 'Successfully restored recurring invoice',
     'archived' => 'Archived',
+    'untitled_account' => 'Untitled Company',
     
 );
diff --git a/resources/views/emails/view_action.blade.php b/resources/views/emails/view_action.blade.php
index 718af5a5968d..987aa527a02b 100644
--- a/resources/views/emails/view_action.blade.php
+++ b/resources/views/emails/view_action.blade.php
@@ -5,13 +5,13 @@
         "description":"View your {{ $entityType }}",
         "action": {
             "@type": "ViewAction",
-            "url": "{{{ $link }}}",
+            "url": "{!! $link !!}",
             "name": "View {{ $entityType }}"
-        },        
+        },
         "publisher": {
             "@type": "Organization",
             "name": "Invoice Ninja",
-            "url": "{{{ NINJA_WEB_URL }}}"
+            "url": "{!! NINJA_WEB_URL !!}"
         }
     }
 </script>
\ No newline at end of file