Compare commits

...

2 Commits

Author SHA1 Message Date
Benjamin Völkl 52e9038a51 Merge branch 'master' of code.areya.de:Areya/areya-energy 2022-09-05 16:40:24 +02:00
Benjamin Völkl 22d6341f25 . 2022-09-05 16:40:12 +02:00
5 changed files with 193 additions and 29 deletions

View File

@ -3,7 +3,10 @@
<component name="ChangeListManager">
<list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="gustavo luigi helped me with that">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/lists/produkte.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/lists/produkte.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/contents/balkonkraftwerk.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/contents/balkonkraftwerk.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/contents/solarmodule.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/contents/solarmodule.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/master.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/master.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/content/pages/bestellablauf.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/pages/bestellablauf.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@ -45,6 +45,13 @@
</div>
<br>

<div class="row">
<div class="col">
<h5>Kurzbeschreibung</h5>

{{$content->data_fields['kurzbeschreibung']}}
</div>
</div>


<div class="row mt-5">
@ -65,8 +72,158 @@
</button>
</div>
</div>



</div>
<hr class="mt-5">

<div class="row">
<div class="col-12 mt-5">

<style>
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
color: var(--bs-nav-pills-link-active-color);
background-color:#79b27f ;
}
</style>
<div class="card">
<div class="card-header" style="background-color: #546c8a; color: white;">
<nav class="nav nav-pills nav-justified">
<a class="nav-link text-light active" href="#" data-bs-toggle="tab" data-bs-target="#bla1" type="button" role="tab" aria-controls="bla1" aria-selected="false">Beschreibung</a>
<a class="nav-link text-light" href="#" data-bs-toggle="tab" data-bs-target="#bla2" type="button" role="tab" aria-controls="bla2" aria-selected="false">Technische Daten</a>
<a class="nav-link text-light" href="#" data-bs-toggle="tab" data-bs-target="#bla3" type="button" role="tab" aria-controls="bla3" aria-selected="false">Datenblätter & Downloads</a>
<a class="nav-link text-light" href="#" data-bs-toggle="tab" data-bs-target="#bla3" type="button" role="tab" aria-controls="bla4" aria-selected="false">Garantien</a>
</nav>


</div>

<div class="tab-content" id="myTabContent">


<div class="tab-pane fade show active" id="bla1" role="bla1" aria-labelledby="bla1" tabindex="0">
<div class="card-body" style="min-height: 300px;">

<h4 class="mt-3 mb-4">Beschreibung</h4>

{{$content->data_fields['preis']}}
</div>
</div>

<div class="tab-pane fade" id="bla2" role="bla2" aria-labelledby="bla2" tabindex="0">
<div class="card-body" style="min-height: 300px;">
<h4 class="mt-3 mb-5">Technische Daten</h4>

<b>Monokristallines Solarmodul mit 360 Wp</b>
<ul>
<li>Modulmaße von 1756 x 1039 x 35 mm</li>
<li>Gewicht von 20,3 kg</li>
<li>19,7 % Modulwirkungsgrad</li>
<li>Monokristalline Zellstruktur mit ausgezeichnetem Schwachlichtverhalten</li>
<li>25 Jahre Leistungsgarantie, 15 Jahre Produktgarantie</li>
</ul>


<b>Microwechselrichter mit 600 Watt Marke Hoymiles</b>
<ul>
<li>Wirkungsgrad von 96,70 % max</li>
<li>Nennstrom (AC): 1,74 A</li>
<li>Gewicht von 1,98 kg</li>

</ul>

<b>Sonstiges Zubehör</b>
<ul>
<li>Steckverbindung für die Steckdose</li>
<li>UV-beständige Kabelbinder Kabelbefestigung am Modul</li>
<li>Eine Endkappe für den Verschluss der Buchse des Wechselrichters</li>

</ul>


</div>
</div>

<div class="tab-pane fade" id="bla3" role="bla3" aria-labelledby="bla3" tabindex="0">
<div class="card-body" style="min-height: 300px;">
<h4 class="mt-3 mb-4">Datenbläter & Downloads</h4>

