Added Contractconfig Edit

Layout/default/Contract/Form.php

@@ -182,10 +182,9 @@
                       <th>Matchcode</th>
                       <th></th>
                     </tr>
-                    <?php foreach($contract->links as $type => $links): ?>
-                      <?php foreach($links as $link): ?>
+                    <?php foreach($contract->links as $link): ?>
                       <tr>
-                        <td><?=$type?></td>
+                        <td><?=__($link->type, "contract")?></td>
                         <td><a href="<?=self::getUrl("Address", "View", ["id" => $link->contract->owner_id])?>"><?=$link->contract->owner->getCompanyOrName()?></a></td>
                         <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract_id?></a></td>
                         <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->product->name?></a></td>
@@ -194,60 +193,10 @@
                           <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
                         </td>
                       </tr>
-                      <?php endforeach; ?>
+                      
                     <?php endforeach; ?>
                   </table>
-                  
-                  <?php foreach($contract->links as $link): ?>
-                    <div class="form-group row" id="link-<?=$linknum?>">
-                      <label class="col-lg-2 col-form-label" for="links_<?=$link->id?>_contract_id"></label>
-                      <div class="col-lg-6">
-                        <div class="input-group mb-3">
-                          <div class="input-group-prepend">
-                            <select class="form-control" name="links[<?=$link->id?>][type]">
-                              <option value="link" <?=($link->type == "link") ? "selected='selected'" : ""?>>Verknüpfung mit</option>
-                              <option value="upgrade" <?=($link->type == "upgrade") ? "selected='selected'" : ""?>>Upgrade von</option>
-                              <option value="downgrade" <?=($link->type == "downgrade") ? "selected='selected'" : ""?>>Downgrade von</option>
-                              <option value="relocation" <?=($link->type == "relocation") ? "selected='selected'" : ""?>>Umzug von</option>
-                              <option value="productchange" <?=($link->type == "productchange") ? "selected='selected'" : ""?>>Produktwechsel von</option>
-                            </select>
-                          </div>
-                          <!--input type="text" class="form-control" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" placeholder="Contract ID oder Suche nach Produkt, Matchcode, Kunde" value="<?=$contract->cancel_date?>"-->
-                          <select class="form-control basicAutoComplete link-autocomplete" autocomplete="off" name="links[<?=$link->id?>][contract_id]" id="links_<?=$link->id?>_contract_id" data-linknum="<?=$link->id?>" data-url="<?=self::getUrl('Contract','api')?>?do=findContract&autocomplete=1&preferred_address_id=<?=$contract->owner->id?>" placeholder="Contract ID oder Suche nach Produkt, Matchcode, Kunde" data-noresults-text="Keine Suchergebnisse">
-                            <option></option>
-                          </select>
-                          <div class="input-group-append">
-                            <button type="button" class="btn btn-danger" onclick="clearNewLink(<?=$link->id?>)"><i class="fas fa-xmark-large mr-1"></i> Entfernen</button>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  <?php endforeach; ?>
-                  
-                  <?php $linknum = 1337; ?>
-                  <div class="form-group row" id="link-<?=$linknum?>">
-                    <label class="col-lg-2 col-form-label" for="links_<?=$linknum?>_contract_id"></label>
-                    <div class="col-lg-6">
-                      <div class="input-group mb-3">
-                        <div class="input-group-prepend">
-                          <select class="form-control" name="links[<?=$linknum?>][type]">
-                            <option value="link">Verknüpfung mit</option>
-                            <option value="upgrade">Upgrade von</option>
-                            <option value="downgrade">Downgrade von</option>
-                            <option value="relocation">Umzug von</option>
-                            <option value="productchange">Produktwechsel von</option>
-                          </select>
-                        </div>
-                        <!--input type="text" class="form-control" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" placeholder="Contract ID oder Suche nach Produkt, Matchcode, Kunde" value="<?=$contract->cancel_date?>"-->
-                        <select class="form-control basicAutoComplete link-autocomplete" autocomplete="off" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" data-linknum="<?=$linknum?>" data-url="<?=self::getUrl('Contract','api')?>?do=findContract&autocomplete=1" placeholder="Contract ID oder Suche nach Produkt, Matchcode, Kunde" data-noresults-text="Keine Suchergebnisse">
-                          <option></option>
-                        </select>
-                        <div class="input-group-append">
-                          <button type="button" class="btn btn-danger" onclick="clearNewLink(<?=$linknum?>)"><i class="fas fa-xmark-large mr-1"></i> Entfernen</button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+
                 </div>
               </div>
               

Layout/default/Contract/View.php

@@ -22,14 +22,17 @@
         
         <div class="card">
           <div class="card-body">
-            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
-            <a href="<?=self::getUrl("Contract","edit", ['id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
+            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
+            <a href="<?=self::getUrl("Contract","edit", ['id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-sm btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
           </div>
         </div>
         
         <div class="card">
           <div class="card-body">
-              <h3 class="text-center mb-3"><?=$contract->product_name?> (<?=$contract->id?>)</h3>
+            <?php if($contract->isCancelled()): ?>
+              <h2 class="text-center mb-3 text-danger">GEKÜNDIGT</h2>
+            <?php endif; ?>
+            <h3 class="text-center mb-3 <?=($contract->isCancelled()) ? "canceled" : ""?>"><?=$contract->product_name?> (<?=$contract->id?>)</h3>
             
             <table class="table table-sm table-striped view-table">
               <tr>
@@ -209,12 +212,15 @@
           <div class="card-body">
             <h4>Verknüpfte Verträge</h4>
 
-            <table class="table table-striped table-sm table-bordered">
+            <table class="table table-striped table-sm table-bordered table-hover">
               <tr>
                 <th>Kunde</th>
                 <th>Contract ID</th>
                 <th>Produkt</th>
                 <th>Matchcode</th>
+                <th>Bestelldatum</th>
+                <th>Fertigstellung</th>
+                <th>Kündigung</th>
                 <th></th>
               </tr>
               <?php foreach($contract->links as $link): ?>
@@ -230,9 +236,12 @@
               ?>
               <tr>
                 <td><a href="<?=self::getUrl("Address", "View", ["id" => $linkcontract->owner_id])?>"><?=$linkcontract->owner->getCompanyOrName()?></a></td>
-                <td><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->id?></a></td>
-                <td><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->product->name?></a></td>
-                <td><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->matchcode?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->id?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->product->name?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $linkcontract->id])?>"><?=$linkcontract->matchcode?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?></td>
                 <td>
                   <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
                 </td>
@@ -272,8 +281,8 @@
         
         <div class="card">
           <div class="card-body">
-            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
-            <a href="<?=self::getUrl("Contract","edit", ['id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
+            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
+            <a href="<?=self::getUrl("Contract","edit", ['id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-sm btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
           </div>
         </div>