diff --git a/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php b/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php index 290894131..a5fe83b4a 100755 --- a/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php +++ b/src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php @@ -199,7 +199,6 @@ class EditController extends AbstractController 'CMS Site saved', ); } else { - dump($form->getErrors()); } return array( diff --git a/src/new/src/PSC/Shop/EntityBundle/Entity/Paper.php b/src/new/src/PSC/Shop/EntityBundle/Entity/Paper.php index 161c2ba95..9ad78a2fb 100755 --- a/src/new/src/PSC/Shop/EntityBundle/Entity/Paper.php +++ b/src/new/src/PSC/Shop/EntityBundle/Entity/Paper.php @@ -50,275 +50,276 @@ class Paper protected $post; protected $volume; /** - * @var integer - */ + * @var integer + */ #[ORM\Column(name: 'id', type: 'integer')] #[ORM\Id] #[ORM\GeneratedValue(strategy: 'IDENTITY')] private $id; /** - * @var integer - */ + * @var integer + */ #[ORM\Column(name: 'install_id', type: 'integer', nullable: true)] private $install; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'art_nr', type: 'string', length: 25, nullable: true)] private $artNr; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'auslauf', type: 'string', length: 1, nullable: true)] private $auslauf; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'description_1', type: 'string', length: 255, nullable: true)] private $description1; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'description_2', type: 'string', length: 255, nullable: true)] private $description2; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'grammatur', type: 'string', length: 6, nullable: true)] private $grammatur; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'staerke', type: 'string', length: 60, nullable: true)] private $staerke; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'breite', type: 'string', length: 60, nullable: true)] private $breite; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'hoehe', type: 'string', length: 60, nullable: true)] private $hoehe; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'laenge', type: 'string', length: 60, nullable: true)] private $laenge; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'rollenlaenge', type: 'string', length: 60, nullable: true)] private $rollenLaenge; /** - * @var integer - */ + * @var integer + */ #[ORM\Column(name: 'gewicht', type: 'integer', nullable: true)] private $gewicht; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'papierausruestung', type: 'string', length: 60, nullable: true)] private $papierAusruestung; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'farbnummer', type: 'string', length: 60, nullable: true)] private $farbNummer; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'farbbezeichnung', type: 'string', length: 60, nullable: true)] private $farbBezeichnung; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'huelsendurchmesser', type: 'string', length: 60, nullable: true)] private $huelsenDurchmesser; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'kleber', type: 'string', length: 60, nullable: true)] private $kleber; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'abdeckpapier', type: 'string', length: 60, nullable: true)] private $abdeckPapier; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'laufrichtung', type: 'string', length: 2, nullable: true)] private $laufRichtung; /** - * @var integer - */ + * @var integer + */ #[ORM\Column(name: 'mengenangabe', type: 'integer', nullable: true)] private $mengenAngabe; /** - * @var integer - */ + * @var integer + */ #[ORM\Column(name: 'mengenangabe_palette', type: 'integer', nullable: true)] private $mengenangabePalette; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'inhalt', type: 'string', length: 60, nullable: true)] private $inhalt; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'etiketten_je_blatt', type: 'string', length: 60, nullable: true)] private $etikettenJeBlatt; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'mengeneinheit', type: 'string', length: 30, nullable: true)] private $mengenEinheit; /** - * @var integer - */ - #[ORM\Column(name: 'staffelmenge_1', type: 'integer', nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelmenge_1', type: 'float', nullable: true)] private $staffelmenge1; /** - * @var float - */ - #[ORM\Column(name: 'staffelpreis_1', type: 'float', precision: 10, scale: 0, nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelpreis_1', type: 'float', nullable: true)] private $staffelpreis1; /** - * @var integer - */ - #[ORM\Column(name: 'staffelmenge_2', type: 'integer', nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelmenge_2', type: 'float', nullable: true)] private $staffelmenge2; /** - * @var float - */ - #[ORM\Column(name: 'staffelpreis_2', type: 'float', precision: 10, scale: 0, nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelpreis_2', type: 'float', nullable: true)] private $staffelpreis2; /** - * @var integer - */ - #[ORM\Column(name: 'staffelmenge_3', type: 'integer', nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelmenge_3', type: 'float', nullable: true)] private $staffelmenge3; /** - * @var float - */ - #[ORM\Column(name: 'staffelpreis_3', type: 'float', precision: 10, scale: 0, nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelpreis_3', type: 'float', nullable: true)] private $staffelpreis3; /** - * @var integer - */ - #[ORM\Column(name: 'staffelmenge_4', type: 'integer', nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelmenge_4', type: 'float', nullable: true)] private $staffelmenge4; /** - * @var float - */ - #[ORM\Column(name: 'staffelpreis_4', type: 'float', precision: 10, scale: 0, nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelpreis_4', type: 'float', nullable: true)] private $staffelpreis4; /** - * @var integer - */ - #[ORM\Column(name: 'staffelmenge_5', type: 'integer', nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelmenge_5', type: 'float', nullable: true)] private $staffelmenge5; /** - * @var float - */ - #[ORM\Column(name: 'staffelpreis_5', type: 'float', precision: 10, scale: 0, nullable: true)] + * @var float + */ + #[ORM\Column(name: 'staffelpreis_5', type: 'float', nullable: true)] private $staffelpreis5; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'lagerort', type: 'string', length: 7, nullable: true)] private $lagerOrt; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'verkaufshinweise', type: 'text', nullable: true)] private $verkaufshinweise; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'abnahmeinfo', type: 'string', length: 60, nullable: true)] private $abnahmeInfo; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_beschreibung', type: 'text', nullable: true)] private $produktBeschreibung; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_eigenschaften', type: 'text', nullable: true)] private $produktEigenschaften; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_vorteile', type: 'text', nullable: true)] private $produktVorteile; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_nutzen', type: 'text', nullable: true)] private $produktNutzen; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_anwendungen', type: 'text', nullable: true)] private $produktAnwendungen; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'produkt_besonderheit', type: 'text', nullable: true)] private $produktBesonderheit; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'musterbuch', type: 'string', length: 40, nullable: true)] private $musterbuch; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'zur_aufnahme_von', type: 'string', length: 60, nullable: true)] private $zurAufnahmeVon; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'eigenschaften', type: 'text', nullable: true)] private $eigenschaften; /** - * @var float - */ + * @var float + */ #[ORM\Column(name: 'preis', type: 'float', precision: 10, scale: 0, nullable: true)] private $preis; /** - * @var string - */ + * @var string + */ #[ORM\Column(name: 'uuid', type: 'string', length: 40, nullable: true)] private $uuid; /** - * @var float - */ + * @var float + */ #[ORM\Column(name: 'offset_fix', type: 'float', precision: 10, scale: 0, nullable: true)] private $offsetFix; /** - * @var float - */ + * @var float + */ #[ORM\Column(name: 'offset_var', type: 'float', precision: 10, scale: 0, nullable: true)] private $offsetVar; /** - * @var float - */ + * @var float + */ #[ORM\Column(name: 'digital_fix', type: 'float', precision: 10, scale: 0, nullable: true)] private $digitalFix; /** - * @var float - */ + * @var float + */ #[ORM\Column(name: 'digital_var', type: 'float', precision: 10, scale: 0, nullable: true)] private $digitalVar; + /** - * Paper constructor. - */ + * Paper constructor. + */ public function __construct() { $this->install = ''; @@ -375,7 +376,6 @@ class Paper $this->digitalVar = ''; } - /** * @return int */ diff --git a/src/new/src/PSC/System/SettingsBundle/Form/Backend/PaperType.php b/src/new/src/PSC/System/SettingsBundle/Form/Backend/PaperType.php index 07dc887cd..b796bda6f 100755 --- a/src/new/src/PSC/System/SettingsBundle/Form/Backend/PaperType.php +++ b/src/new/src/PSC/System/SettingsBundle/Form/Backend/PaperType.php @@ -73,16 +73,16 @@ class PaperType extends AbstractType ->add('laufrichtung', TextType::class, array('label' => 'Laufrichtung', 'required' => false)) ->add('etiketten_je_blatt', TextType::class, array('label' => 'Etiketten je Blatt', 'required' => false)) ->add('mengeneinheit', TextType::class, array('label' => 'Mengeneinheit', 'required' => false)) - ->add('staffelmenge_1', NumberType::class, array('label' => 'Staffelmenge 1', 'required' => false)) - ->add('staffelpreis_1', NumberType::class, array('label' => 'Staffelpreis 1', 'required' => false)) - ->add('staffelmenge_2', NumberType::class, array('label' => 'Staffelmenge 2', 'required' => false)) - ->add('staffelpreis_2', NumberType::class, array('label' => 'Staffelpreis 2', 'required' => false)) - ->add('staffelmenge_3', NumberType::class, array('label' => 'Staffelmenge 3', 'required' => false)) - ->add('staffelpreis_3', NumberType::class, array('label' => 'Staffelpreis 3', 'required' => false)) - ->add('staffelmenge_4', NumberType::class, array('label' => 'Staffelmenge 4', 'required' => false)) - ->add('staffelpreis_4', NumberType::class, array('label' => 'Staffelpreis 4', 'required' => false)) - ->add('staffelmenge_5', NumberType::class, array('label' => 'Staffelmenge 5', 'required' => false)) - ->add('staffelpreis_5', NumberType::class, array('label' => 'Staffelpreis 5', 'required' => false)) + ->add('staffelmenge_1', NumberType::class, array('label' => 'Staffelmenge 1', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelpreis_1', NumberType::class, array('label' => 'Staffelpreis 1', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelmenge_2', NumberType::class, array('label' => 'Staffelmenge 2', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelpreis_2', NumberType::class, array('label' => 'Staffelpreis 2', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelmenge_3', NumberType::class, array('label' => 'Staffelmenge 3', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelpreis_3', NumberType::class, array('label' => 'Staffelpreis 3', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelmenge_4', NumberType::class, array('label' => 'Staffelmenge 4', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelpreis_4', NumberType::class, array('label' => 'Staffelpreis 4', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelmenge_5', NumberType::class, array('label' => 'Staffelmenge 5', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) + ->add('staffelpreis_5', NumberType::class, array('label' => 'Staffelpreis 5', 'required' => false, 'scale' => 4, 'grouping' => false, 'html5' => false, 'input' => 'number')) ->add('eigenschaften', TextType::class, array('label' => 'Eigenschaften', 'required' => false)) ->add('verkaufshinweise', TextType::class, array('label' => 'Verkaufshinweise', 'required' => false)) diff --git a/src/new/src/PSC/System/UpdateBundle/Migrations/Version20260420120000.php b/src/new/src/PSC/System/UpdateBundle/Migrations/Version20260420120000.php new file mode 100644 index 000000000..a532a550b --- /dev/null +++ b/src/new/src/PSC/System/UpdateBundle/Migrations/Version20260420120000.php @@ -0,0 +1,21 @@ +entityManager->getConnection(); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelmenge_1 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelmenge_2 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelmenge_3 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelmenge_4 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelmenge_5 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelpreis_1 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelpreis_2 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelpreis_3 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelpreis_4 DOUBLE NULL DEFAULT NULL;"); + $connection->executeQuery("ALTER TABLE papierdb MODIFY COLUMN staffelpreis_5 DOUBLE NULL DEFAULT NULL;"); + } +} diff --git a/src/new/version.yaml b/src/new/version.yaml index 7c5afd02b..90a318f7c 100755 --- a/src/new/version.yaml +++ b/src/new/version.yaml @@ -1,8 +1,13 @@ info: - datum: 01.04.2026 - release: 2.3.5 + datum: 20.04.2026 + release: 2.3.6 changelog: + - version: 2.3.6 + datum: 20.04.2026 + changes: + - "Kalk kann jetzt mit $Vxxx_staffel_value$V umgehen. Mit staffelCalc=\"$Vauflage$V\" kann in der Option die Grundlage der Staffel aus der Papierdatenbank übergeben werden." + - "Papierdatenbank Kommawerte" - version: 2.3.5 datum: 01.04.2026 changes: diff --git a/src/old/application/articles/Market/Article.php b/src/old/application/articles/Market/Article.php index 75db8f577..ee045452d 100755 --- a/src/old/application/articles/Market/Article.php +++ b/src/old/application/articles/Market/Article.php @@ -149,14 +149,16 @@ class market_article } } if ($view->getRequest()->getParam('auflage', false)) { - $view->getRequest()->setParam( - 'auflage', - str_replace('.', '', $view->getRequest()->getParam('auflage', false)), - ); - $view->getRequest()->setPost( - 'auflage', - str_replace('.', '', $view->getRequest()->getParam('auflage', false)), - ); + $view->getRequest()->setParam('auflage', str_replace( + '.', + '', + $view->getRequest()->getParam('auflage', false), + )); + $view->getRequest()->setPost('auflage', str_replace( + '.', + '', + $view->getRequest()->getParam('auflage', false), + )); } if (!$view->getRequest()->getParam('upload_mode', false)) { $keys = array_keys($upload); @@ -165,13 +167,13 @@ class market_article $_POST['upload_mode'] = 'article'; $view->getRequest()->setParam('upload_mode', 'article'); } elseif ( - count($upload) == 1 && - ( - $view->view->upload_possible[0] == 'provided' || - $view->view->upload_possible[0] == 'center' || - $view->view->upload_possible[0] == 'mail' || - $view->view->upload_possible[0] == 'post' - ) + count($upload) == 1 + && ( + $view->view->upload_possible[0] == 'provided' + || $view->view->upload_possible[0] == 'center' + || $view->view->upload_possible[0] == 'mail' + || $view->view->upload_possible[0] == 'post' + ) ) { $_POST['upload_mode'] = $view->view->upload_possible[0]; $view->getRequest()->setParam('upload_mode', $view->view->upload_possible[0]); @@ -181,8 +183,8 @@ class market_article } if ( - $view->getRequest()->getParam('layouter', false) || - $view->getRequest()->getParam('openlayouter', false) + $view->getRequest()->getParam('layouter', false) + || $view->getRequest()->getParam('openlayouter', false) ) { $view->getRequest()->setParam('upload_mode', 'steplayouter2'); $_POST['upload_mode'] = 'steplayouter2'; @@ -354,7 +356,7 @@ class market_article $articleBasket->setUploadSeiten($max); } - $this->netto = $calc->parse($view, null, $param, $article->a6_resale_price + $articleBasket->getMotivPrice()); + $this->netto = $calc->parse($view, null, $param, 0); if (isset($view->view->layouterPreviewId) && $view->view->layouterPreviewId != '') { $articleSession = new TP_Layoutersession(); @@ -400,9 +402,9 @@ class market_article $auflage = $view->getRequest()->getParam('auflage', false); if ($auflage && $auflage > 1) { return ( - $this->netto + - ($view->getRequest()->getParam('auflage', 1) * $article->a6_resale_price) + - ($view->getRequest()->getParam('auflage', 1) * $articleBasket->getMotivPrice()) + $this->netto + + ($view->getRequest()->getParam('auflage', 1) * $article->a6_resale_price) + + ($view->getRequest()->getParam('auflage', 1) * $articleBasket->getMotivPrice()) ); } return $this->netto + $article->a6_resale_price + $articleBasket->getMotivPrice(); @@ -417,13 +419,9 @@ class market_article $data->save(); } - public function clearPreDispatch($data) - { - } + public function clearPreDispatch($data) {} - public function updatePreDispatch($data) - { - } + public function updatePreDispatch($data) {} public function copyPreDispatch($data, $orguuid = false, $art = false) { @@ -534,8 +532,8 @@ class market_article } } - if (((string) $nod['mode']) == 'papierdb' && ((string) $nod['container']) != '') { - $inhalt = $papierdborg->xpath('//papiercontainer[@id="' . ((string) $nod['container']) . '"]'); + if ((string) $nod['mode'] == 'papierdb' && (string) $nod['container'] != '') { + $inhalt = $papierdborg->xpath('//papiercontainer[@id="' . (string) $nod['container'] . '"]'); $inhalt = $inhalt[0]; $papierdborgset = $papierdb->addChild('papiercontainer'); @@ -660,9 +658,9 @@ class market_article ); } elseif ($articleSess->getLayouterModus() == 4) { return ( - '' + '' ); } elseif ($articleSess->getLayouterModus() == 5) { require_once APPLICATION_PATH . '/helpers/Image.php'; @@ -676,23 +674,27 @@ class market_article return TP_Image::generateWidthImgTag(TP_Image::LAYOUTERPREVIEW, $file, $mode, $class, $onlyPath); } elseif ($articleSess->getLayouterModus() == 8) { return ( - '' + '' ); } elseif ($articleSess->getLayouterModus() == 9) { return ( - '' + '' ); } elseif ($articleSess->getLayouterModus() == 10) { return ( - '' + '' ); } elseif ($articleSess->getLayouterModus() == 11) { $layoutData = Doctrine_Query::create() @@ -746,7 +748,9 @@ class market_article ->fetchOne(); if ($article->upload_steplayouter_data != '') { return ( - '' + '' ); } elseif (TP_Templateprint::isTemplateExists($article)) { return TP_Image::generateWidthImgTag( @@ -795,15 +799,15 @@ class market_article return TP_Image::generateWidthImgTag(TP_Image::LAYOUTERPREVIEW, $file); } elseif ($articleSess->getLayouterModus() == 8) { return ( - '' + '' ); } elseif ($articleSess->getTemplatePrintId() != '') { - return TP_Image::generateWidthImgTag( - TP_Image::LAYOUTERPREVIEW, - TP_Templateprint::generatePreview($article, $layouterPreviewId), - ); + return TP_Image::generateWidthImgTag(TP_Image::LAYOUTERPREVIEW, TP_Templateprint::generatePreview( + $article, + $layouterPreviewId, + )); } } else { $article = Doctrine_Query::create() @@ -820,10 +824,10 @@ class market_article } if ($layouterPreviewId != false && $layouterPreviewId != '') { - return TP_Image::generateWidthImgTag( - TP_Image::LAYOUTERPREVIEW, - TP_FOP::generatePreview($articleId, $layouterPreviewId), - ); + return TP_Image::generateWidthImgTag(TP_Image::LAYOUTERPREVIEW, TP_FOP::generatePreview( + $articleId, + $layouterPreviewId, + )); } return TP_Image::generateWidthImgTag(TP_Image::LAYOUTERPREVIEW, TP_FOP::generatePreview($articleId)); }