Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 02:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-07-23 11:25:33 +10:00
parent 00d1273bd9
commit 5729578926
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,7 @@ class PaymentEmailEngine extends BaseEmailEngine
$data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')]; $data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
$data['$client_name'] = ['value' => $this->client->present()->name() ?: ' ', 'label' => ctrans('texts.client_name')]; $data['$client_name'] = ['value' => $this->client->present()->name() ?: ' ', 'label' => ctrans('texts.client_name')];
$data['$client.name'] = &$data['$client_name']; $data['$client.name'] = &$data['$client_name'];
$data['$client'] = &$data['client_name'];
$data['$client.address1'] = &$data['$address1']; $data['$client.address1'] = &$data['$address1'];
$data['$client.address2'] = &$data['$address2']; $data['$client.address2'] = &$data['$address2'];
$data['$client_address'] = ['value' => $this->client->present()->address() ?: ' ', 'label' => ctrans('texts.address')]; $data['$client_address'] = ['value' => $this->client->present()->address() ?: ' ', 'label' => ctrans('texts.address')];

5
app/Mail/SupportMessageSent.php
View File

@ -60,11 +60,12 @@ class SupportMessageSent extends Mailable
$company = auth()->user()->company(); $company = auth()->user()->company();
$user = auth()->user(); $user = auth()->user();
$db = str_replace("db-ninja-", "", $company->db);
if(Ninja::isHosted()) if(Ninja::isHosted())
$subject = "{$priority}Hosted-{$company->db} :: Customer Support - {$plan} ".date('M jS, g:ia'); $subject = "{$priority}Hosted-{$company->db} :: {$plan} :: ".date('M jS, g:ia');
else else
$subject = "{$priority}Self Hosted :: Customer Support - [{$plan}] ".date('M jS, g:ia'); $subject = "{$priority}Self Hosted :: {$plan} :: ".date('M jS, g:ia');
return $this->from(config('mail.from.address'), $user->present()->name()) return $this->from(config('mail.from.address'), $user->present()->name())
->replyTo($user->email, $user->present()->name()) ->replyTo($user->email, $user->present()->name())

4
database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
View File

@ -15,9 +15,7 @@ class ActivatePaytracePaymentDriver extends Migration
public function up() public function up()
{ {
$paytrace = Gateway::find(46); if($paytrace = Gateway::find(46))
if($paytrace)
{ {
$fields = json_decode($paytrace->fields); $fields = json_decode($paytrace->fields);
$fields->integratorId = ""; $fields->integratorId = "";