Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #4482 from turbo124/v5-develop

Browse Source 
Version bump 5.0.35
This commit is contained in:
David Bomba 2020-12-11 23:21:22 +11:00 committed by GitHub
commit df09336761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.34
5.0.35

1
app/DataMapper/CompanySettings.php
View File

@ -583,6 +583,7 @@ class CompanySettings extends BaseSettings
$variables = [
'client_details' => [
'$client.name',
'$client.id_number',
'$client.vat_number',
'$client.address1',
'$client.address2',

2
app/Http/Controllers/BaseController.php
View File

@ -421,8 +421,6 @@ class BaseController extends Controller
$data['report_errors'] = true;
}
// $data['hash'] = md5_file(public_path('main.dart.js'));
$this->buildCache();
return view('index.index', $data);

9
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -87,12 +87,14 @@ class CreateEntityPdf implements ShouldQueue
public function handle()
{
if (config('ninja.phantomjs_pdf_generation')) {
return (new Phantom)->generate($this->invitation);
}
App::setLocale($this->contact->preferredLocale());
App::forgetInstance('translator');
Lang::replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
if (config('ninja.phantomjs_pdf_generation')) {
return (new Phantom)->generate($this->invitation);
}
$entity_design_id = '';
@ -107,7 +109,6 @@ class CreateEntityPdf implements ShouldQueue
$entity_design_id = 'credit_design_id';
}
Lang::replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
$file_path = $path.$this->entity->number.'.pdf';

36
composer.lock generated
View File

@ -116,16 +116,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.168.1",
"version": "3.168.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "d648085cce7bfadc8973a8ded401921583c1e3f9"
"reference": "1d6a976da857d13b156bd63613ee086c13f6dc29"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d648085cce7bfadc8973a8ded401921583c1e3f9",
"reference": "d648085cce7bfadc8973a8ded401921583c1e3f9",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1d6a976da857d13b156bd63613ee086c13f6dc29",
"reference": "1d6a976da857d13b156bd63613ee086c13f6dc29",
"shasum": ""
},
"require": {
@ -200,9 +200,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.168.1"
"source": "https://github.com/aws/aws-sdk-php/tree/3.168.2"
},
"time": "2020-12-09T19:17:01+00:00"
"time": "2020-12-10T19:35:18+00:00"
},
{
"name": "brick/math",
@ -1778,16 +1778,16 @@
},
{
"name": "fzaninotto/faker",
"version": "v1.9.1",
"version": "v1.9.2",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "fc10d778e4b84d5bd315dad194661e091d307c6f"
"reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fc10d778e4b84d5bd315dad194661e091d307c6f",
"reference": "fc10d778e4b84d5bd315dad194661e091d307c6f",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
"reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e",
"shasum": ""
},
"require": {
@ -1826,10 +1826,10 @@
],
"support": {
"issues": "https://github.com/fzaninotto/Faker/issues",
"source": "https://github.com/fzaninotto/Faker/tree/v1.9.1"
"source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
},
"abandoned": true,
"time": "2019-12-12T13:22:17+00:00"
"time": "2020-12-11T09:56:16+00:00"
},
{
"name": "google/apiclient",
@ -13101,16 +13101,16 @@
},
{
"name": "swagger-api/swagger-ui",
"version": "v3.37.2",
"version": "v3.38.0",
"source": {
"type": "git",
"url": "https://github.com/swagger-api/swagger-ui.git",
"reference": "f568592c176aa479e507e5b9480bd10a36202ba3"
"reference": "bf97e1f2439c26421fa36f187f675b6c81701368"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/f568592c176aa479e507e5b9480bd10a36202ba3",
"reference": "f568592c176aa479e507e5b9480bd10a36202ba3",
"url": "https://api.github.com/repos/swagger-api/swagger-ui/zipball/bf97e1f2439c26421fa36f187f675b6c81701368",
"reference": "bf97e1f2439c26421fa36f187f675b6c81701368",
"shasum": ""
},
"type": "library",
@ -13156,9 +13156,9 @@
],
"support": {
"issues": "https://github.com/swagger-api/swagger-ui/issues",
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.37.2"
"source": "https://github.com/swagger-api/swagger-ui/tree/v3.38.0"
},
"time": "2020-11-26T21:19:40+00:00"
"time": "2020-12-10T20:44:28+00:00"
},
{
"name": "symfony/debug",

2
config/ninja.php
View File

@ -12,7 +12,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.34',
'app_version' => '5.0.35',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

56
tests/Integration/MultiDBUserTest.php
View File

@ -207,36 +207,36 @@ class MultiDBUserTest extends TestCase
}
}
public function test_cross_db_user_linking_succeeds_appropriately()
{
$data = [
'first_name' => 'hey',
'last_name' => 'you',
'email' => 'db1@example.com',
'company_user' => [
'is_admin' => false,
'is_owner' => false,
'permissions' => 'create_client,create_invoice',
],
];
// public function test_cross_db_user_linking_succeeds_appropriately()
// {
// $data = [
// 'first_name' => 'hey',
// 'last_name' => 'you',
// 'email' => 'db1@example.com',
// 'company_user' => [
// 'is_admin' => false,
// 'is_owner' => false,
// 'permissions' => 'create_client,create_invoice',
// ],
// ];
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->post('/api/v1/users?include=company_user', $data);
} catch (ValidationException $e) {
\Log::error('in the validator');
$message = json_decode($e->validator->getMessageBag(), 1);
\Log::error($message);
$this->assertNotNull($message);
}
// try {
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $this->token,
// 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
// ])->post('/api/v1/users?include=company_user', $data);
// } catch (ValidationException $e) {
// \Log::error('in the validator');
// $message = json_decode($e->validator->getMessageBag(), 1);
// \Log::error($message);
// $this->assertNotNull($message);
// }
if ($response) {
$response->assertStatus(200);
}
}
// if ($response) {
// $response->assertStatus(200);
// }
// }
public function tearDown() :void
{