mirror of https://github.com/BTCPrivate/copay.git
paypro: display ack memo on notification.
This commit is contained in:
parent
fb77e46111
commit
e1478fefbf
|
@ -70,6 +70,7 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
message += '\nThis payment protocol transaction'
|
||||
+ ' has been verified through ' + merchantData.pr.ca + '.';
|
||||
}
|
||||
message += '\nMessage from server: ' + merchantData.ack.memo;
|
||||
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
|
||||
}
|
||||
notification.success('Success!', message);
|
||||
|
@ -83,6 +84,7 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
message += '\nThis payment protocol transaction'
|
||||
+ ' has been verified through ' + merchantData.pr.ca + '.';
|
||||
}
|
||||
message += '\nMessage from server: ' + merchantData.ack.memo;
|
||||
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
|
||||
}
|
||||
notification.success('Transaction broadcast', message);
|
||||
|
@ -342,6 +344,7 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
message += '\nThis payment protocol transaction'
|
||||
+ ' has been verified through ' + merchantData.pr.ca + '.';
|
||||
}
|
||||
message += '\nMessage from server: ' + merchantData.ack.memo;
|
||||
message += '\nFor merchant: ' + merchantData.pr.pd.payment_url;
|
||||
notification.success('Transaction sent', message);
|
||||
}
|
||||
|
|
|
@ -1082,6 +1082,10 @@ Wallet.prototype.receivePaymentRequestACK = function(tx, txp, ack, cb) {
|
|||
tx = ptx;
|
||||
}
|
||||
|
||||
txp.merchant.ack = {
|
||||
memo: memo
|
||||
};
|
||||
|
||||
var txid = tx.getHash().toString('hex');
|
||||
return cb(txid, txp.merchant);
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue