Added Preordertype legacytransfer + moved createWorkorder to Rimoapi
This commit is contained in:
@@ -381,16 +381,15 @@ class PreorderController extends mfBaseController {
|
||||
$mode = "add";
|
||||
}
|
||||
|
||||
/*
|
||||
* data colletion
|
||||
*/
|
||||
$data = [];
|
||||
$data['preordercampaign_id'] = $r->campaign_id;
|
||||
$data['building_id'] = ($r->building_id) ? $r->building_id : null;
|
||||
$data['adb_hausnummer_id'] = $r->adb_hausnummer_id;
|
||||
$data['adb_wohneinheit_id'] = ($r->adb_wohneinheit_id) ? $r->adb_wohneinheit_id : null;
|
||||
$data['termination_id'] = ($r->termination_id) ? $r->termination_id : null;
|
||||
|
||||
$data = [];
|
||||
if($mode == "add" || !$preorder->adb_wohneinheit_id || !is_array($preorder->adb_wohneinheit->rimo_workorders) || !count($preorder->adb_wohneinheit->rimo_workorders)) {
|
||||
$data['preordercampaign_id'] = $r->campaign_id;
|
||||
$data['building_id'] = ($r->building_id) ? $r->building_id : null;
|
||||
$data['adb_hausnummer_id'] = $r->adb_hausnummer_id;
|
||||
$data['adb_wohneinheit_id'] = ($r->adb_wohneinheit_id) ? $r->adb_wohneinheit_id : null;
|
||||
$data['termination_id'] = ($r->termination_id) ? $r->termination_id : null;
|
||||
}
|
||||
|
||||
$campaign = new Preordercampaign($r->campaign_id);
|
||||
if(!$campaign->id) {
|
||||
@@ -423,6 +422,12 @@ class PreorderController extends mfBaseController {
|
||||
case "order":
|
||||
$data['type'] = "order";
|
||||
break;
|
||||
case "reorder":
|
||||
$data["type"] = "reorder";
|
||||
break;
|
||||
case "legacytransfer":
|
||||
$data["type"] = "legacytransfer";
|
||||
break;
|
||||
}
|
||||
|
||||
switch($r->connection_type) {
|
||||
@@ -755,7 +760,7 @@ class PreorderController extends mfBaseController {
|
||||
$this->redirect("Preorder", "Index", $qs);
|
||||
}
|
||||
|
||||
$preorder->deleted = date('U');
|
||||
//$preorder->deleted = date('U');
|
||||
$preorder->deleted_by = $this->me->id;
|
||||
$preorder->status_id = 23; // 910 - Cancelled (ohne weitere Begründung)
|
||||
$preorder->save();
|
||||
|
||||
Reference in New Issue
Block a user