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 branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

Browse Source
This commit is contained in:
David Bomba 2022-06-19 18:07:54 +10:00
commit 2d92d733af
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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");