mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 16:31:33 +02:00
Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop
This commit is contained in:
commit
2d92d733af
@ -90,8 +90,10 @@ class TemplateEmail extends Mailable
|
||||
|
||||
if (strlen($settings->bcc_email) > 1){
|
||||
|
||||
if(Ninja::isHosted())
|
||||
$this->bcc(reset(explode(",",str_replace(" ", "", $settings->bcc_email))));//remove whitespace if any has been inserted.
|
||||
if(Ninja::isHosted()){
|
||||
$bccs = explode(",",str_replace(" ", "", $settings->bcc_email));
|
||||
$this->bcc(reset($bccs));//remove whitespace if any has been inserted.
|
||||
}
|
||||
else
|
||||
$this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted.
|
||||
|
||||
|
@ -118,6 +118,9 @@ class PaymentIntentWebhook implements ShouldQueue
|
||||
if(!$payment_hash)
|
||||
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']))
|
||||
{
|
||||
nlog("hash found");
|
||||
|
Loading…
Reference in New Issue
Block a user