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

PNBR#37746 Bestellingen: opmerkingen weergeven bij bestelopdracht

Browse Source 
svn path=/Website/trunk/; revision=31197
This commit is contained in:
Erik Groener
2016-10-24 12:11:46 +00:00
parent 317cb3cad4
commit 612266fa34
7 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
APPL/BES/bes.inc
View File

@@ -172,8 +172,15 @@
return result;
},
generateBesInfoBlock: function (bes_bestelling, show_leverancier) //edit_leverancier)
generateBesInfoBlock: function (bes_bestelling, show_leverancier, mode) //edit_leverancier)
{
if (bes_bestelling.bes_key == -1)
{
BLOCK_START("besInfo" , L("lcl_mld_new_bestelling"));
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {html: "rows='3'"} );
}
else
{
BLOCK_START("besInfo" , L("lcl_bes_key") + " " + S("bes_bestelling_prefix") + bes_bestelling.bes_key + (bes_bestelling.parent_key? "*" : ""));
if (bes_bestelling.satisfaction)
AFIELDTR("fld", L("lcl_res_beoordeling"), "", "", {rating: {score: bes_bestelling.satisfaction, note: bes_bestelling.satisfaction_op} });
@@ -351,6 +358,12 @@
ROFIELDTR ("fld", L("lcl_contract"), S("bes_bestelling_prefix") + bes_bestelling.bes_key, params);
}
}
if (mode == "RW")
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {html: "rows='3'"} );
else
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
}
BLOCK_END();
},
@@ -405,7 +418,8 @@
+ " , b.bes_bestelling_korting"
+ " , b.bes_bestelling_levkosten"
+ " , b.mld_melding_key"
+ " , bes_bestelling_opmerking"
+ " , b.bes_bestelling_opmerking"
+ " , b.bes_bestelling_lev_opm"
+ " , b.fac_activiteit_key"
+ " , b.bes_bestelling_parentkey"
+ " , b.bes_bestelling_satisfaction"
@@ -448,6 +462,7 @@
rfoBesKosten : oRs("bes_bestelling_korting").Value,
rfoLevKosten : oRs("bes_bestelling_levkosten").Value,
rfoOpmerking : oRs("bes_bestelling_opmerking").Value,
lev_opm : oRs("bes_bestelling_lev_opm").Value,
mld_adres_naam : oRs("mld_adres_naam").Value,
mld_adres_key : oRs("mld_adres_key").Value,
fac_activiteit_key : oRs("fac_activiteit_key").Value? oRs("fac_activiteit_key").Value : -1,

12
APPL/BES/bes_edit_bestelling.asp
View File

