Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 15:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for vendor presenter;

Browse Source
This commit is contained in:
David Bomba 2020-10-20 08:18:09 +11:00
parent a3afa8ede9
commit 9c324f187e
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/DataMapper/CompanySettings.php
View File

@ -105,6 +105,9 @@ class CompanySettings extends BaseSettings
public $payment_number_pattern = ''; public $payment_number_pattern = '';
public $payment_number_counter = 1; public $payment_number_counter = 1;
public $project_number_pattern = '';
public $project_number_counter = 1;
public $shared_invoice_quote_counter = false; public $shared_invoice_quote_counter = false;
public $recurring_number_prefix = 'R'; public $recurring_number_prefix = 'R';
public $reset_counter_frequency_id = '0'; public $reset_counter_frequency_id = '0';
@ -313,6 +316,8 @@ class CompanySettings extends BaseSettings
'embed_documents' => 'bool', 'embed_documents' => 'bool',
'all_pages_header' => 'bool', 'all_pages_header' => 'bool',
'all_pages_footer' => 'bool', 'all_pages_footer' => 'bool',
'project_number_pattern' => 'string',
'project_number_counter' => 'int',
'task_number_pattern' => 'string', 'task_number_pattern' => 'string',
'task_number_counter' => 'int', 'task_number_counter' => 'int',
'expense_number_pattern' => 'string', 'expense_number_pattern' => 'string',

11
app/DataMapper/EmailTemplateDefaults.php
View File

@ -198,54 +198,47 @@ class EmailTemplateDefaults
public static function emailReminder1Template() public static function emailReminder1Template()
{ {
// return Parsedown::instance()->line('First Email Reminder Text'); return '';
} }
public static function emailReminder2Subject() public static function emailReminder2Subject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
// return Parsedown::instance()->line(self::transformText('reminder_subject'));
} }
public static function emailReminder2Template() public static function emailReminder2Template()
{ {
// return Parsedown::instance()->line('Second Email Reminder Text'); return '';
} }
public static function emailReminder3Subject() public static function emailReminder3Subject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
// return Parsedown::instance()->line(self::transformText('reminder_subject'));
} }
public static function emailReminder3Template() public static function emailReminder3Template()
{ {
return ''; return '';
// return Parsedown::instance()->line('Third Email Reminder Text');
} }
public static function emailReminderEndlessSubject() public static function emailReminderEndlessSubject()
{ {
return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']); return ctrans('texts.reminder_subject', ['invoice'=>'$invoice.number', 'account'=>'$company.name']);
// return Parsedown::instance()->line(self::transformText('reminder_subject'));
} }
public static function emailReminderEndlessTemplate() public static function emailReminderEndlessTemplate()
{ {
return ''; return '';
// return ctrans('');
} }
public static function emailStatementSubject() public static function emailStatementSubject()
{ {
return ''; return '';
// return ctrans('');
} }
public static function emailStatementTemplate() public static function emailStatementTemplate()
{ {
return ''; return '';
// return ctrans('');
} }
private static function transformText($string) private static function transformText($string)

1
app/Models/Presenters/EntityPresenter.php
View File

@ -14,7 +14,6 @@ namespace App\Models\Presenters;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Hashids\Hashids; use Hashids\Hashids;
use Laracasts\Presenter\Presenter; use Laracasts\Presenter\Presenter;
use stdClass;
use URL; use URL;
use Utils; use Utils;

4
app/Models/Vendor.php
View File

@ -17,13 +17,15 @@ use App\Utils\Traits\GeneratesCounter;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Laracasts\Presenter\PresentableTrait;
class Vendor extends BaseModel class Vendor extends BaseModel
{ {
use SoftDeletes; use SoftDeletes;
use Filterable; use Filterable;
use GeneratesCounter; use GeneratesCounter;
use PresentableTrait;
protected $fillable = [ protected $fillable = [
'name', 'name',
'assigned_user_id', 'assigned_user_id',

4
database/migrations/2020_10_19_101823_project_name_unique_removal.php
View File

@ -23,6 +23,10 @@ class ProjectNameUniqueRemoval extends Migration
$table->unsignedInteger('expense_currency_id')->nullable()->change(); $table->unsignedInteger('expense_currency_id')->nullable()->change();
}); });
Schema::table('companies', function (Blueprint $table) {
$table->boolean('invoice_expense_documents')->default(false);
});
} }
/** /**