EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/export-formatting'

Browse Source
This commit is contained in:
Björn Fromme
2019-09-11 13:43:59 +02:00
parent 71fcd5ad96 7862ee39fa
commit e21281588f
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php
+1 -2
View File
@@ -133,7 +133,6 @@ class ResellerController extends ActionController
public function xmlAction(Reseller $reseller)
{
$cacheKey = sprintf('reseller_export_xml_full_%d', $reseller->getUid());
if (($xml = $this->cache->get($cacheKey)) === false) {
$data = $this->resellerDataService->preprocessAll($reseller);
$encoders = [new XmlEncoder('products')];
@@ -142,7 +141,7 @@ class ResellerController extends ActionController
$xml = $serializer->serialize(
$data,
'xml',
[ 'xml_encoding' => 'utf-8', 'xml_format_output' => true ]
[ 'xml_encoding' => 'utf-8', 'xml_format_output' => false ]
);
$this->cache->set($cacheKey, $xml, [], 3600);
}
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
+20 -20
View File
@@ -49,19 +49,19 @@
<f:if condition="{name}">
<div class="form-group">
<label class="control-label">Name</label>
<input type="text" value="{name}" class="form-control">
<div class="well">{name}</div>
</div>
</f:if>
<f:if condition="{description}">
<div class="form-group">
<label class="control-label">Beschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{description}</textarea>
<div class="well">{description -> f:format.html()}</div>
</div>
</f:if>
<f:if condition="{facts}">
<div class="form-group">
<label class="control-label">Facts</label>
<textarea rows="5" class="form-control" onclick="this.select()">{facts -> v:iterator.implode(glue: 'constant:LF')}</textarea>
<div class="well">{facts -> v:iterator.implode(glue: '<br>')}</div>
</div>
</f:if>
</div>
@@ -81,27 +81,27 @@
<div class="panel-body">
<div class="form-group">
<label class="control-label">Name</label>
<input type="text" value="{hotel.name}" class="form-control">
<div class="well">{hotel.name}</div>
</div>
<div class="form-group">
<label class="control-label">Kategorie</label>
<input type="text" value="{hotel.category}" class="form-control">
<div class="well">{hotel.category}</div>
</div>
<div class="form-group">
<label class="control-label">Unterkunftsart</label>
<input type="text" value="{hotel.type}" class="form-control">
<div class="well">{hotel.type}</div>
</div>
<div class="form-group">
<label class="control-label">Beschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{hotel.description}</textarea>
<div class="well">{hotel.description -> f:format.html()}</div>
</div>
<div class="form-group">
<label class="control-label">Ausstattung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{hotel.features}</textarea>
<div class="well">{hotel.features -> f:format.html()}</div>
</div>
<div class="form-group">
<label class="control-label">Zimmerarten/Appartmentbeschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{hotel.roomtypes}</textarea>
<div class="well">{hotel.roomtypes -> f:format.html()}</div>
</div>
<h4>Termine, Zimmer, Leistungen und Zustiege</h4>
<f:if condition="{hotel.dates.date}">
@@ -241,19 +241,19 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">Name</label>
<input type="text" value="{city.name}" class="form-control">
<div class="well">{city.name}</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">Beschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{city.description}</textarea>
<div class="well">{city.description -> f:format.html()}</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="control-label">Facts</label>
<textarea rows="5" class="form-control" onclick="this.select()">{city.facts.fact -> v:iterator.implode(glue: 'constant:LF')}</textarea>
<div class="well">{city.facts.fact -> v:iterator.implode(glue: '<br>')}</div>
</div>
</div>
</div>
@@ -274,47 +274,47 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">Name</label>
<input type="text" value="{region.name}" class="form-control">
<div class="well">{region.name -> f:format.html()}</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">Beschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{region.description} {region.descriptionExtended}</textarea>
<div class="well">{region.description -> f:format.html()} {region.descriptionExtended -> f:format.html()}</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">Skipass</label>
<textarea rows="5" class="form-control" onclick="this.select()">{region.skipass}</textarea>
<div class="well">{region.skipass -> f:format.html()}</div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<label class="control-label">News</label>
<textarea rows="5" class="form-control" onclick="this.select()">{region.news}</textarea>
<div class="well">{region.news -> f:format.html()}</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="control-label">Facts</label>
<textarea rows="5" class="form-control" onclick="this.select()">{region.facts.fact -> v:iterator.implode(glue: 'constant:LF')}</textarea>
<div class="well">{region.facts.fact -> v:iterator.implode(glue: '<br>')}</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="control-label">Pisten</label>
<input type="text" class="form-control" value="{region.piste}"/>
<div class="well">{region.piste}</div>
</div>
<div class="form-group">
<label class="control-label">Höhe</label>
<input type="text" class="form-control" value="{region.height}"/>
<div class="well">{region.height}</div>
</div>
</div>
<div class="col-xs-4">
<div class="form-group">
<label class="control-label">Lifte</label>
<input type="text" class="form-control" value="{region.lifts}"/>
<div class="well">{region.lifts}</div>
</div>
</div>
</div>