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

Fixes

Browse Source
This commit is contained in:
Thomas 2025-01-22 20:12:10 +01:00
parent 4ac4e19d0f
commit 816bc50f98
8 changed files with 74 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/new/src/PSC/Backend/DashboardBundle/Resources/views/shop/my_editable_shops_tailwind.html.twig
View File

@ -1,4 +1,4 @@
<select class="text-gray-900 transition duration-75 rounded-lg shadow-sm outline-none focus:border-primary-500 focus:ring-1 focus:ring-inset focus:ring-primary-500 disabled:opacity-70 border-gray-300" onchange="this.options[this.selectedIndex].value && (window.location = this.options[this.selectedIndex].value);">
<select class="text-gray-900 transition duration-75 rounded-sm shadow-sm outline-none focus:border-primary-500 focus:ring-1 focus:ring-inset focus:ring-primary-500 disabled:opacity-70 border-gray-300" onchange="this.options[this.selectedIndex].value && (window.location = this.options[this.selectedIndex].value);">
{% for shop in shops %}
{% if displayDeletedShop == true or shop.deleted == false %}
<option {% if selectedShop.uid == shop.uid %}selected{% endif %} value="{{ path('psc_backend_dashboard_shop_change', {'shop_uuid': shop.uid}) }}">{{ shop.title }}</option>
@ -12,6 +12,6 @@
</svg>
</a>
{% endif %}
<span class="hidden md:inline"><input type="checkbox" class=" border-gray-300 rounded shadow-sm text-primary-600 outline-none focus:ring focus:ring-primary-200 focus:ring-opacity-50" onchange="window.location='{{ path('psc_backend_dashboard_toogle_deleted_shop') }}'" {% if displayDeletedShop %}checked="checked"{% endif %}/> Deaktive Shops zeigen</span>
<span class="hidden md:inline"><input type="checkbox" class=" border-gray-300 rounded-sm shadow-sm text-primary-600 outline-none focus:ring focus:ring-primary-200 focus:ring-opacity-50" onchange="window.location='{{ path('psc_backend_dashboard_toogle_deleted_shop') }}'" {% if displayDeletedShop %}checked="checked"{% endif %}/> Deaktive Shops zeigen</span>

4
src/new/templates/tailwind_sortable.html.twig
View File

@ -1,7 +1,8 @@
<a{% for attr, value in options %} {{ attr }}="{{ value }}"{% endfor %}>
<span class="flex flex-row gap-2">
{{ title }}
{% if sorted %}
{% if direction != 'desc' %}
{% if direction == 'desc' %}
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="table-icon">
<path stroke-linecap="round" stroke-linejoin="round" d="m4.5 15.75 7.5-7.5 7.5 7.5" />
</svg>
@ -15,6 +16,5 @@
<path stroke-linecap="round" stroke-linejoin="round" d="m4.5 15.75 7.5-7.5 7.5 7.5" />
</svg>
{% endif %}
{{ title }}
</span>
</a>

2
src/new/web/build/backend/dashboard.js
View File

File diff suppressed because one or more lines are too long

55
src/new/web/build/backend/login.css
View File

File diff suppressed because one or more lines are too long

25
src/new/web/build/manifest.json
View File

