@@ -46,18 +38,7 @@
{{ form_errors(form.type) }}
-
-
-
-
-
- {{ form_widget(form.pos) }}
-
- {{ form_errors(form.pos) }}
-
+
+
+
+
+
+
+
+
+ {{ form_widget(form.homepage) }}
+
+ {{ form_errors(form.homepage) }}
+
+
+
+
+
+
+ {{ form_widget(form.pos) }}
+
+ {{ form_errors(form.pos) }}
+
@@ -169,10 +174,10 @@
-
{{ form_widget(form.zip) }}
-
+
{{ form_widget(form.city) }}
-
+
{{ form_widget(form.country) }}
{{ form_errors(form.zip) }}
@@ -257,23 +262,8 @@
-
-
-
-
-
-
-
- {{ form_widget(form.homepage) }}
-
- {{ form_errors(form.homepage) }}
-
-
+
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/address_detail/edit.html.twig b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/address_detail/edit.html.twig
index e870d0aba..077237e58 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/address_detail/edit.html.twig
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/address_detail/edit.html.twig
@@ -26,14 +26,6 @@
{{ form_start(form, { 'attr': {'class': 'smart-form'}}) }}
{{ form_errors(form) }}
-
-
-
{{ form_widget(form.save, {attr: {class: 'btn btn-primary btn-sm'}}) }}
-
-
-
@@ -46,18 +38,7 @@
{{ form_errors(form.type) }}
-
-
-
-
-
- {{ form_widget(form.pos) }}
-
- {{ form_errors(form.pos) }}
-
+
+
+
+
+
+
+
+
+
+ {{ form_widget(form.homepage) }}
+
+ {{ form_errors(form.homepage) }}
+
+
+
+
+
+
+ {{ form_widget(form.pos) }}
+
+ {{ form_errors(form.pos) }}
+
@@ -169,10 +175,10 @@
-
{{ form_widget(form.zip) }}
-
+
{{ form_widget(form.city) }}
-
+
{{ form_widget(form.country) }}
{{ form_errors(form.zip) }}
@@ -255,23 +261,8 @@
-
-
-
-
-
-
-
- {{ form_widget(form.homepage) }}
-
- {{ form_errors(form.homepage) }}
-
-
+
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
index b5d0b3c9e..0c574f5ab 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/create.html.twig
@@ -32,9 +32,6 @@
{{ form_widget(form.save, {attr: {class: 'btn btn-primary btn-sm'}}) }}
{{ contact.username }}
-
-
-
@@ -276,19 +273,6 @@
-
@@ -904,6 +888,21 @@
+
-
-
-
- {{ form_label(form.image) }}
-
-
-
-
- {{ form_widget(form.image) }}
-
- {{ form_errors(form.image) }}
- {{ form_label(form.country) }}
+
+
{{ form_label(form.image) }}
+
+
+
+
+ {{ form_widget(form.image) }}
+ {{ form_errors(form.image) }}
+
+
+ {{ form_widget(form.image2) }}
+ {{ form_errors(form.image2) }}
+
+
@@ -1594,4 +1593,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
index 824cb12ac..99c133a27 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
+++ b/src/new/src/PSC/Shop/ContactBundle/Resources/views/backend/edit/edit.html.twig
@@ -31,9 +31,6 @@
{{ form_start(form) }}
-
@@ -260,19 +257,6 @@
-
-
{{ contact.username }} ( {{ contact.uid }})
-
@@ -888,6 +872,21 @@
+
-
-
-
- {{ form_label(form.image) }}
-
-
-
-
- {{ form_widget(form.image) }}
-
- {{ form_errors(form.image) }}
- {{ form_label(form.country) }}
+
+
{{ form_label(form.image) }}
+
+
+
+
+ {{ form_widget(form.image) }}
+ {{ form_errors(form.image) }}
+
+
+ {{ form_widget(form.image2) }}
+ {{ form_errors(form.image2) }}
+
+
@@ -1723,4 +1722,4 @@
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php b/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
index 6ad980ecc..8129ecb97 100755
--- a/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
+++ b/src/new/src/PSC/Shop/ContactBundle/Transformer/Model/Contact.php
@@ -6,43 +6,45 @@ use Doctrine\ODM\MongoDB\DocumentManager;
use Doctrine\ORM\EntityManagerInterface;
use PSC\Shop\ContactBundle\Model\Role;
use PSC\Shop\ContactBundle\Repository\ContactRepository;
+use PSC\Shop\MediaBundle\Model\Media;
+use PSC\Shop\MediaBundle\Service\MediaManager;
+use PSC\Shop\MediaBundle\Transformer\Media as PSCMedia;
use PSC\System\SettingsBundle\Service\Shop;
class Contact
{
-
- public function __construct(private readonly ContactRepository $contactRepository, private readonly Shop $shopService, private readonly EntityManagerInterface $entityManager, private readonly DocumentManager $documentManager)
+ public function __construct(private readonly MediaManager $mediaManager, private readonly ContactRepository $contactRepository, private readonly Shop $shopService, private readonly EntityManagerInterface $entityManager, private readonly DocumentManager $documentManager, private readonly PSCMedia $mediaTransformer)
{
}
public function toDb(\PSC\Shop\ContactBundle\Model\Contact $contact): void
{
- if($contact->getUuid() !== "") {
+ if ($contact->getUuid() !== "") {
/** @var \PSC\Shop\EntityBundle\Entity\Contact $contactEntity */
$contactEntity = $this->contactRepository->findOneBy(['uuid' => $contact->getUuid()]);
$contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
- }else{
- if($contact->getUid() !== 0) {
+ } else {
+ if ($contact->getUid() !== 0) {
$contactEntity = $this->contactRepository->findOneBy(['uid' => $contact->getUuid()]);
$contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
- }else{
+ } else {
$contactEntity = new \PSC\Shop\EntityBundle\Entity\Contact();
$contactDoc = new \PSC\Shop\EntityBundle\Document\Contact();
}
}
- if(!$contactDoc) {
+ if (!$contactDoc) {
$contactDoc = new \PSC\Shop\EntityBundle\Document\Contact();
}
$shops = [];
- foreach($contact->getShops() as $shop) {
+ foreach ($contact->getShops() as $shop) {
$shops[] = $this->shopService->getShopByUid($shop->getUuid());
}
- if(count($shops) > 0) {
+ if (count($shops) > 0) {
$contactEntity->setShops($shops);
}
- if($contact->getEmail() != "") {
+ if ($contact->getEmail() != "") {
$contactEntity->setEmail($contact->getEmail());
}
$contactEntity->setEnable(true);
@@ -56,6 +58,13 @@ class Contact
$contactEntity->setHouseNumber((string)$contact->getLayouterData()->getHouseNumber());
$contactEntity->setHomepage((string)$contact->getLayouterData()->getHomepage());
+ if ($contact->getLayouterData()->getImage1() != null) {
+ $contactEntity->setImage((string)$contact->getLayouterData()->getImage1()->getUuid());
+ }
+ if ($contact->getLayouterData()->getImage2() != null) {
+ $contactEntity->setImage2((string)$contact->getLayouterData()->getImage2()->getUuid());
+ }
+
$contactEntity->setBirthday((string)$contact->getLayouterData()->getBirthday());
$contactEntity->setKostenstellung((string)$contact->getLayouterData()->getKst());
$contactEntity->setState((string)$contact->getLayouterData()->getState());
@@ -103,7 +112,7 @@ class Contact
}
}
- if(count($contact->getRoles()) > 0) {
+ if (count($contact->getRoles()) > 0) {
$roles = [];
/** @var Role $role */
foreach ($contact->getRoles() as $role) {
@@ -125,7 +134,7 @@ class Contact
public function fromDb(\PSC\Shop\ContactBundle\Model\Contact $contact, \PSC\Shop\EntityBundle\Entity\Contact $contactEntity): void
{
$contactDoc = $this->documentManager->getRepository(\PSC\Shop\EntityBundle\Document\Contact::class)->findOneBy(['uid' => $contactEntity->getUid()]);
- if(!$contactDoc) {
+ if (!$contactDoc) {
$contactDoc = new \PSC\Shop\EntityBundle\Document\Contact();
$contactDoc->setUid($contactEntity->getUid());
}
@@ -209,5 +218,22 @@ class Contact
$contact->getLayouterData()->setState((string)$contactEntity->getState());
$contact->getLayouterData()->setEmail((string)$contactDoc->getLayouterEmail());
+
+ if ($contactEntity->getImage() != "") {
+ $media = $this->mediaManager->getMedia($contactEntity->getImage());
+ if ($media) {
+ $mediaModel = new Media();
+ $this->mediaTransformer->fromDb($mediaModel, $media);
+ $contact->getLayouterData()->setImage1($mediaModel);
+ }
+ }
+ if ($contactEntity->getImage2() != "") {
+ $media = $this->mediaManager->getMedia($contactEntity->getImage2());
+ if ($media) {
+ $mediaModel = new Media();
+ $this->mediaTransformer->fromDb($mediaModel, $media);
+ $contact->getLayouterData()->setImage2($mediaModel);
+ }
+ }
}
}
diff --git a/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php b/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php
index c676336fa..dcba946c0 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Document/Shop.php
@@ -56,63 +56,63 @@ class Shop
public $browsericon;
public $sitemap;
public $robots;
-/**
- * @var string $id
- */
+ /**
+ * @var string $id
+ */
#[Id]
protected $id;
-/**
- * @var string $uid
- */
+ /**
+ * @var string $uid
+ */
#[Field(type: 'string')]
protected $uid;
-/**
- * @var string $apiKey;
- */
+ /**
+ * @var string $apiKey;
+ */
#[Field(type: 'string')]
protected $apiKey;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected string $defaultCurrency = "EUR";
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected string $defaultLocale = "de_DE";
-/**
- * @var string $numberPattern;
- */
+ /**
+ * @var string $numberPattern;
+ */
#[Field(type: 'string')]
protected $numberPattern;
-/**
- * @var int $numberStart;
- */
+ /**
+ * @var int $numberStart;
+ */
#[Field(type: 'int')]
protected $numberStart;
-/**
- * @var boolean $ownNumber
- */
+ /**
+ * @var boolean $ownNumber
+ */
#[Field(type: 'bool')]
protected $ownNumber;
-/**
- * @var boolean
- */
+ /**
+ * @var boolean
+ */
#[Field(type: 'bool')]
protected $guestEnable;
-/**
- * @var string $contactNumberPattern;
- */
+ /**
+ * @var string $contactNumberPattern;
+ */
#[Field(type: 'string')]
protected $contactNumberPattern;
-/**
- * @var int $contactNumberStart;
- */
+ /**
+ * @var int $contactNumberStart;
+ */
#[Field(type: 'int')]
protected $contactNumberStart;
-/**
- * @var float $priceFactor;
- */
+ /**
+ * @var float $priceFactor;
+ */
#[Field(type: 'float')]
protected $priceFactor;
-/**
- * @var boolean $contactOwnNumber
- */
+ /**
+ * @var boolean $contactOwnNumber
+ */
#[Field(type: 'bool')]
protected $contactOwnNumber;
@@ -172,367 +172,379 @@ class Shop
#[Field(type: 'string')]
protected $docInvoiceJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docInvoicePosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPPJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPPPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOrderJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOrderPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docLabelJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docLabelPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docDeliveryJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docDeliveryPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docStornoJasperXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docStornoPosition;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $redirectAfterBuy;
-/**
- * @var boolean $redirectToSSL
- */
+ /**
+ * @var boolean $redirectToSSL
+ */
#[Field(type: 'bool')]
protected $redirectToSSL;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $theme;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $layouterTheme;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $betreiberFax;
-/**
- * @var boolean $createPackageAfterBuy
- */
+ /**
+ * @var boolean $createPackageAfterBuy
+ */
#[Field(type: 'bool')]
protected $createPackageAfterBuy;
-/**
- * @var boolean $tpSaveUserData
- */
+ /**
+ * @var boolean $tpSaveUserData
+ */
#[Field(type: 'bool')]
protected $tpSaveUserData;
-/**
- * @var string $productFieldName1;
- */
+ /**
+ * @var string $productFieldName1;
+ */
#[Field(type: 'string')]
protected $productFieldName1;
-/**
- * @var string $productFieldName2;
- */
+ /**
+ * @var string $productFieldName2;
+ */
#[Field(type: 'string')]
protected $productFieldName2;
-/**
- * @var string $productFieldName3;
- */
+ /**
+ * @var string $productFieldName3;
+ */
#[Field(type: 'string')]
protected $productFieldName3;
-/**
- * @var string $productFieldName4;
- */
+ /**
+ * @var string $productFieldName4;
+ */
#[Field(type: 'string')]
protected $productFieldName4;
-/**
- * @var string $productFieldName5;
- */
+ /**
+ * @var string $productFieldName5;
+ */
#[Field(type: 'string')]
protected $productFieldName5;
-/**
- * @var string $productFieldName6;
- */
+ /**
+ * @var string $productFieldName6;
+ */
#[Field(type: 'string')]
protected $productFieldName6;
-/**
- * @var string $productFieldName7;
- */
+ /**
+ * @var string $productFieldName7;
+ */
#[Field(type: 'string')]
protected $productFieldName7;
-/**
- * @var string $productFieldName8;
- */
+ /**
+ * @var string $productFieldName8;
+ */
#[Field(type: 'string')]
protected $productFieldName8;
-/**
- * @var string $productFieldName9;
- */
+ /**
+ * @var string $productFieldName9;
+ */
#[Field(type: 'string')]
protected $productFieldName9;
-/**
- * @var string $productFieldName10;
- */
+ /**
+ * @var string $productFieldName10;
+ */
#[Field(type: 'string')]
protected $productFieldName10;
-/**
- * @var string $productFieldName12;
- */
+ /**
+ * @var string $productFieldName12;
+ */
#[Field(type: 'string')]
protected $productFieldName11;
-/**
- * @var string $productFieldName12;
- */
+ /**
+ * @var string $productFieldName12;
+ */
#[Field(type: 'string')]
protected $productFieldName12;
-/**
- * @var string $customerFieldName1;
- */
+ /**
+ * @var string $customerFieldName1;
+ */
#[Field(type: 'string')]
protected $customerFieldName1;
-/**
- * @var string $customerFieldName2;
- */
+ /**
+ * @var string $customerFieldName2;
+ */
#[Field(type: 'string')]
protected $customerFieldName2;
-/**
- * @var string $customerFieldName3;
- */
+ /**
+ * @var string $customerFieldName3;
+ */
#[Field(type: 'string')]
protected $customerFieldName3;
-/**
- * @var string $customerFieldName4;
- */
+ /**
+ * @var string $customerFieldName4;
+ */
#[Field(type: 'string')]
protected $customerFieldName4;
-/**
- * @var string $customerFieldName5;
- */
+ /**
+ * @var string $customerFieldName5;
+ */
#[Field(type: 'string')]
protected $customerFieldName5;
-/**
- * @var string $customerFieldName6;
- */
+ /**
+ * @var string $customerFieldName6;
+ */
#[Field(type: 'string')]
protected $customerFieldName6;
-/**
- * @var string $customerFieldName7;
- */
+ /**
+ * @var string $customerFieldName7;
+ */
#[Field(type: 'string')]
protected $customerFieldName7;
-/**
- * @var string $customerFieldName8;
- */
+ /**
+ * @var string $customerFieldName8;
+ */
#[Field(type: 'string')]
protected $customerFieldName8;
-/**
- * @var string $customerFieldName9;
- */
+ /**
+ * @var string $customerFieldName9;
+ */
#[Field(type: 'string')]
protected $customerFieldName9;
-/**
- * @var string $customerFieldName10;
- */
+ /**
+ * @var string $customerFieldName10;
+ */
#[Field(type: 'string')]
protected $customerFieldName10;
-/**
- * @var string $customerFieldName12;
- */
+ /**
+ * @var string $customerFieldName12;
+ */
#[Field(type: 'string')]
protected $customerFieldName11;
-/**
- * @var string $customerFieldName12;
- */
+ /**
+ * @var string $customerFieldName12;
+ */
#[Field(type: 'string')]
protected $customerFieldName12;
-/**
- * @var string $customerFieldName13;
- */
+ /**
+ * @var string $customerFieldName13;
+ */
#[Field(type: 'string')]
protected $customerFieldName13;
-/**
- * @var string $customerFieldName14;
- */
+ /**
+ * @var string $customerFieldName14;
+ */
#[Field(type: 'string')]
protected $customerFieldName14;
-/**
- * @var string $customerFieldName15;
- */
+ /**
+ * @var string $customerFieldName15;
+ */
#[Field(type: 'string')]
protected $customerFieldName15;
-/**
- * @var string $customerFieldName16;
- */
+ /**
+ * @var string $customerFieldName16;
+ */
#[Field(type: 'string')]
protected $customerFieldName16;
-/**
- * @var string $customerFieldName17;
- */
+ /**
+ * @var string $customerFieldName17;
+ */
#[Field(type: 'string')]
protected $customerFieldName17;
-/**
- * @var string $customerFieldName18;
- */
+ /**
+ * @var string $customerFieldName18;
+ */
#[Field(type: 'string')]
protected $customerFieldName18;
-/**
- * @var string $customerFieldName19;
- */
+ /**
+ * @var string $customerFieldName19;
+ */
#[Field(type: 'string')]
protected $customerFieldName19;
-/**
- * @var string $customerFieldName20;
- */
+ /**
+ * @var string $customerFieldName20;
+ */
#[Field(type: 'string')]
protected $customerFieldName20;
-/**
- * @var string $customerFieldName21;
- */
+ /**
+ * @var string $customerFieldName21;
+ */
#[Field(type: 'string')]
protected $customerFieldName21;
-/**
- * @var string $customerFieldName22;
- */
+ /**
+ * @var string $customerFieldName22;
+ */
#[Field(type: 'string')]
protected $customerFieldName22;
-/**
- * @var string $customerFieldName23;
- */
+ /**
+ * @var string $customerFieldName23;
+ */
#[Field(type: 'string')]
protected $customerFieldName23;
-/**
- * @var string $customerFieldName24;
- */
+ /**
+ * @var string $customerFieldName24;
+ */
#[Field(type: 'string')]
protected $customerFieldName24;
-/**
- * @var string $mailOrderCustomerSubjectTemplate;
- */
+ /**
+ * @var string $mailOrderCustomerSubjectTemplate;
+ */
#[Field(type: 'string')]
protected $mailOrderCustomerSubjectTemplate;
-/**
- * @var string $mailOrderCustomerTextTemplate;
- */
+ /**
+ * @var string $mailOrderCustomerTextTemplate;
+ */
#[Field(type: 'string')]
protected $mailOrderCustomerTextTemplate;
-/**
- * @var string $imprintText;
- */
+ /**
+ * @var string $imprintText;
+ */
#[Field(type: 'string')]
protected $imprintText;
-/**
- * @var string $privacyPolicyText;
- */
+ /**
+ * @var string $privacyPolicyText;
+ */
#[Field(type: 'string')]
protected $privacyPolicyText;
-/**
- * @var string $cancellationTermsText;
- */
+ /**
+ * @var string $cancellationTermsText;
+ */
#[Field(type: 'string')]
protected $cancellationTermsText;
-/**
- * @var string $conditionsText;
- */
+ /**
+ * @var string $conditionsText;
+ */
#[Field(type: 'string')]
protected $conditionsText;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPPBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPPPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOrderBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOrderPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docInvoiceBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docInvoiceFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docStornoFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docJobticketPPFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOrderFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docDeliveryFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docLabelFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docInvoicePositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docLabelBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docLabelPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docDeliveryBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docDeliveryPositionBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docStornoBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docStornoPositionBg;
-#[Field(type: 'hash')]
+ #[Field(type: 'hash')]
protected $pluginSettings = [];
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferProductBg;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferProductXml;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $docOfferProductFileName;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderCompany;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderFirstname;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderLastname;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderStreet;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderHouseNumber;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderZip;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderCity;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderCountry;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderTel;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderFax;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderMobile;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $senderEmail;
-/**
- * @var string $extraSettings;
- */
+ #[Field(type: 'bool')]
+ protected bool $docInvoiceXML = false;
+ #[Field(type: 'bool')]
+ protected bool $docOrderXML = false;
+ #[Field(type: 'bool')]
+ protected bool $docDeliveryXML = false;
+ #[Field(type: 'bool')]
+ protected bool $docOfferXML = false;
+ #[Field(type: 'bool')]
+ protected bool $docStornoXML = false;
+ #[Field(type: 'bool')]
+ protected bool $docJobticketXML = false;
+ /**
+ * @var string $extraSettings;
+ */
#[Field(type: 'string')]
protected $extraSettings;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected string $routingConfigCMS = '';
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected string $routingConfigProduct = '';
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected string $routingConfigProductGroup = '';
public bool $noVerify;
#[Field(type: 'bool')]
protected bool $disableOldCalc = false;
-/**
- * @return mixed
- */
+ /**
+ * @return mixed
+ */
public function getId()
{
return $this->id;
@@ -3119,4 +3131,65 @@ class Shop
{
$this->disableOldCalc = $disableOldCalc;
}
+
+ public function isDocInvoiceXML(): bool
+ {
+ return (bool)$this->docInvoiceXML;
+ }
+
+ public function setDocInvoiceXML(bool $value): void
+ {
+ $this->docInvoiceXML = $value;
+ }
+ public function isDocDeliveryXML(): bool
+ {
+ return (bool)$this->docDeliveryXML;
+ }
+
+ public function setDocDeliveryXML(bool $value): void
+ {
+ $this->docDeliveryXML = $value;
+ }
+
+ public function isDocOrderXML(): bool
+ {
+ return (bool)$this->docOrderXML;
+ }
+
+ public function setDocOrderXML(bool $value): void
+ {
+ $this->docOrderXML = $value;
+ }
+
+ public function isDocJobticketXML(): bool
+ {
+ return (bool)$this->docJobticketXML;
+ }
+
+ public function setDocJobticketXML(bool $value): void
+ {
+ $this->docJobticketXML = $value;
+ }
+
+ public function isDocStornoXML(): bool
+ {
+ return (bool)$this->docStornoXML;
+ }
+
+ public function setDocStornoXML(bool $value): void
+ {
+ $this->docStornoXML = $value;
+ }
+
+ public function isDocOfferXML(): bool
+ {
+ return (bool)$this->docOfferXML;
+ }
+
+ public function setDocOfferXML(bool $value): void
+ {
+ $this->docOfferXML = $value;
+ }
+
+
}
diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
index 2836bbd79..086ae8a23 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Contact.php
@@ -191,9 +191,9 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->createdAt = new \DateTime();
$this->updatedAt = new \DateTime();
$this->uuid = Uuid::uuid4();
- if($email == "") {
+ if ($email == "") {
$this->setEmail($this->uuid);
- }else{
+ } else {
$this->setEmail($email);
}
$this->enable = true;
@@ -262,7 +262,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
*/
public function setPassword($password)
{
- if($password != "") {
+ if ($password != "") {
$this->password = $password;
}
}
@@ -505,11 +505,11 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
#[ORM\Column(name: 'self_web', type: 'string', length: 255, nullable: true)]
private $homepage;
- /**
- * @var string
- */
#[ORM\Column(name: 'self_foto', type: 'string', length: 255, nullable: true)]
private $image;
+ #
+ #[ORM\Column(name: 'foto', type: 'string', length: 255, nullable: true)]
+ private $image2;
/**
* @var string
@@ -1087,6 +1087,8 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->setName('anonym@anonym.de');
$this->setEnable(false);
$this->setPassword('anonym');
+ $this->setImage("");
+ $this->setImage2("");
}
/**
@@ -1860,6 +1862,32 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
$this->image = $image;
}
+ public function getImage1()
+ {
+ return $this->image;
+ }
+
+ /**
+ * @param string $image
+ */
+ public function setImage1($image1)
+ {
+ $this->image = $image1;
+ }
+
+ public function getImage2()
+ {
+ return $this->image2;
+ }
+
+ /**
+ * @param string $image
+ */
+ public function setImage2($image2)
+ {
+ $this->image2 = $image2;
+ }
+
/**
* @return string
*/
@@ -2333,7 +2361,7 @@ class Contact implements UserInterface, PasswordAuthenticatedUserInterface, \Ser
if ($row->getLevel() == 50) {
$temp[] = "ROLE_SYSTEM_ADMIN";
}
- if(!in_array($row->getLevel(), [10,20,25,30,35,40,50,0])) {
+ if (!in_array($row->getLevel(), [10,20,25,30,35,40,50,0])) {
$temp[] = $row->getTitle();
}
}
diff --git a/src/new/src/PSC/Shop/EntityBundle/Repository/OrderRepository.php b/src/new/src/PSC/Shop/EntityBundle/Repository/OrderRepository.php
index 7956f60dd..0d1cf92ef 100755
--- a/src/new/src/PSC/Shop/EntityBundle/Repository/OrderRepository.php
+++ b/src/new/src/PSC/Shop/EntityBundle/Repository/OrderRepository.php
@@ -34,19 +34,17 @@ class OrderRepository extends ServiceEntityRepository
parent::__construct($registry, Order::class);
}
- public function getIncomeByShop($shopUuId)
+ public function getIncomeByShop($shopUuId, $year)
{
- $fromDate = new DateTime();
- $fromDate->modify("-12month");
$query = $this->getEntityManager()
->createQuery('
- SELECT sum(o.brutto) as brutto, SUBSTRING(o.created, 1, 7) as month FROM PSCEntityBundle:Order o
+ SELECT sum(o.brutto) as brutto, MONTH(o.created) as monat FROM PSCEntityBundle:Order o
JOIN o.shop s
- WHERE o.status <> 170 AND s.uid = :shop_uuid AND o.type = 1 AND o.created > \'' . $fromDate->format('Y-m-d H:i:s') . '\'
- GROUP BY month ORDER BY o.created DESC')
+ WHERE o.status <> 170 AND s.uid = :shop_uuid AND o.type = 1 AND o.created >= \'' . $year . '-01-01\' AND o.created <= \'' . $year . '-12-31\'
+ GROUP BY monat ORDER BY o.created ASC')
->setParameter('shop_uuid', $shopUuId);
try {
- return $query->execute();
+ return $query->getArrayResult();
} catch (\Doctrine\ORM\NoResultException $e) {
return null;
}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/Upload.php b/src/new/src/PSC/Shop/MediaBundle/Api/Upload.php
new file mode 100644
index 000000000..e3020ff1e
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/Upload.php
@@ -0,0 +1,79 @@
+getShopByDomain();
+ $selectedFolder = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->findOneBy(array('id' => $req->get('folder')));
+ $handler = $mediaManager->getHandlerForType('pdf');
+ $media = new Media();
+ $helper = $handler->getFormHelper($media);
+ $media->setContent($req->files->get('file'));
+ $handler->prepareMedia($media);
+ $media->setFolder($selectedFolder);
+ $media->setShop($selectedShop->getUid());
+ $documentManager->persist($media);
+ $documentManager->flush();
+
+ $mediaModel = new MediaModel();
+ $mediaModel->setUuid($media->getId());
+ $mediaModel->setUrl($media->getUrl());
+ $mediaModel->setTitle($media->getTitle());
+ return $this->json($mediaModel);
+ }
+
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php b/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php
new file mode 100644
index 000000000..f493e4af4
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Api/UploadVariant.php
@@ -0,0 +1,83 @@
+getMedia($req->get('uuid'));
+ $handler = $mediaManager->getHandlerForType('pdf');
+ $helper = $handler->getFormHelper($mediaVariant);
+ $mediaVariant->setContent($req->files->get('file'));
+ $mediaVariant->setSettings($req->get('settings'));
+ $handler->prepareMedia($mediaVariant);
+ $media->addVariant($mediaVariant);
+ $documentManager->persist($media);
+ $documentManager->flush();
+
+ $mediaModel = new MediaModel();
+ $mediaTransformer->fromDb($mediaModel, $media);
+ return $this->json($mediaModel);
+ }
+
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/FolderController.php b/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/FolderController.php
index 47ab44f4f..3647a4d6f 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/FolderController.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/FolderController.php
@@ -29,6 +29,7 @@ use PSC\Shop\EntityBundle\Entity\Shop;
use PSC\Shop\MediaBundle\Document\Folder;
use PSC\Shop\MediaBundle\Form\Backend\FolderType;
use PSC\Shop\MediaBundle\Form\Backend\SearchType;
+use PSC\Shop\MediaBundle\Form\Backend\SubFolderType;
use PSC\Shop\MediaBundle\Helper\Media\AbstractMediaHandler;
use PSC\Shop\MediaBundle\Service\MediaManager;
use PSC\System\SettingsBundle\Form\Backend\DeleteType;
@@ -84,18 +85,18 @@ class FolderController extends AbstractController
}
$type = $request->get('type');
-/** @var AbstractMediaHandler $handler */
+ /** @var AbstractMediaHandler $handler */
$handler = null;
if ($type) {
$handler = $mediaManager->getHandlerForType($type);
}
+ $searchForm->handleRequest($request);
/** @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop */
$selectedShop = $shopService->getSelectedShop();
$cat = new Folder();
$folderForm = $this->createForm(FolderType::class, $cat);
$folderForm->handleRequest($request);
- $searchForm->handleRequest($request);
if ($folderForm->isSubmitted() && $folderForm->isValid()) {
$cat->setIcon($request->get('icon', 'fa-file'));
$documentManager->persist($cat);
@@ -104,31 +105,69 @@ class FolderController extends AbstractController
$uuid = $cat->getId();
}
+ $subCat = new Folder();
+ $subFolderForm = $this->createForm(SubFolderType::class, $subCat);
+ $subFolderForm->handleRequest($request);
/** @var CachingIterator $folders */
$folders = $documentManager
->getRepository('PSC\Shop\MediaBundle\Document\Folder')
->createQueryBuilder('folder')
+ ->field('parent_id')->exists(false)
->sort('title', 'ASC')->getQuery()->execute();
if (count($folders->toArray()) == 0) {
$this->createDefaultFolder($documentManager);
- /** @var Folder[] $folders */
+ /** @var Folder[] $folders */
$folders = $documentManager
->getRepository('PSC\Shop\MediaBundle\Document\Folder')
->createQueryBuilder('folder')
+ ->field('parent_id')->exists(false)
->sort('title', 'ASC')->getQuery()->execute();
}
+ $level = 1;
- $tempFolders = array();
foreach ($folders as $cat) {
+ $subFolders = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->createQueryBuilder('folder')
+ ->field('parent_id')->equals($cat->getId())
+ ->sort('title', 'ASC')->getQuery()->execute();
$count = $documentManager
->getRepository('PSC\Shop\MediaBundle\Document\Media')
->createQueryBuilder('media')
->field('folder.$id')->equals(new ObjectId($cat->getId()))->count()
->getQuery()->execute();
$cat->setMedia($count);
- $tempFolders[] = $cat;
+ foreach($subFolders as $subFolder) {
+ $count = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Media')
+ ->createQueryBuilder('media')
+ ->field('folder.$id')->equals(new ObjectId($subFolder->getId()))->count()
+ ->getQuery()->execute();
+ $subFolder->setMedia($count);
+ $cat->addSubFolder($subFolder);
+ $subSubFolders = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->createQueryBuilder('folder')
+ ->field('parent_id')->equals($subFolder->getId())
+ ->sort('title', 'ASC')->getQuery()->execute();
+ if($uuid == $subFolder->getId()) {
+ $level = 2;
+ }
+ foreach($subSubFolders as $subSubFolder) {
+ $count = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Media')
+ ->createQueryBuilder('media')
+ ->field('folder.$id')->equals(new ObjectId($subSubFolder->getId()))->count()
+ ->getQuery()->execute();
+ $subSubFolder->setMedia($count);
+ $subFolder->addSubFolder($subSubFolder);
+ if($uuid == $subSubFolder->getId()) {
+ $level = 3;
+ }
+ }
+ }
}
if (!$uuid) {
@@ -146,6 +185,18 @@ class FolderController extends AbstractController
->findOneBy([]);
}
+ if ($subFolderForm->isSubmitted() && $subFolderForm->isValid()) {
+ $subCat->setIcon($request->get('icon', 'fa-file'));
+ $subCat->setParentId($selectedFolder->getId());
+ $documentManager->persist($subCat);
+ $documentManager->flush();
+ $session->set('media-folder-uuid', $subCat->getId());
+ $uuid = $subCat->getId();
+ $selectedFolder = $documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->findOneBy(array('id' => $uuid));
+ return $this->redirectToRoute('psc_shop_media_backend_folder_show', ['uuid' => $uuid, 'htmlId' => $htmlId, 'modal' => $modal]);
+ }
$searchTerm = $request->query->get('term', '');
$page = $request->query->getInt('page', 1);
if ($searchForm->isSubmitted() && $searchForm->isValid()) {
@@ -175,9 +226,11 @@ class FolderController extends AbstractController
return array(
'pagination' => $pagination,
'mediamanager' => $mediaManager,
- 'folders' => $tempFolders,
+ 'level' => $level,
+ 'folders' => $folders,
'selectedFolder' => $selectedFolder,
'folderForm' => $folderForm->createView(),
+ 'subFolderForm' => $subFolderForm->createView(),
'modal' => $modal,
'handler' => $handler,
'htmlId' => $htmlId,
@@ -185,20 +238,6 @@ class FolderController extends AbstractController
);
}
- /**
- * Default Seite
- *
- *
- * @param Request $request
- * @param \PSC\System\SettingsBundle\Service\Shop $shopService
- * @param DocumentManager $documentManager
- * @param $uuid
- * @param $modal
- * @param $htmlId
- * @return array
- * @throws \Doctrine\ODM\MongoDB\MongoDBException
- * @throws \Doctrine\ORM\ORMException
- */
#[Route(path: '/list/folder/delete/{uuid}/{modal}/{htmlId}', defaults: ['uuid' => false, 'modal' => false, 'htmlId' => false], name: 'psc_shop_media_backend_folder_delete')]
#[Template]
public function deleteAction(Request $request, \PSC\System\SettingsBundle\Service\Shop $shopService, DocumentManager $documentManager, $uuid, $modal, $htmlId)
diff --git a/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/UploadController.php b/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/UploadController.php
index 68c10891b..243be5e4b 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/UploadController.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Controller/Backend/UploadController.php
@@ -95,7 +95,7 @@ class UploadController extends AbstractController
$form = $this->createForm($handler->getFormType(), $helper);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
- //$media = $helper->getMedia();
+ //$media = $helper->getMedia();
$documentManager->detach($media);
$documentManager->persist($media);
$documentManager->flush();
diff --git a/src/new/src/PSC/Shop/MediaBundle/Document/Embed/Variant.php b/src/new/src/PSC/Shop/MediaBundle/Document/Embed/Variant.php
new file mode 100644
index 000000000..e10253c8e
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Document/Embed/Variant.php
@@ -0,0 +1,659 @@
+setCreatedAt(new \DateTime());
+ $this->setUpdatedAt(new \DateTime());
+ $this->deleted = false;
+ }
+
+ /**
+ * @return string
+ */
+ public function getFileSize()
+ {
+ $size = $this->filesize;
+ if ($size < 1024) {
+ return $size . "b";
+ } else {
+ $help = $size / 1024;
+ if ($help < 1024) {
+ return round($help, 1) . "kb";
+ } else {
+ return round(($help / 1024), 1) . "mb";
+ }
+ }
+ }
+
+ public function setSettings(string $settings): void
+ {
+ $this->settings = $settings;
+ }
+
+ public function getSettings(): string
+ {
+ return $this->settings;
+ }
+ /**
+ * @return int
+ */
+ public function getFileSizeBytes()
+ {
+ return $this->filesize;
+ }
+
+ /**
+ * @param int $filesize
+ *
+ * @return Media
+ */
+ public function setFileSize($filesize)
+ {
+ $this->filesize = $filesize;
+ return $this;
+ }
+
+ /**
+ * Set location
+ *
+ * @param string $location
+ *
+ * @return Media
+ */
+ public function setLocation($location)
+ {
+ $this->location = $location;
+ return $this;
+ }
+
+ /**
+ * Get location
+ *
+ * @return string
+ */
+ public function getLocation()
+ {
+ return $this->location;
+ }
+
+ /**
+ * Set contentType
+ *
+ * @param string $contentType
+ *
+ * @return Media
+ */
+ public function setContentType($contentType)
+ {
+ $this->contentType = $contentType;
+ return $this;
+ }
+
+ /**
+ * Get contentType
+ *
+ * @return string
+ */
+ public function getContentType()
+ {
+ return $this->contentType;
+ }
+
+ /**
+ * Get contentType
+ *
+ * @return string
+ */
+ public function getContentTypeShort()
+ {
+ $contentType = $this->contentType;
+ $array = explode("/", $contentType);
+ $contentType = end($array);
+ return $contentType;
+ }
+
+ /**
+ * Set metadata
+ *
+ * @param array $metadata
+ *
+ * @return Media
+ */
+ public function setMetadata($metadata)
+ {
+ $this->metadata = $metadata;
+ return $this;
+ }
+
+ /**
+ * Get metadata
+ *
+ * @return array
+ */
+ public function getMetadata()
+ {
+ return $this->metadata;
+ }
+
+ /**
+ * Set the specified metadata value
+ *
+ * @param string $name
+ * @param mixed $value
+ *
+ * @return Media
+ */
+ public function setMetadataValue($name, $value)
+ {
+ $metadata = $this->getProviderMetadata();
+ $metadata[$name] = $value;
+ $this->setProviderMetadata($metadata);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getMetadataValue($name, $default = null)
+ {
+ $metadata = $this->getProviderMetadata();
+ return isset($metadata[$name]) ? $metadata[$name] : $default;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function unsetMetadataValue($name)
+ {
+ $metadata = $this->getProviderMetadata();
+ unset($metadata[$name]);
+ $this->setProviderMetadata($metadata);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setCreatedAt(\DateTime $createdAt = null)
+ {
+ $this->createdAt = $createdAt;
+ }
+
+ /**
+ * Get createdAt
+ *
+ * @return \DateTime
+ */
+ public function getCreatedAt()
+ {
+ return $this->createdAt;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUpdatedAt(\DateTime $updatedAt = null)
+ {
+ $this->updatedAt = $updatedAt;
+ }
+
+ /**
+ * Get updatedAt
+ *
+ * @return \DateTime
+ */
+ public function getUpdatedAt()
+ {
+ return $this->updatedAt;
+ }
+
+ /**
+ * Set content
+ *
+ * @param mixed $content
+ *
+ * @return Media
+ */
+ public function setContent($content)
+ {
+ $this->content = $content;
+ $this->setUpdatedAt(new \DateTime());
+ return $this;
+ }
+
+ /**
+ * Get content
+ *
+ * @return mixed
+ */
+ public function getContent()
+ {
+ return $this->content;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isDeleted()
+ {
+ return $this->deleted;
+ }
+
+ /**
+ * @param bool $deleted
+ *
+ * @return Media
+ */
+ public function setDeleted($deleted)
+ {
+ $this->deleted = $deleted;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getUrl()
+ {
+ return $this->url;
+ }
+
+ /**
+ * @param string $url
+ *
+ * @return Media
+ */
+ public function setUrl($url)
+ {
+ $this->url = $url;
+ return $this;
+ }
+
+ /**
+ * @param string $originalFilename
+ *
+ * @return Media
+ */
+ public function setOriginalFilename($originalFilename)
+ {
+ $this->originalFilename = $originalFilename;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getOriginalFilename()
+ {
+ return $this->originalFilename;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setBinaryContent($binaryContent)
+ {
+ // TODO: Implement setBinaryContent() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getBinaryContent()
+ {
+ // TODO: Implement getBinaryContent() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function resetBinaryContent()
+ {
+ // TODO: Implement resetBinaryContent() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setName($name)
+ {
+ // TODO: Implement setName() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getName()
+ {
+ // TODO: Implement getName() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setEnabled($enabled)
+ {
+ // TODO: Implement setEnabled() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getEnabled()
+ {
+ // TODO: Implement getEnabled() method.
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setProviderName($providerName)
+ {
+ $this->providerName = $providerName;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getProviderName()
+ {
+ if ($this->providerName === null) {
+ return 'psc.shop.media.provider.image';
+ }
+ return $this->providerName;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setProviderStatus($providerStatus)
+ {
+ $this->providerStatus = $providerStatus;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getProviderStatus()
+ {
+ if ($this->providerStatus === null) {
+ return MediaInterface::STATUS_OK;
+ }
+ return $this->providerStatus;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setProviderReference($providerReference)
+ {
+ $this->providerReference = $providerReference;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getProviderReference()
+ {
+ return $this->providerReference;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setProviderMetadata(array $providerMetadata = [])
+ {
+ $this->providerMetadata = $providerMetadata;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getProviderMetadata()
+ {
+ return $this->providerMetadata;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setWidth($width)
+ {
+ // TODO: Implement setWidth() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getWidth()
+ {
+ // TODO: Implement getWidth() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setHeight($height)
+ {
+ // TODO: Implement setHeight() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getHeight()
+ {
+ // TODO: Implement getHeight() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setLength($length)
+ {
+ // TODO: Implement setLength() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getLength()
+ {
+ // TODO: Implement getLength() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setAuthorName($authorName)
+ {
+ // TODO: Implement setAuthorName() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getAuthorName()
+ {
+ // TODO: Implement getAuthorName() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setContext($context)
+ {
+ // TODO: Implement setContext() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getContext()
+ {
+ // TODO: Implement getContext() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setCdnIsFlushable($cdnIsFlushable)
+ {
+ // TODO: Implement setCdnIsFlushable() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCdnIsFlushable()
+ {
+ // TODO: Implement getCdnIsFlushable() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setCdnFlushIdentifier($cdnFlushIdentifier)
+ {
+ // TODO: Implement setCdnFlushIdentifier() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCdnFlushIdentifier()
+ {
+ // TODO: Implement getCdnFlushIdentifier() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setCdnFlushAt(\DateTime $cdnFlushAt = null)
+ {
+ // TODO: Implement setCdnFlushAt() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCdnFlushAt()
+ {
+ // TODO: Implement getCdnFlushAt() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getExtension()
+ {
+ $providerReference = $this->getProviderReference();
+ if (!$providerReference) {
+ return null;
+ }
+
+ // strips off query strings or hashes, which are common in URIs remote references
+ return preg_replace('{(\?|#).*}', '', pathinfo($providerReference, PATHINFO_EXTENSION));
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setSize($size)
+ {
+ // TODO: Implement setSize() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getSize()
+ {
+ // TODO: Implement getSize() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setCdnStatus($cdnStatus)
+ {
+ // TODO: Implement setCdnStatus() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getCdnStatus()
+ {
+ // TODO: Implement getCdnStatus() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getBox()
+ {
+ // TODO: Implement getBox() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function setGalleryHasMedias($galleryHasMedias)
+ {
+ // TODO: Implement setGalleryHasMedias() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getGalleryHasMedias()
+ {
+ // TODO: Implement getGalleryHasMedias() method.
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getPreviousProviderReference()
+ {
+ // TODO: Implement getPreviousProviderReference() method.
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Document/Folder.php b/src/new/src/PSC/Shop/MediaBundle/Document/Folder.php
index 2085cf784..4a637c313 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Document/Folder.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Document/Folder.php
@@ -18,38 +18,41 @@ use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument;
use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\Index;
use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceMany;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne;
#[Document(collection: 'Media_Folder')]
class Folder
{
#[Id]
protected $id;
-/**
- * @var \DateTime $created;
- */
+ /**
+ * @var \DateTime $created;
+ */
#[Field(type: 'date')]
protected $created;
-/**
- * @var \DateTime $updated;
- */
+ /**
+ * @var \DateTime $updated;
+ */
#[Field(type: 'date')]
protected $updated;
-/**
- * @var string $title
- */
+ /**
+ * @var string $title
+ */
#[Field(type: 'string')]
protected $title;
-/**
- * @var string $icon
- */
+ /**
+ * @var string $icon
+ */
#[Field(type: 'string')]
protected $icon;
-/**
- * @var string $parent
- */
+
#[Field(type: 'string')]
- protected $parent;
+ protected $parent_id;
+
+ private $subFolders = [];
+
private $media = 0;
public function __construct()
{
@@ -153,19 +156,23 @@ class Folder
$this->media = $media;
}
- /**
- * @return string
- */
- public function getParent()
+ public function getParentId()
{
- return $this->parent;
+ return $this->parent_id;
}
- /**
- * @param string $parent
- */
- public function setParent($parent)
+ public function setParentId($parent_id)
{
- $this->parent = $parent;
+ $this->parent_id = $parent_id;
+ }
+
+ public function getSubFolders(): array
+ {
+ return $this->subFolders;
+ }
+
+ public function addSubFolder(Folder $folder): void
+ {
+ $this->subFolders[] = $folder;
}
}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Document/Media.php b/src/new/src/PSC/Shop/MediaBundle/Document/Media.php
index 3e796d0b4..bd31cbb8a 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Document/Media.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Document/Media.php
@@ -13,13 +13,14 @@
namespace PSC\Shop\MediaBundle\Document;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedMany;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Field;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Id;
use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbeddedDocument;
-use Doctrine\ODM\MongoDB\Mapping\Annotations\EmbedOne;
use Doctrine\ODM\MongoDB\Mapping\Annotations\ReferenceOne;
-use Imagine\Image\Box;
+use Doctrine\ODM\MongoDB\PersistentCollection;
+use PSC\Shop\MediaBundle\Document\Embed\Variant;
use PSC\Shop\MediaBundle\Model\MediaInterface;
#[Document]
@@ -27,92 +28,95 @@ class Media implements MediaInterface
{
#[Id]
protected $id;
-/**
- * @var string $shop
- */
+
#[Field(type: 'string')]
protected $shop;
-/**
- * @var string
- */
+
+ #[Field(type: 'string')]
+ protected $contact;
+
+ #[EmbedMany(targetDocument: Variant::class)]
+ protected $variants;
+
#[Field(type: 'string')]
protected $title;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $description;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $copyright;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $location;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $contentType;
-/**
- * @var array
- */
+ /**
+ * @var array
+ */
#[Field(type: 'hash')]
protected $metadata = array();
-/**
- * @var \DateTime
- */
+ /**
+ * @var \DateTime
+ */
#[Field(type: 'date')]
protected $createdAt;
-/**
- * @var \DateTime
- */
+ /**
+ * @var \DateTime
+ */
#[Field(type: 'date')]
protected $updatedAt;
-/**
- * @var Folder
- */
+ /**
+ * @var Folder
+ */
#[ReferenceOne(targetDocument: 'PSC\Shop\MediaBundle\Document\Folder')]
protected $folder;
-/**
- * @var mixed
- */
+ /**
+ * @var mixed
+ */
protected $content;
-/**
- * @var int
- */
+ /**
+ * @var int
+ */
#[Field(type: 'int')]
protected $filesize;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $url;
-/**
- * @var string
- */
+ /**
+ * @var string
+ */
#[Field(type: 'string')]
protected $originalFilename;
-/**
- * @var bool
- */
+ /**
+ * @var bool
+ */
#[Field(type: 'bool')]
protected $deleted;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $providerName;
-#[Field(type: 'int')]
+ #[Field(type: 'int')]
protected $providerStatus;
-#[Field(type: 'string')]
+ #[Field(type: 'string')]
protected $providerReference;
-#[Field(type: 'hash')]
+ #[Field(type: 'hash')]
protected $providerMetadata = [];
public function __construct()
{
$this->setCreatedAt(new \DateTime());
$this->setUpdatedAt(new \DateTime());
+ $this->variants = new ArrayCollection();
$this->deleted = false;
}
@@ -818,4 +822,29 @@ class Media implements MediaInterface
{
// TODO: Implement getPreviousProviderReference() method.
}
+
+ public function addVariant(Variant $variant): void
+ {
+ $tmp = [];
+ $found = false;
+ foreach ($this->variants as $var) {
+ if ($var->getSettings() == $variant->getSettings()) {
+ $tmp[] = $variant;
+ $found = true;
+ } else {
+ $tmp[] = $var;
+ }
+ }
+
+ if (!$found) {
+ $tmp[] = $variant;
+ }
+
+ $this->variants = $tmp;
+ }
+
+ public function getVariants(): PersistentCollection
+ {
+ return $this->variants;
+ }
}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Form/Backend/SubFolderType.php b/src/new/src/PSC/Shop/MediaBundle/Form/Backend/SubFolderType.php
new file mode 100644
index 000000000..d9881b11a
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Form/Backend/SubFolderType.php
@@ -0,0 +1,40 @@
+
+ * @copyright 2012-2013 PrintshopCreator GmbH
+ * @license Private
+ * @link http://www.printshopcreator.de
+ */
+
+namespace PSC\Shop\MediaBundle\Form\Backend;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class SubFolderType extends AbstractType
+{
+ public function buildForm(FormBuilderInterface $builder, array $options)
+ {
+ $builder
+ ->add('title', TextType::class, array('attr' => array('placeholder' => 'Folder')));
+ }
+
+ public function getName()
+ {
+ return 'subFolder';
+ }
+
+ public function configureOptions(OptionsResolver $resolver)
+ {
+ $resolver->setDefaults(array(
+ 'data_class' => 'PSC\Shop\MediaBundle\Document\Folder',
+ ));
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Helper/File/FileHandler.php b/src/new/src/PSC/Shop/MediaBundle/Helper/File/FileHandler.php
index 57026e23f..8e6c0a7dc 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Helper/File/FileHandler.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Helper/File/FileHandler.php
@@ -22,12 +22,12 @@ class FileHandler extends AbstractMediaHandler
/**
* @var string
*/
- const TYPE = 'file';
+ public const TYPE = 'file';
/**
* @var string
*/
- const MEDIA_PATH = '/uploads/media/';
+ public const MEDIA_PATH = '/uploads/media/';
/**
* @var Filesystem
@@ -168,6 +168,7 @@ class FileHandler extends AbstractMediaHandler
$media->setContent($file);
}
if ($content instanceof UploadedFile) {
+ $this->checkExif($content->getPathname());
$pathInfo = pathinfo($content->getClientOriginalName());
$media->setOriginalFilename($this->slugifier->slugify($pathInfo['filename']) . '.' . $pathInfo['extension']);
$name = $media->getTitle();
@@ -184,6 +185,35 @@ class FileHandler extends AbstractMediaHandler
$media->setLocation('local');
}
+ private function checkExif($filename)
+ {
+ if (function_exists('exif_read_data')) {
+ if (exif_imagetype($filename) != IMAGETYPE_JPEG) {
+ return;
+ }
+ $exif = exif_read_data($filename);
+ if ($exif && isset($exif['Orientation'])) {
+ $orientation = $exif['Orientation'];
+ if ($exif['Orientation'] == 3 or $exif['Orientation'] == 6 or $exif['Orientation'] == 8) {
+ $imageResource = imagecreatefromjpeg($filename);
+ switch ($exif['Orientation']) {
+ case 3:
+ $image = imagerotate($imageResource, 180, 0);
+ break;
+ case 6:
+ $image = imagerotate($imageResource, -90, 0);
+ break;
+ case 8:
+ $image = imagerotate($imageResource, 90, 0);
+ break;
+ }
+ imagejpeg($image, $filename);
+ imagedestroy($imageResource);
+ imagedestroy($image);
+ }
+ }
+ }
+ }
/**
* @param Media $media
*/
diff --git a/src/new/src/PSC/Shop/MediaBundle/Helper/Image/ImageHandler.php b/src/new/src/PSC/Shop/MediaBundle/Helper/Image/ImageHandler.php
index 62b8880db..c3c81c8a6 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Helper/Image/ImageHandler.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Helper/Image/ImageHandler.php
@@ -88,12 +88,14 @@ class ImageHandler extends FileHandler
parent::prepareMedia($media);
if ($media->getContent()) {
- $imageInfo = getimagesize($media->getContent());
- $width = $imageInfo[0];
- $height = $imageInfo[1];
+ if ('image/svg+xml' !== mime_content_type($media->getContent()->getPathname())) {
+ $imageInfo = getimagesize($media->getContent());
+ $width = $imageInfo[0];
+ $height = $imageInfo[1];
- $media->setMetadataValue('original_width', $width);
- $media->setMetadataValue('original_height', $height);
+ $media->setMetadataValue('original_width', $width);
+ $media->setMetadataValue('original_height', $height);
+ }
}
}
}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Model/Media.php b/src/new/src/PSC/Shop/MediaBundle/Model/Media.php
index 977bcf088..51c615f34 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Model/Media.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Model/Media.php
@@ -16,6 +16,9 @@ class Media
#[OA\Property(type: 'string')]
private string $uuid = "";
+ #[OA\Property(type: 'array', items: new OA\Items(ref: new Model(type: Variant::class)))]
+ private array $variants = [];
+
/**
* @return string
*/
@@ -63,4 +66,43 @@ class Media
{
$this->uuid = $uuid;
}
-}
\ No newline at end of file
+
+ public function __toString(): string
+ {
+ return $this->uuid;
+ }
+
+ public function getArray(): array
+ {
+ return [
+ 'uuid' => $this->uuid,
+ 'url' => $this->url,
+ 'title' => $this->title
+ ];
+ }
+
+ public function getVariants(): array
+ {
+ return $this->variants;
+ }
+
+ public function getVariant(string $settings): Media|Variant
+ {
+ foreach ($this->variants as $variant) {
+ if ($settings == $variant->getSettings()) {
+ return $variant;
+ }
+ }
+ return $this;
+ }
+
+ public function addVariant(Variant $variant): void
+ {
+ $this->variants[] = $variant;
+ }
+
+ public function clearVariants(): void
+ {
+ $this->variants = [];
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Model/Upload.php b/src/new/src/PSC/Shop/MediaBundle/Model/Upload.php
new file mode 100644
index 000000000..32b38060a
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Model/Upload.php
@@ -0,0 +1,16 @@
+title;
+ }
+
+ public function setTitle(string $title): void
+ {
+ $this->title = $title;
+ }
+ public function getUrl(): string
+ {
+ return $this->url;
+ }
+
+ public function setUrl(string $url): void
+ {
+ $this->url = $url;
+ }
+
+ public function getContact(): string
+ {
+ return $this->contact;
+ }
+
+ public function setContact(string $contact): void
+ {
+ $this->contact = $contact;
+ }
+
+ public function getSettings(): string
+ {
+ return $this->settings;
+ }
+
+ public function setSettings(string $settings): void
+ {
+ $this->settings = $settings;
+ }
+
+ public function getUuid(): string
+ {
+ return $this->uuid;
+ }
+
+ public function setUuid(string $uuid): void
+ {
+ $this->uuid = $uuid;
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Resources/config/routing.yml b/src/new/src/PSC/Shop/MediaBundle/Resources/config/routing.yml
index f318e1c11..717405ce2 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Resources/config/routing.yml
+++ b/src/new/src/PSC/Shop/MediaBundle/Resources/config/routing.yml
@@ -3,3 +3,7 @@ psc_shop_media_backend:
type: annotation
prefix: /backend/media
+psc_shop_media_api:
+ resource: "@PSCShopMediaBundle/Api"
+ prefix: /api/media
+ type: annotation
diff --git a/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/folder/show.html.twig b/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/folder/show.html.twig
index 64f7cc784..c3d5b5ee3 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/folder/show.html.twig
+++ b/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/folder/show.html.twig
@@ -45,6 +45,27 @@
({{ cat.media }}) {{ cat.title }}
+ {% if cat.subFolders|length > 0 %}
+
{% endfor %}
@@ -55,7 +76,7 @@
-
+ {% for subCat in cat.subFolders %}
+
+ {% endfor %}
+
-
@@ -165,4 +201,4 @@
});
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/media/detail.html.twig b/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/media/detail.html.twig
index 4950661f9..8dc734a29 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/media/detail.html.twig
+++ b/src/new/src/PSC/Shop/MediaBundle/Resources/views/backend/media/detail.html.twig
@@ -48,7 +48,7 @@
{% set isImage = false %}
{% endif %}
{% if imageurlorg %}
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Service/Folder.php b/src/new/src/PSC/Shop/MediaBundle/Service/Folder.php
new file mode 100644
index 000000000..30ca988ab
--- /dev/null
+++ b/src/new/src/PSC/Shop/MediaBundle/Service/Folder.php
@@ -0,0 +1,45 @@
+documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->createQueryBuilder('folder')
+ ->field('parent_id')->exists(false)
+ ->sort('title', 'ASC')->getQuery()->execute();
+
+ $temp = [];
+ foreach($folders as $folder) {
+ $temp[$folder->getTitle()] = $folder->getId();
+ $subFolders = $this->documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->createQueryBuilder('folder')
+ ->field('parent_id')->equals($folder->getId())
+ ->sort('title', 'ASC')->getQuery()->execute();
+ foreach($subFolders as $subFolder) {
+ $temp['--' . $subFolder->getTitle()] = $subFolder->getId();
+ $subSubFolders = $this->documentManager
+ ->getRepository('PSC\Shop\MediaBundle\Document\Folder')
+ ->createQueryBuilder('folder')
+ ->field('parent_id')->equals($subFolder->getId())
+ ->sort('title', 'ASC')->getQuery()->execute();
+ foreach($subSubFolders as $subSubFolder) {
+ $temp['----' . $subSubFolder->getTitle()] = $subSubFolder->getId();
+ }
+ }
+ }
+ return $temp;
+ }
+}
diff --git a/src/new/src/PSC/Shop/MediaBundle/Service/MediaManager.php b/src/new/src/PSC/Shop/MediaBundle/Service/MediaManager.php
index 9144089d7..a3085155f 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Service/MediaManager.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Service/MediaManager.php
@@ -5,27 +5,14 @@ namespace PSC\Shop\MediaBundle\Service;
use Doctrine\ODM\MongoDB\DocumentManager;
use Liip\ImagineBundle\Imagine\Cache\CacheManager;
use PSC\Shop\MediaBundle\Document\Media;
-use PSC\Shop\MediaBundle\Helper\Media\AbstractMediaHandler;
-use Symfony\Component\HttpFoundation\File\File;
use MongoDB\BSON\ObjectId;
+use PSC\Shop\MediaBundle\Model\Media as AliasedMedia;
+use PSC\Shop\MediaBundle\Transformer\Media as PSCMedia;
-/**
- * MediaManager
- */
class MediaManager
{
- /** @var DocumentManager */
- private $mongoDb;
-
- private $cacheManager;
-
- /**
- * @var DocumentManager $repository
- */
- public function __construct(DocumentManager $mongoDb, CacheManager $cacheManager)
+ public function __construct(private readonly DocumentManager $mongoDb, private readonly CacheManager $cacheManager, private readonly PSCMedia $mediaTransformer)
{
- $this->mongoDb = $mongoDb;
- $this->cacheManager = $cacheManager;
}
public function getMedia($id)
@@ -37,6 +24,14 @@ class MediaManager
return $media;
}
+ public function getModelByUuid(string $id): AliasedMedia
+ {
+ $mediaModel = new AliasedMedia();
+ $this->mediaTransformer->fromDb($mediaModel, $this->getMedia($id));
+
+ return $mediaModel;
+ }
+
public function retrieveThumbnailPath(Media $media, $mode = 'psc_backend_portal_image')
{
/** @var string */
diff --git a/src/new/src/PSC/Shop/MediaBundle/Transformer/Media.php b/src/new/src/PSC/Shop/MediaBundle/Transformer/Media.php
index 4e0099935..4ca718fd6 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Transformer/Media.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Transformer/Media.php
@@ -1,8 +1,11 @@
setTitle($mediaDoc->getTitle());
$media->setUrl($mediaDoc->getUrl());
$media->setUuid($mediaDoc->getId());
+
+ foreach ($mediaDoc->getVariants() as $variant) {
+ $variantModel = new Variant();
+ $variantModel->setUrl($variant->getUrl());
+ $variantModel->setTitle($variant->getTitle());
+ $variantModel->setSettings($variant->getSettings());
+ $media->addVariant($variantModel);
+ }
+
}
public function toDb(\PSC\Shop\MediaBundle\Model\Media $media, \PSC\Shop\MediaBundle\Document\Media $mediaDoc)
diff --git a/src/new/src/PSC/Shop/MediaBundle/Twig/Extension/MediaExtension.php b/src/new/src/PSC/Shop/MediaBundle/Twig/Extension/MediaExtension.php
index b42db8d99..f68b63a96 100755
--- a/src/new/src/PSC/Shop/MediaBundle/Twig/Extension/MediaExtension.php
+++ b/src/new/src/PSC/Shop/MediaBundle/Twig/Extension/MediaExtension.php
@@ -7,7 +7,9 @@ use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
use MongoDB\BSON\ObjectId;
use PSC\Shop\MediaBundle\Document\Media;
use PSC\Shop\MediaBundle\Helper\MediaManager;
+use PSC\Shop\MediaBundle\Model\Media as PSCMedia;
use PSC\Shop\MediaBundle\Model\MediaInterface;
+use PSC\Shop\MediaBundle\Model\Variant;
use PSC\Shop\MediaBundle\Service\Pool;
use PSC\Shop\MediaBundle\Twig\TokenParser\MediaTokenParser;
use PSC\Shop\MediaBundle\Twig\TokenParser\PathTokenParser;
@@ -22,25 +24,25 @@ class MediaExtension extends \Twig\Extension\AbstractExtension
* @var Pool
*/
protected $mediaService;
-/**
- * @var array
- */
+ /**
+ * @var array
+ */
protected $resources = array();
-/**
- * @var ManagerInterface
- */
+ /**
+ * @var ManagerInterface
+ */
protected $mediaManager;
protected $mongoManager;
-/**
- * @var \Twig_Environment
- */
+ /**
+ * @var \Twig_Environment
+ */
protected $environment;
-/**
- * @param Pool $mediaService
- * @param MediaManager $mediaManager
- * @param DocumentManager $mongoManager
- * @param Environment $environment
- */
+ /**
+ * @param Pool $mediaService
+ * @param MediaManager $mediaManager
+ * @param DocumentManager $mongoManager
+ * @param Environment $environment
+ */
public function __construct(Pool $mediaService, MediaManager $mediaManager, DocumentManager $mongoManager, Environment $environment)
{
$this->mediaService = $mediaService;
@@ -57,7 +59,11 @@ class MediaExtension extends \Twig\Extension\AbstractExtension
);
}
- public function file($media): string {
+ public function file(string|PSCMedia|Variant $media): string
+ {
+ if ($media instanceof PSCMedia || $media instanceof Variant) {
+ return '/data/www/new/web'.$media->getUrl();
+ }
$media = $this->getMedia($media);
if (!$media) {
return '';
@@ -66,7 +72,8 @@ class MediaExtension extends \Twig\Extension\AbstractExtension
return '/data/www/new/web'.$media->getUrl();
}
- public function fileWeb($media): string {
+ public function fileWeb($media): string
+ {
$media = $this->getMedia($media);
if (!$media) {
return '';
@@ -122,7 +129,7 @@ class MediaExtension extends \Twig\Extension\AbstractExtension
->getProvider($media->getProviderName());
$format = $provider->getFormatName($media, $format);
$format_definition = $provider->getFormat($format);
-// build option
+ // build option
$defaultOptions = array(
'title' => $media->getName(),
'alt' => $media->getName(),
@@ -167,7 +174,7 @@ class MediaExtension extends \Twig\Extension\AbstractExtension
->getProvider($media->getProviderName());
$format = $provider->getFormatName($media, $format);
$format_definition = $provider->getFormat($format);
-// build option
+ // build option
$defaultOptions = array(
'title' => $media->getName(),
'alt' => $media->getName(),
diff --git a/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/DetailController.php b/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/DetailController.php
index 83049f558..bd40d100e 100755
--- a/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/DetailController.php
+++ b/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/DetailController.php
@@ -33,6 +33,7 @@ use PSC\Shop\OrderBundle\Form\Backend\ProdType;
use PSC\Shop\OrderBundle\Form\Backend\ProdinfoType;
use PSC\Shop\OrderBundle\Form\Backend\Upload\DeleteType;
use PSC\Shop\OrderBundle\PSCShopOrderBundle;
+use PSC\Shop\OrderBundle\Service\Order as PSCOrder;
use PSC\Shop\QueueBundle\Event\Order\Create;
use PSC\Shop\QueueBundle\Event\Order\Updated;
use PSC\Shop\QueueBundle\Event\Position\Printpartner\Notify;
@@ -70,26 +71,6 @@ class DetailController extends AbstractController
{
}
- /**
- * Detail Seite
- *
- * @param Request $request
- * @param Field $fieldService
- * @param Section $sectionService
- * @param Shop $shopService
- * @param DocumentManager $mongoService
- * @param EntityManagerInterface $entityManager
- * @param Manager $eventManagerService
- * @param Status $statusService
- * @param PaperDB $paperService
- * @param SessionInterface $session
- * @param string $uuid
- * @param boolean $enableDelivery
- *
- * @return array
- * @throws \Doctrine\ODM\MongoDB\MongoDBException
- * @throws \Doctrine\ORM\ORMException
- */
#[Route(path: '/detail/show/{uuid}/{enableDelivery}', defaults: ['enableDelivery' => 0], name: 'psc_shop_order_backend_detail_show')]
#[Template]
public function showAction(
@@ -104,15 +85,17 @@ class DetailController extends AbstractController
PaperDB $paperService,
SessionInterface $session,
FormFactoryInterface $formFactory,
+ PSCOrder $orderService,
$uuid = "",
$enableDelivery = false
) {
$customFields = $fieldService->getFields(\PSC\System\PluginBundle\Form\Interfaces\Field::Order);
$customGroups = $fieldService->getGroups(\PSC\System\PluginBundle\Form\Interfaces\Field::Order);
$customSections = $sectionService->get(\PSC\System\PluginBundle\Form\Interfaces\Section::Order);
+ $customPositionDetailSections = $sectionService->get(\PSC\System\PluginBundle\Form\Interfaces\Section::OrderPositionDetail);
$selectedShop = $shopService->getSelectedShop();
/**
- * @var \PSC\Shop\EntityBundle\Document\Shop $shop
+ * @var \PSC\Shop\EntityBundle\Document\Shop $shop
*/
$shop = $mongoService
->getRepository('PSC\Shop\EntityBundle\Document\Shop')
@@ -123,13 +106,13 @@ class DetailController extends AbstractController
}
/**
- * @var Order $order
+ * @var Order $order
*/
$order = $entityManager
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->findOneBy(array('shop' => $selectedShop, 'uuid' => $uuid));
/**
- * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
+ * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
*/
$orderObj = $mongoService
->getRepository('PSC\Shop\EntityBundle\Document\Order')
@@ -154,7 +137,7 @@ class DetailController extends AbstractController
$order->setStatus($data['status']);
$eventManagerService->addJob($notify);
$this->logService->createLogEntry($selectedShop, $this->getUser(), LogEntry::INFO, PSCShopOrderBundle::class, $order->getUuid(), "Order Status Detail Changed To: " . $data['status']);
- }else{
+ } else {
$this->logService->createLogEntry($selectedShop, $this->getUser(), LogEntry::INFO, PSCShopOrderBundle::class, $order->getUuid(), "Order Status Not Changed But Rest Saved Current Status: " . $order->getStatus());
}
@@ -238,19 +221,19 @@ class DetailController extends AbstractController
$positions = array();
/**
- * @var Orderpos $pos
+ * @var Orderpos $pos
*/
foreach ($order->getPositions() as $pos) {
if ($pos->getProduct()->getOriginalProduct() != 0) {
/**
- * @var Product $objProduct
+ * @var Product $objProduct
*/
$objProduct = $mongoService
->getRepository(Product::class)
->findOneBy(['uid' => (string)$pos->getProduct()->getOriginalProduct()]);
} else {
/**
- * @var Product $objProduct
+ * @var Product $objProduct
*/
$objProduct = $mongoService
->getRepository(Product::class)
@@ -260,7 +243,7 @@ class DetailController extends AbstractController
$count = $pos->getCount();
/**
- * @var Position $objDoc
+ * @var Position $objDoc
*/
$objDoc = $mongoService
->getRepository(Position::class)
@@ -286,7 +269,7 @@ class DetailController extends AbstractController
if(isset($objDoc->getSpecialProductTypeObject()['kalk_artikel'])) {
$engine->setActiveArticle($objDoc->getSpecialProductTypeObject()['kalk_artikel']);
}
- }else{
+ } else {
$objPosition = unserialize($pos->getData());
$engine->setVariables($objPosition->getOptions());
if(isset($objPosition->getOptions()['kalk_artikel'])) {
@@ -345,6 +328,7 @@ class DetailController extends AbstractController
return array(
'order' => $order,
'orderObj' => $orderObj,
+ 'orderModel' => $orderService->getOrderByUuid($uuid),
'positions' => $positions,
'formInvoice' => $formInvoice->createView(),
'formDelivery' => $formDelivery->createView(),
@@ -354,7 +338,8 @@ class DetailController extends AbstractController
'shop' => $shop,
'customFields' => $customFields,
'customGroups' => $customGroups,
- 'customSections' => $customSections
+ 'customSections' => $customSections,
+ 'customPositionDetailSections' => $customPositionDetailSections,
);
}
@@ -376,7 +361,7 @@ class DetailController extends AbstractController
public function switchPosStatusAction(EntityManagerInterface $entityManagerService, Manager $eventManagerService, Shop $shopService, $order = "", $pos = "", $status = 10)
{
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
*/
$selectedShop = $shopService->getSelectedShop();
/**
@@ -408,11 +393,11 @@ class DetailController extends AbstractController
public function setPackageExportedAction(DocumentManager $mongoService, EntityManagerInterface $entityManagerService, Manager $eventManagerService, Shop $shopService, $uuid = "")
{
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
*/
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Order $order
+ * @var Order $order
*/
$order = $entityManagerService
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
@@ -426,7 +411,7 @@ class DetailController extends AbstractController
->getQuery();
$q->execute();
/**
- * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
+ * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
*/
$orderObj = $mongoService
->getRepository('PSC\Shop\EntityBundle\Document\Order')
@@ -452,11 +437,11 @@ class DetailController extends AbstractController
public function createNewOrderStatus(DocumentManager $mongoService, EntityManagerInterface $entityManagerService, Manager $eventManagerService, Shop $shopService, $uuid = "")
{
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
*/
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Order $order
+ * @var Order $order
*/
$order = $entityManagerService
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
@@ -470,7 +455,7 @@ class DetailController extends AbstractController
->getQuery();
$q->execute();
/**
- * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
+ * @var \PSC\Shop\EntityBundle\Document\Order $orderObj
*/
$orderObj = $mongoService
->getRepository('PSC\Shop\EntityBundle\Document\Order')
@@ -497,21 +482,21 @@ class DetailController extends AbstractController
public function deleteOrder(DocumentManager $mongoService, EntityManagerInterface $entityManagerService, Manager $eventManagerService, Shop $shopService, $uuid = "")
{
/**
- * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
+ * @var \PSC\Shop\EntityBundle\Entity\Shop $selectedShop
*/
$selectedShop = $shopService->getSelectedShop();
/**
- * @var Order $order
+ * @var Order $order
*/
$order = $entityManagerService
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->findOneBy(array('shop' => $selectedShop, 'uuid' => $uuid));
/**
- * @var Orderpos $pos
+ * @var Orderpos $pos
*/
foreach ($order->getPositions() as $pos) {
/**
- * @var Upload $upload
+ * @var Upload $upload
*/
foreach ($pos->getUploads() as $upload) {
$entityManagerService->remove($upload);
diff --git a/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/PrintController.php b/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/PrintController.php
index 084f6fbff..d53e15487 100755
--- a/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/PrintController.php
+++ b/src/new/src/PSC/Shop/OrderBundle/Controller/Backend/PrintController.php
@@ -44,15 +44,8 @@ use Symfony\Component\HttpFoundation\Request;
require_once(__DIR__ . '/../../../EntityBundle/Lagacy/TP_Basket_Item.php');
-/**
- * DetailController fürs Backend
- *
- * @package PSC\Shop\Order\Backend
- * @subpackage Controller
- */
class PrintController extends AbstractController
{
-
#[Route(path: '/detail/print/{type}/{uuid}', name: 'psc_shop_order_backend_detail_print')]
#[Template]
public function printAction(
@@ -66,7 +59,7 @@ class PrintController extends AbstractController
if ($uuid == 'last') {
$selectedShop = $shopService->getSelectedShop();
-/** @var Order $order */
+ /** @var Order $order */
$order = $entityManager
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->createQueryBuilder('orders')
@@ -76,7 +69,7 @@ class PrintController extends AbstractController
->orderBy('orders.uid', 'DESC')
->getQuery()->getSingleResult();
} else {
- /** @var Order $order */
+ /** @var Order $order */
$order = $entityManager
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->findOneBy(array('uuid' => $uuid));
@@ -84,7 +77,7 @@ class PrintController extends AbstractController
$content = $printingService->generateOrder($order, $type);
$response = new StreamedResponse(function () use ($content) {
- echo $content;
+ echo $content;
});
$response->headers->set('Content-Type', 'application/pdf');
$response->headers->set('Cache-Control', '');
@@ -110,7 +103,7 @@ class PrintController extends AbstractController
if ($uuid == 'last') {
$selectedShop = $shopService->getSelectedShop();
-/** @var Order $order */
+ /** @var Order $order */
$order = $entityManager
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->createQueryBuilder('orders')
@@ -120,14 +113,14 @@ class PrintController extends AbstractController
->orderBy('orders.uid', 'DESC')
->getQuery()->getSingleResult();
} else {
- /** @var Order $order */
+ /** @var Order $order */
$order = $entityManager
->getRepository('PSC\Shop\EntityBundle\Entity\Order')
->findOneBy(array('uuid' => $uuid));
}
$content = "";
-/** @var Orderpos $position */
+ /** @var Orderpos $position */
foreach ($order->getPositions() as $position) {
if ($position->getUuid() == $posuuid) {
$content = $printingService->generatePosition($position, $type);
@@ -140,7 +133,7 @@ class PrintController extends AbstractController
$response = new StreamedResponse(function () use ($content) {
- echo $content;
+ echo $content;
});
$response->headers->set('Content-Type', 'application/pdf');
$response->headers->set('Cache-Control', '');
@@ -148,35 +141,35 @@ class PrintController extends AbstractController
$response->headers->set('Last-Modified', gmdate('D, d M Y H:i:s'));
switch ($type) {
case Printing::INVOICE:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'invoice_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'invoice_' . $order->getAlias() . '.pdf');
break;
case Printing::DELIVERY:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'delivery_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'delivery_' . $order->getAlias() . '.pdf');
break;
case Printing::LABEL:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'label_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'label_' . $order->getAlias() . '.pdf');
break;
case Printing::ORDER:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'order_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'order_' . $order->getAlias() . '.pdf');
break;
case Printing::OFFER:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'offer_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'offer_' . $order->getAlias() . '.pdf');
break;
case Printing::STORNO:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'storno_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'storno_' . $order->getAlias() . '.pdf');
break;
case Printing::JOBTICKET:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'jobticket_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'jobticket_' . $order->getAlias() . '.pdf');
break;
case Printing::JOBTICKET_PRINTPARTNER:
- $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'jobticket_pp_' . $order->getAlias() . '.pdf');
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'jobticket_pp_' . $order->getAlias() . '.pdf');
break;
}
@@ -186,4 +179,46 @@ class PrintController extends AbstractController
$response->prepare($request);
return $response;
}
+
+ #[Route(path: '/detail/xrechnung/{uuid}', name: 'psc_shop_order_backend_detail_xrechnung')]
+ #[Template]
+ public function xrechnung(
+ Request $request,
+ Printing $printingService,
+ \PSC\System\SettingsBundle\Service\Shop $shopService,
+ EntityManagerInterface $entityManager,
+ $uuid = ""
+ ) {
+
+ if ($uuid == 'last') {
+ $selectedShop = $shopService->getSelectedShop();
+ /** @var Order $order */
+ $order = $entityManager
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Order')
+ ->createQueryBuilder('orders')
+ ->andWhere('orders.shop = :shop_id')
+ ->setParameter("shop_id", $selectedShop->getUid())
+ ->setMaxResults(1)
+ ->orderBy('orders.uid', 'DESC')
+ ->getQuery()->getSingleResult();
+ } else {
+ /** @var Order $order */
+ $order = $entityManager
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Order')
+ ->findOneBy(array('uuid' => $uuid));
+ }
+ $content = $printingService->generateXRechnung($order);
+ $response = new StreamedResponse(function () use ($content) {
+
+ echo $content;
+ });
+ $response->headers->set('Content-Type', 'application/xml');
+ $response->headers->set('Cache-Control', '');
+ $response->headers->set('Content-Length', strlen($content));
+ $response->headers->set('Last-Modified', gmdate('D, d M Y H:i:s'));
+ $contentDisposition = $response->headers->makeDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, "xrechnung.xml");
+ $response->headers->set('Content-Disposition', $contentDisposition);
+ $response->prepare($request);
+ return $response;
+ }
}
diff --git a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/detail/show.html.twig b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/detail/show.html.twig
index 84d209fbd..d0d198a1b 100755
--- a/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/detail/show.html.twig
+++ b/src/new/src/PSC/Shop/OrderBundle/Resources/views/backend/detail/show.html.twig
@@ -35,6 +35,7 @@ span.row {
{% if shop.docLabelJasperXml != "" %} {{'labels'|trans}}{% endif %}
{% if shop.docJobticketJasperXml != "" %} {{'jobticket'|trans}}{% endif %}
{% if shop.docStornoJasperXml != "" %} {{'cancel'|trans}}{% endif %}
+ {{'XRechnung'|trans}}
+
{% if selectedFolder %} Dateien hinzufügen (Einzelupload){% if pagination|length == 0 %} Ordner löschen{% endif %}{% endif %}
+ {% if selectedFolder %} Dateien hinzufügen (Einzelupload) {% if pagination|length == 0 %} Ordner löschen{% endif %}{% endif %}
{{ form_start(searchForm, { 'attr': {'class': ''}}) }}
+ {% if level < 3 %}
+ {{ form_start(subFolderForm, { 'attr': {'class': ''}}) }}
+
@@ -67,7 +88,22 @@
{{ form_end(searchForm) }}
+
+ {{ form_end(subFolderForm) }}
+ {% endif %}
+
+
+
+ {{ form_widget(subFolderForm.title, {attr: {'class': 'form-control'}}) }}
+
+
+
+
+ | Setting | +Url | +
|---|---|
| {{ variant.settings }} |
Referenzen
@@ -137,4 +157,4 @@
+
+
+
+
+
+
+ (Esc)
+
+
+
+
+