Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 04:14:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed for company imports / migrations

Browse Source
This commit is contained in:
David Bomba 2023-11-04 14:26:54 +11:00
parent 413eadd6fb
commit 4fb8763817
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.43 5.7.44

25
app/Models/Company.php
View File

@ -11,20 +11,21 @@
namespace App\Models; namespace App\Models;
use App\Casts\EncryptedCast;
use App\DataMapper\CompanySettings;
use App\Models\Presenters\CompanyPresenter;
use App\Services\Notification\NotificationService;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Casts\EncryptedCast;
use App\Models\VendorContact;
use App\Utils\Traits\AppSetup; use App\Utils\Traits\AppSetup;
use App\Utils\Traits\CompanySettingsSaver;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use App\DataMapper\CompanySettings;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use Laracasts\Presenter\PresentableTrait; use Laracasts\Presenter\PresentableTrait;
use App\Utils\Traits\CompanySettingsSaver;
use Illuminate\Notifications\Notification;
use App\Models\Presenters\CompanyPresenter;
use App\Services\Notification\NotificationService;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/** /**
* App\Models\Company * App\Models\Company
@ -512,6 +513,14 @@ class Company extends BaseModel
return $this->hasMany(Project::class)->withTrashed(); return $this->hasMany(Project::class)->withTrashed();
} }
/**
* @return HasMany
*/
public function vendor_contacts() :HasMany
{
return $this->hasMany(VendorContact::class)->withTrashed();
}
/** /**
* @return HasMany * @return HasMany
*/ */

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.43'), 'app_version' => env('APP_VERSION','5.7.44'),
'app_tag' => env('APP_TAG','5.7.43'), 'app_tag' => env('APP_TAG','5.7.44'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),