From 044757d380ea7206905fb4c62a04c003c6d047cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BD?= Date: Fri, 25 Oct 2024 00:50:44 +0300 Subject: [PATCH] Added support for double naming of the `leave-before` key (`leave_before`). --- src/modules/Workers/WebService/WebService.cpp | 6 +++++- src/modules/Workers/WebSocket/WebSocket.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/Workers/WebService/WebService.cpp b/src/modules/Workers/WebService/WebService.cpp index e8caa5b..2311ea3 100644 --- a/src/modules/Workers/WebService/WebService.cpp +++ b/src/modules/Workers/WebService/WebService.cpp @@ -726,7 +726,11 @@ namespace Apostol { const CJSONValue &jsonFeedback = jsonData["feedback"]; - const auto &formFeedbackLeaveBefore = jsonFeedback["leave-before"].AsString(); + CString Key("leave_before"); + if (!jsonFeedback.HasOwnProperty(Key)) + Key = "leave-before"; + + const auto &formFeedbackLeaveBefore = jsonFeedback[Key].AsString(); const auto &formFeedbackStatus = jsonFeedback["status"].AsString(); const auto &formFeedbackComments = jsonFeedback["comments"].AsString(); const auto &formFeedbackRefund = jsonFeedback["refund"].AsString(); diff --git a/src/modules/Workers/WebSocket/WebSocket.cpp b/src/modules/Workers/WebSocket/WebSocket.cpp index f5a6006..24001d1 100644 --- a/src/modules/Workers/WebSocket/WebSocket.cpp +++ b/src/modules/Workers/WebSocket/WebSocket.cpp @@ -813,7 +813,11 @@ namespace Apostol { const CJSONValue &jsonFeedback = jsonData["feedback"]; - const auto &formFeedbackLeaveBefore = jsonFeedback["leave-before"].AsString(); + CString Key("leave_before"); + if (!jsonFeedback.HasOwnProperty(Key)) + Key = "leave-before"; + + const auto &formFeedbackLeaveBefore = jsonFeedback[Key].AsString(); const auto &formFeedbackStatus = jsonFeedback["status"].AsString(); const auto &formFeedbackComments = jsonFeedback["comments"].AsString();