Merge branch 'fronkdev' into 'master'

Added icons in quick contract view

See merge request fronk/thetool!594

Layout/default/Address/View.php

@@ -255,21 +255,28 @@
               </div>
               <?php if(is_array($address->contracts) && count($address->contracts)): ?>
               <ul class="list-group list-group-flush">
-                <?php foreach($address->contracts as $contract): ?>
+                 <?php foreach($address->contracts as $contract): ?>
-                <?php if($contract->owner_id != $address->id) continue; ?>
+                    <?php if($contract->owner_id != $address->id) continue; ?>
-                <li class="list-group-item">
+                    <li class="list-group-item <?=$contract->isCancelled() ? "canceled" : ""?>">
-                    <a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>" class="<?=($contract->price < 0) ? "text-danger" : ""?>">
+                        <?php if($contract->billingaddress_id && $contract->owner_id != $contract->billingaddress_id): ?>
-                        <?=$contract->product_name?> <?=($contract->matchcode) ? "[".$contract->matchcode."]" : ""?>
+                            <i class="far fa-fw fa-money-bill-simple-wave" title="Hat separate Rechungsadresse"></i>
-                    </a>
+                        <?php endif; ?>
-                    <?php if(is_array($contract->voicenumbers)): ?>
+                        <?php if($contract->cancel_date && $contract->cancel_date > date("U")): ?>
-                    <span class="text-pink">
+                            <i class="far fa-fw fa-eraser text-danger" title="Kündigungsdatum <?=date("d.m.Y", $contract->cancel_date)?>"></i>
-                        (<?=implode(", ", $contract->voicenumbers)?>)
+                        <?php endif; ?>
-                    </span>
+                        <a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>" class="<?=($contract->price < 0) ? "text-danger" : ""?>">
-                    <?php endif; ?>
+                            <?=$contract->product_name?> <?=($contract->matchcode) ? "[".$contract->matchcode."]" : ""?>
-                    <span class='text-secondary'>
+                        </a>
-                        <?=($contract->finish_date) ? "Fertigstellung: ".date('d.m.Y', $contract->finish_date) : "in Herstellung"?>
+                        <?php if(is_array($contract->voicenumbers)): ?>
-                    </span>
+                            <span class="text-pink">
-                </li>
+                                (<?=implode(", ", $contract->voicenumbers)?>)
+                            </span>
+                        <?php endif; ?>
+                        <span class='text-secondary'>
+                            <?=($contract->finish_date) ? "Fertigstellung: ".date('d.m.Y', $contract->finish_date) : "in Herstellung"?>
+                            <?=($contract->cancel_date) ? "Kündigung: ".date('d.m.Y', $contract->cancel_date) : ""?>
+                        </span>
+                    </li>
                 <?php endforeach; ?>
               </ul>
               <?php endif; ?>

Layout/default/Invoice/Index.php

@@ -29,7 +29,7 @@ $pagination_entity_name = "Rechnungen";
                 <div class="card-body">
                     <div class="row">
                         <div class="col">
-                            <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> AR-Merge / Fibu Konten Import</a>
+                            <a href="https://thetool.xinon.at/xfarm/" class="btn btn-primary" target="_blank"><i class="far fa-arrows-to-circle fa-fw"></i> Fakt-Rechnungen Import</a>
                         </div>
                     </div>
                 </div>

application/Pipework/PipeworkController.php

@@ -313,7 +313,8 @@ class PipeworkController extends mfBaseController {
       
       if($r->pipework_enabled != 1 && $building->pipework_enabled == 1) {
         $building->pipework_enabled = 0;
-        $building->pipework_enabled_date = 0;
+        $building->pipework_enabled_date = date('U');
+        $building->pipework_enabled_by = $this->me->id;
         $building->save();
       }