diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php index 057f07638a64..d2ff960b2019 100644 --- a/app/Console/Commands/CreateAccount.php +++ b/app/Console/Commands/CreateAccount.php @@ -63,11 +63,18 @@ class CreateAccount extends Command private function createAccount() { + $settings = CompanySettings::defaults(); + + $settings->name = "Untitled Company"; + $settings->currency_id = '1'; + $settings->language_id = '1'; + $account = Account::factory()->create(); $company = Company::factory()->create([ 'account_id' => $account->id, 'portal_domain' => config('ninja.app_url'), 'portal_mode' => 'domain', + 'settings' => $settings, ]); $company->client_registration_fields = ClientRegistrationFields::generate(); diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index e4e8ff3085c5..bebf00b65d1f 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -841,6 +841,8 @@ class CompanySettings extends BaseSettings { $notification = new stdClass; $notification->email = []; + $notification->email = ['invoice_sent_all']; + // $notification->email = ['all_notifications']; return $notification; diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 058f9ed36731..d12ff9094da7 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -1013,9 +1013,9 @@ html { */ protected function generateEntityImagesMarkup() { - if ($this->client->getSetting('embed_documents') === false) { - return ''; - } + // if ($this->client->getSetting('embed_documents') === false) { + // return ''; + // } $dom = new \DOMDocument('1.0', 'UTF-8'); @@ -1029,7 +1029,7 @@ html { $image = $dom->createElement('img'); - $image->setAttribute('src', $document->generateUrl()); + $image->setAttribute('src', "data:image/png;base64,".base64_encode($document->getFile())); $image->setAttribute('style', 'max-height: 100px; margin-top: 20px;'); $container->appendChild($image); @@ -1040,6 +1040,8 @@ html { $html = $dom->saveHTML(); $dom = null; + + nlog($html); return $html; } diff --git a/database/seeders/RandomDataSeeder.php b/database/seeders/RandomDataSeeder.php index e508ba0daaee..027fad32815a 100644 --- a/database/seeders/RandomDataSeeder.php +++ b/database/seeders/RandomDataSeeder.php @@ -89,10 +89,16 @@ class RandomDataSeeder extends Seeder Model::unguard(); $faker = \Faker\Factory::create(); - + $settings= CompanySettings::defaults(); + + $settings->name = "Random Test Company"; + $settings->currency_id = '1'; + $settings->language_id = '1'; + $account = Account::factory()->create(); $company = Company::factory()->create([ 'account_id' => $account->id, + 'settings' => $settings, ]); $account->default_company_id = $company->id;