mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-09 12:42:36 +01:00
Updates for email template variables
This commit is contained in:
parent
1241d8226d
commit
8eb26085f0
@ -140,7 +140,7 @@ class EmailTemplateDefaults
|
||||
|
||||
public static function emailPaymentFailedTemplate()
|
||||
{
|
||||
return '<p>$client<br><br>'.ctrans('texts.client_payment_failure_body', ['invoice' => '$number', 'amount' => '$amount']).'</p><div class="center">$gateway_payment_error</div><br><div class="center">$payment_button</div>';
|
||||
return '<p>$client<br><br>'.ctrans('texts.client_payment_failure_body', ['invoice' => '$number', 'amount' => '$amount']).'</p><div>$payment_error</div><br><div>$payment_button</div>';
|
||||
}
|
||||
|
||||
public static function emailQuoteReminder1Subject()
|
||||
@ -151,7 +151,7 @@ class EmailTemplateDefaults
|
||||
public static function emailQuoteReminder1Body()
|
||||
{
|
||||
|
||||
return '<p>$client<br><br>'.self::transformText('quote_reminder_message').'</p><div class="center">$view_button</div>';
|
||||
return '<p>$client<br><br>'.self::transformText('quote_reminder_message').'</p><div>$view_button</div>';
|
||||
|
||||
}
|
||||
|
||||
@ -177,14 +177,14 @@ class EmailTemplateDefaults
|
||||
|
||||
public static function emailInvoiceTemplate()
|
||||
{
|
||||
$invoice_message = '<p>$client<br><br>'.self::transformText('invoice_message').'</p><div class="center">$view_button</div>';
|
||||
$invoice_message = '<p>$client<br><br>'.self::transformText('invoice_message').'</p><div>$view_button</div>';
|
||||
|
||||
return $invoice_message;
|
||||
}
|
||||
|
||||
public static function emailInvoiceReminderTemplate()
|
||||
{
|
||||
$invoice_message = '<p>$client<br><br>'.self::transformText('reminder_message').'</p><div class="center">$view_button</div>';
|
||||
$invoice_message = '<p>$client<br><br>'.self::transformText('reminder_message').'</p><div>$view_button</div>';
|
||||
|
||||
return $invoice_message;
|
||||
}
|
||||
@ -196,7 +196,7 @@ class EmailTemplateDefaults
|
||||
|
||||
public static function emailQuoteTemplate()
|
||||
{
|
||||
$quote_message = '<p>$client<br><br>'.self::transformText('quote_message').'</p><div class="center">$view_button</div>';
|
||||
$quote_message = '<p>$client<br><br>'.self::transformText('quote_message').'</p><div>$view_button</div>';
|
||||
|
||||
return $quote_message;
|
||||
}
|
||||
@ -213,28 +213,28 @@ class EmailTemplateDefaults
|
||||
|
||||
public static function emailPurchaseOrderTemplate()
|
||||
{
|
||||
$purchase_order_message = '<p>$vendor<br><br>'.self::transformText('purchase_order_message').'</p><div class="center">$view_button</div>';
|
||||
$purchase_order_message = '<p>$vendor<br><br>'.self::transformText('purchase_order_message').'</p><div>$view_button</div>';
|
||||
|
||||
return $purchase_order_message;
|
||||
}
|
||||
|
||||
public static function emailPaymentTemplate()
|
||||
{
|
||||
$payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div class="center">$view_button</div>';
|
||||
$payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div>$view_button</div>';
|
||||
|
||||
return $payment_message;
|
||||
}
|
||||
|
||||
public static function emailCreditTemplate()
|
||||
{
|
||||
$credit_message = '<p>$client<br><br>'.self::transformText('credit_message').'</p><div class="center">$view_button</div>';
|
||||
$credit_message = '<p>$client<br><br>'.self::transformText('credit_message').'</p><div>$view_button</div>';
|
||||
|
||||
return $credit_message;
|
||||
}
|
||||
|
||||
public static function emailPaymentPartialTemplate()
|
||||
{
|
||||
$payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div class="center">$view_button</div>';
|
||||
$payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div>$view_button</div>';
|
||||
|
||||
return $payment_message;
|
||||
}
|
||||
|
@ -123,7 +123,7 @@ class ClientPaymentFailureObject
|
||||
$signature = $this->client->getSetting('email_signature');
|
||||
$html_variables = (new HtmlEngine($invitation))->makeValues();
|
||||
|
||||
$html_variables['$gateway_payment_error'] = $this->error ?? '';
|
||||
$html_variables['$payment_error'] = $this->error ?? '';
|
||||
$html_variables['$total'] = $this->getAmount();
|
||||
|
||||
$signature = str_replace(array_keys($html_variables), array_values($html_variables), $signature);
|
||||
|
@ -287,7 +287,7 @@ class MolliePaymentDriver extends BaseDriver
|
||||
{
|
||||
// Allow app to catch up with webhook request.
|
||||
// sleep(4);
|
||||
usleep(2800000, 4000000);
|
||||
usleep(rand(2800000, 4000000));
|
||||
|
||||
$validator = Validator::make($request->all(), [
|
||||
'id' => ['required', 'starts_with:tr'],
|
||||
|
@ -261,7 +261,7 @@ class Storecove
|
||||
*
|
||||
* @param int $id
|
||||
* @param array $data
|
||||
* @return array
|
||||
* @return mixed
|
||||
*/
|
||||
public function updateLegalEntity(int $id, array $data)
|
||||
{
|
||||
|
@ -335,7 +335,7 @@ class Peppol extends AbstractService
|
||||
/**
|
||||
* getInvoice
|
||||
*
|
||||
* @return InvoiceNinja\EInvoice\Models\Peppol\Invoice
|
||||
* @return \InvoiceNinja\EInvoice\Models\Peppol\Invoice
|
||||
*/
|
||||
public function getInvoice(): \InvoiceNinja\EInvoice\Models\Peppol\Invoice
|
||||
{
|
||||
|
@ -733,7 +733,7 @@ class HtmlEngine
|
||||
$data['$payment.number'] = ['value' => '', 'label' => ctrans('texts.payment_number')];
|
||||
$data['$payment.transaction_reference'] = ['value' => '', 'label' => ctrans('texts.transaction_reference')];
|
||||
$data['$payment.refunded'] = ['value' => '', 'label' => ctrans('texts.refund')];
|
||||
$data['$gateway_payment_error'] = ['value' => '', 'label' => ctrans('texts.error')];
|
||||
$data['$payment_error'] = ['value' => '', 'label' => ctrans('texts.error')];
|
||||
|
||||
if ($this->entity_string == 'invoice' && $this->entity->net_payments()->exists()) {
|
||||
$payment_list = '<br><br>';
|
||||
@ -1166,7 +1166,7 @@ class HtmlEngine
|
||||
}
|
||||
|
||||
return '
|
||||
<div>
|
||||
<div class=\"center\">
|
||||
<!--[if (gte mso 9)|(IE)]>
|
||||
<table align="center" cellspacing="0" cellpadding="0" style="width: 600px;">
|
||||
<tr>
|
||||
|
@ -5325,7 +5325,9 @@ $lang = array(
|
||||
'activity_143' => 'Auto Bill succeeded for invoice :invoice',
|
||||
'activity_144' => 'Auto Bill failed for invoice :invoice. :notes',
|
||||
'activity_145' => 'EInvoice :invoice for :client was e-delivered. :notes',
|
||||
|
||||
'payment_failed' => 'Payment Failed',
|
||||
'ssl_host_override' => 'SSL Host Override',
|
||||
'upload_logo_short' => 'Upload Logo',
|
||||
);
|
||||
|
||||
return $lang;
|
||||
|
@ -5319,6 +5319,13 @@ E-mail: :email<b><br><b>',
|
||||
'one_page_checkout' => 'Afrekenen op één pagina',
|
||||
'one_page_checkout_help' => 'Schakel de nieuwe betaalflow \'afrekenen op één pagina\' in',
|
||||
'applies_to' => 'Is van toepassing op',
|
||||
'accept_purchase_order' => 'Accepteer inkooporder',
|
||||
'round_to_seconds' => 'Afronden op seconden',
|
||||
'activity_142' => 'Quote :number reminder 1 sent',
|
||||
'activity_143' => 'Auto Bill succeeded for invoice :invoice',
|
||||
'activity_144' => 'Auto Bill failed for invoice :invoice. :notes',
|
||||
'activity_145' => 'EInvoice :invoice for :client was e-delivered. :notes',
|
||||
|
||||
);
|
||||
|
||||
return $lang;
|
||||
|
Loading…
Reference in New Issue
Block a user