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

Autoload snappdf in composer post hooks - add client number when importing

Browse Source
This commit is contained in:
= 2020-12-28 08:58:49 +11:00
parent 4129dba08b
commit 0a9c66cab8
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Import/CSVImport.php
View File

@ -98,7 +98,7 @@ class CSVImport implements ShouldQueue
//sort the array by key
ksort($this->column_map);
info("import".ucfirst($this->entity_type));
nlog("import".ucfirst($this->entity_type));
$this->{"import".ucfirst($this->entity_type)}();
$data = [
@ -110,7 +110,7 @@ class CSVImport implements ShouldQueue
'settings' => $this->company->settings
];
info(print_r($data, 1));
//info(print_r($data, 1));
MailRouter::dispatch(new ImportCompleted($data), $this->company, auth()->user());
}

4
app/Repositories/ClientRepository.php
View File

@ -59,8 +59,8 @@ class ClientRepository extends BaseRepository
}
$client->fill($data);
if (!isset($client->id_number)) {
if (!isset($client->id_number) || empty($client->id_number)) {
$client->id_number = $this->getNextClientNumber($client);
}

6
composer.json
View File

@ -102,6 +102,12 @@
}
},
"scripts": {
"post-install-cmd": [
"vendor/bin/snappdf download"
],
"post-update-cmd": [
"vendor/bin/snappdf download"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],

26
composer.lock generated
View File

@ -116,16 +116,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.171.4",
"version": "3.171.6",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984"
"reference": "5587d22e63ef82ef74dffca5d47f307b84137b51"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984",
"reference": "6a6b5b2e48ad18c2bfa48b7035e09d220d0e3984",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5587d22e63ef82ef74dffca5d47f307b84137b51",
"reference": "5587d22e63ef82ef74dffca5d47f307b84137b51",
"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.171.4"
"source": "https://github.com/aws/aws-sdk-php/tree/3.171.6"
},
"time": "2020-12-22T19:23:05+00:00"
"time": "2020-12-23T19:12:28+00:00"
},
{
"name": "beganovich/snappdf",
@ -10619,16 +10619,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.17.2",
"version": "v2.17.3",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "aaee4f3d16a996fc0b570be0c69d3b80c909c507"
"reference": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/aaee4f3d16a996fc0b570be0c69d3b80c909c507",
"reference": "aaee4f3d16a996fc0b570be0c69d3b80c909c507",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/bd32f5dd72cdfc7b53f54077f980e144bfa2f595",
"reference": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595",
"shasum": ""
},
"require": {
@ -10654,7 +10654,7 @@
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.4",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.4.1",
"php-coveralls/php-coveralls": "^2.4.2",
"php-cs-fixer/accessible-object": "^1.0",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
@ -10711,7 +10711,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.17.2"
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.17.3"
},
"funding": [
{
@ -10719,7 +10719,7 @@
"type": "github"
}
],
"time": "2020-12-17T16:41:55+00:00"
"time": "2020-12-24T11:14:44+00:00"
},
{
"name": "hamcrest/hamcrest-php",