diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php index e0d32d9532c9..f89ca3103990 100644 --- a/app/Jobs/Entity/CreateEntityPdf.php +++ b/app/Jobs/Entity/CreateEntityPdf.php @@ -168,10 +168,10 @@ class CreateEntityPdf implements ShouldQueue ]), 'variables' => $variables, 'options' => [ - 'all_pages_header' => $this->client->getSetting('all_pages_header'), - 'all_pages_footer' => $this->client->getSetting('all_pages_footer'), + 'all_pages_header' => $this->entity->client->getSetting('all_pages_header'), + 'all_pages_footer' => $this->entity->client->getSetting('all_pages_footer'), ], - 'process_markdown' => $this->client->company->markdown_enabled, + 'process_markdown' => $this->entity->client->company->markdown_enabled, ]; $maker = new PdfMakerService($state); diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index 84b13e104c03..3890db1c03f4 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -149,6 +149,7 @@ class Gateway extends StaticModel GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']], GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']], GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']], + GatewayType::FPX => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']], ]; break; case 57: