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 #7572 from turbo124/v5-develop

Browse Source 
v5.4.4
This commit is contained in:
David Bomba 2022-06-19 18:09:10 +10:00 committed by GitHub
commit 6261d9d181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.4.3 5.4.4

6
app/Mail/TemplateEmail.php
View File

@ -90,8 +90,10 @@ class TemplateEmail extends Mailable
if (strlen($settings->bcc_email) > 1){ if (strlen($settings->bcc_email) > 1){
if(Ninja::isHosted()) if(Ninja::isHosted()){
$this->bcc(reset(explode(",",str_replace(" ", "", $settings->bcc_email))));//remove whitespace if any has been inserted. $bccs = explode(",",str_replace(" ", "", $settings->bcc_email));
$this->bcc(reset($bccs));//remove whitespace if any has been inserted.
}
else else
$this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted. $this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted.

3
app/PaymentDrivers/Stripe/Jobs/PaymentIntentWebhook.php
View File

@ -118,6 +118,9 @@ class PaymentIntentWebhook implements ShouldQueue
if(!$payment_hash) if(!$payment_hash)
return; return;
nlog("payment intent");
nlog($this->stripe_request);
if(optional($this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash']) && in_array('card', $this->stripe_request['object']['allowed_source_types'])) if(optional($this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash']) && in_array('card', $this->stripe_request['object']['allowed_source_types']))
{ {
nlog("hash found"); nlog("hash found");

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.3', 'app_version' => '5.4.4',
'app_tag' => '5.4.3', 'app_tag' => '5.4.4',
'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', ''),

2
database/migrations/2022_05_18_162152_create_scheduled_jobs_table.php
View File

@ -26,7 +26,7 @@ class CreateScheduledJobsTable extends Migration
$table->id(); $table->id();
$table->string('action_name'); $table->string('action_name');
$table->string('action_class'); $table->string('action_class');
$table->json('parameters')->nullable(); $table->mediumText('parameters')->nullable();
$table->foreignIdFor(\App\Models\Company::class); $table->foreignIdFor(\App\Models\Company::class);
$table->foreignIdFor(\App\Models\Scheduler::class); $table->foreignIdFor(\App\Models\Scheduler::class);
$table->timestamps(); $table->timestamps();