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

Merge pull request #7607 from turbo124/v5-develop

Browse Source 
v5.4.7
This commit is contained in:
David Bomba 2022-07-02 12:38:04 +10:00 committed by GitHub
commit aac03163dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.4.6 5.4.7

4
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -334,8 +334,8 @@ class NinjaMailerJob implements ShouldQueue
return true; return true;
/* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */ /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */
// if(Ninja::isHosted()) if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class))
// return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
return false; return false;
} }

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

@ -923,6 +923,9 @@ class Import implements ShouldQueue
$modified['company_id'] = $this->company->id; $modified['company_id'] = $this->company->id;
$modified['line_items'] = $this->cleanItems($modified['line_items']); $modified['line_items'] = $this->cleanItems($modified['line_items']);
if(array_key_exists('next_send_date', $resource))
$modified['next_send_date_client'] = $resource['next_send_date'];
if(array_key_exists('created_at', $modified)) if(array_key_exists('created_at', $modified))
$modified['created_at'] = Carbon::parse($modified['created_at']); $modified['created_at'] = Carbon::parse($modified['created_at']);

5
app/Services/PdfMaker/Design.php
View File

@ -332,7 +332,10 @@ class Design extends BaseDesign
$_variable = explode('.', $variable)[1]; $_variable = explode('.', $variable)[1];
$_customs = ['custom1', 'custom2', 'custom3', 'custom4']; $_customs = ['custom1', 'custom2', 'custom3', 'custom4'];
if (in_array($_variable, $_customs)) { /* 2/7/2022 don't show custom values if they are empty */
$var = str_replace("custom", "custom_value", $_variable);
if (in_array($_variable, $_customs) && !empty($this->entity->{$var})) {
$elements[] = ['element' => 'tr', 'elements' => [ $elements[] = ['element' => 'tr', 'elements' => [
['element' => 'th', 'content' => $variable . '_label', 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1) . '_label']], ['element' => 'th', 'content' => $variable . '_label', 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1) . '_label']],
['element' => 'th', 'content' => $variable, 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1)]], ['element' => 'th', 'content' => $variable, 'properties' => ['data-ref' => 'entity_details-' . substr($variable, 1)]],

15
app/Services/PurchaseOrder/ApplyNumber.php
View File

@ -41,7 +41,20 @@ class ApplyNumber extends AbstractService
return $this->purchase_order; return $this->purchase_order;
} }
$this->trySaving(); switch ($this->vendor->company->getSetting('counter_number_applied')) {
case 'when_saved':
$this->trySaving();
break;
case 'when_sent':
if ($this->invoice->status_id == PurchaseOrder::STATUS_SENT) {
$this->trySaving();
}
break;
default:
break;
}
return $this->purchase_order; return $this->purchase_order;
} }

4
config/ninja.php
View File

@ -14,8 +14,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' => '5.4.6', 'app_version' => '5.4.7',
'app_tag' => '5.4.6', 'app_tag' => '5.4.7',
'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', ''), 'api_secret' => env('API_SECRET', ''),