@@ -85,7 +85,7 @@ if (bes_key > 0)
}
else // nieuwe bestelling. Defaults bepalen
{
bes_bestelling = { bes_key: bes_key, dis_key: dis_key, fac_activiteit_key: act_key };
bes_bestelling = { bes_key: bes_key, dis_key: dis_key, fac_activiteit_key: act_key, lev_opm: "" };
var authparams = user.checkAutorisation(autfunction, false, dis_key); // verplicht, is toch niet veel gevraagd?
// Eigenlijk had je hier zonder rechten al nooit mogen komen maar soms lukt het via een deeplink
@@ -698,7 +698,7 @@ else // nieuwe bestelling. Defaults bepalen
%><input type='hidden' name='deliveryAddr' value='<%=bes_bestelling.mld_adres_key%>'><%
}
RWFIELDTR("delivery_place", "fld", L("lcl_bes_del_room"), bes_bestelling.afleverruimte,
RWFIELDTR("delivery_place", "fld", L("lcl_bes_del_room"), bes_bestelling.afleverruimte,
{
required: S("bes_afleverruimte_verplicht") == 1,
readonly: aflever_readonly,
@@ -706,11 +706,9 @@ else // nieuwe bestelling. Defaults bepalen
})
BLOCK_END();
if (bes_key > 0)
{
var show_leverancier = !(backo && bes_disc_info.isFreeArticle);
bes.generateBesInfoBlock(bes_bestelling, show_leverancier);
}
var show_leverancier = !(backo && bes_disc_info.isFreeArticle);
bes.generateBesInfoBlock(bes_bestelling, show_leverancier, "RW");
BLOCK_START("besFlex"+(S("bes_flexcolumns")!=1?"2":"") , L("lcl_bes_flexblok"));
%><tr><td class="besflex"><%

3
APPL/BES/bes_edit_bestelling_save.asp
View File

@@ -282,7 +282,8 @@ var fields = [ { dbs: "prs_perslid_key", typ: "key", val: prs_
{ dbs: "bes_bestelling_plaats", typ: "varchar", frm: "delivery_place", track: L("lcl_bes_del_room") },
{ dbs: "bes_bestelling_module", typ: "varchar", val: "BES" },
{ dbs: "bes_bestelling_levkosten", typ: "float", val: staffel_info.bes_kosten },
{ dbs: "bes_bestelling_korting", typ: "float", val: staffel_info.opdrachtkortingbedrag }
{ dbs: "bes_bestelling_korting", typ: "float", val: staffel_info.opdrachtkortingbedrag },
{ dbs: "bes_bestelling_lev_opm", typ: "varchar", frm: "lev_opm", track: L("lcl_bes_bestellling_lev_opm") }
];
var mld_key = getQParamInt("mld_key", -1);

2
APPL/BES/bes_edit_opdr.asp
View File

@@ -235,8 +235,10 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
emptyOption:(bes_bestelopdr.mld_adres_key_fac < 0? null : "")})
RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord
ROTEXTAREATR("fldtxt", L("lcl_bes_comment"), bes_bestelopdr.delivery_opmerk, {suppressEmpty: true});
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
BLOCK_END();
BLOCK_START("besOpdrItems", L("lcl_bes_geselecteerd"));
%>
<tr>

2
APPL/BES/bes_show_bestelling.asp
View File

@@ -209,7 +209,7 @@ IFRAMER_HEADER((bes_bestelling.fac_activiteit_key > 0? L("lcl_bes_frame_algemeen
}
BLOCK_END();
bes.generateBesInfoBlock(bes_bestelling, true);
bes.generateBesInfoBlock(bes_bestelling, true, "RO");
BLOCK_START("besFlex"+(S("bes_flexcolumns")!=1?"2":"") , L("lcl_bes_flexblok"));
%><tr><td class="besflex"><%

1
APPL/BES/bes_show_opdr.asp
View File

@@ -198,6 +198,7 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
ROFIELDTR("fld", L("lcl_bes_adres_fac"), !oRs1.eof ? oRs1("mld_adres_naam").value : '?');
ROTEXTAREATR("fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {id: "txt", suppressEmpty: true}); // Afhandeling, reden niet akkoord
ROTEXTAREATR("fldtxt", L("lcl_bes_comment"), bes_bestelopdr.delivery_opmerk, {id: "odtxt", suppressEmpty: true});
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
BLOCK_END();
BLOCK_START("besOpdrItems", L("lcl_bes_geselecteerd"));

4
APPL/PDA/bestelling.asp
View File

@@ -172,6 +172,10 @@ if (bes_key > -1)
ROFIELD("fld", L("lcl_bes_del_place"), bes_bestelling.mld_adres_naam);
ROFIELD("fld", L("lcl_bes_del_room") , bes_bestelling.afleverruimte);
//
BLOCK_START({collapsed: false, title: L("lcl_bes_delivery")});
ROFIELD("fld", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
BLOCK_END();
//
BLOCK_START({collapsed: true, title: L("lcl_bes_flexblok")});
generateFlexKenmerkCode ({ urole: urole
, bes_key: bes_bestelling.bes_key