Categories, Netto Homeparty

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

@@ -15,7 +15,10 @@
             @foreach($homeparty->homeparty_users as $homeparty_user)
             <div class="card mb-3">
                 <div class="card-body d-flex justify-content-between align-items-start pb-2">
+                   
+                    @if(!$homeparty->completed)
                     <div>
+                        
                         <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="text-body text-big font-weight-semibold">
                             @if($homeparty_user->is_host)
                                 <span class="text-muted">Gastgeber/in: </span>
@@ -26,10 +29,7 @@
                         </a>
                         {{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
                     </div>
-                    @if(!$homeparty->completed)
-
                     <div>
-
                         <a href="{{route('user_homeparty_guest_detail', [$homeparty->id, $homeparty_user->id])}}" class="btn btn-sm btn-secondary mr-2"><i class="fa fa-edit"></i> bearbeiten</a>
                         <div class="btn-group project-actions">
                             @if($homeparty_user->is_host)
@@ -43,6 +43,19 @@
                             @endif
                         </div>
                     </div>
+                    @else
+                    <div>
+                        
+                        <div class="text-body text-big font-weight-semibold">
+                            @if($homeparty_user->is_host)
+                                <span class="text-muted">Gastgeber/in: </span>
+                            @else
+                                <span class="text-muted">Gast {{$g_count++}}: </span>
+                            @endif
+                            {{$homeparty_user->billing_firstname}} {{$homeparty_user->billing_lastname}}
+                        </div>
+                        {{-- <span class="badge badge-success align-text-bottom ml-1">offen ...</span> --}}
+                    </div>
                     @endif
                  </div>
                  <div class="progress rounded-0" style="height: 2px;">

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

@@ -4,7 +4,7 @@
         <tr class="foot-small">
             <td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
             <td>&nbsp;</td>
-            <td>&nbsp;</td>
+            <td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</td>
             <td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusValue() }} &euro;</td>
         </tr>
     @endif
@@ -12,16 +12,17 @@
         <tr class="foot-small">
             <td colspan="5" class="text-left">Gutschrift Bonus</td>
             <td>&nbsp;</td>
-            <td>&nbsp;</td>
+            <td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</td>
             <td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusCoupon() }} &euro;</td>
         </tr>
     @endif
     @if(\App\Services\HomepartyCart::$is_bonus)
         <tr class="foot-small">
-            <td colspan="5" class="text-left">Abzug Points durch Gutschein</td>
+            <td colspan="4" class="text-left">Abzug Points durch Gutschein</td>
             <td class="text-right">- {{ \App\Services\HomepartyCart::getFormattedBonusPointsDiff() }} </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
+            <td>&nbsp;</td>
         </tr>
     @endif
     <tr class="foot-small">
@@ -32,8 +33,9 @@
     </tr>
     <tr>
         <td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
-        <td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
         <td class="border-top text-right"><strong>{{$user_cart->getFormattedPoints()}}</strong></td>
         <td class="border-top text-right"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></td>
         <td class="border-top text-right"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></td>
+        <td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
+
     </tr>

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

@@ -7,10 +7,11 @@
            <th>{{__('Produkt')}}</th>
            <th>{{__('Anzahl')}}</th>
            <th>{{__('Marge')}}</th>
-           <th class="text-right">{{__('EK-Preis')}}</th>
            <th class="text-right">{{__('Points')}}</th>
            <th class="text-right">{{__('Verdienst')}}</th>
            <th class="text-right">{{__('VK-Preis')}}</th>
+           <th class="text-right">{{__('EK-Preis')}}</th>
+
        </tr>
        </thead>
        <tbody>
@@ -53,9 +54,7 @@
                    <td>
                        {{ $value->margin }}%
                    </td>
-                   <td class="text-right">
-                       {{ $value->getFormattedTotalEKPrice() }} &euro;
-                   </td>
+                  
                    <td class="text-right">
                        {{ $value->getFormattedTotalPoints() }}
                    </td>
