Merge branch 'develop' into staging

* develop:
  add order status and page updated
  update readme
  update readme

README.md

@@ -13,6 +13,10 @@ External DB management access:
     (Credentials can be found in our secure password manager)
 * live: ???
 
+External DB management access is only for management purposes NOT for development! 
+For development you have to setup local DBs! But you can use the external management i.e. for dumps.
+
+
 ### Deployment Components
 * staging: 
   * Backend/CMS:
@@ -42,33 +46,35 @@ External DB management access:
 * [wazum/pagetree-resizable](https://extensions.typo3.org/extension/pagetree_resizable)
 * [vlucas/phpdotenv](https://github.com/vlucas/phpdotenv)
 
-### Setup (general)
-1. Clone project.
-2. Setup mysql db.
-3. Copy <projectdir>/public/typo3conf/env-file-template to <projectdir>/public/typo3conf/.env and set DB credentials and other
-   secrets in the newly created .env .
-4. Import a fresh dump into your mysql db.
-5. Fill up the 'fileadmin'-Directory with a fresh backup.
-6. cd into project's root folder
-7. composer install
+### DDEV Setup (local development)
 
----------
+* Create a local project directory change to it. (cd projectdir)
+* clone this git repo into your projectdir (git clone .....)
+* Copy <projectdir>/public/typo3conf/env-file-template to <projectdir>/public/typo3conf/.env and set DB credentials and other
+* secrets in the newly created .env .
+* ddev config
+* Choose 'php' (NOT 'typo3') as kind of project and accept all other default options in the 'ddev config challenge'
+* Edit **.ddev/config.yaml**:
+* docroot: "abitypo3cms/public"
+* php_version: "7.4"
+* webimage_extra_packages: [php7.4-mongodb]  # add this line if it is not already there!
+* ddev start
+* ddev describe (to get an overview of what ddev has build for you)
+* ddev ssh (to ssh into the projects web server)
+* cd abitypo3cms (on the web server!)
+* composer install
 
+------------------------
 
-### DDEV Setup (local development)
 
-1. Create a local project directory change to it. (cd projectdir)
-2. clone this git repo into your projectdir (git clone .....)
-3. Copy <projectdir>/public/typo3conf/env-file-template to <projectdir>/public/typo3conf/.env and set DB credentials and other
+### Setup (general)
+* Clone project.
+* Setup mysql db.
+* Copy <projectdir>/public/typo3conf/env-file-template to <projectdir>/public/typo3conf/.env and set DB credentials and other
    secrets in the newly created .env .
-4. ddev config
-5. Choose 'php' (NOT 'typo3') as kind of project and accept all other default options in the 'ddev config challenge'
-6. Edit **.ddev/config.yaml**:
-    * docroot: "abitypo3cms/public"
-    * php_version: "7.4"
-    * webimage_extra_packages: [php7.4-mongodb]  # add this line if it is not already there!
-7. ddev start
-8. ddev describe (to get an overview of what ddev has build for you)
-9. ddev ssh (to ssh into the projects web server)
-10. cd abitypo3cms (on the web server!)
-11. composer install
+* Import a fresh dump into your mysql db.
+* Fill up the 'fileadmin'-Directory with a fresh backup.
+* cd into project's root folder
+* composer install
+
+

extensions/mrm_be/Classes/Hooks/TCE/TCEMainHook.php

@@ -804,6 +804,8 @@ class TCEMainHook
       'isLiveFrom' => -1,
       'isLiveTill' => -1,
       'publicationType' => $publicationType,
+      'orderStatus' => $post['orderStatus'],
+      'date-updated' => ($post['orderStatus'] === 'neu') ? $post['starttime'] : (($post['orderStatus'] === 'aktualisiert') ? $post['red_end'] : ''),
       'seo' => array(
         'sitemap_changefreq' => $post['sitemap_changefreq'],
         'sitemap_priority' => $post['sitemap_priority'],

extensions/mrm_be/Configuration/TCA/Overrides/pages.php

@@ -113,7 +113,7 @@
       'renderType' => 'selectSingle',
       'items' => [
         ['LLL:EXT:mrm_be/Resources/Private/Language/locallang_ttc.xlf:pages.general.orderStatus.0', 'new'],
-        ['LLL:EXT:mrm_be/Resources/Private/Language/locallang_ttc.xlf:pages.general.orderStatus.1', 'edited'],
+        ['LLL:EXT:mrm_be/Resources/Private/Language/locallang_ttc.xlf:pages.general.orderStatus.3', 'aktualisiert'],
         ['LLL:EXT:mrm_be/Resources/Private/Language/locallang_ttc.xlf:pages.general.orderStatus.2', 'locked'],
       ],
       'default' => 'new'

extensions/mrm_be/Resources/Private/Language/locallang_ttc.xlf

@@ -230,6 +230,9 @@
       <trans-unit id="pages.general.orderStatus.2">
         <source>locked</source>
       </trans-unit>
+      <trans-unit id="pages.general.orderStatus.3">
+        <source>Aktualisiert</source>
+      </trans-unit>
       <trans-unit id="pages.general.orderType">
         <source>Beauftragung</source>
       </trans-unit>