BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #223 from isocolsky/email_templates 

spend proposal -> payment proposal
This commit is contained in:
Matias Alejo Garcia 2015-05-28 12:10:34 -03:00
parent 62bdb543e7 c2fecb03aa
commit 236d26b8ad
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/templates/new_tx_proposal.plain
View File

@ -1,2 +1,2 @@
<%= subjectPrefix %>New spend proposal
A new spend proposal has been created in your wallet <%= walletName %> by <%= creatorName %>.
<%= subjectPrefix %>New payment proposal
A new payment proposal has been created in your wallet <%= walletName %> by <%= creatorName %>.

4
lib/templates/txp_finally_rejected.plain
View File

@ -1,2 +1,2 @@
<%= subjectPrefix %>Spend proposal rejected
A spend proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>.
<%= subjectPrefix %>Payment proposal rejected
A payment proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>.

2
test/integration/server.js
View File

@ -3220,7 +3220,7 @@ describe('Wallet service', function() {
_.difference(['copayer1@domain.com', 'copayer2@domain.com'], _.pluck(emails, 'to')).should.be.empty;
var one = emails[0];
one.from.should.equal('bws@dummy.net');
one.subject.should.contain('New spend proposal');
one.subject.should.contain('New payment proposal');
one.text.should.contain(wallet.name);
one.text.should.contain(wallet.copayers[0].name);
server.storage.fetchUnsentEmails(function(err, unsent) {