Feedback status has been updated.

This commit is contained in:
Преподобный Ален
2025-10-25 15:56:58 +03:00
parent 22a2511f06
commit 1657e93861
3 changed files with 21 additions and 7 deletions

15
configure vendored
View File

@@ -14,6 +14,8 @@ set -e
PROJECT_NAME=apostol-dm PROJECT_NAME=apostol-dm
BUILD_TYPE=Release BUILD_TYPE=Release
PULL_SELF=yes
PULL_GITHUB=yes
pop_directory() pop_directory()
{ {
@@ -61,6 +63,8 @@ display_help()
display_message " --release Release build (default)." display_message " --release Release build (default)."
display_message " --debug Debug build." display_message " --debug Debug build."
display_message " --update Update build." display_message " --update Update build."
display_message " --not-pull-self Not pull self."
display_message " --not-pull-github Not pull from GitHub."
display_message " --help Display usage, overriding script execution." display_message " --help Display usage, overriding script execution."
display_message "" display_message ""
} }
@@ -106,7 +110,10 @@ download_from_github()
github() github()
{ {
display_heading_message "Updating the current project" display_heading_message "Updating the current project"
git pull
if [[ $PULL_SELF == yes ]]; then
git pull
fi
download_from_github src/lib ufocomp libdelphi master delphi download_from_github src/lib ufocomp libdelphi master delphi
download_from_github src apostoldevel apostol-core master core download_from_github src apostoldevel apostol-core master core
@@ -135,7 +142,9 @@ make_configuration()
echo '#define AUTO_VERSION _T("1.0.e00000-b0")' > version.h echo '#define AUTO_VERSION _T("1.0.e00000-b0")' > version.h
github if [[ $PULL_GITHUB == yes ]]; then
github
fi
display_heading_message "Make: $PROJECT_NAME" display_heading_message "Make: $PROJECT_NAME"
@@ -155,6 +164,8 @@ for OPTION in "$@"; do
(--debug) BUILD_TYPE="Debug";; (--debug) BUILD_TYPE="Debug";;
(--update) BUILD_UPDATE="yes";; (--update) BUILD_UPDATE="yes";;
(--not-pull-self) PULL_SELF="no";;
(--not-pull-github) PULL_GITHUB="no";;
# Unique script options. # Unique script options.
(--build-dir=*) BUILD_DIR="${OPTION#*=}";; (--build-dir=*) BUILD_DIR="${OPTION#*=}";;

View File

@@ -284,7 +284,9 @@ namespace Apostol {
CFeedBackStatus DealData::StringToFeedBackStatus(const CString &Value) { CFeedBackStatus DealData::StringToFeedBackStatus(const CString &Value) {
const CString &Status = Value.Lower(); const CString &Status = Value.Lower();
if (Status == "negative") { if (Status == "none") {
return fsNone;
} else if (Status == "negative") {
return fsNegative; return fsNegative;
} else if (Status == "neutral") { } else if (Status == "neutral") {
return fsNeutral; return fsNeutral;
@@ -305,7 +307,7 @@ namespace Apostol {
case fsPositive: case fsPositive:
return "Positive"; return "Positive";
default: default:
return "Unknown"; return "None";
} }
} }
//-------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------
@@ -542,7 +544,8 @@ namespace Apostol {
m_Data.Date = UTCFormat(DateToString(Date)); m_Data.Date = UTCFormat(DateToString(Date));
m_Data.Salt = deal["salt"].as<std::string>(); if (deal["salt"])
m_Data.Salt = deal["salt"].as<std::string>();
const auto& seller = deal["seller"]; const auto& seller = deal["seller"];
m_Data.Seller.Address = seller["address"].as<std::string>(); m_Data.Seller.Address = seller["address"].as<std::string>();

View File

@@ -165,11 +165,11 @@ namespace Apostol {
enum CDealType { dtPrepayment = 0, dtPostpayment }; enum CDealType { dtPrepayment = 0, dtPostpayment };
//-------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------
enum CFeedBackStatus { fsNegative = -1, fsNeutral = 0, fsPositive = 1 }; enum CFeedBackStatus { fsNone = -2, fsNegative = -1, fsNeutral = 0, fsPositive = 1 };
//-------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------
enum CDealOrder { doCreate = 0, doCreated, doSubmit, doSubmitted, doConfirm, doConfirmed, doPay, doPaid, doComplete, doCompleted, doCancel, doCancelled, enum CDealOrder { doCreate = 0, doCreated, doSubmit, doSubmitted, doConfirm, doConfirmed, doPay, doPaid, doComplete, doCompleted, doCancel, doCancelled,
doExecute, doExecuted, doDelete, doDeleted, doFail, doFailed, doFeedback }; doExecute, doExecuted, doDelete, doDeleted, doFail, doFailed, doFeedback };
//-------------------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------------------
typedef struct DealData { typedef struct DealData {