Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added Productowner role to product

Browse Source
This commit is contained in:
Frank Schubert
2022-01-27 22:27:33 +01:00
parent 9198a49a49
commit d09ab832ed
6 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/Address/Form.php
View File

@@ -156,7 +156,7 @@
<div class="col-lg-10">
<select class="select2 form-control select2-multiple" name="addresstypes[]" id="addresstypes" multiple="multiple" data-placeholder="Choose ...">
<option value="systemowner" <?=(array_key_exists("systemowner", $address->types)) ? "selected='selected'" : ""?>><?=__("systemowner")?></option>
<option value="company" <?=(array_key_exists("company", $address->types)) ? "selected='selected'" : ""?>><?=__("company")?></option>
<option value="productowner" <?=(array_key_exists("productowner", $address->types)) ? "selected='selected'" : ""?>><?=__("productowner")?></option>
<option value="netowner" <?=(array_key_exists("netowner", $address->types)) ? "selected='selected'" : "netowner"?>><?=__("netowner")?></option>
<option value="salespartner" <?=(array_key_exists("salespartner", $address->types)) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
<option value="pipeworker" <?=(array_key_exists("pipeworker", $address->types)) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>

1
Layout/default/Address/Index.php
View File

@@ -38,6 +38,7 @@
<label class="form-label" for="filter_addresstype">Rolle</label>
<select name="filter[addresstype][]" id="filter_addresstype" class="form-control" multiple="multiple">
<option value="systemowner" <?=(in_array("systemowner", $filter["addresstype"])) ? "selected='selected'" : ""?>><?=__("systemowner")?></option>
<option value="productowner" <?=(in_array("productowner", $filter["addresstype"])) ? "selected='selected'" : ""?>><?=__("productowner")?></option>
<option value="netowner" <?=(in_array("netowner", $filter["addresstype"])) ? "selected='selected'" : "netowner"?>><?=__("netowner")?></option>
<option value="salespartner" <?=(in_array("salespartner", $filter["addresstype"])) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
<option value="pipeworker" <?=(in_array("pipeworker", $filter["addresstype"])) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>

12
Layout/default/Product/Form.php
View File

@@ -54,6 +54,18 @@
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="external_id">Produktbesitzer (Mandant)</label>
<div class="col-lg-10">
<select class="select2 form-control" name="external_id" id="external_id">
<option></option>
<?php foreach(AddressModel::search(['addresstype' => ['productowner']]) as $owner): ?>
<option value="<?=$owner->id?>" <?=($product->external_id == $owner->id) ? "selected='selected'" : ""?>><?=$owner->getCompanyOrName()?></option>
<?php endforeach; ?>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="productgroup_id">Produktgruppe *</label>
<div class="col-lg-10">

13
application/Product/ProductController.php
View File

@@ -77,7 +77,18 @@ class ProductController extends mfBaseController {
if($r->sla_id) {
$data['sla_id'] = $r->sla_id;
}
$data['external'] = ($r->external == 1) ? "1" : "0";
$data['external'] = ($r->external == 1) ? 1 : 0;
if($data['external'] == 1) {
if(!is_numeric($r->external_id) || $r->external_id < 1) {
$this->layout()->setFlash("Bitte Produktbesitzer auswählen", "warn");
$this->layout()->set("product", $product);
return $this->add();
}
$data['external_id'] = $r->external_id;
}
//var_dump($data);exit;
$data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
$data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;
$data['price'] = ($r->price) ? Layout::commaToDot($r->price) : 0;

1
application/Product/ProductModel.php
View File

@@ -5,6 +5,7 @@ class ProductModel {
public $description = null;
public $sla_id = null;
public $external = null;
public $external_id;
public $productgroup_id = null;
public $producttech_id = null;
public $price = null;

2
lang/de.php
View File

@@ -2,7 +2,7 @@
$l = [];
$l['systemowner'] = "Systembesitzer";
$l['company'] = "Mandant";
$l['productowner'] = "Mandant";
$l['netowner'] = "Netzeigentümer";
$l['salespartner'] = "Vertriebspartner";
$l['pipeworker'] = "Tiefbau";