From d8a1050371ffadc5a595cc1dfff123a2e578ba83 Mon Sep 17 00:00:00 2001 From: MaxBuhe01 Date: Fri, 6 Sep 2024 01:22:36 +0200 Subject: [PATCH] [OST726416][working-state][Changed] smarty-templates moving files and adjusting code --- .../documents/deliverynote/deliverynote.tpl | 0 .../deliverynote/deliverynoteNoLogo.tpl | 0 .../documents/deliverynote/inc/conclusion.tpl | 0 .../deliverynote/inc/informations.tpl | 0 .../deliverynote/inc/recipientAddress.tpl | 0 .../documents/deliverynote/inc/salutation.tpl | 0 .../documents/inc/elements/addressarea.tpl | 0 .../inc/elements/articlecostssummary.tpl | 0 .../documents/inc/elements/articlelist.tpl | 0 .../inc/elements/deliveryaddress.tpl | 0 .../documents/inc/elements/foldmarks.tpl | 0 .../documents/inc/elements/informations.tpl | 0 .../inc/elements/recipientAddress.tpl | 0 .../documents/inc/helper/rulers.tpl | 0 .../{flow => }/documents/inc/page/base.tpl | 0 .../{flow => }/documents/inc/page/footer.tpl | 0 .../{flow => }/documents/inc/page/header.tpl | 0 .../documents/inc/page/returnaddress.tpl | 0 .../documents/invoice/inc/conclusion.tpl | 0 .../documents/invoice/inc/informations.tpl | 0 .../documents/invoice/inc/payinfo.tpl | 0 .../documents/invoice/inc/salutation.tpl | 0 .../{flow => }/documents/invoice/invoice.tpl | 0 .../documents/invoice/invoiceNoLogo.tpl | 0 .../documents/deliverynote/inc/conclusion.tpl | 6 ----- .../deliverynote/inc/informations.tpl | 10 -------- .../deliverynote/inc/recipientAddress.tpl | 25 ------------------- .../documents/deliverynote/inc/salutation.tpl | 12 --------- 28 files changed, 53 deletions(-) rename views/smarty/{flow => }/documents/deliverynote/deliverynote.tpl (100%) rename views/smarty/{flow => }/documents/deliverynote/deliverynoteNoLogo.tpl (100%) rename views/smarty/{flow => }/documents/deliverynote/inc/conclusion.tpl (100%) rename views/smarty/{flow => }/documents/deliverynote/inc/informations.tpl (100%) rename views/smarty/{flow => }/documents/deliverynote/inc/recipientAddress.tpl (100%) rename views/smarty/{flow => }/documents/deliverynote/inc/salutation.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/addressarea.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/articlecostssummary.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/articlelist.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/deliveryaddress.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/foldmarks.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/informations.tpl (100%) rename views/smarty/{flow => }/documents/inc/elements/recipientAddress.tpl (100%) rename views/smarty/{flow => }/documents/inc/helper/rulers.tpl (100%) rename views/smarty/{flow => }/documents/inc/page/base.tpl (100%) rename views/smarty/{flow => }/documents/inc/page/footer.tpl (100%) rename views/smarty/{flow => }/documents/inc/page/header.tpl (100%) rename views/smarty/{flow => }/documents/inc/page/returnaddress.tpl (100%) rename views/smarty/{flow => }/documents/invoice/inc/conclusion.tpl (100%) rename views/smarty/{flow => }/documents/invoice/inc/informations.tpl (100%) rename views/smarty/{flow => }/documents/invoice/inc/payinfo.tpl (100%) rename views/smarty/{flow => }/documents/invoice/inc/salutation.tpl (100%) rename views/smarty/{flow => }/documents/invoice/invoice.tpl (100%) rename views/smarty/{flow => }/documents/invoice/invoiceNoLogo.tpl (100%) delete mode 100644 views/twig/admin/documents/deliverynote/inc/conclusion.tpl delete mode 100644 views/twig/admin/documents/deliverynote/inc/informations.tpl delete mode 100644 views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl delete mode 100644 views/twig/admin/documents/deliverynote/inc/salutation.tpl diff --git a/views/smarty/flow/documents/deliverynote/deliverynote.tpl b/views/smarty/documents/deliverynote/deliverynote.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/deliverynote.tpl rename to views/smarty/documents/deliverynote/deliverynote.tpl diff --git a/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl b/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl rename to views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl diff --git a/views/smarty/flow/documents/deliverynote/inc/conclusion.tpl b/views/smarty/documents/deliverynote/inc/conclusion.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/inc/conclusion.tpl rename to views/smarty/documents/deliverynote/inc/conclusion.tpl diff --git a/views/smarty/flow/documents/deliverynote/inc/informations.tpl b/views/smarty/documents/deliverynote/inc/informations.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/inc/informations.tpl rename to views/smarty/documents/deliverynote/inc/informations.tpl diff --git a/views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl b/views/smarty/documents/deliverynote/inc/recipientAddress.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl rename to views/smarty/documents/deliverynote/inc/recipientAddress.tpl diff --git a/views/smarty/flow/documents/deliverynote/inc/salutation.tpl b/views/smarty/documents/deliverynote/inc/salutation.tpl similarity index 100% rename from views/smarty/flow/documents/deliverynote/inc/salutation.tpl rename to views/smarty/documents/deliverynote/inc/salutation.tpl diff --git a/views/smarty/flow/documents/inc/elements/addressarea.tpl b/views/smarty/documents/inc/elements/addressarea.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/addressarea.tpl rename to views/smarty/documents/inc/elements/addressarea.tpl diff --git a/views/smarty/flow/documents/inc/elements/articlecostssummary.tpl b/views/smarty/documents/inc/elements/articlecostssummary.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/articlecostssummary.tpl rename to views/smarty/documents/inc/elements/articlecostssummary.tpl diff --git a/views/smarty/flow/documents/inc/elements/articlelist.tpl b/views/smarty/documents/inc/elements/articlelist.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/articlelist.tpl rename to views/smarty/documents/inc/elements/articlelist.tpl diff --git a/views/smarty/flow/documents/inc/elements/deliveryaddress.tpl b/views/smarty/documents/inc/elements/deliveryaddress.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/deliveryaddress.tpl rename to views/smarty/documents/inc/elements/deliveryaddress.tpl diff --git a/views/smarty/flow/documents/inc/elements/foldmarks.tpl b/views/smarty/documents/inc/elements/foldmarks.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/foldmarks.tpl rename to views/smarty/documents/inc/elements/foldmarks.tpl diff --git a/views/smarty/flow/documents/inc/elements/informations.tpl b/views/smarty/documents/inc/elements/informations.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/informations.tpl rename to views/smarty/documents/inc/elements/informations.tpl diff --git a/views/smarty/flow/documents/inc/elements/recipientAddress.tpl b/views/smarty/documents/inc/elements/recipientAddress.tpl similarity index 100% rename from views/smarty/flow/documents/inc/elements/recipientAddress.tpl rename to views/smarty/documents/inc/elements/recipientAddress.tpl diff --git a/views/smarty/flow/documents/inc/helper/rulers.tpl b/views/smarty/documents/inc/helper/rulers.tpl similarity index 100% rename from views/smarty/flow/documents/inc/helper/rulers.tpl rename to views/smarty/documents/inc/helper/rulers.tpl diff --git a/views/smarty/flow/documents/inc/page/base.tpl b/views/smarty/documents/inc/page/base.tpl similarity index 100% rename from views/smarty/flow/documents/inc/page/base.tpl rename to views/smarty/documents/inc/page/base.tpl diff --git a/views/smarty/flow/documents/inc/page/footer.tpl b/views/smarty/documents/inc/page/footer.tpl similarity index 100% rename from views/smarty/flow/documents/inc/page/footer.tpl rename to views/smarty/documents/inc/page/footer.tpl diff --git a/views/smarty/flow/documents/inc/page/header.tpl b/views/smarty/documents/inc/page/header.tpl similarity index 100% rename from views/smarty/flow/documents/inc/page/header.tpl rename to views/smarty/documents/inc/page/header.tpl diff --git a/views/smarty/flow/documents/inc/page/returnaddress.tpl b/views/smarty/documents/inc/page/returnaddress.tpl similarity index 100% rename from views/smarty/flow/documents/inc/page/returnaddress.tpl rename to views/smarty/documents/inc/page/returnaddress.tpl diff --git a/views/smarty/flow/documents/invoice/inc/conclusion.tpl b/views/smarty/documents/invoice/inc/conclusion.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/inc/conclusion.tpl rename to views/smarty/documents/invoice/inc/conclusion.tpl diff --git a/views/smarty/flow/documents/invoice/inc/informations.tpl b/views/smarty/documents/invoice/inc/informations.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/inc/informations.tpl rename to views/smarty/documents/invoice/inc/informations.tpl diff --git a/views/smarty/flow/documents/invoice/inc/payinfo.tpl b/views/smarty/documents/invoice/inc/payinfo.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/inc/payinfo.tpl rename to views/smarty/documents/invoice/inc/payinfo.tpl diff --git a/views/smarty/flow/documents/invoice/inc/salutation.tpl b/views/smarty/documents/invoice/inc/salutation.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/inc/salutation.tpl rename to views/smarty/documents/invoice/inc/salutation.tpl diff --git a/views/smarty/flow/documents/invoice/invoice.tpl b/views/smarty/documents/invoice/invoice.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/invoice.tpl rename to views/smarty/documents/invoice/invoice.tpl diff --git a/views/smarty/flow/documents/invoice/invoiceNoLogo.tpl b/views/smarty/documents/invoice/invoiceNoLogo.tpl similarity index 100% rename from views/smarty/flow/documents/invoice/invoiceNoLogo.tpl rename to views/smarty/documents/invoice/invoiceNoLogo.tpl diff --git a/views/twig/admin/documents/deliverynote/inc/conclusion.tpl b/views/twig/admin/documents/deliverynote/inc/conclusion.tpl deleted file mode 100644 index 45544e6..0000000 --- a/views/twig/admin/documents/deliverynote/inc/conclusion.tpl +++ /dev/null @@ -1,6 +0,0 @@ -[{block name="conclusion"}] - - [{block name="conclusion_thankyou"}] - [{/block}] - -[{/block}] \ No newline at end of file diff --git a/views/twig/admin/documents/deliverynote/inc/informations.tpl b/views/twig/admin/documents/deliverynote/inc/informations.tpl deleted file mode 100644 index 2ce19fb..0000000 --- a/views/twig/admin/documents/deliverynote/inc/informations.tpl +++ /dev/null @@ -1,10 +0,0 @@ -[{block name="informations"}] -
- [{block name="pdfDocumentInformations"}] -
- [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] - [{oxmultilang ident="D3_PDFDOCUMENTS_DATE" suffix="COLON"}] [{$smarty.now|date_format:$dateFormat}] -
- [{/block}] -
-[{/block}] \ No newline at end of file diff --git a/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl b/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl deleted file mode 100644 index e872462..0000000 --- a/views/twig/admin/documents/deliverynote/inc/recipientAddress.tpl +++ /dev/null @@ -1,25 +0,0 @@ -[{block name="recipientaddress"}] - [{if $order->getFieldData('oxdellname')}] - [{if $order->getFieldData('oxdelcompany')}] -
[{$order->getFieldData('oxdelcompany')}]
- [{/if}] -
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
- [{if $order->getFieldData('oxdeladdinfo')}] -
[{$order->getFieldData('oxdeladdinfo')}]
- [{/if}] -
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
-
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
-
[{$order->getFieldData('oxdelcountry')}]
- [{else}] - [{if $order->getFieldData('oxbillcompany')}] -
[{$order->getFieldData('oxbillcompany')}]
- [{/if}] -
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
- [{if $order->getFieldData('oxbilladdinfo')}] -
[{$order->getFieldData('oxbilladdinfo')}]
- [{/if}] -
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
-
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
-
[{$order->getFieldData('oxbillcountry')}]
- [{/if}] -[{/block}] \ No newline at end of file diff --git a/views/twig/admin/documents/deliverynote/inc/salutation.tpl b/views/twig/admin/documents/deliverynote/inc/salutation.tpl deleted file mode 100644 index 3a81ac1..0000000 --- a/views/twig/admin/documents/deliverynote/inc/salutation.tpl +++ /dev/null @@ -1,12 +0,0 @@ -[{block name="salutation"}] -
-
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]
- - [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] - [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}] - [{assign var="aArgs" value="//"|explode:$sArgs}] - -
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]
-
-[{/block}] \ No newline at end of file