From bb8b5c8dcb25c9f84fce544c0a22e99e86c6385b Mon Sep 17 00:00:00 2001 From: "Vladimir N. Korotenko" Date: Mon, 17 Nov 2025 18:28:14 +0300 Subject: [PATCH] Add -h key to all deal tree --- dm-cli/Deals.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dm-cli/Deals.cpp b/dm-cli/Deals.cpp index a0dace4..7fbd82b 100644 --- a/dm-cli/Deals.cpp +++ b/dm-cli/Deals.cpp @@ -65,15 +65,15 @@ Deals::Deals(const InputParser& parser, const bool isRussian, const string addre int Deals::Process() { - if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("create") && this->parser.cmdOptionExists("--help")) + if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("create") && (this->parser.cmdOptionExists("--help") || parser.cmdOptionExists("-h"))) return this->HelpCreate(); - if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("status") && this->parser.cmdOptionExists("--help")) + if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("status") && (this->parser.cmdOptionExists("--help") || parser.cmdOptionExists("-h"))) return this->HelpDealStatus(); - if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("complete") && this->parser.cmdOptionExists("--help")) + if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("complete") && (this->parser.cmdOptionExists("--help") || parser.cmdOptionExists("-h"))) return this->HelpDealComplete(); - if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("cancel") && this->parser.cmdOptionExists("--help")) + if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("cancel") && (this->parser.cmdOptionExists("--help") || parser.cmdOptionExists("-h"))) return this->HelpDealCancel(); - if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("negative") && this->parser.cmdOptionExists("--help")) + if (parser.cmdOptionExists("deal") && this->parser.cmdOptionExists("negative") && (this->parser.cmdOptionExists("--help") || parser.cmdOptionExists("-h"))) return this->HelpDealNegative(); return Update(); @@ -312,7 +312,7 @@ int Deals::Complite() { ShowDebug(data, decoded, 0, result); return 0; } -int Deals::Cancel() { +int Deals::Cancel() { string data = CommonStatus(); string result = ExecCommand(data.c_str()); if (result.length() == 0) @@ -331,7 +331,7 @@ int Deals::Cancel() { sign = GetVal("-s", "--signature"); } - deal["seller"]["signature"] = sign; + deal["seller"]["signature"] = sign; deal["feedback"]["comments"] = message; string jsf = deal.dump(); @@ -346,7 +346,7 @@ int Deals::Cancel() { result = ExecCommand(data.c_str()); if (result.length() == 0) return NoResponse(""); - + std::ostringstream stream; stream << "success: " << jsonData["result"]["success"] << endl; stream << "message: " << jsonData["result"]["message"] << endl; @@ -361,7 +361,7 @@ int Deals::Cancel() { return 0; } -int Deals::Negative() { +int Deals::Negative() { string data = CommonStatus(); string result = ExecCommand(data.c_str()); if (result.length() == 0)