User Order all Margins / Checkout

resources/views/admin/product/form.blade.php

@@ -45,10 +45,7 @@
             <label class="form-label" for="copy">{{ __('Produktbeschreibung') }}</label>
             {{ Form::textarea('copy', $product->copy ,  array('placeholder'=>__('Produktbeschreibung'), 'class'=>'form-control summernote', 'id'=>'copy')) }}
         </div>
-        <label class="custom-control custom-checkbox float-right">
-            {!! 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>
+
     </div>
 </div>
 
@@ -58,22 +55,18 @@
     </h5>
     <div class="card-body">
         <div class="form-row">
-            <div class="form-group col-sm-4 col-md-3">
+            <div class="form-group col-sm-4">
                 <label class="form-label" for="price">{{ __('Preis VK in EUR (Brutto)') }}</label>
                 {{ Form::text('price', $product->getFormattedPrice(),  array('placeholder'=>__('Preis VK in EUR (Brutto)'), 'class'=>'form-control', 'id'=>'price')) }}
 
             </div>
-            <div class="form-group col-sm-4 col-md-3">
-                <label class="form-label" for="price_ek">{{ __('Preis EK in EUR') }}</label>
-                {{ Form::text('price_ek', $product->getFormattedPriceEk(),  array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
 
-            </div>
-            <div class="form-group col-sm-4 col-md-3">
+            <div class="form-group col-sm-4">
                 <label class="form-label" for="tax">{{ __('MwSt in %') }}</label>
                 {{ Form::text('tax', $product->getFormattedTax(),  array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'tax')) }}
 
             </div>
-            <div class="form-group col-sm-4 col-md-3">
+            <div class="form-group col-sm-4">
                 <label class="form-label" for="price_old">{{ __('Streichpreis in EUR (wenn > 0)') }}</label>
                 {{ Form::text('price_old', $product->getFormattedPriceOld(),  array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'price_old')) }}
 
@@ -85,16 +78,45 @@
                 <label class="form-label" for="weight">{{ __('Gewicht in g') }}</label>
                 {{ Form::text('weight', $product->weight,  array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }}
             </div>
-            <div class="form-group col-sm-4">
+            {{-- <div class="form-group col-sm-4">
                 <label class="form-label" for="points">{{ __('Points pro Produkt') }}</label>
                 {{ Form::text('points', $product->points,  array('placeholder'=>__('Points pro Produkt'), 'class'=>'form-control', 'id'=>'points')) }}
             </div>
+            --}}
             <div class="form-group col-sm-4">
                 <label class="form-label" for="amount">{{ __('Anzahl/Verfügbarkeit') }}</label>
                 {{ Form::text('amount', $product->amount,  array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }}
+            </div>
+            <div class="form-group col-sm-4">
+                <label class="form-label" for="price_ek">{{ __('Preis EK in EUR') }}</label>
+                {{ Form::text('price_ek', $product->getFormattedPriceEk(),  array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
 
             </div>
         </div>
+        <div class="form-row">
+            <div class="form-group col-sm-4">
+                <label class="form-label" for="weight">{{ __('Keine Staffelprovision') }}</label>
+
+                <label class="custom-control custom-checkbox mt-2">
+                    {!! Form::checkbox('single_commission', 1, $product->single_commission, ['class'=>'custom-control-input']) !!}
+                    <span class="custom-control-label">Einzelrabatt für dieses Produkt</span>
+                </label>
+                <label class="custom-control custom-checkbox mt-2">
+                    {!! Form::checkbox('amount_commission', 1, $product->amount_commission, ['class'=>'custom-control-input']) !!}
+                    <span class="custom-control-label">Betrag zum Staffelumsatz addieren</span>
+                </label>
+
+
+            </div>
+            <div class="form-group col-sm-4">
+                <label class="form-label" for="value_commission">{{ __('Einzelrabatt in %') }}</label>
+                {{ Form::text('value_commission', $product->getFormattedValueCommission(),  array('placeholder'=>__('Einzelrabatt in %'), 'class'=>'form-control', 'id'=>'value_commission')) }}
+            </div>
+            <div class="form-group col-sm-4">
+                <label class="form-label" for="partner_commission">{{ __('Vertriebspartner Einzelrabatt in %') }}</label>
+                {{ Form::text('partner_commission', $product->getFormattedPartnerCommission(),  array('placeholder'=>__('Vertriebspartner Einzelrabatt in %'), 'class'=>'form-control', 'id'=>'partner_commission')) }}
+            </div>
+        </div>
     </div>
 </div>
 

resources/views/admin/product/index.blade.php

@@ -20,14 +20,13 @@
                     <th>{{__('Name')}}</th>
                     <th>{{__('Artikelnummer')}}</th>
                     <th>{{__('Kategorie')}}</th>
-                    <th>{{__('Points')}}</th>
                     <th>{{__('Preis')}}</th>
                     <th>{{__('Inhalt')}}</th>
                     <th>{{__('Einheit')}}</th>
                     <th>{{__('Grundpreis')}}</th>
                     <th>{{__('Gewicht')}}</th>
                     <th>{{__('sichbar')}}</th>
-                    <th>{{__('KP')}}</th>
+                    <th>{{__('ER')}}</th>
                     <th>{{__('Status')}}</th>
                     <th></th>
                 </tr>
@@ -54,13 +53,12 @@
                             @endforeach
                         </td>
                         <td>{{ $value->getFormattedPrice() }}</td>
-                        <td>{{ $value->points }}</td>
                         <td>{{ $value->contents_total }}</td>
                         <td>{{ $value->getUnitType() }}</td>
                         <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->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;
                             <a class="text-danger" href="{{ route('admin_product_delete', [$value->id]) }}"  onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>