Merge branch 'WarehouseOffer/show-zweck' into 'master'
added showing purpose in warehouseoffer See merge request fronk/thetool!1724
This commit is contained in:
@@ -32,6 +32,7 @@ $texts = [
|
|||||||
'total' => 'Gesamtbetrag',
|
'total' => 'Gesamtbetrag',
|
||||||
'alternativeTotal' => 'Summe Alternativpositionen'
|
'alternativeTotal' => 'Summe Alternativpositionen'
|
||||||
],
|
],
|
||||||
|
'purpose' => 'Zweck / Projekt',
|
||||||
'alternativeHeader' => 'Alternativpositionen',
|
'alternativeHeader' => 'Alternativpositionen',
|
||||||
'notes' => 'Anmerkungen & Konditionen',
|
'notes' => 'Anmerkungen & Konditionen',
|
||||||
'defaultOfferText' => 'Vielen Dank für Ihre Anfrage. Es gelten unsere Allgemeinen Geschäftsbedingungen.',
|
'defaultOfferText' => 'Vielen Dank für Ihre Anfrage. Es gelten unsere Allgemeinen Geschäftsbedingungen.',
|
||||||
@@ -70,11 +71,11 @@ $formattedValidUntil = date("d.m.Y", strtotime("+14 days", $offerDate));
|
|||||||
<style>
|
<style>
|
||||||
body { font-family: "Open Sans", sans-serif, Verdana; font-size: 10px; color: #333; }
|
body { font-family: "Open Sans", sans-serif, Verdana; font-size: 10px; color: #333; }
|
||||||
h1 { text-align: center; color: #005384; font-size: 18px; margin-bottom: 20px; }
|
h1 { text-align: center; color: #005384; font-size: 18px; margin-bottom: 20px; }
|
||||||
.header-info table { width: 100%; border-collapse: collapse; font-size: 11px; margin-bottom: 20px; }
|
.header-info table { width: 100%; border-collapse: collapse; font-size: 11px; margin-bottom: 12px; }
|
||||||
.header-info td { padding: 2px 5px; }
|
.header-info td { padding: 2px 5px; }
|
||||||
.header-info .label { font-weight: bold; text-align: right; padding-right: 10px; width: 120px; }
|
.header-info .label { font-weight: bold; text-align: right; padding-right: 10px; width: 120px; }
|
||||||
|
|
||||||
#positionsTable { width: 100%; border-collapse: collapse; margin-top: 15px; margin-bottom: 15px; }
|
#positionsTable { width: 100%; border-collapse: collapse; margin-top: 8px; margin-bottom: 15px; }
|
||||||
#positionsTable th { border-bottom: 2px solid #005384; padding: 8px 4px; text-align: left; background-color: #f2f2f2; font-size: 10px; }
|
#positionsTable th { border-bottom: 2px solid #005384; padding: 8px 4px; text-align: left; background-color: #f2f2f2; font-size: 10px; }
|
||||||
#positionsTable td { border-bottom: 1px solid #e1e1e1; padding: 6px 4px; vertical-align: top; }
|
#positionsTable td { border-bottom: 1px solid #e1e1e1; padding: 6px 4px; vertical-align: top; }
|
||||||
|
|
||||||
@@ -123,6 +124,12 @@ $formattedValidUntil = date("d.m.Y", strtotime("+14 days", $offerDate));
|
|||||||
<td class="label"><?= $text['validUntilLabel'] ?></td>
|
<td class="label"><?= $text['validUntilLabel'] ?></td>
|
||||||
<td><?= $formattedValidUntil ?></td>
|
<td><?= $formattedValidUntil ?></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<?php if (!empty($offer->purpose)): ?>
|
||||||
|
<tr>
|
||||||
|
<td class="label" style="text-align: left; vertical-align: top; padding-top: 12px;"><?= $text['purpose'] ?></td>
|
||||||
|
<td colspan="3" style="padding-top: 12px;"><?= nl2br(htmlspecialchars($offer->purpose)) ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php endif; ?>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user