Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Fixes for email translations

Browse Source
This commit is contained in:
David Bomba 2021-06-29 19:46:40 +10:00
parent 1ac4aa61a9
commit a48328b90c
17 changed files with 142 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/BillingPortalPurchase.php
View File

@ -237,7 +237,7 @@ class BillingPortalPurchase extends Component
$client_repo = new ClientRepository(new ClientContactRepository());
$data = [
'name' => 'Client Name',
'name' => '',
'contacts' => [
['email' => $this->email],
],

11
app/Mail/Admin/AccountCreatedObject.php
View File

@ -11,6 +11,9 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use Illuminate\Support\Facades\App;
class AccountCreatedObject
{
@ -30,6 +33,14 @@ class AccountCreatedObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$data = [
'title' => ctrans('texts.new_signup'),
'message' => ctrans('texts.new_signup_text', ['user' => $this->user->present()->name(), 'email' => $this->user->email, 'ip' => $this->user->ip]),

11
app/Mail/Admin/AutoBillingFailureObject.php
View File

@ -13,8 +13,10 @@ namespace App\Mail\Admin;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\Ninja;
use App\Utils\Number;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\App;
use stdClass;
class AutoBillingFailureObject
@ -55,6 +57,15 @@ class AutoBillingFailureObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->$invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->get();
$mail_obj = new stdClass;

10
app/Mail/Admin/ClientPaymentFailureObject.php
View File

@ -13,8 +13,10 @@ namespace App\Mail\Admin;
use App\Models\Invoice;
use App\Utils\HtmlEngine;
use App\Utils\Ninja;
use App\Utils\Number;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\App;
use stdClass;
class ClientPaymentFailureObject
@ -56,6 +58,14 @@ class ClientPaymentFailureObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->get();
$mail_obj = new stdClass;

9
app/Mail/Admin/EntityCreatedObject.php
View File

@ -11,8 +11,10 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use App\Utils\Number;
use stdClass;
use Illuminate\Support\Facades\App;
class EntityCreatedObject
{
@ -39,6 +41,13 @@ class EntityCreatedObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->contact = $this->entity->invitations()->first()->contact;
$this->company = $this->entity->company;

11
app/Mail/Admin/EntityFailedSendObject.php
View File

@ -12,8 +12,10 @@
namespace App\Mail\Admin;
use App\Utils\HtmlEngine;
use App\Utils\Ninja;
use App\Utils\Number;
use stdClass;
use Illuminate\Support\Facades\App;
class EntityFailedSendObject
{
@ -50,6 +52,15 @@ class EntityFailedSendObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->setTemplate();
$mail_obj = new stdClass;

11
app/Mail/Admin/EntityPaidObject.php
View File

@ -12,7 +12,9 @@
namespace App\Mail\Admin;
use App\Mail\Engine\PaymentEmailEngine;
use App\Utils\Ninja;
use App\Utils\Number;
use Illuminate\Support\Facades\App;
use stdClass;
class EntityPaidObject
@ -35,6 +37,15 @@ class EntityPaidObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$mail_obj = new stdClass;
$mail_obj->amount = $this->getAmount();
$mail_obj->subject = $this->getSubject();

11
app/Mail/Admin/EntitySentObject.php
View File

@ -11,8 +11,10 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use App\Utils\Number;
use stdClass;
use Illuminate\Support\Facades\App;
class EntitySentObject
{
@ -46,6 +48,15 @@ class EntitySentObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->setTemplate();
$mail_obj = new stdClass;

11
app/Mail/Admin/EntityViewedObject.php
View File

@ -11,8 +11,10 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use App\Utils\Number;
use stdClass;
use Illuminate\Support\Facades\App;
class EntityViewedObject
{
@ -39,6 +41,15 @@ class EntityViewedObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$mail_obj = new stdClass;
$mail_obj->amount = $this->getAmount();
$mail_obj->subject = $this->getSubject();

10
app/Mail/Admin/PaymentFailureObject.php
View File

@ -12,9 +12,11 @@
namespace App\Mail\Admin;
use App\Models\Invoice;
use App\Utils\Ninja;
use App\Utils\Number;
use App\Utils\Traits\MakesHash;
use stdClass;
use Illuminate\Support\Facades\App;
class PaymentFailureObject
{
@ -55,6 +57,14 @@ class PaymentFailureObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
// $this->invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->get();
$mail_obj = new stdClass;

11
app/Mail/Admin/ResetPasswordObject.php
View File

@ -11,6 +11,9 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use Illuminate\Support\Facades\App;
class ResetPasswordObject
{
@ -32,6 +35,14 @@ class ResetPasswordObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$data = [
'title' => ctrans('texts.your_password_reset_link'),
'message' => ctrans('texts.reset_password'),

11
app/Mail/Admin/VerifyUserObject.php
View File

@ -11,7 +11,9 @@
namespace App\Mail\Admin;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use Illuminate\Support\Facades\App;
class VerifyUserObject
{
@ -33,6 +35,15 @@ class VerifyUserObject
public function build()
{
App::forgetInstance('translator');
/* Init a new copy of the translator*/
$t = app('translator');
/* Set the locale*/
App::setLocale($this->company->getLocale());
/* Set customized translations _NOW_ */
$t->replace(Ninja::transformTranslations($this->company->settings));
$this->user->confirmation_code = $this->createDbHash($this->company->db);
$this->user->save();

9
app/Mail/ClientContact/ClientContactResetPasswordObject.php
View File

@ -11,6 +11,9 @@
namespace App\Mail\ClientContact;
use App\Utils\Ninja;
use Illuminate\Support\Facades\App;
class ClientContactResetPasswordObject
{
@ -32,6 +35,12 @@ class ClientContactResetPasswordObject
public function build()
{
App::forgetInstance('translator');
$t = app('translator');
App::setLocale($this->client_contact->preferredLocale());
$t->replace(Ninja::transformTranslations($this->client_contact->client->getMergedSettings()));
$data = [
'title' => ctrans('texts.your_password_reset_link'),
'content' => ctrans('texts.reset_password'),

6
app/Mail/Engine/PaymentEmailEngine.php
View File

@ -17,6 +17,7 @@ use App\Utils\Helpers;
use App\Utils\Ninja;
use App\Utils\Number;
use App\Utils\Traits\MakesDates;
use Illuminate\Support\Facades\App;
class PaymentEmailEngine extends BaseEmailEngine
{
@ -49,6 +50,11 @@ class PaymentEmailEngine extends BaseEmailEngine
public function build()
{
App::forgetInstance('translator');
$t = app('translator');
App::setLocale($this->contact->preferredLocale());
$t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
$body_template = $this->template_data['body'];
} elseif (strlen($this->client->getSetting('email_template_payment')) > 0) {

7
app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php
View File

@ -11,6 +11,9 @@
namespace App\Mail\RecurringInvoice;
use App\Utils\Ninja;
use Illuminate\Support\Facades\App;
class ClientContactRequestCancellationObject
{
@ -33,6 +36,10 @@ class ClientContactRequestCancellationObject
public function build()
{
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($this->company->settings));
$data = [
'title' => ctrans('texts.recurring_cancellation_request', ['contact' => $this->client_contact->present()->name()]),
'content' => ctrans('texts.recurring_cancellation_request_body', ['contact' => $this->client_contact->present()->name(), 'client' => $this->client_contact->client->present()->name(), 'invoice' => $this->recurring_invoice->number]),

1
app/Models/Company.php
View File

@ -11,6 +11,7 @@
namespace App\Models;
use App\Models\Language;
use App\Models\Presenters\CompanyPresenter;
use App\Models\User;
use App\Services\Notification\NotificationService;

1
app/Models/User.php
View File

@ -31,6 +31,7 @@ use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;
use Laracasts\Presenter\PresentableTrait;
use Illuminate\Support\Facades\Cache;
class User extends Authenticatable implements MustVerifyEmail
{