Merge branch 'fronkdev' into 'master'
Fixed crash in Rimo Import when no preorder with unit id See merge request fronk/thetool!672
This commit is contained in:
@@ -483,8 +483,8 @@ foreach ($clusters as $cluster_data) {
|
|||||||
if(property_exists($service, "customerState") && is_object($service->customerState) && property_exists($service->customerState, "userLabel") && strtolower($service->customerState->userLabel) == "active") {
|
if(property_exists($service, "customerState") && is_object($service->customerState) && property_exists($service->customerState, "userLabel") && strtolower($service->customerState->userLabel) == "active") {
|
||||||
// active => order 500
|
// active => order 500
|
||||||
$preorder = \PreorderModel::getFirst(["adb_wohneinheit_id" => $unit->id]);
|
$preorder = \PreorderModel::getFirst(["adb_wohneinheit_id" => $unit->id]);
|
||||||
$preorder->resetSaveNesting();
|
|
||||||
if($preorder) {
|
if($preorder) {
|
||||||
|
$preorder->resetSaveNesting();
|
||||||
$new_status = \PreorderstatusModel::getFirst(["code" => 500]);
|
$new_status = \PreorderstatusModel::getFirst(["code" => 500]);
|
||||||
if($new_status) {
|
if($new_status) {
|
||||||
if($preorder->status->code < $new_status->code) {
|
if($preorder->status->code < $new_status->code) {
|
||||||
|
|||||||
Reference in New Issue
Block a user