boonkerz/printshopcreator
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Backup

Browse Source
This commit is contained in:
Thomas Peterson 2026-04-24 12:27:04 +02:00
parent 2632d08946
commit cba13f9b54
6 changed files with 216 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/new/src/PSC/Shop/CmsBundle/Controller/Backend/EditController.php
View File

@ -199,7 +199,6 @@ class EditController extends AbstractController
'CMS Site saved',
);
} else {
dump($form->getErrors());
}
return array(

32
src/new/src/PSC/Shop/EntityBundle/Entity/Paper.php
View File

@ -177,54 +177,54 @@ class Paper
#[ORM\Column(name: 'mengeneinheit', type: 'string', length: 30, nullable: true)]
private $mengenEinheit;
/**
* @var integer
* @var float
*/
#[ORM\Column(name: 'staffelmenge_1', type: 'integer', nullable: true)]
#[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)]
#[ORM\Column(name: 'staffelpreis_1', type: 'float', nullable: true)]
private $staffelpreis1;
/**
* @var integer
* @var float
*/
#[ORM\Column(name: 'staffelmenge_2', type: 'integer', nullable: true)]
#[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)]
#[ORM\Column(name: 'staffelpreis_2', type: 'float', nullable: true)]
private $staffelpreis2;
/**
* @var integer
* @var float
*/
#[ORM\Column(name: 'staffelmenge_3', type: 'integer', nullable: true)]
#[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)]
#[ORM\Column(name: 'staffelpreis_3', type: 'float', nullable: true)]
private $staffelpreis3;
/**
* @var integer
* @var float
*/
#[ORM\Column(name: 'staffelmenge_4', type: 'integer', nullable: true)]
#[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)]
#[ORM\Column(name: 'staffelpreis_4', type: 'float', nullable: true)]
private $staffelpreis4;
/**
* @var integer
* @var float
*/
#[ORM\Column(name: 'staffelmenge_5', type: 'integer', nullable: true)]
#[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)]
#[ORM\Column(name: 'staffelpreis_5', type: 'float', nullable: true)]
private $staffelpreis5;
/**
* @var string
@ -316,6 +316,7 @@ class Paper
*/
#[ORM\Column(name: 'digital_var', type: 'float', precision: 10, scale: 0, nullable: true)]
private $digitalVar;
/**
* Paper constructor.
*/
@ -375,7 +376,6 @@ class Paper
$this->digitalVar = '';
}
/**
* @return int
*/

20
src/new/src/PSC/System/SettingsBundle/Form/Backend/PaperType.php
View File

@ -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))

21
src/new/src/PSC/System/UpdateBundle/Migrations/Version20260420120000.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace PSC\System\UpdateBundle\Migrations;
class Version20260420120000 extends Base
{
public function migrateDatabase(): void
{
$connection = $this->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;");
}
}

9
src/new/version.yaml
View File

@ -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:

112
src/old/application/articles/Market/Article.php
View File

@ -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,12 +167,12 @@ 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];
@ -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 (
'<img src="/apps/component/steplayouter/pdf/imagepreview/' .
strtolower($layouterPreviewId) .
'/500" />'
'<img src="/apps/component/steplayouter/pdf/imagepreview/'
. strtolower($layouterPreviewId)
. '/500" />'
);
} 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 (
'<img src="https://store.hpwallart.com/huelswitt/projects/' .
$articleSess->getTemplatePrintId() .
'/preview_medium.png" />'
'<img src="https://store.hpwallart.com/huelswitt/projects/'
. $articleSess->getTemplatePrintId()
. '/preview_medium.png" />'
);
} elseif ($articleSess->getLayouterModus() == 9) {
return (
'<img src="/apps/plugin/chilipublish/designer/preview/' .
$article->Shop->getApiKey() .
'/' .
$articleSess->getTemplatePrintId() .
'/' .
$site .
'" />'
'<img src="/apps/plugin/chilipublish/designer/preview/'
. $article->Shop->getApiKey()
. '/'
. $articleSess->getTemplatePrintId()
. '/'
. $site
. '" />'
);
} elseif ($articleSess->getLayouterModus() == 10) {
return (
'<img src="/apps/api/formlayouter/preview/layouter/' . $layouterPreviewId . '/' . $site . '/500" />'
'<img src="/apps/api/formlayouter/preview/layouter/'
. $layouterPreviewId
. '/'
. $site
. '/500" />'
);
} elseif ($articleSess->getLayouterModus() == 11) {
$layoutData = Doctrine_Query::create()
@ -746,7 +748,9 @@ class market_article
->fetchOne();
if ($article->upload_steplayouter_data != '') {
return (
'<img src="/apps/component/steplayouter/pdf/imagepreview/' . strtolower($article->uuid) . '/500" />'
'<img src="/apps/component/steplayouter/pdf/imagepreview/'
. strtolower($article->uuid)
. '/500" />'
);
} 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 (
'<img src="https://store.hpwallart.com/huelswitt/projects/' .
$articleSess->getTemplatePrintId() .
'/preview_large.png" />'
'<img src="https://store.hpwallart.com/huelswitt/projects/'
. $articleSess->getTemplatePrintId()
. '/preview_large.png" />'
);
} 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));
}