@@ -65,6 +64,9 @@
                    <td class="text-right">
                        {{ $value->getFormattedTotalPrice() }} &euro;
                    </td>
+                   <td class="text-right">
+                    {{ $value->getFormattedTotalEKPrice() }} &euro;
+                </td>
                </tr>
            @endforeach
 
@@ -98,17 +100,18 @@
             <tr>
                <td colspan="5" class="text-left">Versandkosten</td>
                <td>&nbsp;</td>
-               <td class="text-right">&nbsp;</td>
+               <td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
                <td class="text-right">{{$user_cart->getFormattedShippingPrice()}} &euro;</td>
            </tr>
             @endif
 
            <tr>
                <td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
-               <td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
                <td class="border-top text-right"><strong>{{$user_cart->getFormattedPoints()}}</strong></td>
                <td class="border-top text-right"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></td>
                <td class="border-top text-right"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></td>
+               <td class="border-top text-right"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></td>
+
            </tr>
            @else
 

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

@@ -3,10 +3,10 @@
         <thead>
         <tr>
             <th>&nbsp;</th>
-            <th class="text-right">{{__('EK-Preis')}}</th>
             <th class="text-right">{{__('Points')}}</th>
             <th class="text-right">{{__('Verdienst')}}</th>
             <th class="text-right">{{__('VK-Preis')}}</th>
+            <th class="text-right">{{__('EK-Preis')}}</th>
         </tr>
         </thead>
         <tbody>
@@ -16,9 +16,6 @@
             <td>
                 <strong>Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
             </td>
-            <td class="text-right">
-                {{$user_cart->getFormattedEkPrice()}} &euro;
-            </td>
             <td class="text-right">
                 {{$user_cart->getFormattedPoints()}}
             </td>
@@ -28,6 +25,9 @@
             <td class="text-right">
                 {{$user_cart->getFormattedPrice()}} &euro;
             </td>
+            <td class="text-right">
+                {{$user_cart->getFormattedEkPrice()}} &euro;
+            </td>
         </tr>
         @endif
 
@@ -40,9 +40,6 @@
                     <td>
                         <strong> {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
                     </td>
-                    <td class="text-right">
-                        {{$user_cart->getFormattedEkPrice()}} &euro;
-                    </td>
                     <td class="text-right">
                         {{$user_cart->getFormattedPoints()}}
                     </td>
@@ -52,6 +49,9 @@
                     <td class="text-right">
                         {{$user_cart->getFormattedPrice()}} &euro;
                     </td>
+                    <td class="text-right">
+                        {{$user_cart->getFormattedEkPrice()}} &euro;
+                    </td>
                 </tr>
             @endforeach
         @endif
@@ -72,10 +72,10 @@
             <td colspan="1" class="border-top">
                 <strong>Gesamtsummen:</strong>
             </td>
-            <td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</strong></td>
             <td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedPoints()}}</strong></td>
             <td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedIncomePrice()}} &euro;</strong></td>
             <td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedPrice()}} &euro;</strong></td>
+            <td class="border-top text-right"><strong>{{\App\Services\HomepartyCart::getFormattedEkPrice()}} &euro;</strong></td>
         </tr>
         <tr class="foot-small">
             <td colspan="1" class="text-muted">
@@ -83,9 +83,9 @@
             </td>
             <td class="">&nbsp;</td>
 
-            <td class="">&nbsp;</td>
             <td class="">&nbsp;</td>
             <td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedPriceNet()}} &euro;</td>
+            <td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedEkPriceNet()}} &euro;</td>
         </tr>
         <tr class="foot-small">
             <td colspan="1" class="text-muted">
@@ -93,9 +93,9 @@
             </td>
             <td class="">&nbsp;</td>
 
-            <td class="">&nbsp;</td>
             <td class="">&nbsp;</td>
             <td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedPriceTax()}} &euro;</td>
+            <td class="text-muted text-right">{{\App\Services\HomepartyCart::getFormattedEkPriceTax()}} &euro;</td>
         </tr>
         </tfoot>
     </table>