Skip to content

Commit dbd8c40

Browse files
committed
minor
1 parent e540649 commit dbd8c40

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

handlers/payments/lib/getOrderInfo.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ function* getOrderInfo(order) {
5050
statusText: "Оплата получена",
5151
transaction: transaction,
5252
descriptionProfile: transaction.paymentMethod == 'invoice' && transaction.paymentDetails.agreementRequired ?
53-
`Вы можете повторно скачать <a href="/payments/invoice/${transaction.number}/agreement.docx">договор с актом</a>.` :
53+
`Вы можете повторно скачать <a href="/payments/invoice/${transaction.number}/invoice.docx">скачать счёт</a>
54+
и <a href="/payments/invoice/${transaction.number}/agreement.docx">договор с актом</a>.` :
5455
''
5556
// no title/accent/description, because the action on success is order-module-dependant
5657
};

migrations/20150817235735-teacher.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ exports.up = function*() {
3636
exports.down = function*() {
3737
throw new Error("Rollback not implemented");
3838
};
39+

modules/deploy/tasks/build.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = function() {
1414
var args = require('yargs')
1515
.example('gulp deploy:build --host learn-ru')
1616
.example('gulp deploy:build --host learn-ru --with-npm')
17+
.example('gulp deploy:build --host learn-ru --no-build --no-test')
1718
.demand(['host'])
1819
.argv;
1920

@@ -50,6 +51,12 @@ module.exports = function() {
5051
}
5152
}
5253

54+
55+
// make sure tests pass unless --no-test
56+
if (args.test !== false) {
57+
yield* client.runInBuild(`npm test`);
58+
}
59+
5360
yield* client.runInBuild('git push origin production');
5461
} finally {
5562
client.end();

modules/deploy/tasks/update.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ module.exports = function() {
2323
var client = yield* sshConnect(args.host);
2424

2525
try {
26-
// make sure tests pass unless --no-test
27-
if (args.test !== false) {
28-
yield* client.runInBuild(`npm test`);
29-
}
30-
3126
yield* client.runInTarget(`git reset --hard`);
3227
yield* client.runInTarget(`git fetch origin production`);
3328
yield* client.runInTarget(`git merge origin/production --no-edit`);

0 commit comments

Comments
 (0)