diff --git a/src/new/config/packages/twig.php b/src/new/config/packages/twig.php index 06cdc709d..b150fcf71 100755 --- a/src/new/config/packages/twig.php +++ b/src/new/config/packages/twig.php @@ -7,6 +7,7 @@ use PSC\Shop\OrderBundle\Service\Order; use PSC\System\SettingsBundle\Service\Instance; use PSC\System\SettingsBundle\Service\Shop; use PSC\System\SettingsBundle\Service\Token; +use PSC\System\SettingsBundle\Service\Version; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use function Symfony\Component\DependencyInjection\Loader\Configurator\service; @@ -21,7 +22,8 @@ return static function (ContainerConfigurator $containerConfigurator): void { 'shopService' => service(Shop::class), 'orderService' => service(Order::class), 'tokenService' => service(Token::class), - 'mediaService' => service(MediaManager::class) + 'mediaService' => service(MediaManager::class), + 'versionService' => service(Version::class) ] ] ); diff --git a/src/new/src/PSC/Shop/ProductBundle/Model/Product.php b/src/new/src/PSC/Shop/ProductBundle/Model/Product.php index 96d9b5add..f2a25ecdb 100755 --- a/src/new/src/PSC/Shop/ProductBundle/Model/Product.php +++ b/src/new/src/PSC/Shop/ProductBundle/Model/Product.php @@ -22,16 +22,16 @@ use PSC\Shop\ProductBundle\Model\Lang\Item; class Product { #[OA\Property(type: 'string')] - private string $title = ""; + private string $title = ''; #[OA\Property(type: 'string')] - private string $uuid = ""; + private string $uuid = ''; #[OA\Property(type: 'string')] - private string $nrIntern = ""; + private string $nrIntern = ''; #[OA\Property(type: 'string')] - private string $nrExtern = ""; + private string $nrExtern = ''; #[OA\Property(type: 'integer')] private int $uid = 0; @@ -40,7 +40,7 @@ class Product private ?IProductTypeObject $specialProductTypeObject = null; #[OA\Property(type: 'string')] - private string $shopUuid = ""; + private string $shopUuid = ''; #[OA\Property(ref: new Model(type: Media::class))] private ?Media $image1 = null; @@ -73,34 +73,34 @@ class Product private ?OriginalProduct $originalProduct = null; #[OA\Property(type: 'string')] - private string $custom1 = ""; + private string $custom1 = ''; #[OA\Property(type: 'string')] - private string $custom2 = ""; + private string $custom2 = ''; #[OA\Property(type: 'string')] - private string $custom3 = ""; + private string $custom3 = ''; #[OA\Property(type: 'string')] - private string $custom4 = ""; + private string $custom4 = ''; #[OA\Property(type: 'string')] - private string $custom5 = ""; + private string $custom5 = ''; #[OA\Property(type: 'string')] - private string $custom6 = ""; + private string $custom6 = ''; #[OA\Property(type: 'string')] - private string $custom7 = ""; + private string $custom7 = ''; #[OA\Property(type: 'string')] - private string $custom8 = ""; + private string $custom8 = ''; #[OA\Property(type: 'string')] - private string $custom9 = ""; + private string $custom9 = ''; #[OA\Property(type: 'string')] - private string $custom10 = ""; + private string $custom10 = ''; public function getTitle(): string { diff --git a/src/new/src/PSC/System/PluginBundle/Resources/views/backend/list/index.html.twig b/src/new/src/PSC/System/PluginBundle/Resources/views/backend/list/index.html.twig index 35af6e295..da9ebc36e 100755 --- a/src/new/src/PSC/System/PluginBundle/Resources/views/backend/list/index.html.twig +++ b/src/new/src/PSC/System/PluginBundle/Resources/views/backend/list/index.html.twig @@ -1,107 +1,90 @@ -{% extends 'backend_base.html.twig' %} +{% extends 'backend_tailwind_base.html.twig' %} + +{% block header %} +
| Name | -Version | -Pfad | -Aktiviert? | -- | + | ||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Name | +Version | +Pfad | +Status | +Beschreibung | +Aktionen | |
|---|---|---|---|---|---|---|
| PrintshopCreator App (Core) | -{{ version.datum }} ({{ version.release }}) | -- | Ja | -- | -- | -|
| PrintshopCreator App (Core) | +{{ version.datum }} ({{ version.release }}) | +- | ++ Ja + | +Kernsystem | ++ | |
| {{ plugin.name }} | -{{ plugin.version }} | -{{ plugin.path }} | -{% if plugin.installed and plugin.shouldBeDeInstalled == false %}Ja{% else %}Nein{% endif %} | -+ | ||
| {{ plugin.name }} | +{{ plugin.version }} | +{{ plugin.path }} | +{% if plugin.installed and plugin.shouldBeDeInstalled == false %} - Deaktivieren + Ja {% else %} - Aktivieren + Nein {% endif %} | -+ | {{ plugin.description }} | ++ + |
| {{ plugin.description }} | ||||||
| Version | +Datum | +Änderungen | +
|---|---|---|
| + + v{{ entry.version }} + + | +{{ entry.datum }} | +
+
|
+
{{ date("now")|date('d.m.Y H:i:s') }}
++ + v{{ versionService.release }} ({{ versionService.datum }}) + +
=oc),dM=" ",pM=!1;function hM(i,l){switch(i){case"keyup":return nse.indexOf(l.keyCode)!==-1;case"keydown":return l.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function mM(i){return i=i.detail,typeof i=="object"&&"data"in i?i.data:null}var dl=!1;function ose(i,l){switch(i){case"compositionend":return mM(l);case"keypress":return l.which!==32?null:(pM=!0,dM);case"textInput":return i=l.data,i===dM&&pM?null:i;default:return null}}function ise(i,l){if(dl)return i==="compositionend"||!jx&&hM(i,l)?(i=iM(),gp=Ox=Go=null,dl=!1,i):null;switch(i){case"paste":return null;case"keypress":if(!(l.ctrlKey||l.altKey||l.metaKey)||l.ctrlKey&&l.altKey){if(l.char&&1 ")&&(re=re.replace(" =oc),uM=" ",cM=!1;function fM(i,l){switch(i){case"keyup":return Jie.indexOf(l.keyCode)!==-1;case"keydown":return l.keyCode!==229;case"keypress":case"mousedown":case"focusout":return!0;default:return!1}}function dM(i){return i=i.detail,typeof i=="object"&&"data"in i?i.data:null}var fl=!1;function Zie(i,l){switch(i){case"compositionend":return dM(l);case"keypress":return l.which!==32?null:(cM=!0,uM);case"textInput":return i=l.data,i===uM&&cM?null:i;default:return null}}function ese(i,l){if(fl)return i==="compositionend"||!Ax&&fM(i,l)?(i=nM(),gp=Px=Go=null,fl=!1,i):null;switch(i){case"paste":return null;case"keypress":if(!(l.ctrlKey||l.altKey||l.metaKey)||l.ctrlKey&&l.altKey){if(l.char&&1 <\/script>",i=i.removeChild(i.firstChild)):typeof b.is=="string"?i=F.createElement(p,{is:b.is}):(i=F.createElement(p),p==="select"&&(F=i,b.multiple?F.multiple=!0:b.size&&(F.size=b.size))):i=F.createElementNS(i,p),i[Va]=l,i[pc]=b,V5(i,l,!1,!1),l.stateNode=i;e:{switch(F=Et(p,b),p){case"dialog":ar("cancel",i),ar("close",i),C=b;break;case"iframe":case"object":case"embed":ar("load",i),C=b;break;case"video":case"audio":for(C=0;C