include amount in incomingTx email
This commit is contained in:
parent
3316b64332
commit
26cb34e2b7
|
@ -8,6 +8,7 @@ log.debug = log.verbose;
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var nodemailer = require('nodemailer');
|
var nodemailer = require('nodemailer');
|
||||||
|
|
||||||
|
var WalletUtils = require('bitcore-wallet-utils');
|
||||||
var Storage = require('./storage');
|
var Storage = require('./storage');
|
||||||
var MessageBroker = require('./messagebroker');
|
var MessageBroker = require('./messagebroker');
|
||||||
var Lock = require('./lock');
|
var Lock = require('./lock');
|
||||||
|
@ -140,6 +141,9 @@ EmailService.prototype._getDataForTemplate = function(notification, cb) {
|
||||||
|
|
||||||
var data = _.cloneDeep(notification.data);
|
var data = _.cloneDeep(notification.data);
|
||||||
data.subjectPrefix = _.trim(self.subjectPrefix) + ' ';
|
data.subjectPrefix = _.trim(self.subjectPrefix) + ' ';
|
||||||
|
if (data.amount) {
|
||||||
|
data.amount = WalletUtils.formatAmount(+data.amount, 'bit') + ' bits';
|
||||||
|
}
|
||||||
self.storage.fetchWallet(notification.walletId, function(err, wallet) {
|
self.storage.fetchWallet(notification.walletId, function(err, wallet) {
|
||||||
if (err) return cb(err);
|
if (err) return cb(err);
|
||||||
data.walletId = wallet.id;
|
data.walletId = wallet.id;
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
<%= subjectPrefix %>New payment received
|
<%= subjectPrefix %>New payment received
|
||||||
A Payment has been received into your wallet <%= walletName %>.
|
A payment of <%= amount %> has been received into your wallet <%= walletName %>.
|
||||||
|
|
|
@ -329,7 +329,7 @@ describe('Wallet service', function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should notify copayers of incoming txs', function(done) {
|
it.only('should notify copayers of incoming txs', function(done) {
|
||||||
server.createAddress({}, function(err, address) {
|
server.createAddress({}, function(err, address) {
|
||||||
should.not.exist(err);
|
should.not.exist(err);
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ describe('Wallet service', function() {
|
||||||
server._notify('NewIncomingTx', {
|
server._notify('NewIncomingTx', {
|
||||||
txid: '999',
|
txid: '999',
|
||||||
address: address,
|
address: address,
|
||||||
amount: 123,
|
amount: 12300000,
|
||||||
}, function(err) {
|
}, function(err) {
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
var calls = mailerStub.sendMail.getCalls();
|
var calls = mailerStub.sendMail.getCalls();
|
||||||
|
@ -350,6 +350,7 @@ describe('Wallet service', function() {
|
||||||
one.from.should.equal('bws@dummy.net');
|
one.from.should.equal('bws@dummy.net');
|
||||||
one.subject.should.contain('New payment received');
|
one.subject.should.contain('New payment received');
|
||||||
one.text.should.contain(wallet.name);
|
one.text.should.contain(wallet.name);
|
||||||
|
one.text.should.contain('123,000');
|
||||||
server.storage.fetchUnsentEmails(function(err, unsent) {
|
server.storage.fetchUnsentEmails(function(err, unsent) {
|
||||||
should.not.exist(err);
|
should.not.exist(err);
|
||||||
unsent.should.be.empty;
|
unsent.should.be.empty;
|
||||||
|
|
Loading…
Reference in New Issue