From 9c324f187e7497152f585d25ad18355024fb2f35 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 20 Oct 2020 08:18:09 +1100
Subject: [PATCH] Fixes for vendor presenter;

---
 app/DataMapper/CompanySettings.php                    |  5 +++++
 app/DataMapper/EmailTemplateDefaults.php              | 11 ++---------
 app/Models/Presenters/EntityPresenter.php             |  1 -
 app/Models/Vendor.php                                 |  4 +++-
 .../2020_10_19_101823_project_name_unique_removal.php |  4 ++++
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index c1fa0a6e050a..e8fc16fe69c5 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -105,6 +105,9 @@ class CompanySettings extends BaseSettings
     public $payment_number_pattern = '';
     public $payment_number_counter = 1;
 
+    public $project_number_pattern = '';
+    public $project_number_counter = 1;
+
     public $shared_invoice_quote_counter = false;
     public $recurring_number_prefix = 'R';
     public $reset_counter_frequency_id = '0';
@@ -313,6 +316,8 @@ class CompanySettings extends BaseSettings
         'embed_documents'                    => 'bool',
         'all_pages_header'                   => 'bool',
         'all_pages_footer'                   => 'bool',
+        'project_number_pattern'             => 'string',
+        'project_number_counter'             => 'int',
         'task_number_pattern'                => 'string',
         'task_number_counter'                => 'int',
         'expense_number_pattern'             => 'string',
diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index 0ad337c5eb90..8d502c64f39a 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -198,54 +198,47 @@ class EmailTemplateDefaults
 
     public static function emailReminder1Template()
     {
-        //  return Parsedown::instance()->line('First Email Reminder Text');
+        return '';
     }
 
     public static function emailReminder2Subject()
     {
         return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
-//        return Parsedown::instance()->line(self::transformText('reminder_subject'));
     }
 
     public static function emailReminder2Template()
     {
-        //  return Parsedown::instance()->line('Second Email Reminder Text');
+        return '';
     }
 
     public static function emailReminder3Subject()
     {
         return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
-//        return Parsedown::instance()->line(self::transformText('reminder_subject'));
     }
 
     public static function emailReminder3Template()
     {
         return '';
-        //  return Parsedown::instance()->line('Third Email Reminder Text');
     }
 
     public static function emailReminderEndlessSubject()
     {
         return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
-//        return Parsedown::instance()->line(self::transformText('reminder_subject'));
     }
 
     public static function emailReminderEndlessTemplate()
     {
         return '';
-        // return ctrans('');
     }
 
     public static function emailStatementSubject()
     {
         return '';
-        // return ctrans('');
     }
 
     public static function emailStatementTemplate()
     {
         return '';
-        // return ctrans('');
     }
 
     private static function transformText($string)
diff --git a/app/Models/Presenters/EntityPresenter.php b/app/Models/Presenters/EntityPresenter.php
index 27534220fc3b..99bd5392f57a 100644
--- a/app/Models/Presenters/EntityPresenter.php
+++ b/app/Models/Presenters/EntityPresenter.php
@@ -14,7 +14,6 @@ namespace App\Models\Presenters;
 use App\Utils\Traits\MakesHash;
 use Hashids\Hashids;
 use Laracasts\Presenter\Presenter;
-use stdClass;
 use URL;
 use Utils;
 
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 3cb8b05265ff..9ab0d05dfa00 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -17,13 +17,15 @@ use App\Utils\Traits\GeneratesCounter;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Laracasts\Presenter\PresentableTrait;
 
 class Vendor extends BaseModel
 {
     use SoftDeletes;
     use Filterable;
     use GeneratesCounter;
-    
+    use PresentableTrait;
+
     protected $fillable = [
         'name',
         'assigned_user_id',
diff --git a/database/migrations/2020_10_19_101823_project_name_unique_removal.php b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
index 0795c0777d95..ff0610f77f13 100644
--- a/database/migrations/2020_10_19_101823_project_name_unique_removal.php
+++ b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
@@ -23,6 +23,10 @@ class ProjectNameUniqueRemoval extends Migration
             $table->unsignedInteger('expense_currency_id')->nullable()->change();
         });
 
+        Schema::table('companies', function (Blueprint $table) {
+            $table->boolean('invoice_expense_documents')->default(false);
+        });
+
     }
 
     /**