last changes since 6-2023

resources/views/user/homeparty/show_calc_bonus_host.blade.php

@@ -1,6 +1,15 @@
 
     @php($user_cart = \App\Services\HomepartyCart::getUserCartHost())
     @php($homeparty = \App\Services\HomepartyCart::$homeparty)
+    @if(!$user_cart->isPrice() && (\App\Services\HomepartyCart::$is_bonus || \App\Services\HomepartyCart::$is_bonus_coupon))
+        <tr class="foot-small">
+            <td colspan="8" class="text-left bg-danger text-white">
+                <strong>Gutschein / Bonus kann nicht angewendet werden, da beim Gastgeber:in keine Produkte hinzugefügt wurden.</strong>
+            </td>
+          
+        </tr>
+    @endif
+
     @if(\App\Services\HomepartyCart::$is_bonus)
         <tr class="foot-small">
             <td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
@@ -47,7 +56,9 @@
             <td>&nbsp;</td>
         </tr>
     @endif
-    <tr class="foot-small">
+
+    
+    {{--  <tr class="foot-small">
         <td colspan="5" class="text-left bg-warning-light">Versandkosten:</td>
         <td class="bg-warning-light">&nbsp;</td>
         <td class="text-right bg-warning-light">&nbsp;</td>
@@ -57,7 +68,7 @@
                 <span class="small">~{{  $user_cart->getCurrencyByKey('ShippingPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
                 @endif    
         </td>
-    </tr>
+    </tr>--}}
     <tr>
         <td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
         <td class="border-top text-right">
@@ -76,9 +87,9 @@
             @endif     
          </td>
         <td class="border-top text-right">
-            <div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
+            <div class="no-line-break"><strong>{{$user_cart->getFormattedEkPriceWithout()}} &euro;</strong></div>
             @if($homeparty->isPriceCurrency())
-            <span class="small">~{{  $user_cart->getCurrencyByKey('EkPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
+            <span class="small">~{{  $user_cart->getCurrencyByKey('EkPriceWithout') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
             @endif     
          </td>
     </tr>

resources/views/user/homeparty/show_products_order.blade.php

@@ -106,7 +106,7 @@
                @endif
            </tr>
            @if($homeparty_guest->getDelivery() === 'direct')
-            <tr>
+           {{--   <tr>
                <td colspan="5" class="text-left bg-warning-light">Versandkosten</td>
                <td class="bg-warning-light">&nbsp;</td>
                <td class="text-right bg-warning-light">
@@ -121,29 +121,29 @@
                     <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('ShippingPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
                     @endif     
                </td>
-           </tr>
+           </tr>--}}
             @endif
            <tr>
                <td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
                <td class="border-top text-right">
-                   <div class="no-line-break"><strong>{{$user_cart->getFormattedPoints()}}</strong></div>
+                   <div class="no-line-break"><strong>{{ $user_cart->getFormattedPoints()}}</strong></div>
                 </td>
                <td class="border-top text-right">
-                   <div class="no-line-break"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
+                   <div class="no-line-break"><strong>{{ $user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
                    @if($homeparty->isPriceCurrency())
                    <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('IncomePrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
                    @endif     
                 </td>
                <td class="border-top text-right">
-                   <div class="no-line-break"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></div>
+                   <div class="no-line-break"><strong>{{$user_cart->getFormattedPriceWithout()}} &euro;</strong></div>
                    @if($homeparty->isPriceCurrency())
-                   <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('Price') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
+                   <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('PriceWithout') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
                    @endif     
                 </td>
                <td class="border-top text-right">
-                   <div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
+                   <div class="no-line-break"><strong>{{$user_cart->getFormattedEkPriceWithout()}} &euro;</strong></div>
                    @if($homeparty->isPriceCurrency())
-                   <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('EkPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
+                   <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('EkPriceWithout') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
                    @endif     
                 </td>
            </tr>

resources/views/user/homeparty/show_total_order.blade.php

@@ -14,7 +14,7 @@
             @php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty->homeparty_host->id))
             <tr>
             <td>
-                <strong>Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
+                <strong>Gastgeber:in | {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
             </td>
             <td class="text-right">
                 {{$user_cart->getFormattedPoints()}}
@@ -40,8 +40,8 @@
         </tr>
             @if($user_cart->shipping_price > 0)
             <tr>
-                <td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
-                <td class="text-right bg-warning-light">
+                <td class="text-left bg-warning-light1" colspan="4">Versandkosten Gastgeber:in</td>
+                <td class="text-right bg-warning-light1">
                     <div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
                         @if($homeparty->isPriceCurrency())
                         <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('ShippingPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>
@@ -52,12 +52,12 @@
         @endif
 
         @if($homeparty->homeparty_guests)
-            @php($g_count = 1)
+            @php($g_count = 0)
             @foreach($homeparty->homeparty_guests as $homeparty_guest)
                 @php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
                 <tr>
                     <td>
-                        <strong> {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
+                        <strong> {!! ++$g_count !!}. Gast | {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
                     </td>
                     <td class="text-right">
                         {{$user_cart->getFormattedPoints()}}
@@ -83,8 +83,8 @@
                 </tr>
                 @if($user_cart->shipping_price > 0)
                 <tr>
-                    <td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
-                    <td class="text-right bg-warning-light">
+                    <td class="text-left bg-warning-light1" colspan="4">Versandkosten {!! $g_count !!}. Gast</td>
+                    <td class="text-right bg-warning-light1">
                         <div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
                             @if($homeparty->isPriceCurrency())
                             <span class="small no-line-break">~{{  $user_cart->getCurrencyByKey('ShippingPrice') }} {{  $homeparty->getPriceCurrencyUnit() }} </span>

resources/views/user/team/_points_sum.blade.php

@@ -1,7 +1,7 @@
 <h6>
     @if($userSalesVolume)
     <div class="mb-2">
-        <strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong>  | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
+        <strong>Gesamte Points: {{ $userSalesVolume->getPointsKPSum() }}</strong>  | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
     </div>
     <div>
         <strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;

resources/views/user/team/export.blade.php

@@ -0,0 +1,103 @@
+@extends('layouts.layout-2')
+
+@section('content')
+
+    @if ($errors->any())
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="alert alert-danger">
+                    <ul>
+                        @foreach ($errors->all() as $error)
+                            <li>{{ $error }}</li>
+                        @endforeach
+                    </ul>
+                </div>
+            </div>
+        </div>
+    @endif
+    <h4 class="font-weight-bold py-2 mb-2">
+        {{ __('navigation.my_team') }}
+    </h4>
+    <div class="card">
+        <h5 class="card-header">
+            {{__('Export')}} 
+        </h5>
+        <div class="card-body">
+            {!! Form::open(['url' => route('user_team_export_download'), 'class' => '']) !!}
+            {!! Form::hidden('key', 'value') !!}
+                 <button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> &nbsp;Export als xls</button>
+            {!! Form::close() !!}
+
+            <div class="card">
+                <div class="card-datatable table-responsive">
+                    <table class="table table-striped table-bordered"  id="datatable-user-team">
+    
+                        <thead>
+                        <tr>
+                            <th>{{__('Line') }}</th>
+                            <th>{{__('Level')}}</th>
+                            <th>{{__('E-Mail')}}</th>
+                            <th>{{__('Vorname')}}</th>
+                            <th>{{__('Nachname')}}</th>
+                            <th>{{__('Adresse')}}</th>
+                            <th>{{__('Zusatz') }}</th>
+                            <th>{{__('PLZ') }}</th>
+                            <th>{{__('Ort') }}</th>
+                            <th>{{__('Land') }}</th>
+                            <th>{{__('Tel') }}</th>
+                            <th>{{__('Mobil') }}</th>
+                            <th>{{__('Geburtstag') }}</th>
+                            <th>{{__('Account') }}</th>
+                            <th>{{__('Account bis') }}</th>
+                            <th>{{__('Sponsor')}}</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                            @if(isset($ExportBot) && isset($ExportBot->user_list->childs))
+                                @foreach ($ExportBot->user_list->childs as $child)
+                                <tr>
+                                    <td>{{ $child->line }}</td>
+                                    <td>{{ $child->level_name }}</td>
+                                    <td>{{ $child->email }}</td>
+                                    <td>{{ $child->first_name }}</td>
+                                    <td>{{ $child->last_name }}</td>
+                                    <td>{{ $child->address }}</td>
+                                    <td>{{ $child->address_2 }}</td>
+                                    <td>{{ $child->zipcode }}</td>
+                                    <td>{{ $child->city }}</td>
+                                    <td>{{ $child->country_id }}</td>
+                                    <td>{{ $child->phone }}</td>
+                                    <td>{{ $child->mobil }}</td>
+                                    <td>{{ $child->birthday }}</td>
+                                    <td>{!! ($child->active_account == 1 ? 'JA' : 'NEIN') !!}</td>
+                                    <td>{{ $child->payment_account_date }}</td>
+                                    <td>{{ $child->sponsor_name }}</td>
+                    
+                                </tr>
+                                @endforeach
+                            @endif
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+        <script>
+
+            $( document ).ready(function() {
+
+
+                $('#datatable-user-team').dataTable({
+                    "bLengthChange": false,
+                    "iDisplayLength": 50,
+                    "order": [[ 1, "desc" ]],
+        
+                    "language": {
+                        "url": "/js/German.json"
+                    }
+                });
+            });
+        </script>
+@endsection

resources/views/user/wizard/_payment.blade.php

@@ -104,12 +104,13 @@
     @endif
     <div class="text-left mt-3">
         <hr>
-        <label class="custom-control custom-checkbox">
+      {{--    <label class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" name="abo_options">
             <span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
             <p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
         </label>
         <hr>
+        --}}
         <div class="float-right">
             
             <strong>Gesamtsumme @if(\App\Services\UserService::getTaxFree()) netto @else brutto @endif: <span id="card_total_price">0</span> €</strong>