Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for import / texts

Browse Source
This commit is contained in:
= 2020-12-23 08:38:13 +11:00
parent 950a057496
commit 383d3ab8c1
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Util/Import.php
View File

@ -980,6 +980,7 @@ class Import implements ShouldQueue
$modified = collect($data)->map(function ($item) { $modified = collect($data)->map(function ($item) {
$item['user_id'] = $this->user->id; $item['user_id'] = $this->user->id;
$item['company_id'] = $this->company->id; $item['company_id'] = $this->company->id;
$item['is_deleted'] = isset($item['is_deleted']) ? $item['is_deleted'] : 0;
return $item; return $item;
})->toArray(); })->toArray();

58
composer.lock generated
View File

@ -116,16 +116,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.171.2", "version": "3.171.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "742663a85ec84647f74dea454d2dc45bba180f9d" "reference": "6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/742663a85ec84647f74dea454d2dc45bba180f9d", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984",
"reference": "742663a85ec84647f74dea454d2dc45bba180f9d", "reference": "6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -200,9 +200,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.171.2" "source": "https://github.com/aws/aws-sdk-php/tree/3.171.4"
}, },
"time": "2020-12-18T19:12:13+00:00" "time": "2020-12-22T19:23:05+00:00"
}, },
{ {
"name": "beganovich/chromium-pdf", "name": "beganovich/chromium-pdf",
@ -2715,16 +2715,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v8.19.0", "version": "v8.20.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb" "reference": "b5d8573ab16027867eaa1ac148893833434f9b02"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb", "url": "https://api.github.com/repos/laravel/framework/zipball/b5d8573ab16027867eaa1ac148893833434f9b02",
"reference": "f5f331cee60f1bbe672503b7eb9ba5b22b2ceacb", "reference": "b5d8573ab16027867eaa1ac148893833434f9b02",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2878,7 +2878,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2020-12-15T16:16:31+00:00" "time": "2020-12-22T21:21:19+00:00"
}, },
{ {
"name": "laravel/slack-notification-channel", "name": "laravel/slack-notification-channel",
@ -4280,16 +4280,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.42.0", "version": "2.43.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "d0463779663437392fe42ff339ebc0213bd55498" "reference": "d32c57d8389113742f4a88725a170236470012e2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d0463779663437392fe42ff339ebc0213bd55498", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d32c57d8389113742f4a88725a170236470012e2",
"reference": "d0463779663437392fe42ff339ebc0213bd55498", "reference": "d32c57d8389113742f4a88725a170236470012e2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4369,20 +4369,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-11-28T14:25:28+00:00" "time": "2020-12-17T20:55:32+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.10.3", "version": "v4.10.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984" "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e",
"reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4423,9 +4423,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.3" "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4"
}, },
"time": "2020-12-03T17:45:45+00:00" "time": "2020-12-20T10:01:03+00:00"
}, },
{ {
"name": "nwidart/laravel-modules", "name": "nwidart/laravel-modules",
@ -11780,16 +11780,16 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "1.12.1", "version": "1.12.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d" "reference": "245710e971a030f42e08f4912863805570f23d39"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/245710e971a030f42e08f4912863805570f23d39",
"reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d", "reference": "245710e971a030f42e08f4912863805570f23d39",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11801,7 +11801,7 @@
}, },
"require-dev": { "require-dev": {
"phpspec/phpspec": "^6.0", "phpspec/phpspec": "^6.0",
"phpunit/phpunit": "^8.0 || ^9.0 <9.3" "phpunit/phpunit": "^8.0 || ^9.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -11841,9 +11841,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpspec/prophecy/issues", "issues": "https://github.com/phpspec/prophecy/issues",
"source": "https://github.com/phpspec/prophecy/tree/1.12.1" "source": "https://github.com/phpspec/prophecy/tree/1.12.2"
}, },
"time": "2020-09-29T09:10:42+00:00" "time": "2020-12-19T10:15:11+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",

2
resources/lang/en/texts.php
View File

@ -3331,5 +3331,5 @@ return [
'setup_phantomjs_note' => 'Note about Phantom JS. Read more.', 'setup_phantomjs_note' => 'Note about Phantom JS. Read more.',
'currency_armenian_dram' => 'Armenian Dram', 'currency_armenian_dram' => 'Armenian Dram',
'currency_albanian_lek' => 'Albanian Lek',
]; ];