FMHN#86573: Reservering blokkeren bij onbeschikbaar verbruiksartikel.

svn path=/Website/trunk/; revision=67576
This commit is contained in:
Maykel Geerdink
2025-01-13 13:11:08 +00:00
parent 51cd985ac2
commit 6b1894ee87

View File

@@ -75,6 +75,13 @@ if (S("res_fe_allow_dirty") != 1 && this_res.canChangeFEOnly) {
+ " end if;"
}
var art_dirty_sql = "";
if (!(S("res_fo_catering_scopeless") && (urole == "fo" || urole == "bo")))
{ // Controle of artikelen dirty zijn.
art_dirty_sql = " res.set_artikelen_dirty (" + rsv_ruimte_key + ");"
+ check_fail_sql;
}
var _disc_expires = []; // expire tijd per discipline
function is_expired(disc_key, jsDate)
{
@@ -782,6 +789,7 @@ for (var i = 0; i < r_a_key.length; i++)
+ " WHERE res_rsv_ruimte_key = " + rsv_ruimte_key
+ " AND res_artikel_key = " + r_a_key[i].key
+ " AND res_rsv_artikel_key = " + r_a_key[i].rsv_key + ";"
+ art_dirty_sql
+ " END;";
var err = Oracle.Execute(sql, true);
if (err.friendlyMsg)
@@ -901,12 +909,6 @@ for (var i = 0; i < a_arIns.length; i++)
var resArtIns = buildInsert("res_rsv_artikel", fields);
var rsv_artikel_key = resArtIns.sequences["res_rsv_artikel_key"];
var sql_insArt = resArtIns.sql;
var art_dirty_sql = "";
if (!(S("res_fo_catering_scopeless") && (urole == "fo" || urole == "bo")))
{ // Controle of artikelen dirty zijn.
art_dirty_sql = " res.set_artikelen_dirty (" + rsv_ruimte_key + ");"
+ check_fail_sql;
}
var sql = "BEGIN "
+ sql_insArt + "; "
+ art_dirty_sql