Merge branch 'fronkdev' into 'master'
Optimizing PreoderController::getFilteredPreorderApi return values See merge request fronk/thetool!237
This commit is contained in:
@@ -525,8 +525,8 @@
|
||||
if(preorder.borderpoint_lat && preorder.borderpoint_long) {
|
||||
var circle = L.circle([preorder.borderpoint_lat,preorder.borderpoint_long], {
|
||||
color: 'orange',
|
||||
fillColor: 'orange',
|
||||
fillOpacity: 0.5,
|
||||
fillColor: 'aqua',
|
||||
fillOpacity: 0.8,
|
||||
radius: 1
|
||||
}).bindTooltip(preorder.borderpoint_lat + ", " + preorder.borderpoint_long).addTo(preorderMap);
|
||||
}
|
||||
|
||||
@@ -919,6 +919,7 @@ class PreorderController extends mfBaseController {
|
||||
$data = clone($preorder->data);
|
||||
unset($data->workorder_export_data);
|
||||
unset($data->submit_request);
|
||||
unset($data->addon_services);
|
||||
$data->id = $preorder->id;
|
||||
$data->status_code = $preorder->status->code;
|
||||
$data->adrcd = $preorder->adb_hausnummer->adrcd;
|
||||
|
||||
Reference in New Issue
Block a user