@ -1,17 +1,16 @@
{
"build/backend/login.css": "/apps/build/backend/login.css",
"build/backend/login.js": "/apps/build/backend/login.js",
"build/backend/dashboard.css": "/apps/build/backend/dashboard.css",
"build/backend/dashboard.js": "/apps/build/backend/dashboard.js",
"build/backend/tailwind.css": "/apps/build/backend/tailwind.css",
"build/backend/tailwind.js": "/apps/build/backend/tailwind.js",
"build/runtime.js": "/apps/build/runtime.js",
"build/vendors-node_modules_symfony_stimulus-bridge_dist_index_js-node_modules_core-js_modules_es_ar-a8da79.css": "/apps/build/vendors-node_modules_symfony_stimulus-bridge_dist_index_js-node_modules_core-js_modules_es_ar-a8da79.css",
"build/vendors-node_modules_symfony_stimulus-bridge_dist_index_js-node_modules_core-js_modules_es_ar-a8da79.js": "/apps/build/vendors-node_modules_symfony_stimulus-bridge_dist_index_js-node_modules_core-js_modules_es_ar-a8da79.js",
"build/vendors-node_modules_popperjs_core_dist_cjs_popper_js-node_modules_bootstrap-toggle_js_bootst-2e5edb.css": "/apps/build/vendors-node_modules_popperjs_core_dist_cjs_popper_js-node_modules_bootstrap-toggle_js_bootst-2e5edb.css",
"build/vendors-node_modules_popperjs_core_dist_cjs_popper_js-node_modules_bootstrap-toggle_js_bootst-2e5edb.js": "/apps/build/vendors-node_modules_popperjs_core_dist_cjs_popper_js-node_modules_bootstrap-toggle_js_bootst-2e5edb.js",
"build/vendors-node_modules_alpinejs_persist_dist_module_esm_js-node_modules_alpinejs_dist_module_esm_js.js": "/apps/build/vendors-node_modules_alpinejs_persist_dist_module_esm_js-node_modules_alpinejs_dist_module_esm_js.js",
"build/node_modules_symfony_stimulus-bridge_dist_webpack_loader_js_assets_controllers_json.js": "/apps/build/node_modules_symfony_stimulus-bridge_dist_webpack_loader_js_assets_controllers_json.js",
"build/backend/login.css": "/apps/build/backend/login.195471a4.css",
"build/backend/login.js": "/apps/build/backend/login.ab0272c2.js",
"build/backend/dashboard.css": "/apps/build/backend/dashboard.f30e17f9.css",
"build/backend/dashboard.js": "/apps/build/backend/dashboard.564e38a5.js",
"build/backend/tailwind.css": "/apps/build/backend/tailwind.33beacce.css",
"build/backend/tailwind.js": "/apps/build/backend/tailwind.d1378a3a.js",
"build/runtime.js": "/apps/build/runtime.44b7f9b9.js",
"build/185.99565361.js": "/apps/build/185.99565361.js",
"build/857.e053f864.css": "/apps/build/857.e053f864.css",
"build/857.5473cee9.js": "/apps/build/857.5473cee9.js",
"build/280.f481306d.js": "/apps/build/280.f481306d.js",
"build/933.ca932d10.js": "/apps/build/933.ca932d10.js",
"build/fonts/summernote.eot": "/apps/build/fonts/summernote.7a3f9776.eot",
"build/fonts/summernote.ttf": "/apps/build/fonts/summernote.eb23b6b7.ttf",
"build/fonts/summernote.woff": "/apps/build/fonts/summernote.f2bec4f2.woff",

2
src/new/web/build/node_modules_symfony_stimulus-bridge_dist_webpack_loader_js_assets_controllers_json.js
View File

File diff suppressed because one or more lines are too long

51
src/old/application/design/vorlagen/bootstrap4_api/templates/article/_articlelistitem_produktuebersicht.phtml
View File

@ -1,10 +1,10 @@
<?php
/**
* /templates/article/_articlelistitem_produktuebersicht.phtml
*
*
* Formatierungsvariante für die ausgabe in /overview/index.phtml
* - Abfangen leerer Bilder
*
*
*/
?>
<style>
@ -28,23 +28,24 @@ a.btn.btn-primary.produkt-config-btn {
<div class="thumbnail productboxheight">
<div class="product-img">
<a href="<?php echo $this->url(array('article' => $this->article->url), 'article'); ?><?php if($this->articlegroup): ?>/<?php echo $this->articlegroup ?><?php endif; ?>" class="produkt_image_overview">
<?php
if((($this->article->typ == 6 && $this->article->a6_org_article != 0) || $this->article->typ == 8 ) && $this->article->file == ""):
<?php
if((($this->article->typ == 6 && $this->article->a6_org_article != 0) || $this->article->typ == 8) && $this->article->file == ""):
$_img_tmp = $this->image()->thumbnailFop($this->article->title, 'productlist', $this->article->getMarketFile(), false, $this->article->id);
else:
$_img_tmp = $this->image()->thumbnailImage($this->article->title, 'productlist', $this->article->file);
endif;
empty($_img_tmp) ? print '<div style="width:100%; height:100%; min-height:200px; background:silver">&nbsp;</div>' : print str_replace('id=""','',$_img_tmp);
?>
empty($_img_tmp) ? print '<div style="width:100%; height:100%; min-height:200px; background:silver">&nbsp;</div>' : print str_replace('id=""', '', $_img_tmp);
?>
</a>
</div>
<div class="caption productboxtxt">
<label class="produkttitel" style="
height: 40px;
overflow: hidden;margin-bottom: 0px;
"><?php echo $this->Text()->truncate_text($this->escape($this->article->getTitle()),80) ?></label><br />
"><?php echo $this->Text()->truncate_text($this->escape($this->article->getTitle()), 80) ?></label><br />
<div class="productbox">
<label class="artikelnr"><?php if($this->article->article_nr_extern) { ?><?php echo $this->translate('Artikelnummer')?>: <?php echo $this->article->article_nr_extern; ?><?php } ?><br />
@ -53,27 +54,27 @@ a.btn.btn-primary.produkt-config-btn {
<span class="pricepro"><?php echo $this->article->text_format; ?></span><br />
<?php if(!$this->designsettings()->get('display_no_price')) { ?><label><?php if(str_replace(".", ",", $this->article->a4_abpreis) != "0,00") { ?><?php echo $this->translate('ab')?> <?php echo str_replace(".", ",", $this->currency->toCurrency($this->article->a4_abpreis)); ?><?php } ?></label>
<?php
if(!$this->designsettings()->get('b2bshop') &&
($this->article->a4_abpreis_calc != 0 ||
$this->article->OrgArticle->a4_abpreis_calc ||
($this->article->a6_org_article != 0 && $this->article->sum*1+($this->article->sum/100*$this->article->mwert) != 0) ||
(($this->article->a4_abpreis + $this->article->a6_resale_price)*1+(($this->article->a4_abpreis + $this->article->a6_resale_price)/100*$this->article->mwert) != 0))):
?>
<?php
if(!$this->designsettings()->get('b2bshop') &&
($this->article->a4_abpreis_calc != 0 ||
$this->article->OrgArticle->a4_abpreis_calc ||
($this->article->a6_org_article != 0 && $this->article->sum * 1 + ($this->article->sum / 100 * $this->article->mwert) != 0) ||
(($this->article->a4_abpreis + $this->article->a6_resale_price) * 1 + (($this->article->a4_abpreis + $this->article->a6_resale_price) / 100 * $this->article->mwert) != 0))):
?>
<p>
<!--<h6 class="abpreis">
<?php
if($this->article->typ != 2 && $this->article->a4_abpreis_calc || $this->article->OrgArticle->a4_abpreis_calc):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->a4_abpreis) ?>
<?php
if($this->article->typ != 2 && $this->article->a4_abpreis_calc || $this->article->OrgArticle->a4_abpreis_calc):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->a4_abpreis) ?>
<?php elseif($this->article->typ == 2):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->preis*1+($this->article->preis/100*$this->article->mwert)) ?>
<?php elseif($this->article->typ == 2):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->preis * 1 + ($this->article->preis / 100 * $this->article->mwert)) ?>
<?php elseif($this->article->a6_org_article != 0):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->sum*1+($this->article->sum/100*$this->article->mwert)) ?>
<?php elseif($this->article->a6_org_article != 0):
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency($this->article->sum * 1 + ($this->article->sum / 100 * $this->article->mwert)) ?>
<?php else:
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency(($this->article->a4_abpreis + $this->article->a6_resale_price)*1+(($this->article->a4_abpreis + $this->article->a6_resale_price)/100*$this->article->mwert)) ?>
<?php else:
echo $this->translate('ab') ?> <span class="badge badge-info"><?php echo $this->currency->toCurrency(($this->article->a4_abpreis + $this->article->a6_resale_price) * 1 + (($this->article->a4_abpreis + $this->article->a6_resale_price) / 100 * $this->article->mwert)) ?>
<?php endif;?>
</span>

