admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARAI#56318 Behandelaar wordt niet opgeslagen bij opdracht (mobile)

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40736
This commit is contained in:
Erik Groener
2019-01-30 13:21:18 +00:00
parent 9977411360
commit 6170e52e66
1 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
APPL/PDA/order.asp
View File

@@ -164,6 +164,11 @@ if (mld_opdr.uitv_type == "B")
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_goedkeur").format(opdr_nr)))
{
opdr_submit_first(opdr_goedkeur_callback);
}
}
function opdr_goedkeur_callback()
{
var data = { opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
@@ -172,13 +177,18 @@ if (mld_opdr.uitv_type == "B")
, McltCallbackAndThenAlways(opdr_action_callback)
, "json"
);
}
}
function opdr_approve()
{
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_approve").format(opdr_nr)))
{
opdr_submit_first(opdr_approve_callback);
}
}
function opdr_approve_callback()
{
var data = { opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
@@ -187,8 +197,8 @@ if (mld_opdr.uitv_type == "B")
, McltCallbackAndThenAlways(opdr_action_callback)
, "json"
);
}
}
function opdr_accept()
{
var opdr_nr = "<%=mld_opdr.srtdiscprefix + mld_opdr.mld_key + "/" + mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
@@ -197,32 +207,19 @@ if (mld_opdr.uitv_type == "B")
: L("lcl_mld_opdr_accept").format(opdr_nr));
if (confirm(confirmtekst))
{
var data = { opdr_key: <%=opdr_key%> };
<% protectRequest.dataToken("data"); %>
$.post( "<%=rooturl%>/appl/mld/opdr_accept_save.asp",
data,
McltCallbackRefresh,
"json"
);
opdr_submit_first(opdr_accept_callback);
}
}
function opdr_cancel()
function opdr_accept_callback()
{
var opmerk = prompt(L("lcl_mld_opdr_cancel"), "");
if (!opmerk)
return;
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
//if (confirm(L("lcl_mld_opdr_cancel").format(opdr_nr)))
{
var data = { opdr_key: <%=opdr_key%>
, opmerk: opmerk //L("lcl_mld_opdr_canceledbymobile")
};
<% protectRequest.dataToken("data"); %>
$.post("<%=rooturl%>/appl/mld/opdr_cancel_save.asp"
$.post( "<%=rooturl%>/appl/mld/opdr_accept_save.asp"
, data
, McltCallbackAndThenAlways(opdr_action_callback)
, "json");
}
, McltCallbackRefresh
, "json"
);
}
function opdr_reject()
@@ -233,46 +230,63 @@ if (mld_opdr.uitv_type == "B")
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_reject").format(opdr_nr)))
{
opdr_submit_first(opdr_reject_callback(opmerk));
}
}
function opdr_reject_callback(opm)
{
var data = { opdr_key: <%=opdr_key%>
, opmerk: opmerk //L("lcl_mld_opdr_rejectedbymobile")
, opmerk: opm //L("lcl_mld_opdr_rejectedbymobile")
};
<% protectRequest.dataToken("data"); %>
$.post("<%=rooturl%>/appl/mld/opdr_reject_save.asp"
$.post( "<%=rooturl%>/appl/mld/opdr_reject_save.asp"
, data
, McltCallbackAndThenAlways(opdr_action_callback)
, "json");
}
}
function opdr_accept_offer()
{
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_approve").format(opdr_nr)))
{
opdr_submit_first(opdr_accept_offer_callback);
}
}
function opdr_accept_offer_callback()
{
var murl = "?opdr_key=<%=opdr_key%>&submit=1";
var data = { opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("<%=rooturl%>/appl/mld/opdr_accept_offer_save.asp" + murl
$.post( "<%=rooturl%>/appl/mld/opdr_accept_offer_save.asp" + murl
, data
, McltCallbackAndThenAlways(opdr_action_callback)
, "json");
}
, "json"
);
}
function opdr_reject_offer()
{
var opdr_nr = "<%=mld_opdr.mld_key%>/<%=mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_reject").format(opdr_nr)))
{
opdr_submit_first(opdr_reject_offer_callback);
}
}
function opdr_reject_offer_callback()
{
var murl = "?opdr_key=<%=opdr_key%>&submit=1";
var data = { opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("<%=rooturl%>/appl/mld/opdr_reject_offer_save.asp" + murl
$.post( "<%=rooturl%>/appl/mld/opdr_reject_offer_save.asp" + murl
, data
, McltCallbackAndThenAlways(opdr_action_callback)
, "json");
}
, "json"
);
}
function opdr_action_callback()
{
//window.location.href = "fiat_list.asp"; // Als je terug bent in fiat_list en doet dan "terug" kom je in de zojuist gefiatteerde opdracht.
@@ -281,34 +295,31 @@ if (mld_opdr.uitv_type == "B")
window.history.go(-1);
}
function opdr_halt_submit()
{
var data = $("[name=haltform]").serialize();
protectRequest.dataToken(data);
$.post($("form[name=haltform]")[0].action,
data,
McltCallbackAndThenAlways(function() { window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>"; }),
"json");
return false;
}
function opdr_halt()
{
var opdr_nr = "<%=mld_opdr.srtdiscprefix + mld_opdr.mld_key + "/" + mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_hlt").format(opdr_nr)))
{
window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>&hlt=1";
opdr_submit_first(opdr_halt_callback);
}
}
function opdr_halt_callback()
{
window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>&hlt=1";
}
function opdr_resume()
{
var opdr_nr = "<%=mld_opdr.srtdiscprefix + mld_opdr.mld_key + "/" + mld_opdr.mld_opdr_bedrijfopdr_volgnr%>";
if (confirm(L("lcl_mld_opdr_rsm").format(opdr_nr)))
{
window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>&rsm=1";
opdr_submit_first(opdr_resume_callback);
}
}
function opdr_resume_callback()
{
window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>&rsm=1";
}
function opdr_close()
{
@@ -328,7 +339,7 @@ if (mld_opdr.uitv_type == "B")
return false;
}
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), opdr_close_callback_1, "json");
opdr_submit_first(opdr_close_callback_1);
return false;
}
@@ -344,7 +355,7 @@ if (mld_opdr.uitv_type == "B")
window.location.href = "<%=rooturl%>/appl/pda/orders_list.asp";
}
function opdr_submit()
function opdr_submit_first(callback_function)
{
// Als totaalkosten verplicht is, moet er een waarde > 0 zijn ingevuld.
if ((opdrkosten_verplicht) && (parseFloat($("#tot_kosten").val().replace(',', '.')) == "0.00"))
@@ -352,10 +363,18 @@ if (mld_opdr.uitv_type == "B")
if (!validateForm("u2"))
return false;
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), McltCallbackAndThenAlways(opdr_submit_callback), "json");
return true;
$.post( $("form[name=u2]")[0].action
, $("[name=u2]").serialize()
, McltCallbackAndThenAlways(callback_function)
, "json"
);
}
function opdr_submit()
{
opdr_submit_first(opdr_submit_callback);
return true;
}
function opdr_submit_callback(json)
{
if (json.success)
@@ -373,12 +392,22 @@ if (mld_opdr.uitv_type == "B")
}
}
function opdr_halt_submit()
{
var data = $("[name=haltform]").serialize();
protectRequest.dataToken(data);
$.post($("form[name=haltform]")[0].action,
data,
McltCallbackAndThenAlways(function() { window.location.href = "<%=rooturl%>/appl/pda/order.asp?opdr_key=<%=opdr_key%>"; }),
"json");
return false;
}
function opdr_cancel_submit()
{
$.post($("form[name=cancelform]")[0].action, $("[name=cancelform]").serialize(), McltCallbackAndThenAlways(opdr_cancel_submit_callback), "json");
return false;
}
function opdr_cancel_submit_callback(json)
{
if (json.success)
@@ -458,8 +487,11 @@ if (mld_opdr.uitv_type == "B")
<input type="hidden" name="t_opdr" value="<%=opdr_type%>"/>
<input type="hidden" name="uitvoerende" value="<%=uitv_key%>"/>
<input type="hidden" name="uitvkeystr" value="<%=uitv_key%>"/>
<input type="hidden" name="behandelaar" value="<%=mld_opdr.contactpers_key%>"/>
<%
if (pbtype != "BI")
{
%> <input type="hidden" name="behandelaar" value="<%=mld_opdr.contactpers_key%>"/> <%
}
BLOCK_START({collapsed: true, title: mld_opdr.opdr_type_omschr});
if (mld_opdr.uitvoerende_key && mld_opdr.uitvoerende_key > 0)