mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2026-03-03 02:47:02 +00:00
Merge pull request #11575 from turbo124/v5-develop
Update for dependencies
This commit is contained in:
@@ -362,7 +362,7 @@ class ProcessPostmarkWebhook implements ShouldQueue
|
||||
|
||||
try {
|
||||
$messageDetail = $postmark->getOutboundMessageDetails($message_id);
|
||||
} catch (\Exception $e) {
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
$postmark_secret = config('services.postmark-outlook.token');
|
||||
$postmark = new PostmarkClient($postmark_secret);
|
||||
@@ -380,7 +380,6 @@ class ProcessPostmarkWebhook implements ShouldQueue
|
||||
|
||||
$messageDetail = $this->getRawMessage($message_id);
|
||||
|
||||
|
||||
$event = collect($messageDetail->messageevents)->first(function ($event) {
|
||||
|
||||
return $event?->Details?->BounceID ?? false;
|
||||
|
||||
@@ -391,8 +391,9 @@ class BaseModel extends Model
|
||||
|
||||
$section = strtr($this->{$field}, $variables['labels']);
|
||||
|
||||
return strtr($section, $variables['values']);
|
||||
$parsed = strtr($section, $variables['values']);
|
||||
|
||||
return \App\Services\Pdf\Purify::clean(html_entity_decode($parsed));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -217,9 +217,9 @@ class Peppol extends AbstractService
|
||||
|
||||
/** Auto switch between Invoice / Credit based on the amount value */
|
||||
|
||||
// $this->p_invoice->InvoiceTypeCode = ($this->invoice->amount >= 0) ? 380 : 381;
|
||||
$this->p_invoice->InvoiceTypeCode = ($this->invoice->amount >= 0) ? 380 : 381;
|
||||
|
||||
$this->p_invoice->InvoiceTypeCode = 380;
|
||||
// $this->p_invoice->InvoiceTypeCode = 380;
|
||||
|
||||
$this->p_invoice->AccountingSupplierParty = $this->getAccountingSupplierParty();
|
||||
$this->p_invoice->AccountingCustomerParty = $this->getAccountingCustomerParty();
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
"hyvor/php-json-exporter": "^0.0.3",
|
||||
"imdhemy/laravel-purchases": "^1.7",
|
||||
"intervention/image": "^2.5",
|
||||
"invoiceninja/einvoice": "dev-main",
|
||||
"invoiceninja/einvoice": "v1.0.0",
|
||||
"invoiceninja/ubl_invoice": "^3",
|
||||
"josemmo/facturae-php": "^1.7",
|
||||
"laracasts/presenter": "^0.2.1",
|
||||
|
||||
Reference in New Issue
Block a user