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

DIAN#52892 hide_cost ook aan bes_show_bestelling.asp toegevoegd

Browse Source 
svn path=/Website/trunk/; revision=38095
This commit is contained in:
Koen Reefman
2018-06-07 07:30:12 +00:00
parent e8a6edfd89
commit cde4f309c4
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/BES/bes_show_bestelling.asp
View File

@@ -50,6 +50,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"],
+ "&key=" + bes_key
+ "&subject=" + Server.URLencode(subjectMail)
+ "&mailfrom=" + (hasFOBOread? 1 : 0);
var hide_cost = bes_disc_info.disc_params_hide_cost_fe && (urole == "fe" || frontend);
%>
<html>
<head>
@@ -57,7 +58,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"],
FCLTHeader.Generate();
%>
<script type="text/javascript" >
<script>
var details_Items = new Array(); // voor details.inc
</script>
<% generateDetails(bes_key); %>
@@ -264,6 +265,7 @@ var show_price = '<%=show_price%>';
var lower = false;
var inclBTW = <%=bes_bestelling.inclBTW%> == 1;
var fotomode = <%=bes_disc_info.fotomode%>;
var hide_cost = <%=(hide_cost ? "true" : "false")%>;
function bes_accept()
{
@@ -315,11 +317,17 @@ function bes_reject()
<th><%=L("lcl_bes_srtdeel_nr")%></th>
<th><%=L("lcl_bes_srtdeel")%></th>
<th><%=L("lcl_bes_unity")%></th>
<% if (!hide_cost)
{ %>
<th style="text-align:right"><%=L("lcl_bes_price_per_unity")%></th>
<th style="text-align:right"><%=L("lcl_btw_percentage")%></th>
<% } %>
<th style="text-align:right"><%=L("lcl_bes_amount")%></th>
<th style="text-align:right"><%=L("lcl_bes_geleverd")%></th>
<% if (!hide_cost)
{ %>
<th style="text-align:right" <% = show_price ? "" : " style='display:none;'" %> ><%=L("lcl_bes_subtotal")%></th>
<% } %>
</tr>
</thead>
<tbody>
@@ -328,7 +336,7 @@ function bes_reject()
</table>
<br>
<%
if (show_price)
if (show_price && !hide_cost)
{
%>
<table align="right"><%

1
APPL/BES/sel_items_tab.js
View File

@@ -279,7 +279,6 @@ function CreateRow(bes_item_info, aantal, received, editable, objFlex, urole)
var tr = table.insertRow(-1);
if (bes_item_info.isFreeArticle)
{
tr.title = L("lcl_bes_free_artgroep");
}
else