From d5ab3cc02e3055956e25ec50cf7ffa12768eb549 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 2 Jul 2023 15:26:03 +1000 Subject: [PATCH] Fixes for mailer --- app/Jobs/Mail/NinjaMailer.php | 4 ++- openapi/components/schemas/company.yaml | 35 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/Jobs/Mail/NinjaMailer.php b/app/Jobs/Mail/NinjaMailer.php index 2e63818fdf..9dfd369de3 100644 --- a/app/Jobs/Mail/NinjaMailer.php +++ b/app/Jobs/Mail/NinjaMailer.php @@ -15,14 +15,16 @@ use Illuminate\Mail\Mailable; class NinjaMailer extends Mailable { + public $mail_obj; /** * Create a new message instance. * * @param $mail_obj */ - public function __construct(public mixed $mail_obj) + public function __construct($mail_obj) { + $this->mail_obj = $mail_obj; } /** diff --git a/openapi/components/schemas/company.yaml b/openapi/components/schemas/company.yaml index 3dbd83639e..403a8cfe78 100644 --- a/openapi/components/schemas/company.yaml +++ b/openapi/components/schemas/company.yaml @@ -52,6 +52,10 @@ description: "A flag determining whether to display product details in the user interface" type: boolean example: true + show_product_cost: + description: "A flag determining whether to display product cost is shown in the user interface" + type: boolean + example: true custom_fields: description: "A mapping of custom fields for various objects within the company" type: object @@ -86,6 +90,37 @@ type: string format: binary example: logo.png + company_key: + description: "The static company key hash used to identify the Company" + readOnly: true + type: string + example: "Vnb14bRlwiFjc5ckte6cfbygTRkn5IMQ" + client_can_register: + description: "A flag determining whether clients can register for the client portal" + type: boolean + example: true + enabled_modules: + type: integer + example: 2048 + description: | + + Bitmask representation of the modules that are enabled in the application + + ``` + self::ENTITY_RECURRING_INVOICE => 1, + self::ENTITY_CREDIT => 2, + self::ENTITY_QUOTE => 4, + self::ENTITY_TASK => 8, + self::ENTITY_EXPENSE => 16, + self::ENTITY_PROJECT => 32, + self::ENTITY_VENDOR => 64, + self::ENTITY_TICKET => 128, + self::ENTITY_PROPOSAL => 256, + self::ENTITY_RECURRING_EXPENSE => 512, + self::ENTITY_RECURRING_TASK => 1024, + self::ENTITY_RECURRING_QUOTE => 2048, + ``` + settings: $ref: '#/components/schemas/CompanySettings' type: object \ No newline at end of file