56
src/old/application/design/vorlagen/bootstrap4_api/templates/user/verify.phtml
View File

@ -1,49 +1,15 @@
<script type="text/javascript">
$(function() {
var data = new Array();
data['#fragment-1'] = '/user/login';
$('#tabs').tabs({
selected: 1,
select: function(event, ui) {
var url = data[ui.tab.hash];
if( url ) {
location.href = url;
return false;
}
return true;
}
});
})
</script>
<style type="text/css">
<!--
#login dd {
margin-left: 10px;
}
-->
</style>
<div id="tabs">
<ul>
<li><a href="#fragment-1"><span><?php echo $this->translate('Login') ?></span></a></li>
</ul>
<div id="fragment-1">
<br/>
<h1><?php echo $this->translate('Freischalten') ?></h1>
<?php if(Zend_Auth::getInstance()->hasIdentity()==false): ?>
<div id="BlueBox"><?php echo $this->translate('Please fill out the Form') ?></div>
<?php echo $this->form->render();?>
<div id="BlueBox">
<?php if (!$this->designsettings()->get('b2bshop')) : ?>
<div class="page-header"><h1>Danke für Ihre Registrierung.</h1></div>
<div class="row">
<div class="col-xs-12">
<div class="cms_inhalt">Nach einer Überprüfung schalten wir Ihr Kundenkontofrei.</div>
</div>
</div>
<?php else: ?>
<div id="BlueBox"><?php echo $this->translate('You are logged in') ?></div>
<hr>
<div id="BlueBox">
<a href="/admin"><?php echo $this->translate('Admin') ?></a>
<div class="page-header"><h1>Danke für Ihre Registrierung.</h1></div>
<div class="row">
<div class="col-xs-12">
<div class="cms_inhalt">Sie erhalten eine Email mit einem Bestätigungslink zur Freischaltung.</div>
</div>
</div>
<?php endif; ?>
</div>