Komp / Max Produkt,

This commit is contained in:
Kevin Adametz 2021-06-18 15:01:01 +02:00
parent a4c76d06fa
commit 78f43169c8
19 changed files with 347 additions and 51 deletions

View file

@ -46,6 +46,29 @@
{{ Form::textarea('copy', $product->copy , array('placeholder'=>__('Produktbeschreibung'), 'class'=>'form-control summernote', 'id'=>'copy')) }}
</div>
<div class="form-row">
<div class="form-group col-sm-6">
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('shipping_addon', 1, $product->shipping_addon, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt beim Versand für Berater</span>
</label>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('max_buy', 1, $product->max_buy, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Maximaler Kauf für einen Berater für dieses Produkt</span>
</label>
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="max_buy_num">{{ __('Anzahl maximaler Kauf pro Berater') }}</label>
{{ Form::text('max_buy_num', $product->max_buy_num, array('placeholder'=>__('in Stück'), 'class'=>'form-control', 'id'=>'max_buy_num')) }}
</div>
</div>
</div>
</div>

View file

@ -26,7 +26,9 @@
<th>{{__('Grundpreis')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('sichbar')}}</th>
<th>{{__('ER')}}</th>
<th><div data-toggle="tooltip" title data-original-title="Kompensationsprodukt">{{__('KP')}}</div></th>
<th><div data-toggle="tooltip" title data-original-title="Maximaler Kauf pro Berater">{{__('MK')}}</div></th>
<th><div data-toggle="tooltip" title data-original-title="Einzelrabatt">{{__('ER')}}</div></th>
<th>{{__('Status')}}</th>
<th></th>
</tr>
@ -58,6 +60,8 @@
<td>{{ $value->getBasePriceFormatted() }}</td>
<td>{{ $value->weight }}</td>
<td>{{ $value->getShowAtType() }}</td>
<td data-sort="{{ $value->shipping_addon }}">{!! get_active_badge($value->shipping_addon) !!}</td>
<td data-sort="{{ $value->max_buy }}">{!! get_active_badge($value->max_buy) !!}</td>
<td data-sort="{{ $value->single_commission }}">{!! get_active_badge($value->single_commission) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
<td><a class="text-info" href="{{ route('admin_product_copy', [$value->id]) }}" onclick="return confirm('{{__('Eintrag kopieren?')}}');"><i class="far fa-copy"></i></a> &nbsp;

View file

@ -71,6 +71,35 @@
</div>
</div>
<div class="card mb-2">
<div class="card-body">
<h4>Kauf Einstellungen</h4>
<div class="form-row">
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('settings[order_partner_is_comp_me][val]', 1, \App\Models\Setting::getContentBySlug('order_partner_is_comp_me'), ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt bei Beraterbestellungen für sich</span>
</label>
{{ Form::hidden('settings[order_partner_is_comp_me][type]', 'bool') }}
<label class="custom-control custom-checkbox mt-3">
{!! Form::checkbox('settings[order_partner_is_comp_ot][val]', 1, \App\Models\Setting::getContentBySlug('order_partner_is_comp_ot'), ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt bei Beraterbestellungen für Kunden</span>
</label>
{{ Form::hidden('settings[order_partner_is_comp_ot][type]', 'bool') }}
</div>
<div class="form-group col-sm-12">
<label class="form-label">{{ __('Beschreibung Kompensationprodukt, wird als Subline angezeigt.') }}</label>
{!! Form::textarea('settings[order_partner_comp_text][val]', \App\Models\Setting::getContentBySlug('order_partner_comp_text'), array('class'=>'form-control', 'rows'=>3)) !!}
{{ Form::hidden('settings[order_partner_comp_text][type]', 'full_text') }}
</div>
</div>
<button type="submit" name="action" value="save_prepayment" class="btn btn-primary btn-sm mb-2"><i class="ion ion-ios-save"></i> speichern</button>
</div>
</div>
{!! Form::close() !!}
@endsection

View file

@ -69,7 +69,8 @@
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Kunden Preis')}}</th>
<th>{{__('Kompensation Preis')}}</th>
<th>{{__('Anzahl KP')}}</th>
<th>{{__('Tax')}}</th>
<th>{{__('Preis von - bis')}}</th>
<th>{{__('Gewicht von - bis')}}</th>
@ -96,6 +97,8 @@
</button>
</td>
<td>{{ $price->getFormattedPrice() }}</td>
<td>{{ $price->getFormattedPriceComp() }}</td>
<td>{{ $price->num_comp }}</td>
<td>{{ $price->getFormattedTaxRate() }}</td>
<td>{{ $price->getFormatTotalFrom() }} - {{ $price->getFormattedTotalTo() }}</td>
<td>{{ $price->weight_from }} - {{ $price->weight_to }}</td>
@ -109,6 +112,8 @@
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-price"
data-id="new"
data-price=""
data-price_comp=""
data-num_comp=""
data-tax_rate=""
data-factor="1"
data-total_from=""
@ -141,13 +146,22 @@
<label for="price" class="form-label">{{__('Kunden Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price" placeholder="{{__('Preis in Euro')}}" required>
</div>
<div class="form-group col-6">
<label for="price_comp" class="form-label">{{__('Kompensation Preis (brutto)')}}*</label>
<input type="text" class="form-control" name="price_comp" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="tax_rate" class="form-label">{{__('enthaltene Tax (%)')}}</label>
<input type="text" class="form-control" name="tax_rate" placeholder="{{__('Tax in %')}}">
</div>
<div class="form-group col-6">
<label for="num_comp" class="form-label">{{__('Anzahl Kompensationsprodukte')}}*</label>
<input type="text" class="form-control" name="num_comp" placeholder="{{__('Anzahl Kompensationsprodukte')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="total_from" class="form-label">{{__('von Preis')}}</label>
@ -255,6 +269,8 @@
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='price']").val(button.data('price'));
$(this).find(".modal-body input[name='price_comp']").val(button.data('price_comp'));
$(this).find(".modal-body input[name='num_comp']").val(button.data('num_comp'));
$(this).find(".modal-body input[name='tax_rate']").val(button.data('tax_rate'));
$(this).find(".modal-body input[name='factor']").val(button.data('factor'));
$(this).find(".modal-body input[name='total_from']").val(button.data('total_from'));

View file

@ -9,6 +9,11 @@
@else
<h4 class="border-bottom pb-2">Versand Kompensationsprodukt</h4>
@endif
@if($order_partner_comp_text = \App\Models\Setting::getContentBySlug('order_partner_comp_text'))
{!! nl2br($order_partner_comp_text) !!}
<hr>
@endif
<div class="row no-gutters row-bordered">
@php($counter = 1)
@php($checked_id = Yard::instance('shopping')->getCompProductBy($i))

View file

@ -109,11 +109,11 @@
</div>
</div>
@if($for === 'me')
{{-- <div id="holder_html_view_comp_product">
@if($comp_products)
<div id="holder_html_view_comp_product">
@include('user.order.comp_product')
</div>
--}}
@endif
<div class="card mt-4">
@ -191,5 +191,5 @@
@endsection
@section('scripts')
<script src="{{ asset('/js/iq-shopping-cart.js') }}?v=1{{ get_file_last_time('/js/iq-shopping-cart.js') }}"></script>
<script src="{{ asset('/js/iq-shopping-cart.js') }}?v=2{{ get_file_last_time('/js/iq-shopping-cart.js') }}"></script>
@endsection