<ul>
<li>
<a href="" class="mb-3 text-decoration-none">
<svg style="fill: currentColor; width: 12px; margin-bottom: 2px; margin-right: 2px; " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.98L286.02 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h288.02c26.49 0 47.99-21.5 47.99-47.99V131.97c0-12.69-5.1-24.99-14.1-33.99zM256.03 32.59c2.8.7 5.3 2.1 7.4 4.2l83.88 83.88c2.1 2.1 3.5 4.6 4.2 7.4h-95.48V32.59zm95.98 431.42c0 8.8-7.2 16-16 16H47.99c-8.8 0-16-7.2-16-16V48.09c0-8.8 7.2-16.09 16-16.09h176.04v104.07c0 13.3 10.7 23.93 24 23.93h103.98v304.01zM208 216c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v88.02h-52.66c-11 0-20.59 6.41-25 16.72-4.5 10.52-2.38 22.62 5.44 30.81l68.12 71.78c5.34 5.59 12.47 8.69 20.09 8.69s14.75-3.09 20.09-8.7l68.12-71.75c7.81-8.2 9.94-20.31 5.44-30.83-4.41-10.31-14-16.72-25-16.72H208V216zm42.84 120.02l-58.84 62-58.84-62h117.68z"/></svg>
PV-Modul: LONGi 60HIH-375M, black frame</a>
</li>
<li>
<a href="" class="mb-3 text-decoration-none">
<svg style="fill: currentColor; width: 12px; margin-bottom: 2px; margin-right: 2px; " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.98L286.02 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h288.02c26.49 0 47.99-21.5 47.99-47.99V131.97c0-12.69-5.1-24.99-14.1-33.99zM256.03 32.59c2.8.7 5.3 2.1 7.4 4.2l83.88 83.88c2.1 2.1 3.5 4.6 4.2 7.4h-95.48V32.59zm95.98 431.42c0 8.8-7.2 16-16 16H47.99c-8.8 0-16-7.2-16-16V48.09c0-8.8 7.2-16.09 16-16.09h176.04v104.07c0 13.3 10.7 23.93 24 23.93h103.98v304.01zM208 216c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v88.02h-52.66c-11 0-20.59 6.41-25 16.72-4.5 10.52-2.38 22.62 5.44 30.81l68.12 71.78c5.34 5.59 12.47 8.69 20.09 8.69s14.75-3.09 20.09-8.7l68.12-71.75c7.81-8.2 9.94-20.31 5.44-30.83-4.41-10.31-14-16.72-25-16.72H208V216zm42.84 120.02l-58.84 62-58.84-62h117.68z"/></svg>

Microwechselrichter: Hoymiles HM-600/700/800
</a>
</li>
<li>
<a href="" class="mb-3 text-decoration-none">
<svg style="fill: currentColor; width: 12px; margin-bottom: 2px; margin-right: 2px; " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.98L286.02 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h288.02c26.49 0 47.99-21.5 47.99-47.99V131.97c0-12.69-5.1-24.99-14.1-33.99zM256.03 32.59c2.8.7 5.3 2.1 7.4 4.2l83.88 83.88c2.1 2.1 3.5 4.6 4.2 7.4h-95.48V32.59zm95.98 431.42c0 8.8-7.2 16-16 16H47.99c-8.8 0-16-7.2-16-16V48.09c0-8.8 7.2-16.09 16-16.09h176.04v104.07c0 13.3 10.7 23.93 24 23.93h103.98v304.01zM208 216c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v88.02h-52.66c-11 0-20.59 6.41-25 16.72-4.5 10.52-2.38 22.62 5.44 30.81l68.12 71.78c5.34 5.59 12.47 8.69 20.09 8.69s14.75-3.09 20.09-8.7l68.12-71.75c7.81-8.2 9.94-20.31 5.44-30.83-4.41-10.31-14-16.72-25-16.72H208V216zm42.84 120.02l-58.84 62-58.84-62h117.68z"/></svg>
Hoymiles NA-Zertifikat
</a>
</li>
<li>
<a href="" class="mb-3 text-decoration-none">
<svg style="fill: currentColor; width: 12px; margin-bottom: 2px; margin-right: 2px; " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.98L286.02 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h288.02c26.49 0 47.99-21.5 47.99-47.99V131.97c0-12.69-5.1-24.99-14.1-33.99zM256.03 32.59c2.8.7 5.3 2.1 7.4 4.2l83.88 83.88c2.1 2.1 3.5 4.6 4.2 7.4h-95.48V32.59zm95.98 431.42c0 8.8-7.2 16-16 16H47.99c-8.8 0-16-7.2-16-16V48.09c0-8.8 7.2-16.09 16-16.09h176.04v104.07c0 13.3 10.7 23.93 24 23.93h103.98v304.01zM208 216c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v88.02h-52.66c-11 0-20.59 6.41-25 16.72-4.5 10.52-2.38 22.62 5.44 30.81l68.12 71.78c5.34 5.59 12.47 8.69 20.09 8.69s14.75-3.09 20.09-8.7l68.12-71.75c7.81-8.2 9.94-20.31 5.44-30.83-4.41-10.31-14-16.72-25-16.72H208V216zm42.84 120.02l-58.84 62-58.84-62h117.68z"/></svg>

