Skip to content

Commit 2753754

Browse files
knocteMersho
andauthored
commands: new msg 'order is already cancelled' (#508)
Fixes: #484 Co-authored-by: Mehrshad <[email protected]>
1 parent 66a01bc commit 2753754

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

Diff for: bot/commands.js

+3
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,9 @@ const cancelOrder = async (ctx, orderId, user) => {
579579
return await cancelShowHoldInvoice(ctx, order);
580580
}
581581

582+
if (order.status === 'CANCELED')
583+
return await messages.orderIsAlreadyCanceledMessage(ctx);
584+
582585
if (
583586
!(
584587
order.status === 'ACTIVE' ||

Diff for: bot/messages.ts

+9
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,14 @@ const badStatusOnCancelOrderMessage = async (ctx: MainContext) => {
955955
}
956956
};
957957

958+
const orderIsAlreadyCanceledMessage = async (ctx: MainContext) => {
959+
try {
960+
await ctx.reply(ctx.i18n.t('already_cancelled'));
961+
} catch (error) {
962+
logger.error(error);
963+
}
964+
};
965+
958966
const successCancelOrderMessage = async (ctx: MainContext, user: UserDocument, order: IOrder, i18n: I18nContext) => {
959967
try {
960968
await ctx.telegram.sendMessage(
@@ -1669,6 +1677,7 @@ module.exports = {
16691677
successCancelOrderByAdminMessage,
16701678
successCancelOrderMessage,
16711679
badStatusOnCancelOrderMessage,
1680+
orderIsAlreadyCanceledMessage,
16721681
invoicePaymentFailedMessage,
16731682
userCantTakeMoreThanOneWaitingOrderMessage,
16741683
buyerReceivedSatsMessage,

Diff for: locales/en.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ lightning_address_saved: Lightning address has been saved
273273
cancel_error: This order cannot be cancelled at this moment
274274
cancel_success: 'You have cancelled the order ID: ${orderId}!'
275275
cancelall_success: You have cancelled all your published orders!
276+
already_cancelled: The order has already been cancelled!
276277
order_cancelled_by_admin: 'Admin has cancelled the order ID: ${orderId}!'
277278
order_completed: 'You have completed the order ID: ${orderId}!'
278279
order_completed_by_admin: 'Admin has completed the order ID: ${orderId}!'

0 commit comments

Comments
 (0)