private/apostol-dm
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Committing updates.

Browse Source
This commit is contained in:
Преподобный Ален
2024-05-06 13:46:15 +03:00
parent 49d89bf2e1
commit 1c9d847d64
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/Workers/WebService/WebService.cpp
View File

@@ -519,6 +519,7 @@ namespace Apostol {
const auto &formType = FormData["type"];
const auto &formAt = FormData["at"];
const auto &formDate = FormData["date"];
const auto &formSalt = FormData["salt"];
const auto &formSellerAddress = FormData["seller_address"];
const auto &formSellerRating = FormData["seller_rating"];
const auto &formSellerSignature = FormData["seller_signature"];
@@ -536,7 +537,6 @@ namespace Apostol {
CheckKeyForNull("order", Action.c_str());
CheckKeyForNull("type", formType.c_str());
CheckKeyForNull("at", formAt.c_str());
//CheckKeyForNull("date", formDate.c_str());
CheckKeyForNull("seller_address", formSellerAddress.c_str());
CheckKeyForNull("customer_address", formCustomerAddress.c_str());
CheckKeyForNull("payment_sum", formPaymentSum.c_str());
@@ -556,6 +556,7 @@ namespace Apostol {
Deal["at"] = formAt.c_str();
Deal["date"] = formDate.IsEmpty() ? UTCFormat(DateToString(UTC())).c_str() : formDate.c_str();
Deal["salt"] = formSalt.IsEmpty() ? GenSalt().c_str() : formSalt.c_str();
YAML::Node Seller = Deal["seller"];
@@ -610,6 +611,7 @@ namespace Apostol {
const auto &formType = FormData.Data("type");
const auto &formAt = FormData.Data("at");
const auto &formDate = FormData.Data("date");
const auto &formSalt = FormData.Data("salt");
const auto &formSellerAddress = FormData.Data("seller_address");
const auto &formSellerRating = FormData.Data("seller_rating");
const auto &formSellerSignature = FormData.Data("seller_signature");
@@ -627,7 +629,6 @@ namespace Apostol {
CheckKeyForNull("order", Action.c_str());
CheckKeyForNull("type", formType.c_str());
CheckKeyForNull("at", formAt.c_str());
//CheckKeyForNull("date", formDate.c_str());
CheckKeyForNull("seller_address", formSellerAddress.c_str());
CheckKeyForNull("customer_address", formCustomerAddress.c_str());
CheckKeyForNull("payment_sum", formPaymentSum.c_str());
@@ -647,6 +648,7 @@ namespace Apostol {
Deal["at"] = formAt.c_str();
Deal["date"] = formDate.IsEmpty() ? UTCFormat(DateToString(UTC())).c_str() : formDate.c_str();
Deal["salt"] = formSalt.IsEmpty() ? GenSalt().c_str() : formSalt.c_str();
YAML::Node Seller = Deal["seller"];
@@ -702,6 +704,7 @@ namespace Apostol {
const auto &formAt = jsonData["at"].AsString();
const auto &formDate = jsonData["date"].AsString();
const auto &formSalt = jsonData["salt"].AsString();
const CJSONValue &jsonSeller = jsonData["seller"];
@@ -733,7 +736,6 @@ namespace Apostol {
CheckKeyForNull("order", action.c_str());
CheckKeyForNull("type", formType.c_str());
CheckKeyForNull("at", formAt.c_str());
//CheckKeyForNull("date", formDate.c_str());
CheckKeyForNull("seller.address", formSellerAddress.c_str());
CheckKeyForNull("customer.address", formCustomerAddress.c_str());
CheckKeyForNull("payment.sum", formPaymentSum.c_str());
@@ -753,6 +755,7 @@ namespace Apostol {
Deal["at"] = formAt.c_str();
Deal["date"] = formDate.IsEmpty() ? UTCFormat(DateToString(UTC())).c_str() : formDate.c_str();
Deal["salt"] = formSalt.IsEmpty() ? GenSalt().c_str() : formSalt.c_str();
YAML::Node Seller = Deal["seller"];