Hoymiles Einheitenzertifikat
</a>
</li>
<li>
<a href="" class="mb-3 text-decoration-none">
<svg style="fill: currentColor; width: 12px; margin-bottom: 2px; margin-right: 2px; " xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M369.9 97.98L286.02 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h288.02c26.49 0 47.99-21.5 47.99-47.99V131.97c0-12.69-5.1-24.99-14.1-33.99zM256.03 32.59c2.8.7 5.3 2.1 7.4 4.2l83.88 83.88c2.1 2.1 3.5 4.6 4.2 7.4h-95.48V32.59zm95.98 431.42c0 8.8-7.2 16-16 16H47.99c-8.8 0-16-7.2-16-16V48.09c0-8.8 7.2-16.09 16-16.09h176.04v104.07c0 13.3 10.7 23.93 24 23.93h103.98v304.01zM208 216c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v88.02h-52.66c-11 0-20.59 6.41-25 16.72-4.5 10.52-2.38 22.62 5.44 30.81l68.12 71.78c5.34 5.59 12.47 8.69 20.09 8.69s14.75-3.09 20.09-8.7l68.12-71.75c7.81-8.2 9.94-20.31 5.44-30.83-4.41-10.31-14-16.72-25-16.72H208V216zm42.84 120.02l-58.84 62-58.84-62h117.68z"/></svg>

Garantiebedingungen Hoymiles
</a>
</li>
</ul>

<br>
<br>
<br>
<br>
<br>
<br>






</div>
</div>

<div class="tab-pane fade" id="bla3" role="bla3" aria-labelledby="bla3" tabindex="0">
<div class="card-body" style="min-height: 300px;">
<h4 class="mt-3 mb-4">Beschreibung</h4>
<p>
Bla1 Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dicta fugit libero maiores minima nihil. A aspernatur est fugiat hic nihil? Ab expedita facere hic ipsum perspiciatis quaerat quia quod tempore?
</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Animi aperiam consequatur eius fuga impedit ipsum, magni molestiae recusandae saepe sed ullam veniam voluptates. Corporis expedita iusto magni maxime, minus perferendis?</p>

<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Animi aperiam consequatur eius fuga impedit ipsum, magni molestiae recusandae saepe sed ullam veniam voluptates. Corporis expedita iusto magni maxime, minus perferendis?</p>

<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Animi aperiam consequatur eius fuga impedit ipsum, magni molestiae recusandae saepe sed ullam veniam voluptates. Corporis expedita iusto magni maxime, minus perferendis?</p>

</div>
</div>
</div>

</div>




</div>
</div>



</div>
</div>
</section>

View File

@ -199,7 +199,7 @@



<div class="row mt-5">
<div class="row mt-5 ">
<div class="col-6">
<button style="display: none;" id="btn-add-to-bag" data-id="{{$content->id}}" class="btn btn-outline-success mb-5" style="padding-top: 6px; padding-bottom: 6px; padding-right: 20px; padding-left: 20px;">
<svg style="fill: currentColor; width: 19px; margin-right: 8px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M352 128C352 57.42 294.579 0 224 0 153.42 0 96 57.42 96 128H0v304c0 44.183 35.817 80 80 80h288c44.183 0 80-35.817 80-80V128h-96zM224 48c44.112 0 80 35.888 80 80H144c0-44.112 35.888-80 80-80zm176 384c0 17.645-14.355 32-32 32H80c-17.645 0-32-14.355-32-32V176h48v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h160v40c0 13.255 10.745 24 24 24s24-10.745 24-24v-40h48v256z"/></svg>
@ -217,6 +217,11 @@
</button>
</div>
</div>





</div>
<hr class="mt-5">
</div>

View File

@ -138,19 +138,20 @@
</table>
</div>
</div>
<div class="row mt-3">
<div class="col-6">
<a href="" class="text-muted text-decoration-none" data-bs-toggle="modal" data-bs-target="#shareCart">
Warenkorb teilen
<svg style="fill: currentColor; width: 19px; margin-left: 4px; margin-bottom: 4px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M564.907 196.35L388.91 12.366C364.216-13.45 320 3.746 320 40.016v88.154C154.548 130.155 0 160.103 0 331.19c0 94.98 55.84 150.231 89.13 174.571 24.233 17.722 58.021-4.992 49.68-34.51C100.937 336.887 165.575 321.972 320 320.16V408c0 36.239 44.19 53.494 68.91 27.65l175.998-184c14.79-15.47 14.79-39.83-.001-55.3zm-23.127 33.18l-176 184c-4.933 5.16-13.78 1.73-13.78-5.53V288c-171.396 0-295.313 9.707-243.98 191.7C72 453.36 32 405.59 32 331.19 32 171.18 194.886 160 352 160V40c0-7.262 8.851-10.69 13.78-5.53l176 184a7.978 7.978 0 0 1 0 11.06z"/></svg>
</a>
</div>
<div class="col-6 text-end">
<a href="{{url('/checkout')}}" type="button" class="btn btn-primary">Angebot unverbindlich anfragen</a>

