Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / oe / check_for_direct_delivery.html
diff --git a/templates/webpages/oe/check_for_direct_delivery.html b/templates/webpages/oe/check_for_direct_delivery.html

index abe1aeb..8160188 100644 (file)
--- a/templates/webpages/oe/check_for_direct_delivery.html
+++ b/templates/webpages/oe/check_for_direct_delivery.html
@@ -1,8 +1,6 @@
  [%- USE T8 %]
  [%- USE HTML %]
-<body>
-
- <div class="listtop" width="100%">[% 'Carry over shipping address' | $T8 %]</div>
+<h1>[% 'Carry over shipping address' | $T8 %]</h1>
  
   <p>[% 'You have entered or selected the following shipping address for this customer:' | $T8 %]</p>
  
@@ -43,6 +41,11 @@
      <td valign="top">[% HTML.escape(CFDD_shiptocountry) %]</td>
     </tr>
  
+   <tr>
+    <th align="right" valign="top">[% 'GLN' | $T8 %]:</th>
+    <td valign="top">[% HTML.escape(CFDD_shiptogln) %]</td>
+   </tr>
+
     <tr>
      <th align="right" valign="top">[% 'Contact' | $T8 %]:</th>
      <td valign="top">[% HTML.escape(CFDD_shiptocontact) %]</td>
@@ -62,6 +65,13 @@
      <th align="right" valign="top">[% 'E-mail' | $T8 %]:</th>
      <td valign="top">[% HTML.escape(CFDD_shiptoemail) %]</td>
     </tr>
+
+[% FOREACH var = cvars %]
+   <tr valign="top">
+    <th align="right" nowrap>[% HTML.escape(var.config.description) %]</th>
+    <td>[% HTML.escape(var.value_as_text) %]</td>
+   </tr>
+[% END %]
    </table>
   </p>
  
@@ -84,5 +94,3 @@
  
   </form>
  
-</body>
-</html>