diff --git a/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php b/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php index d094d55be..2f2f62b20 100755 --- a/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php +++ b/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php @@ -32,6 +32,7 @@ class Shop public $subTitle; public $keywords; public $description; + public $templateCopyright; public $copyright; public $author; public $private; diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml index 8fe423a8f..2b7296af0 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/translations/core_product_list.de.yaml @@ -14,5 +14,6 @@ Subtitle: Untertitel NoIntern: Nr. Intern Producttype: Produkttyp Productgroups: Produktgruppen -Mainproduct: Hauptprodukt +Mainproduct: H +Private: P Filter: Filtern diff --git a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig index 5a3e3ced4..f745f9130 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig +++ b/src/new/src/PSC/Shop/ProductBundle/Resources/views/backend/product/list/index.html.twig @@ -75,7 +75,8 @@ {{ knp_pagination_sortable(pagination, 'NoIntern'|trans, 'product.nrIntern') }} {{ knp_pagination_sortable(pagination, 'Producttype'|trans, 'product.type') }} {{ "Productgroups"|trans }} - {{ 'Mainproduct'|trans }} + {{ 'Mainproduct'|trans }} + {{ 'Private'|trans }} @@ -96,6 +97,7 @@ {{ product.type|productType }} {% for productGroup in product.productGroups %}{{ productGroup.title }}{% if loop.last != true %}, {% endif %}{% endfor %} {% if product.originalproduct == 0 %}{{ 'Yes'|trans }}{% else %}{{ 'No'|trans }}{% endif %} + {% if product.private %}{{ 'Yes'|trans }}{% else %}{{ 'No'|trans }}{% endif %} diff --git a/src/new/src/PSC/Shop/SettingsBundle/Controller/Backend/SettingsController.php b/src/new/src/PSC/Shop/SettingsBundle/Controller/Backend/SettingsController.php index 6bdc14d92..22f2b6577 100755 --- a/src/new/src/PSC/Shop/SettingsBundle/Controller/Backend/SettingsController.php +++ b/src/new/src/PSC/Shop/SettingsBundle/Controller/Backend/SettingsController.php @@ -80,9 +80,9 @@ class SettingsController extends AbstractController ) { $customFields = $fieldService->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop); $customGroups = $fieldService->getGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Shop); -/** @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop */ + /** @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop */ $selectedShop = $shopService->getSelectedShop(); -/** @var Shop $shop */ + /** @var Shop $shop */ $shop = $documentManager ->getRepository('PSC\Shop\EntityBundle\Document\Shop') ->findOneBy(array('uid' => (string)$selectedShop->getUid())); @@ -99,6 +99,7 @@ class SettingsController extends AbstractController $shop->productSortDir = $selectedShop->getProductSortDir(); $shop->title = $selectedShop->getTitle(); $shop->subTitle = $selectedShop->getSubTitle(); + $shop->templateCopyright = $selectedShop->getTemplateCopyright(); $shop->keywords = $selectedShop->getKeywords(); $shop->description = $selectedShop->getDescription(); $shop->deleted = $selectedShop->isDeleted(); @@ -149,6 +150,7 @@ class SettingsController extends AbstractController $selectedShop->setLogo1($shop->logo1); $selectedShop->setLogo2($shop->logo2); $selectedShop->setSitemap($shop->sitemap); + $selectedShop->setTemplateCopyright($shop->templateCopyright); $selectedShop->setRobots($shop->robots); $selectedShop->setTitle($shop->title); $selectedShop->setSubTitle($shop->subTitle); @@ -220,7 +222,7 @@ class SettingsController extends AbstractController { /** @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop */ $selectedShop = $shopService->getSelectedShop(); -/** @var Shop $shop */ + /** @var Shop $shop */ $shop = $documentManager ->getRepository('PSC\Shop\EntityBundle\Document\Shop') ->findOneBy(array('uid' => (string)$selectedShop->getUid())); diff --git a/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php b/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php index 85cc84c73..5f72a8ae0 100755 --- a/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php +++ b/src/new/src/PSC/Shop/SettingsBundle/Form/Backend/ShopSettingsType.php @@ -483,6 +483,10 @@ class ShopSettingsType extends AbstractType 'label' => 'Text', 'required' => false, )) + ->add('templateCopyright', TextareaType::class, array( + 'label' => 'Text', + 'required' => false, + )) ->add('conditionsText', TextareaType::class, array( 'label' => 'Text', 'required' => false, diff --git a/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig b/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig index 3fcc22d69..f73cfdebf 100755 --- a/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig +++ b/src/new/src/PSC/Shop/SettingsBundle/Resources/views/backend/settings/index.html.twig @@ -1685,6 +1685,9 @@
  • Datenschutz
    • +
  • + Template / Copyright +
    • @@ -1723,6 +1726,18 @@
    +
    +
    +
    +
    + +
    + {{ form_widget(form.templateCopyright, {attr: {'class': 'form-control summernote'}}) }} +
    +
    +
    +
    +
    diff --git a/src/new/var/plugins/System/PSC/XmlCalc/Api/GetPrice.php b/src/new/var/plugins/System/PSC/XmlCalc/Api/GetPrice.php index b2eb1e82d..e4326c6f1 100755 --- a/src/new/var/plugins/System/PSC/XmlCalc/Api/GetPrice.php +++ b/src/new/var/plugins/System/PSC/XmlCalc/Api/GetPrice.php @@ -189,6 +189,8 @@ class GetPrice extends AbstractController $tmpOpt = new Option(); $tmpOpt->id = $opt->getId(); $tmpOpt->name = $opt->getLabel(); + $tmpOpt->prefix = $opt->getPrefix(); + $tmpOpt->suffix = $opt->getSuffix(); $tmpOpt->valid = $opt->isValid(); $tmpOpt->selected = $opt->isSelected(); $output->colorDb[$option->getColorSystem()][] = $tmpOpt; diff --git a/src/new/var/plugins/System/PSC/XmlCalc/Dto/Output/Price/Option.php b/src/new/var/plugins/System/PSC/XmlCalc/Dto/Output/Price/Option.php index f332da239..8a1f4ae3c 100755 --- a/src/new/var/plugins/System/PSC/XmlCalc/Dto/Output/Price/Option.php +++ b/src/new/var/plugins/System/PSC/XmlCalc/Dto/Output/Price/Option.php @@ -6,13 +6,19 @@ use OpenApi\Attributes as OA; final class Option { - #[OA\Property(type: 'string')] public string $id; #[OA\Property(type: 'string')] public string $name; + #[OA\Property(type: 'string')] + public string $prefix; + + #[OA\Property(type: 'string')] + public string $suffix; + + #[OA\Property(type: 'string')] public string $info;