Attached Files are now deleted when deleting order
This commit is contained in:
@@ -111,7 +111,7 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-lg-2 col-form-label" for="sla_id">SLA *</label>
|
||||
<label class="col-lg-2 col-form-label" for="sla_id">SLA</label>
|
||||
<div class="col-lg-10">
|
||||
<select class="select2 form-control " name="sla_id" id="sla_id">
|
||||
<option></option>
|
||||
@@ -128,7 +128,7 @@
|
||||
<select class="select2 form-control select2-multiple" name="networks[]" id="networks" multiple="multiple" data-placeholder="Choose ...">
|
||||
<option></option>
|
||||
<?php foreach($networks as $network): ?>
|
||||
<option value="<?=$network->id?>" <?=(array_key_exists($network->id, $product->networks)) ? "selected='selected'" : ""?>><?=$network->name?></option>
|
||||
<option value="<?=$network->id?>" <?=(is_array($product->networks) && array_key_exists($network->id, $product->networks)) ? "selected='selected'" : ""?>><?=$network->name?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -55,6 +55,18 @@ class Order extends mfBaseModel {
|
||||
}
|
||||
}
|
||||
|
||||
public function deleteFiles() {
|
||||
if(!is_array($this->getProperty("files")) || !count($this->getProperty("files"))) {
|
||||
return true;
|
||||
}
|
||||
//var_dump($this->files);exit;
|
||||
|
||||
foreach($this->getProperty("files") as $file) {
|
||||
$file->file->delete();
|
||||
$file->delete();
|
||||
}
|
||||
}
|
||||
|
||||
public function getProperty($name) {
|
||||
if($this->$name == null) {
|
||||
|
||||
|
||||
@@ -444,8 +444,10 @@ class OrderController extends mfBaseController {
|
||||
}
|
||||
}
|
||||
|
||||
$order->deleteFiles();
|
||||
$order->deletePositions();
|
||||
|
||||
|
||||
// TODO: check if Product is unused
|
||||
$order->delete();
|
||||
$this->layout()->setFlash("Bestellung gelöscht", "success");
|
||||
|
||||
@@ -74,7 +74,9 @@ class ProductController extends mfBaseController {
|
||||
$data = [];
|
||||
$data['name'] = $r->name;
|
||||
$data['description'] = $r->description;
|
||||
$data['sla_id'] = $r->sla_id;
|
||||
if($r->sla_id) {
|
||||
$data['sla_id'] = $r->sla_id;
|
||||
}
|
||||
$data['external'] = ($r->external == 1) ? "1" : "0";
|
||||
$data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
|
||||
$data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;
|
||||
|
||||
Reference in New Issue
Block a user