Skip to content
Snippets Groups Projects
Commit 872852da authored by S.Listl's avatar S.Listl
Browse files

Refactoring

parent b6cf6d62
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 202 additions and 42 deletions
entity/Address_entity/conditionProcess.js
+ 2
− 2
View file @ 872852da
import("system.result");
import("system.vars");
if(vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param") != null && vars.get("$param.ContactId_param") != "")
if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
result.string("ADDRESS.CONTACT_ID = ('" + vars.getString("$param.ContactId_param") + "')");
else
result.string("1 = 1");
result.string("1=1");
entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js
+ 1
− 1
View file @ 872852da
import("system.result");
import("system.vars");
if(vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param") != null)
if(vars.exists("$param.AttributeId_param") && vars.get("$param.AttributeId_param"))
result.string("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = ('" + vars.getString("$param.AttributeId_param") + "')");
else
result.string("1 = 2");
\ No newline at end of file
entity/Offer_entity/entityfields/contact_id/onValueChange.js
+ 6
− 3
View file @ 872852da
import("Sql_lib");
import("system.neon");
import("system.vars");
import("system.db");
......@@ -9,9 +10,11 @@ var contactid = vars.get("local.value");
if(contactid != "")
{
//Language Preset
var relData = db.array(db.ROW, "select ISOLANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
if(relData[0] != "")
neon.setFieldValue("field.ISOLANGUAGE", relData[0]);
var lang = db.cell(SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", contactid)
.buildSql("select ISOLANGUAGE from CONTACT"));
if(lang != "")
neon.setFieldValue("field.ISOLANGUAGE", lang);
// set $field.CONTATCT_ORG_ID per contactid
var orgid = ContactUtils.getPersOrgIds(contactid);
......
entity/Offer_entity/entityfields/contact_id/valueProcess.js
+ 5
− 3
View file @ 872852da
......@@ -20,10 +20,12 @@ if ((!vars.exists("$param.ContactId_param") || !vars.get("$param.ContactId_param
if (contactId)
{
var relData = db.array(db.ROW, "select ISOLANGUAGE from CONTACT where CONTACTID = '" + contactId + "'");
var lang = db.cell(SqlCondition.begin()
.andPrepare("CONTACT.CONTACTID", contactid)
.buildSql("select ISOLANGUAGE from CONTACT"));
if(relData[0] != "")
neon.setFieldValue("field.ISOLANGUAGE", relData[0]);
if(lang != "")
neon.setFieldValue("field.ISOLANGUAGE", lang);
result.string(contactId);
}
\ No newline at end of file
entity/Offer_entity/entityfields/footer/valueProcess.js
+ 4
− 2
View file @ 872852da
......@@ -12,10 +12,12 @@ 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!")
result.string("Vielen Dank!"); //TODO: translate
if (vars.get("$field.ChoosenTEXFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChoosenTEXFooter") + "'", SqlUtils.getSystemAlias());
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXFooter")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getSystemAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getSystemAlias())));
}
\ No newline at end of file
entity/Offer_entity/entityfields/header/valueProcess.js
+ 6
− 4
View file @ 872852da
import("Sql_lib");
import("system.logging");
import("system.result");
import("system.vars");
......@@ -12,11 +13,12 @@ else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:")
result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translate
if (vars.get("$field.ChoosenTEXHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChoosenTEXHeader") + "'", "_____SYSTEMALIAS");
logging.log(binaryId);
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXHeader")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getSystemAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getSystemAlias())));
}
\ No newline at end of file
entity/Offer_entity/onDBDelete.js
+ 2
− 1
View file @ 872852da
import("Sql_lib");
import("system.vars");
import("system.db");
db.deleteData("OFFERITEM", "OFFERITEM.OFFER_ID = '" + vars.getString("$field.OFFERID") + "'");
\ No newline at end of file
db.deleteData("OFFERITEM", SqlCondition.equals("OFFERITEM.OFFER_ID", vars.getString("$field.OFFERID"), "1=2"));
\ No newline at end of file
entity/Offer_entity/recordcontainers/db/onDBDelete.js
+ 2
− 1
View file @ 872852da
import("Sql_lib");
import("system.vars");
import("system.db");
db.deleteData("OFFERITEM", "OFFERITEM.OFFER_ID = '" + vars.getString("$field.OFFERID") + "'");
\ No newline at end of file
db.deleteData("OFFERITEM", SqlCondition.equals("OFFERITEM.OFFER_ID", vars.getString("$field.OFFERID"), "1=2"));
\ No newline at end of file
entity/Order_entity/entityfields/footer/valueProcess.js
+ 16
− 14
View file @ 872852da
import("Sql_lib");
import("system.result");
import("system.vars");
import("system.neon");
......@@ -6,21 +7,22 @@ import("system.util");
if (vars.get("$this.value") == null)
{
if (vars.exists("$param.OrderFooter_param"))
{
result.string(vars.get("$param.OrderFooter_param"));
}
if (vars.exists("$param.OrderFooter_param"))
{
result.string(vars.get("$param.OrderFooter_param"));
}
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Danke sehr:")
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Danke sehr:"); //TODO: translate
if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexFooter") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
if (vars.get("$field.ChosenTexFooter") != "")
{
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getSystemAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getSystemAlias())));
}
}
\ No newline at end of file
entity/Order_entity/entityfields/header/valueProcess.js
+ 14
− 11
View file @ 872852da
import("Sql_lib");
import("system.result");
import("system.vars");
import("system.neon");
......@@ -6,18 +7,20 @@ import("system.util");
if (vars.get("$this.value") == null)
{
if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param"))
result.string(vars.get("$param.OrderHeader_param"));
if(vars.exists("$param.OrderHeader_param") && vars.get("$param.OrderHeader_param"))
result.string(vars.get("$param.OrderHeader_param"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$this.value"))
result.string(vars.get("$this.value"));
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:")
else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("Gerne bieten wir Ihnen wie folgt an:"); //TODO: translation
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.ChosenTexHeader") + "'", "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
if (vars.get("$field.ChosenTexHeader") != "")
{
var binaryId = db.cell(SqlCondition.begin()
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getSystemAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getSystemAlias())));
}
}
\ No newline at end of file
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+ 3
− 0
View file @ 872852da
......@@ -5076,6 +5076,9 @@
<entry>
<key>This error should never appear - contact administrator.</key>
</entry>
<entry>
<key>Entrydate (Year)</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+ 138
− 0
View file @ 872852da
......@@ -6249,6 +6249,144 @@
<entry>
<key>Credit</key>
</entry>
<entry>
<key>Reminder</key>
</entry>
<entry>
<key>versendet</key>
</entry>
<entry>
<key>Netto</key>
</entry>
<entry>
<key>Only </key>
</entry>
<entry>
<key>Währung</key>
</entry>
<entry>
<key>Transfer to Invoice</key>
</entry>
<entry>
<key>Pay due date</key>
</entry>
<entry>
<key>No duplicates allowed: action '</key>
</entry>
<entry>
<key>Payment address</key>
</entry>
<entry>
<key>Texts</key>
</entry>
<entry>
<key>Print reminder</key>
</entry>
<entry>
<key>keine Standard-E-Mail Büro vorhanden !</key>
</entry>
<entry>
<key>Rech.-Betrag</key>
</entry>
<entry>
<key>Order date</key>
</entry>
<entry>
<key>Due date</key>
</entry>
<entry>
<key>Order amount</key>
</entry>
<entry>
<key>Belegdatum</key>
</entry>
<entry>
<key>Firma</key>
</entry>
<entry>
<key>Choose payment address</key>
</entry>
<entry>
<key>Adds the selection to a bulk mail</key>
</entry>
<entry>
<key>Order number</key>
</entry>
<entry>
<key>Paid</key>
</entry>
<entry>
<key>Empty actions are not allowed!</key>
</entry>
<entry>
<key>Dunning level</key>
</entry>
<entry>
<key>Print order</key>
</entry>
<entry>
<key>Beleg</key>
</entry>
<entry>
<key>Order Type</key>
</entry>
<entry>
<key>Notice</key>
</entry>
<entry>
<key>Bitte einen Adressat in 'to' eintragen!</key>
</entry>
<entry>
<key>Dunning text</key>
</entry>
<entry>
<key>Choose delivery address</key>
</entry>
<entry>
<key>Links</key>
</entry>
<entry>
<key>geprüft</key>
</entry>
<entry>
<key>Mahnung</key>
</entry>
<entry>
<key>Set dunning</key>
</entry>
<entry>
<key>Beleg-Nr.</key>
</entry>
<entry>
<key>Adds the selection to a serial letter</key>
</entry>
<entry>
<key>Cancel</key>
</entry>
<entry>
<key>Set to sent</key>
</entry>
<entry>
<key>Due</key>
</entry>
<entry>
<key>Set paid amount</key>
</entry>
<entry>
<key>Belegliste</key>
</entry>
<entry>
<key>Pay date</key>
</entry>
<entry>
<key>This error should never appear - contact administrator.</key>
</entry>
<entry>
<key>Transfer to delivery note</key>
</entry>
<entry>
<key>Dunning date</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+ 3
− 0
View file @ 872852da
......@@ -5126,6 +5126,9 @@
<entry>
<key>This error should never appear - contact administrator.</key>
</entry>
<entry>
<key>Entrydate (Year)</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment