Skip to content

Commit df8dffd

Browse files
vitek-rostislavvitek-rostislav
authored
product expected restocking date and order delivery calculation (#4715)
2 parents 8003317 + 7b1ffbb commit df8dffd

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎templates/content/closedDay/list.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% block h1 %}{{ 'Holidays and internal days'|trans }}{% endblock %}
77

88
{% block sub_title %}
9-
{{ 'The days are used to display proper stores opening hours and to calculate order withdrawal deadline.'|trans }}
9+
{{ 'The days are used to display proper stores opening hours, to calculate order withdrawal deadline, and to calculate the expected delivery date of transports.'|trans }}
1010
{% endblock %}
1111

1212
{% block main_content %}

‎templates/content/feed/feedDeliveryDaysForOutOfStockProductsInfo.html.twig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
<a href="https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf">DELIVERY_DAYS</a> setting in Mergado XML feed
99
</li>
1010
</ul>
11+
The value applies only to products without the "Expected restocking date" filled. Otherwise, the number of days is derived from that date.
1112
{% endtrans %}

‎translations/messages.cs.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,8 +2218,8 @@ msgstr "Nastavení obchodních podmínek"
22182218
msgid "The current list of URL addresses can be found in the project's repository in the \"storefront/config/routes.ts\" file."
22192219
msgstr "Aktuální seznam URL adres lze nalézt v repozitáři projektu v souboru \"storefront/config/routes.ts\"."
22202220

2221-
msgid "The days are used to display proper stores opening hours and to calculate order withdrawal deadline."
2222-
msgstr "Dny se používají k zobrazení správné otevírací doby prodejen a k výpočtu lhůty pro odstoupení od smlouvy u objednávky."
2221+
msgid "The days are used to display proper stores opening hours, to calculate order withdrawal deadline, and to calculate the expected delivery date of transports."
2222+
msgstr "Dny se používají k zobrazení správné otevírací doby prodejen, k výpočtu lhůty pro odstoupení od smlouvy u objednávky a k výpočtu předpokládaného data doručení doprav."
22232223

22242224
msgid "The password reset link you used is invalid, expired, or has already been used."
22252225
msgstr "Odkaz pro resetování hesla je neplatný, expirovaný nebo již byl použit."
@@ -2230,8 +2230,8 @@ msgstr "Produkt nemá specifikovaný název pro daný jazyk."
22302230
msgid "The product is no longer in the catalog. This was the catalog number at the time of the inquiry."
22312231
msgstr "Produkt již není v katalogu. Toto bylo katalogové číslo v době vytvoření poptávky."
22322232

2233-
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul>"
2234-
msgstr "Hodnota se používá pro: <ul> <li> nastavení <a href=\"https://napoveda.zbozi.cz/xml-feed/specifikace/#DELIVERY_DATE\">DELIVERY_DATE</a> v XML feedu Zbozi.cz</li> <li> nastavení <a href=\"https://www.mergado.cz/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-4.pdf\">DELIVERY_DAYS</a> v XML feedu Mergado</li> </ul>"
2233+
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul> The value applies only to products without the \"Expected restocking date\" filled. Otherwise, the number of days is derived from that date."
2234+
msgstr "Hodnota se používá pro: <ul> <li> nastavení <a href=\"https://napoveda.zbozi.cz/xml-feed/specifikace/#DELIVERY_DATE\">DELIVERY_DATE</a> v XML feedu Zbozi.cz</li> <li> nastavení <a href=\"https://www.mergado.cz/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-4.pdf\">DELIVERY_DAYS</a> v XML feedu Mergado</li> </ul> Hodnota se použije pouze u produktů, které nemají vyplněné \"Předpokládané datum naskladnění\". Jinak se počet dní odvozuje z tohoto data."
22352235

22362236
msgid "There are no parameter values of type color yet."
22372237
msgstr "Žádná hodnota parametru typu barva zatím nebyla vytvořena."

‎translations/messages.en.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2218,7 +2218,7 @@ msgstr ""
22182218
msgid "The current list of URL addresses can be found in the project's repository in the \"storefront/config/routes.ts\" file."
22192219
msgstr ""
22202220

2221-
msgid "The days are used to display proper stores opening hours and to calculate order withdrawal deadline."
2221+
msgid "The days are used to display proper stores opening hours, to calculate order withdrawal deadline, and to calculate the expected delivery date of transports."
22222222
msgstr ""
22232223

