Merge branch 'master' of gitlab.com:printshopcreator/pscdevmake

src/old/application/design/vorlagen/tailwindcss/articletemplates/scripts/100_basket_index.phtml

@@ -4,7 +4,7 @@
 $articleObj = new market_article();
     $filesOptions =$this->article['basketarticle']->getFiles();
 ?>
-    <div class="basis-4/12">
+    <div class="basis-4/12 mr-1">
     	<?php if(($basketArticle['a6_org_article'] == 0 || $basketArticle['a6_org_article'] == "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
     		<?php echo $this->image()->thumbnailImage($basketArticle['title'], 'articlelist', $basketArticle['file']); ?>
     	<?php elseif(($basketArticle['a6_org_article'] != 0 && $basketArticle['file'] != "") && ($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
@@ -13,12 +13,7 @@ $articleObj = new market_article();
             <?= $articleObj->generatePreview($basketArticle['id'],$this->article['basketarticle']->getLayouterId()); ?>
         <?php endif; ?>
     </div>
-    <div class="basis-5/12"><span class="mobilelabel"><strong>Anzahl:</strong> </span>
-        <?php if(isset($count)): ?>
-            <strong><?php echo $count ?></strong>
-    	<?php else: ?>
-        <strong>Anzahl: <?php echo $this->article['basketarticle']->getAuflage() ?></strong><br /><br />
-        <?php endif; ?>
+    <div class="basis-5/12">
         <?php if(($this->article['basketarticle']->getLayouterId() == "" || $this->article['basketarticle']->getLayouterId() == false)): ?>
             <strong><?php echo $basketArticle['title'] ?></strong><br />
         <?php else: ?>
@@ -53,22 +48,21 @@ $articleObj = new market_article();
         
         <?php if($this->shop->basketposfield1 != ""): ?><?php echo $this->shop->basketposfield1 ?>
         <form enctype="multipart/form-data" method="post">
-            <div><input type="text" class="span3" style="margin-bottom: 0;" name="ref_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getRef(); ?>"/>
-            <input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
+            <div><input type="text" class="border bg-gray-200 text-black p-2 border-gray-300" style="margin-bottom: 0;" name="ref_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getRef(); ?>"/>
+            <input type="submit" class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
         </form>
         <?php endif; ?>
         <?php if($this->shop->basketposfield2 != ""): ?><?php echo $this->shop->basketposfield2 ?>
         <form enctype="multipart/form-data" method="post">
-            <div><input type="text" class="span3" style="margin-bottom: 0;" name="kst_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getKst(); ?>"/>
-                <input type="submit" class="btn vouchersubmit" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
+            <div><input type="text" class="border bg-gray-200 text-black p-2 border-gray-300" style="margin-bottom: 0;" name="kst_<?php echo $this->article['uuid'] ?>" value="<?php echo $this->article['basketarticle']->getKst(); ?>"/>
+                <input type="submit" class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white" style="" value="<?php echo $this->translate('übernehmen')?>"/></div>
         </form>
         <?php endif; ?>
-        Gewicht: <?php echo $this->article['basketarticle']->getWeight() ?>
     </div>
     <div class="basis-4/12" style="text-align: right;">
     <?php if(!$this->designsettings()->get('display_no_price')) { ?><?php echo $this->currency->toCurrency($this->article['basketarticle']->getNetto()*$this->article['basketarticle']->getCount()) ?> <label style="font-size:14px; font-weight:100;width: 45px;">(Netto)</label><br /><strong><?php echo $this->currency->toCurrency($this->article['basketarticle']->getBrutto()*$this->article['basketarticle']->getCount()) ?></strong> <label style="font-size:14px; font-weight:100;"><?php echo $this->translate('(Brutto inkl. '.$basketArticle["mwert"].'% MwSt.)')?></label></label><?php } ?>
-        <br/><a href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
-        <br/><a href="<?php echo $this->url(array('key' => $this->article['uuid']), 'articleload') ?>"><?php echo $this->translate('Bearbeiten') ?></a>
+        <br/><a class="text-highlight underline" href="<?php echo $this->url(array('del' => $this->article['uuid']), 'basketdel') ?>"><?php echo $this->translate('Löschen'); ?></a>
+        <br/><a class="text-highlight underline" href="<?php echo $this->url(array('key' => $this->article['uuid']), 'articleload') ?>"><?php echo $this->translate('Bearbeiten') ?></a>
 
     </div>
 

src/old/application/design/vorlagen/tailwindcss/templates/basket/done.phtml

@@ -1,9 +1,9 @@
 <div class=" md:w-2/4 m-auto">
-    <h1 class="mt-4 text-xl"><?php echo $this->translate('Vielen Dank für Ihre Bestellung') ?></h1>
-    <p class="mt-4 mb-4"><?php echo $this->translate('Sie erhalten in Kürze eine Bestätigungsmail Ihrer Bestellung.')?></p>
-    <div class="md:flex gap-4">
-        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user/myorders"><?php echo $this->translate('Zu meinen Aufträgen')?></a>
-        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/"><?php echo $this->translate('Zur Startseite')?></a> 
-        <a class="transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user?logout=1"><?php echo $this->translate('Abmelden')?></a>
+    <h1 class="ml-1 mr-1 md:ml-0 md:mr-0 mt-4 text-xl"><?php echo $this->translate('Vielen Dank für Ihre Bestellung') ?></h1>
+    <p class="ml-1 mr-1 md:ml-0 md:mr-0 mt-4 mb-4"><?php echo $this->translate('Sie erhalten in Kürze eine Bestätigungsmail Ihrer Bestellung.')?></p>
+    <div class="ml-1 mr-1 md:ml-0 md:mr-0 md:flex gap-4">
+        <a class="block text-center transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user/myorders"><?php echo $this->translate('Zu meinen Aufträgen')?></a>
+        <a class="block text-center transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/"><?php echo $this->translate('Zur Startseite')?></a> 
+        <a class="block text-center transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-black mt-2 mb-2 p-2 pl-5 pr-5 text-xs rounded-full disabled bg-white " href="/user?logout=1"><?php echo $this->translate('Abmelden')?></a>
     </div>
 </div>

src/old/application/design/vorlagen/tailwindcss/templates/basket/finish.phtml

@@ -17,10 +17,10 @@
 
         <div class="md:flex bg-white mt-4 border mb-4">
             <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
-                <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
+                <a href="/basket"><h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?></a>
             </label>
             <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
-                <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>
+                <a href="/basket/review"><h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?></a>
             </label>
             <label class="bg-highlight md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 3: <?php echo $this->translate('AGB') ?></h4><?php echo $this->translate('Bestätigen und bestellen') ?>
@@ -80,12 +80,12 @@
     </div>
 
 
-    <div class="flex mt-4 mb-4">
+    <div class="flex mt-4 mb-4 ml-1 mr-1 md:ml-0 md:mr-0">
         <div class="flex-1"><?php echo $this->translate('Gewählte Versandart') ?>: <b><?php echo $this->shippingtype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a></div>
         <div class="flex-1"><?php echo $this->translate('Gewählte Zahlungsart') ?>: <b><?php echo $this->paymenttype->title ?></b> <a href="/basket/index"><?php echo $this->translate('Ändern') ?></a></div>
     </div>
 
-    <h3 class="mb-4"><?php echo $this->translate('Warenkorb') ?> <a class="underline" href="/basket/index"><?php echo $this->translate('Produkte ändern') ?></a></h3>
+    <h3 class="mb-4 ml-1 md:ml-0"><?php echo $this->translate('Warenkorb') ?> <a class="underline" href="/basket/index"><?php echo $this->translate('Produkte ändern') ?></a></h3>
 
     <form action="/basket/finish" method="post" enctype="multipart/form-data">
 
@@ -101,7 +101,7 @@
                     <?php endif; ?>
 
             </div>
-            <div class="basis-4/12 p-1 font-medium ">Anzahl: <?php if (isset($count) && intval($count) > 0) : ?><?php echo $count ?><?php else : ?><?php echo $barticle['basketarticle']->getCount() ?><?php endif; ?><br /><br />
+            <div class="basis-4/12 p-1 font-medium ">
                     <?php if (($barticle['basketarticle']->getLayouterId() == "" || $barticle['basketarticle']->getLayouterId() == false)) : ?>
                         <?php echo $barticle['article']['title'] ?>
                     <?php else : ?>
@@ -139,7 +139,7 @@
         ?>
 
 
-        <table width="100%" class="table table-bordered">
+        <table class="w-full table table-bordered ml-1 mr-1">
         <?php if(!$this->designsettings()->get('display_no_price')) { ?><thead>
                 <?php if ($this->withTax) : ?>
                     <tr>
@@ -260,7 +260,7 @@
         });
         }
         </script>
-            <div class="text-right mt-2 mb-2">
+            <div class="md:text-right mt-2 mb-2 ml-1 mr-1 md:ml-0 md:mr-0">
                 <?php if (!$this->designsettings()->get('b2bshop')) : ?>
                     <input type="hidden" name="agb" value="0" />
                     <?php if ($this->erroragb == true) : ?>
@@ -336,7 +336,7 @@
 
             </div><!-- //class="pull-right" -->
 
-            <div class="text-right">
+            <div class="text-right ml-1 mr-1 md:ml-0 md:mr-0">
                 <button type="submit" class=" transition ease-in-out duration-300 delay-150 hover:bg-white hover:text-black border-gray-300 border bg-highlight text-white p-2 pl-5 pr-5 rounded-full disabled bg-highlight "><?php echo $this->translate('kostenpflichtig bestellen') ?></button>
             </div>
         </form>

src/old/application/design/vorlagen/tailwindcss/templates/basket/index.phtml

@@ -1,4 +1,4 @@
-<div class=" md:w-2/4 m-auto">
+<div class="md:w-2/4 m-auto">
     <!--<div class="page-header col-xs-12"><?php echo $this->translate('Warenkorb / Bestellung') ?></div>-->
     <?php if ($this->basketIsEmpty) : ?>
 
@@ -15,14 +15,14 @@
 
     <?php else : ?>
 
-        <div class="flex bg-white border mb-4">
-            <label class="bg-highlight p-4 text-white flex-1">
+        <div class="md:flex bg-white mb-4 mt-4 border">
+            <label class="bg-highlight md:p-4  text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
             </label>
-            <label class="flex-1 p-4">
+            <label class="md:flex-1 md:p-4 ">
                 <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>
             </label>
-            <label class="flex-1 p-4">
+            <label class="md:flex-1 md:p-4 ">
                 <h4><?php echo $this->translate('Schritt') ?> 3: <?php echo $this->translate('AGB') ?></h4><?php echo $this->translate('Bestätigen und bestellen') ?>
             </label>
         </div>
@@ -43,8 +43,8 @@
              * Zusammenfassung der Bestellung
              */
             ?>
-            <div class="flex flex-row-reverse mt-5">
-                <div class="basis-10/12">
+            <div class="md:flex flex-row-reverse mt-5 ml-2 mr-2">
+                <div class="md:basis-10/12">
 
                     <form action="<?php echo $this->redirect_ssl_path ?>/basket" method="post" class="niceform" enctype="multipart/form-data">
                         <table class="table-auto w-full border-collapse border-spacing-2">

src/old/application/design/vorlagen/tailwindcss/templates/basket/review.phtml

@@ -21,7 +21,7 @@ $this->headScript()->prependFile('/' . $this->designPath . '/js/review.js');
 
         <div class="md:flex bg-white mb-4 mt-4 border">
             <label class="bg-lenzBlue md:p-4 text-white md:flex-1">
-                <h4><?php echo $this->translate('Schritt') ?> 1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?>
+                <a href="/basket"><h4><?php echo $this->translate('Schritt') ?>1: <?php echo $this->translate('Warenkorb') ?></h4><?php echo $this->translate('Übersicht über Ihre Bestellung') ?></a>
             </label>
             <label class="bg-highlight md:p-4 text-white md:flex-1">
                 <h4><?php echo $this->translate('Schritt') ?> 2: <?php echo $this->translate('Adressdaten') ?></h4><?php echo $this->translate('Rechnungs- und Lieferadresse angeben') ?>

src/old/application/design/vorlagen/tailwindcss/templates/index/sliderproductsnosidenav.phtml

@@ -11,7 +11,7 @@
       <?= $this->image()->thumbnailImage($first->title, 'productgrouplist', $first->image); ?>
     </a>
   </div>
-  <div class="md:w-1/2 p-5">
+  <div class="md:w-1/2 md:p-5">
     <h4 class="text-2xl font-lenzFont"><?php echo $first->title ?></h4>
     <p class="mt-4 mb-8 font-lenzFont"><?php echo $first->getEinleitung() ?></p>
     <a href="<?= $this->url(array('id' => $first->url), 'overview') ?>" class="uppercase bg-white p-4 text-black rounded-full text-sm font-bold transition ease-in-out duration-300 delay-150 hover:bg-black hover:text-white">Zu den Produkten</a>