Revision 78e36cfd
Von Bernd Bleßmann vor mehr als 7 Jahren hinzugefügt
SL/Controller/Order.pm | ||
---|---|---|
my $row_as_html = $self->p->render('order/tabs/_row',
|
||
ITEM => $item,
|
||
ID => $item_id,
|
||
TYPE => $self->type,
|
||
ALL_PRICE_FACTORS => $self->all_price_factors
|
||
);
|
||
|
||
... | ... | |
my $row_as_html = $self->p->render('order/tabs/_row',
|
||
ITEM => $item,
|
||
ID => $item_id,
|
||
TYPE => $self->type,
|
||
ALL_PRICE_FACTORS => $self->all_price_factors
|
||
);
|
||
$self->js
|
||
... | ... | |
my $row_as_html = $self->p->render('order/tabs/_row',
|
||
ITEM => $item,
|
||
ID => $item_id,
|
||
TYPE => $self->type,
|
||
ALL_PRICE_FACTORS => $self->all_price_factors
|
||
);
|
||
|
||
... | ... | |
$item->parse_custom_variable_values;
|
||
}
|
||
|
||
my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item);
|
||
my $row_as_html = $self->p->render('order/tabs/_second_row', ITEM => $item, TYPE => $self->type);
|
||
|
||
$self->js
|
||
->html('.row_entry:has(#item_' . $item_id . ') [name = "second_row"]', $row_as_html)
|
templates/webpages/order/tabs/_row.html | ||
---|---|---|
<td colspan="100%">
|
||
[%- IF MYCONFIG.show_form_details %]
|
||
<div name="second_row" data-loaded="1">
|
||
[%- PROCESS order/tabs/_second_row.html ITEM=ITEM %]
|
||
[%- PROCESS order/tabs/_second_row.html ITEM=ITEM TYPE=TYPE %]
|
||
</div>
|
||
[%- ELSE %]
|
||
<div name="second_row">
|
templates/webpages/order/tabs/_second_row.html | ||
---|---|---|
[% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]
|
||
<b>[%- 'Subtotal' | $T8 %]</b>
|
||
[% L.yes_no_tag("order.orderitems[].subtotal", ITEM.subtotal) %]
|
||
[%- IF ITEM.order.is_sales %]
|
||
[%- IF TYPE == "sales_order" %]
|
||
<b>[%- 'Ertrag' | $T8 %]</b>
|
||
<span name="linemargin">
|
||
<span[%- IF ITEM.marge_total < 0 -%] class="plus0"[%- END -%]>
|
templates/webpages/order/tabs/basic_data.html | ||
---|---|---|
</thead>
|
||
|
||
[%- FOREACH item = SELF.order.items_sorted %]
|
||
[%- PROCESS order/tabs/_row.html ITEM=item ID=item.id ALL_PRICE_FACTORS=SELF.all_price_factors %]
|
||
[%- PROCESS order/tabs/_row.html ITEM=item ID=item.id TYPE=SELF.type ALL_PRICE_FACTORS=SELF.all_price_factors %]
|
||
[%- END %]
|
||
|
||
</table>
|
Auch abrufbar als: Unified diff
Auftrags-Controller: Fehler bei Anzeige von EK und Marge in 2. Zeile behoben
Wenn das Order-Objekt noch nicht gespeichert ist, kann darauf nicht über
$item->order zugegriffen werden. Darum muss an die 2. Zeile eine weitere
Variable durchgereicht werden, um zu bestimmen, ob wir im Verkauf sind und
EK und Margen angezeigt werden sollen.