Skip to content
Snippets Groups Projects
Commit be69f1d2 authored by Mohamed Mansour's avatar Mohamed Mansour
Browse files

Fix bugs

parent 6b629340
No related branches found
No related tags found
No related merge requests found
Showing
with 49 additions and 17 deletions
......@@ -168,6 +168,14 @@
<name>OrderId_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>OrderStatus_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>Language_param</name>
<expose v="true" />
</entityParameter>
</children>
</entityProvider>
<entityField>
......@@ -220,6 +228,10 @@
<name>OrderStatus_param</name>
<expose v="true" />
</entityParameter>
<entityParameter>
<name>Language_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
......@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
......@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
import("Order_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
result.string(oiUtils.getNextItemPosition(vars.get("$field.ASSIGNEDTO")));
......
......@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
import("Order_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
result.string(oiUtils.getNextItemSort());
......
......@@ -2,5 +2,9 @@ import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string("0");
\ No newline at end of file
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null){
result.string("0");
}
\ No newline at end of file
......@@ -4,14 +4,21 @@ import("system.logging");
import("system.result");
import("Sql_lib");
if (vars.get("$this.value") == null)
{
var orderNo=vars.get("$param.OrderId_param");
if (vars.get("$this.value") == null) {
if (vars.get("$param.OrderId_param"))
{
var orderNo=vars.get("$param.OrderId_param");
logging.log(orderNo);
var status = db.array(db.ROW, SqlCondition.begin()
.andPrepare("SALESORDER.SALESORDERID", orderNo)
.buildSql("select ORDERSTATUS from SALESORDER", "1 = 0"));
result.string(status);
}
else {
result.string("0");
}
}
......@@ -2,9 +2,9 @@ import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
if(vars.exists("$param.OrderId_param") && vars.get("$param.OrderId_param") != null && vars.get("$param.OrderId_param") != "")
result.string(vars.getString("$param.OrderId_param"));
result.string(vars.get("$param.OrderId_param"));
}
......@@ -3,5 +3,5 @@ import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string(util.getNewUUID());
\ No newline at end of file
......@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
......@@ -4,10 +4,15 @@ import("system.vars");
import("system.result");
import("Order_lib");
var itemcount = db.cell(SqlCondition.begin()
.andPrepareVars("SALESORDERITEM.SALESORDER_ID", "$field.SALESORDER_ID")
.buildSql("select count(*) from SALESORDERITEM", "1=2"));
if (vars.get("$field.OrderStatus") == undefined){
result.string(false);
}
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
......
......@@ -4,10 +4,15 @@ import("system.vars");
import("system.result");
import("Order_lib");
var itemcount = db.cell(SqlCondition.begin()
.andPrepareVars("SALESORDERITEM.SALESORDER_ID", "$field.SALESORDER_ID")
.buildSql("select count(*) from SALESORDERITEM", "1=2"));
if (vars.get("$field.OrderStatus") == undefined){
result.string(false);
}
if (itemcount == "0" && vars.get("$field.OrderStatus") == "1" ) {
result.string(false);
}
......
......@@ -7,6 +7,7 @@ import("Order_lib");
import("Product_lib");
import("Sql_lib");
var rowdata = vars.get("$local.rowdata");
var oid = rowdata["SALESORDERITEM.SALESORDER_ID"];
......@@ -14,9 +15,8 @@ if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OrderItemUtils(rowdata["SALESORDERITEM.SALESORDER_ID"]);
oiUtils.insertPartsList(rowdata["SALESORDERITEM.PRODUCT_ID"], vars.get("$local.uid"), curr, contactid);
oiUtils.insertPartsList(rowdata["SALESORDERITEM.PRODUCT_ID"], vars.get("$local.uid"), curr, contactid, vars.get("$param.Language_param"));
oiUtils.reOrgItems();
//update order price
......@@ -25,5 +25,4 @@ if(oid != "")
db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", oid, "1 = 2"));
neon.refresh();
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment