From bcfd7cfb30f831f93993de8b147268598249703f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Blon=C4=8F=C3=A1k?= Date: Mon, 6 Feb 2017 09:53:17 +0100 Subject: [PATCH] Updated push notifications format --- include/classes/transaction.class.php | 1 + templates/mail/push_notifications/idle_worker.tpl | 8 ++++---- templates/mail/push_notifications/new_block.tpl | 2 +- templates/mail/push_notifications/payout.tpl | 3 +-- templates/mail/push_notifications/success_login.tpl | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/classes/transaction.class.php b/include/classes/transaction.class.php index b2d30b597..923d306a1 100644 --- a/include/classes/transaction.class.php +++ b/include/classes/transaction.class.php @@ -430,6 +430,7 @@ private function createDebitRecord($account_id, $coin_address, $amount, $type) { $aMailData['email'] = $this->user->getUserEmailById($account_id); $aMailData['subject'] = $type . ' Completed'; $aMailData['amount'] = $amount; + $aMailData['currency'] = $this->config['currency']; if (!$this->notification->sendNotification($account_id, 'payout', $aMailData)) { $this->setErrorMessage('Failed to send notification email to users address: ' . $aMailData['email'] . 'ERROR: ' . $this->notification->getCronError()); } diff --git a/templates/mail/push_notifications/idle_worker.tpl b/templates/mail/push_notifications/idle_worker.tpl index 5036ae062..8d66b75c8 100644 --- a/templates/mail/push_notifications/idle_worker.tpl +++ b/templates/mail/push_notifications/idle_worker.tpl @@ -1,5 +1,5 @@ -

One of your workers is currently IDLE: {nocache}{$DATA.worker}{/nocache}

-

We have not received any shares for this worker in the past 10 minutes.

-

Since monitoring is enabled for this worker, this notification was sent.

+One of your workers is currently IDLE: {nocache}{$DATA.worker}{/nocache}
+We have not received any shares for this worker in the past 10 minutes.
+Since monitoring is enabled for this worker, this notification was sent.

-

Please check your workers!

+Please check your workers! diff --git a/templates/mail/push_notifications/new_block.tpl b/templates/mail/push_notifications/new_block.tpl index b8607b6f8..a8237547b 100644 --- a/templates/mail/push_notifications/new_block.tpl +++ b/templates/mail/push_notifications/new_block.tpl @@ -1 +1 @@ -

{nocache}Block Number {$DATA.height} has been discovered by {$DATA.finder} with a total value of {$DATA.amount} {$DATA.currency}! The current difficulty is {$DATA.difficulty}.{/nocache}

+{nocache}Block Number {$DATA.height} has been discovered by {$DATA.finder} with a total value of {$DATA.amount} {$DATA.currency}! The current difficulty is {$DATA.difficulty}.{/nocache} diff --git a/templates/mail/push_notifications/payout.tpl b/templates/mail/push_notifications/payout.tpl index 7c0d8e35c..973cdecd1 100644 --- a/templates/mail/push_notifications/payout.tpl +++ b/templates/mail/push_notifications/payout.tpl @@ -1,2 +1 @@ -

You account has been debited and the coins have been sent to your wallet.

-

Amount: {nocache}{$DATA.amount}{/nocache}

+You account has been debited and the coins have been sent to your wallet.Amount: {nocache}{$DATA.amount} {$DATA.currency}{/nocache} diff --git a/templates/mail/push_notifications/success_login.tpl b/templates/mail/push_notifications/success_login.tpl index 97fcce9db..eec15741e 100644 --- a/templates/mail/push_notifications/success_login.tpl +++ b/templates/mail/push_notifications/success_login.tpl @@ -1,5 +1,5 @@ -

Your account has successfully logged in

-

User: {$DATA.LOGINUSER}

-

IP: {$DATA.LOGINIP}

-

Time: {$DATA.LOGINTIME}

-

If you initiated this login, you can ignore this message. If you did NOT, please notify an administrator.

+Your account has successfully logged in
+User: {$DATA.LOGINUSER}
+IP: {$DATA.LOGINIP}
+Time: {$DATA.LOGINTIME}
+If you initiated this login, you can ignore this message. If you did NOT, please notify an administrator.