22242224
msgid "The password reset link you used is invalid, expired, or has already been used."
@@ -2230,7 +2230,7 @@ msgstr ""
22302230
msgid "The product is no longer in the catalog. This was the catalog number at the time of the inquiry."
22312231
msgstr ""
22322232

2233-
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul>"
2233+
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul> The value applies only to products without the \"Expected restocking date\" filled. Otherwise, the number of days is derived from that date."
22342234
msgstr ""
22352235

22362236
msgid "There are no parameter values of type color yet."

‎translations/messages.sk.po‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ msgid "Close"
368368
msgstr "Zavrieť"
369369

370370
msgid "Closed days"
371-
msgstr "Zatvorené dni"
371+
msgstr "Sviatky a interné dni"
372372

373373
msgid "Closing modules"
374374
msgstr "Zatvárací moduly"
@@ -1112,7 +1112,7 @@ msgid "Holidays and internal days"
11121112
msgstr "Sviatky a interné dni"
11131113

11141114
msgid "Holidays and internal days overview"
1115-
msgstr "Prehľad Holidays and internal days"
1115+
msgstr "Prehľad sviatkov a interných dní"
11161116

11171117
msgid "Holidays import"
11181118
msgstr "Import sviatkov"
@@ -1340,7 +1340,7 @@ msgid "New category"
13401340
msgstr "Nová kategória"
13411341

13421342
msgid "New closed day"
1343-
msgstr "Nový zatvorený deň"
1343+
msgstr "Nový sviatok / interný deň"
13441344

13451345
msgid "New country"
13461346
msgstr "Nová krajina"
@@ -2218,8 +2218,8 @@ msgstr "Nastavenia Terms and conditions"
22182218
msgid "The current list of URL addresses can be found in the project's repository in the \"storefront/config/routes.ts\" file."
22192219
msgstr "Aktuálny zoznam URL adries sa nachádza v repozitári projektu v súbore \"storefront/config/routes.ts\"."
22202220

2221-
msgid "The days are used to display proper stores opening hours and to calculate order withdrawal deadline."
2222-
msgstr "Tieto dni sa používajú na zobrazenie správnych otváracích hodín obchodov a na výpočet lehoty na odstúpenie od objednávky."
2221+
msgid "The days are used to display proper stores opening hours, to calculate order withdrawal deadline, and to calculate the expected delivery date of transports."
2222+
msgstr "Tieto dni sa používajú na zobrazenie správnych otváracích hodín obchodov, na výpočet lehoty na odstúpenie od objednávky a na výpočet predpokladaného dátumu doručenia dopráv."
22232223

22242224
msgid "The password reset link you used is invalid, expired, or has already been used."
22252225
msgstr "Odkaz na resetovanie hesla je neplatný, expirovaný alebo už bol použitý."
@@ -2230,8 +2230,8 @@ msgstr "Produkt nemá stanovený názov pre daný jazyk."
22302230
msgid "The product is no longer in the catalog. This was the catalog number at the time of the inquiry."
22312231
msgstr "Produkt už nie je v katalógu. Toto bolo katalógové číslo v čase dopytovánia."
22322232

2233-
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul>"
2234-
msgstr "Hodnota sa používa pre: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> nastavenie v Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> nastavenie v Mergado XML feed </li> </ul>"
2233+
msgid "The value is used for: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> setting in Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> setting in Mergado XML feed </li> </ul> The value applies only to products without the \"Expected restocking date\" filled. Otherwise, the number of days is derived from that date."
2234+
msgstr "Hodnota sa používa pre: <ul> <li> <a href=\"https://napoveda.zbozi.cz/en/xml-feed-2/specification/#DELIVERY_DATE\">DELIVERY_DATE</a> nastavenie v Zbozi.cz XML feed </li> <li> <a href=\"https://www.mergado.com/sites/default/files/users/documents/shopsystems/mergado-product-xml-1-10-en.pdf\">DELIVERY_DAYS</a> nastavenie v Mergado XML feed </li> </ul> Hodnota sa použije iba pri produktoch, ktoré nemajú vyplnený \"Predpokladaný dátum naskladnenia\". Inak sa počet dní odvodzuje z tohto dátumu."
22352235

22362236
msgid "There are no parameter values of type color yet."
22372237
msgstr "Zatiaľ nie sú žiadne hodnoty parametrov typu farba."

0 commit comments

Comments
 (0)