gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cron Jobs, Reminder, Fonts, Members / Wizard / Price, Credit and Promotion

Browse source
This commit is contained in:
Kevin Adametz 2023-01-25 12:42:41 +01:00
parent a0f4eda6ea
commit 6167273a48
204 changed files with 8746 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/views/user/checkout/checkout.blade.php
View file

@ -786,7 +786,7 @@
</div>
<hr />
@if(Yard::instance('shopping')->getPaymentCredit())
@if(Yard::instance('shopping')->reducePaymentCredit())
<div class="clearfix mb-2">
<span class="pull-right">{{ Yard::instance('shopping')->totalWithShippingWithoutCredit() }} €</span>
<span class="pull-left">Summe:</span>

3
resources/views/user/data_confirm.blade.php
View file

@ -20,7 +20,8 @@
<div class="container-p-x py-4 bg-light rounded mb-2" >
<div class="" style="max-height: 400px; overflow-y: auto">
{!! File::get(public_path('pdf/gs_contract_de.php')); !!}
{{-- {!! File::get(public_path('pdf/gs_contract_de.php')); !!} --}}
{!! \App\Models\Setting::getContentBySlug('partner_gs_contract_de') !!}
</div>
</div>

3
resources/views/user/order/list.blade.php
View file

@ -144,8 +144,7 @@
</div>
{!! Form::close() !!}
<script>
$( document ).ready(function() {

18
resources/views/user/order/yard_view_form.blade.php
View file

@ -253,7 +253,7 @@
{{ Yard::instance('shopping')->taxWithShipping() }} €
</td>
</tr>
@if(Yard::instance('shopping')->getPaymentCredit())
@if(Yard::instance('shopping')->reducePaymentCredit())
<tr>
<td class="text-left"><strong>Summe (Brutto):</strong></td>
<td>
@ -290,8 +290,22 @@
<div class="float-right">
<button type="submit" class="btn btn-secondary"><i class="ion ion-ios-redo"></i> bestätigen und weiter zur Kasse</button>
</div>
@if(Yard::instance('shopping')->getPaymentCredit())
@if(Yard::instance('shopping')->hasActivePromotion())
<span class="badge badge-warning">Guthaben kann bei der Bestellung nicht verrechnet werden, Promotion ist aktiv</span>
@else
<label class="switcher switcher-square switcher-secondary">
<input type="checkbox" class="switcher-input" name="switch_reduce_payment_credit" id="switch_reduce_payment_credit" value="1" @if(Yard::instance('shopping')->getReducePaymentCredit()) checked @endif >
<span class="switcher-indicator">
<span class="switcher-yes"></span>
<span class="switcher-no"></span>
</span>
<span class="switcher-label">Mein Guthaben bei der Bestellung verrechnen</span>
</label>
@endif
@endif
<br><br>
<em class="small text-center"> <i class="fa fa-lock"></i> Du wirst auf unseren checkout weitergeletet, die Verbindung ist SSL verschlüsselt.</em>
@endif
@endif
@endif