diff --git a/entity/Offer_entity/entityfields/footer/valueProcess.js b/entity/Offer_entity/entityfields/footer/valueProcess.js index 15f63197dcbb880641f74070d9bdbbd5bcd96d5d..86de6f0346e52f202e966716151e1d7faf3f9856 100644 --- a/entity/Offer_entity/entityfields/footer/valueProcess.js +++ b/entity/Offer_entity/entityfields/footer/valueProcess.js @@ -1,23 +1,23 @@ -import("Sql_lib"); -import("system.result"); -import("system.vars"); -import("system.neon"); -import("system.db"); -import("system.util"); - -if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param")) - result.string(vars.get("$param.OfferFooter_param")); - -else if(vars.get("$this.value")) - result.string(vars.get("$this.value")); - -else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) - result.string("Vielen Dank!"); //TODO: translate - -if (vars.get("$field.ChoosenTEXFooter") != "") -{ - var binaryId = db.cell(SqlCondition.begin() - .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXFooter") - .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias()); - result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias()))); +import("Sql_lib"); +import("system.result"); +import("system.vars"); +import("system.neon"); +import("system.db"); +import("system.util"); + +if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param")) + result.string(vars.get("$param.OfferFooter_param")); + +else if(vars.get("$this.value")) + result.string(vars.get("$this.value")); + +else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) + result.string("Vielen Dank!"); //TODO: translate + +if (vars.get("$field.ChoosenTEXFooter") != "") +{ + var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias()) + .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXFooter") + .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias()); + result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias()))); } \ No newline at end of file diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js index a06ff095b12adab740f92f0fd31539ebc47e1a98..1ccf4448bcc83821262175548c767a63eabcf08b 100644 --- a/entity/Offer_entity/entityfields/header/valueProcess.js +++ b/entity/Offer_entity/entityfields/header/valueProcess.js @@ -16,7 +16,7 @@ else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) if (vars.get("$field.ChoosenTEXHeader") != "") { - var binaryId = db.cell(SqlCondition.begin() + var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias()) .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXHeader") .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias()); result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias()))); diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js index c1f95afc6561ec8bfd0a494f291500999dd9adf6..1a9890c5fc6d584b1f94c1bcc406df6bbeca01d6 100644 --- a/entity/Order_entity/entityfields/footer/valueProcess.js +++ b/entity/Order_entity/entityfields/footer/valueProcess.js @@ -20,7 +20,7 @@ if (vars.get("$this.value") == null) if (vars.get("$field.ChosenTexFooter") != "") { - var binaryId = db.cell(SqlCondition.begin() + var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias()) .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter") .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias()); result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias()))); diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js index 7dd541dea0949f3933bfa9e55f6c58649c643132..2f1398f5c335bcfeed992e0fdaf04e3632591df2 100644 --- a/entity/Order_entity/entityfields/header/valueProcess.js +++ b/entity/Order_entity/entityfields/header/valueProcess.js @@ -18,7 +18,7 @@ if (vars.get("$this.value") == null) if (vars.get("$field.ChosenTexHeader") != "") { - var binaryId = db.cell(SqlCondition.begin() + var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias()) .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader") .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias()); result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));