payments: allow to see paid invoice

iliakan · iliakan · commit 30bdc9616c10 · 2015-11-11T17:46:52.000+03:00
diff --git a/handlers/payments/invoice/controller/invoice.js b/handlers/payments/invoice/controller/invoice.js
@@ -17,7 +17,7 @@ exports.get = function*() {
     this.throw(404);
   }
 
-  if (this.transaction.status != Transaction.STATUS_PENDING || this.transaction.paymentMethod != 'invoice') {
+  if ( (this.transaction.status != Transaction.STATUS_PENDING && this.transaction.status != Transaction.STATUS_SUCCESS) || this.transaction.paymentMethod != 'invoice') {
     this.log.debug("Improper transaction", this.transaction.toObject());
     this.throw(400);
   }
diff --git a/handlers/payments/lib/getOrderInfo.js b/handlers/payments/lib/getOrderInfo.js
@@ -50,7 +50,7 @@ function* getOrderInfo(order) {
       statusText:  "Оплата получена",
       transaction: transaction,
       descriptionProfile: transaction.paymentMethod == 'invoice' && transaction.paymentDetails.agreementRequired ?
-        `Вы можете повторно скачать <a href="/payments/invoice/${transaction.number}/invoice.docx">скачать счёт</a>
+        `Вы можете повторно скачать <a href="/payments/invoice/${transaction.number}/invoice.docx">счёт</a>
         и <a href="/payments/invoice/${transaction.number}/agreement.docx">договор с актом</a>.` :
         ''
       // no title/accent/description, because the action on success is order-module-dependant

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ exports.get = function*() {`
`17`	`17`	`this.throw(404);`
`18`	`18`	`}`
`19`	`19`
`20`		`- if (this.transaction.status != Transaction.STATUS_PENDING \|\| this.transaction.paymentMethod != 'invoice') {`
	`20`	`+ if ( (this.transaction.status != Transaction.STATUS_PENDING && this.transaction.status != Transaction.STATUS_SUCCESS) \|\| this.transaction.paymentMethod != 'invoice') {`
`21`	`21`	`this.log.debug("Improper transaction", this.transaction.toObject());`
`22`	`22`	`this.throw(400);`
`23`	`23`	`}`