</div>
</div>
</div>
<div class="modal-footer">


<!-- Button trigger modal -->
<a href="" class="text-muted text-decoration-none" data-bs-toggle="modal" data-bs-target="#shareCart">
Warenkorb teilen
<svg style="fill: currentColor; width: 19px; margin-left: 4px; margin-bottom: 4px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M564.907 196.35L388.91 12.366C364.216-13.45 320 3.746 320 40.016v88.154C154.548 130.155 0 160.103 0 331.19c0 94.98 55.84 150.231 89.13 174.571 24.233 17.722 58.021-4.992 49.68-34.51C100.937 336.887 165.575 321.972 320 320.16V408c0 36.239 44.19 53.494 68.91 27.65l175.998-184c14.79-15.47 14.79-39.83-.001-55.3zm-23.127 33.18l-176 184c-4.933 5.16-13.78 1.73-13.78-5.53V288c-171.396 0-295.313 9.707-243.98 191.7C72 453.36 32 405.59 32 331.19 32 171.18 194.886 160 352 160V40c0-7.262 8.851-10.69 13.78-5.53l176 184a7.978 7.978 0 0 1 0 11.06z"/></svg>
</a>


<a href="{{url('/checkout')}}" type="button" class="btn btn-primary">Angebot unverbindlich anfragen</a>
</div>
</div>
</div>
</div>
@ -242,16 +243,16 @@
<h5 class="modal-title" id="exampleModalLabel">Warenkorb teilen</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="modal-body" style="background-color: #f7fcf7;">
<div class="row">
<div class="col-12">
<div class="col-12 my-3">
<p>Teilen Sie Ihre Einkaufsliste mit Freunden und Bekannten, damit diese Sie dann bei Ihrere Auswahl helfen können.</p>
</div>
</div>



<div class="input-group input-group-lg">
<div class="input-group input-group-lg my-2">

<input type="text" class="form-control cart-link" aria-label="Sizing example input" aria-describedby="inputGroup-sizing-lg" style="box-shadow: none;" readonly>
<span class="input-group-text" id="btn-copy-cart-link" style="cursor: copy;">

View File

@ -3,25 +3,23 @@
<div class="container">
<section>
<div class="row">

<div class="col-12">
<h1 class="mb-5">Bestellablauf</h1>
<p class="fs-5">
Hier stellen unsere Kunden Ihre Steckeranlagen von uns vor.
</p>
<br>
<br>


</div>


<div class="col-12">

<h4>1. Informieren Sie sich und wählen Sie Ihre Wunschprodukte</h4>
<h4>2. Hinterlassen Sie Ihre Kontaktdaten und fragen unverbindlich Ihre Produkte an</h4>
<h4>3. Als Service bieten wir Ihnen ein persönliches Beratungstelefonat an</h4>
<h4>4. Sie bekommen ein individuelles Angebot</h4>
<h4>5. Zusammenstellung und Packen Ihrer Produkte nach Annahme des Angebots.</h4>
<h4>6. Sie erhalten Ihre Rechnung und einen Abholtermin in unserem Lager in Vohenstrauss</h4>
<h4>7. Barzahlung vor Ort bei Empfang der bestellten Waren</h4>
<h4 class="mb-4">1. Informieren Sie sich und wählen Sie Ihre Wunschprodukte</h4>
<h4 class="mb-4">2. Hinterlassen Sie Ihre Kontaktdaten und fragen unverbindlich Ihre Produkte an</h4>
<h4 class="mb-4">3. Als Service bieten wir Ihnen ein persönliches Beratungstelefonat an</h4>
<h4 class="mb-4">4. Sie bekommen ein individuelles Angebot</h4>
<h4 class="mb-4">5. Zusammenstellung und Packen Ihrer Produkte nach Annahme des Angebots.</h4>
<h4 class="mb-4">6. Sie erhalten Ihre Rechnung und einen Abholtermin in unserem Lager in Vohenstrauss</h4>
<h4 class="mb-4">7. Barzahlung vor Ort bei Empfang der bestellten Waren</h4>
</div>
</div>
</section>