diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php
index ac44e9cfd..054bc5db5 100644
--- a/Layout/default/Address/Index.php
+++ b/Layout/default/Address/Index.php
@@ -181,11 +181,13 @@
- customer_number?>
- spin) ? "
".$address->spin."" : ""?>
+ $address->id, 'filter' => $filter, 's' => $pagination['start']])?>">
+ customer_number?>
+ spin) ? "
".$address->spin."" : ""?>
+
|
- company)?> |
- getFullName()?> |
+ $address->id, 'filter' => $filter, 's' => $pagination['start']])?>">company)?> |
+ $address->id, 'filter' => $filter, 's' => $pagination['start']])?>">getFullName()?> |
street?>
zip?> city?>
diff --git a/Layout/default/Address/View.php b/Layout/default/Address/View.php
index 320917bb2..d8541e2a9 100644
--- a/Layout/default/Address/View.php
+++ b/Layout/default/Address/View.php
@@ -29,7 +29,7 @@
- Person/Firma
+ getCompanyOrName()?>customer_number) ? " [".$address->customer_number."]" : ""?>
-
- links as $link): ?>
-
-
-
-
-
+
diff --git a/Layout/default/Contract/View.php b/Layout/default/Contract/View.php
index 9d32719b1..4b67f9c88 100644
--- a/Layout/default/Contract/View.php
+++ b/Layout/default/Contract/View.php
@@ -22,14 +22,17 @@
- product_name?> (id?>)
+ isCancelled()): ?>
+ GEKÜNDIGT
+
+ ">product_name?> (id?>)
@@ -209,12 +212,15 @@
Verknüpfte Verträge
-
+
| Kunde |
Contract ID |
Produkt |
Matchcode |
+ Bestelldatum |
+ Fertigstellung |
+ Kündigung |
|
links as $link): ?>
@@ -230,9 +236,12 @@
?>
| $linkcontract->owner_id])?>">owner->getCompanyOrName()?> |
- $linkcontract->id])?>">id?> |
- $linkcontract->id])?>">product->name?> |
- $linkcontract->id])?>">matchcode?> |
+ "> $linkcontract->id])?>">id?> |
+ "> $linkcontract->id])?>">product->name?> |
+ "> $linkcontract->id])?>">matchcode?> |
+ ">order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?> |
+ ">finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?> |
+ ">cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?> |
$link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen">
|
@@ -272,8 +281,8 @@
diff --git a/Layout/default/Contractconfig/Form.php b/Layout/default/Contractconfig/Form.php
index 9157fa834..bfa7d3f5f 100644
--- a/Layout/default/Contractconfig/Form.php
+++ b/Layout/default/Contractconfig/Form.php
@@ -1,3 +1,106 @@
-
-var_dump($groups);
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+ product_name?> (id?>)
+
+
+
+
+
+
+
+
+
+ Konfiguration bearbeiten
+
+
+
+
+
+
+
+
+
+
".implode(", ", $error_items), "warning");
+ return $this->editAction();
+ }
+
+ $this->layout()->setFlash("Konfiguration gespeichert", "success");
+ $this->redirect("Contract", "view", ['id' => $contract_id]);
}
diff --git a/application/ContractconfigItem/ContractconfigItem.php b/application/ContractconfigItem/ContractconfigItem.php
index 71dc66e83..cae0ef27c 100644
--- a/application/ContractconfigItem/ContractconfigItem.php
+++ b/application/ContractconfigItem/ContractconfigItem.php
@@ -12,14 +12,52 @@ class ContractconfigItem extends mfBaseModel {
return true;
}
+ public function getValue() {
+ $value = $this->getProperty("value");
+ if(!$value) {
+ return null;
+ }
+
+ if($this->type == "int") {
+ return $value->int;
+ }
+ if($this->type == "decimal") {
+ return $value->number;
+ }
+
+ return $value->string;
+ }
+
+ public function getTypedataArray() {
+ if(!$this->typedata) {
+ return [];
+ }
+
+ return explode("\n", $this->typedata);
+ }
+
public function getProperty($name) {
if($this->$name == null) {
+ if(!$this->id) {
+ return null;
+ }
+
if($name == "value") {
if(!$this->contract_id) {
return null;
}
- $this->value = ContractconfigValueModel::getFirst(['item_id' => $this->id, "contract_id" => $this->contract_id]);
+ $value = ContractconfigValueModel::getFirst(['item_id' => $this->id, "contract_id" => $this->contract_id]);
+ if(!$value) {
+ $me = new User();
+ $me->loadMe();
+ $value = new ContractconfigValue();
+ $value->item_id = $this->id;
+ $value->contract_id = $this->contract_id;
+ $value->create_by = $me->id;
+ }
+
+ $this->value = $value;
return $this->value;
}
diff --git a/application/ContractconfigItem/ContractconfigItemController.php b/application/ContractconfigItem/ContractconfigItemController.php
index 53ffa13a3..2c14c0420 100644
--- a/application/ContractconfigItem/ContractconfigItemController.php
+++ b/application/ContractconfigItem/ContractconfigItemController.php
@@ -44,7 +44,7 @@ class ContractconfigItemController extends mfBaseController {
break;
case "enum":
$item_data['type'] = "enum";
- $item_data['typedata'] = $r->data;
+ $item_data['typedata'] = preg_replace(['/\n{2,}/','/^\n+/','/\n+$/'], ["\n",'',''], str_replace("\r","\n",$r->data));
break;
case "int":
$item_data['type'] = "int";
diff --git a/application/ContractconfigItem/ContractconfigItemModel.php b/application/ContractconfigItem/ContractconfigItemModel.php
index 3a0ce4e85..045ad96c5 100644
--- a/application/ContractconfigItem/ContractconfigItemModel.php
+++ b/application/ContractconfigItem/ContractconfigItemModel.php
@@ -3,7 +3,7 @@
class ContractconfigItemModel {
public $order;
public $contractconfiggroup_id;
- public $ype;
+ public $type;
public $name;
public $displayname;
public $description;
@@ -16,7 +16,7 @@ class ContractconfigItemModel {
public $edit = null;
- public static function create(Array $data) {
+ public static function create(Array $data) {
$model = new ContractconfigItem();
foreach($data as $field => $value) {
diff --git a/application/ContractconfigValue/ContractconfigValue.php b/application/ContractconfigValue/ContractconfigValue.php
index c59f79872..b6615a63d 100644
--- a/application/ContractconfigValue/ContractconfigValue.php
+++ b/application/ContractconfigValue/ContractconfigValue.php
@@ -1,5 +1,63 @@
getProperty("item");
+
+ if($new_value === null || strlen($new_value) == 0) {
+ $this->int = null;
+ $this->number = null;
+ $this->string = null;
+ return true;
+ }
+
+ if($item->type == "int") {
+ if(!is_numeric($new_value)) return false;
+ $this->int = $new_value;
+ } elseif($item->type == "decimal") {
+ if(!is_float($new_value) && !is_numeric($new_value)) return false;
+ $this->number = $new_value;
+ } elseif(is_scalar($new_value)) {
+ $this->string = $new_value;
+ } else {
+ return false;
+ }
+
+ $me = new User();
+ $me->loadMe();
+ $this->edit_by = $me->id;
+
+ return true;
+ }
+
+ public function getProperty($name) {
+ if($this->$name == null) {
+
+ if(!$this->id) {
+ return null;
+ }
+
+ if($name == "item") {
+ $this->item = new ContractconfigItem($this->item_id);
+ if(!$this->item->id) {
+ return null;
+ }
+ return $this->item;
+ }
+
+ $classname = ucfirst($name);
+ $idfield = $name."_id";
+ $this->$name = new $classname($this->$idfield);
+
+ if($this->$name->id) {
+ return $this->$name;
+ } else {
+ return null;
+ }
+ }
+
+ return $this->$name;
+ }
}
\ No newline at end of file
diff --git a/application/Productgroup/ProductgroupController.php b/application/Productgroup/ProductgroupController.php
index d8b1cd5da..38a5cc812 100644
--- a/application/Productgroup/ProductgroupController.php
+++ b/application/Productgroup/ProductgroupController.php
@@ -77,9 +77,6 @@ class ProductgroupController extends mfBaseController {
$this->layout()->setFlash("Produktgruppe nicht gefunden", "error");
$this->redirect("Productgroup");
}
- } else {
- $mode = "add";
- $group = new Productgroup();
}
$name = trim($r->name);
@@ -88,7 +85,14 @@ class ProductgroupController extends mfBaseController {
$this->redirect("Productgroup");
}
- $group->name = $r->name;
+ $group_data = [];
+ $group_data['name'] = $name;
+
+ if($mode == "edit") {
+ $group->update($group_data);
+ } else {
+ $group = ProductgroupModel::create(['name' => $name]);
+ }
$id = $group->save();
if(!$id) {
diff --git a/lang/de.php b/lang/de.php
index 87cdf1d1f..fca251ea6 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -44,4 +44,6 @@ $l['preorder.provision'] = "Vorsorgeanschluss";
$l['preorder.order'] = "Vollanschluss";
$l['preorder.reorder'] = "Nachbestellung";
+$l['contract.link'] = "Verknüpfung";
+
$lang['de'] = $l;
\ No newline at end of file
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 811fbaab4..7c12de288 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -84,7 +84,7 @@ h1, h2, h3, h4, h5, h6 {
}
-.contract-link.canceled {
+.canceled {
text-decoration: line-through;
}
|