2024-07-23 13:03:45 +02:00
parent 398b908729
commit d8b3002cfa
7 changed files with 107 additions and 25 deletions
							
							
								
							
							
						
@@ -150,18 +150,11 @@ class OrderController extends mfBaseController {
      }
    }
    
    //if(!$showLonelies) {
      //var_dump($order_search);exit;
      $pagination['maxItems'] = OrderModel::count($order_search);
      foreach(OrderModel::search($order_search, $pagination) as $order) {
        if(!array_key_exists($order->id, $orders)) {
          $orders[$order->id] = $order;
        }
      }
    //}
    
    $pagination['maxItems'] = OrderModel::count($order_search);
    $orders = OrderModel::search($order_search, $pagination, true);
    $showLoneliesCount = false;
    foreach(["owner", "owner_address", "partner_number"]  as $key) {
    foreach(["owner", "owner_address", "partner_number"] as $key) {
      if(array_key_exists($key, $filter) && $filter[$key]) {
        $showLoneliesCount = true;
        break;
							
								
							
							
								
							
							
						
@@ -192,7 +185,6 @@ class OrderController extends mfBaseController {
        if($this->me->isAdmin()) {
          if(!$this->request->filter['network_id']) {
            $lonelies = OrderModel::search($order_search);
            
          }
        } else {
          $order_search['create_by'] = $userIds;
							
								
							
							
								
							
							
						
@@ -225,7 +217,7 @@ class OrderController extends mfBaseController {
      
      foreach($lonelies as $order) {
        // check for voice or special products only
        $this->log->debug("Order id ".$order->id);
        //$this->log->debug("Order id ".$order->id);
        /*if($order->id == 38) {
          var_dump($order);
          exit;
							
								
							
							
								
							
							
						
@@ -476,7 +468,13 @@ class OrderController extends mfBaseController {
    $this->layout()->setFlash("Wartestatus erfolgreich gespeichert", "success");
    $this->redirect("Order","Index", $qs);
  }
  
  protected function addUpgrade() {
      $this->layout()->setTemplate("Order/Productchange");
  }
  protected function saveAction() {
    $r = $this->request;
    //var_dump($r->products);
							
								
							
							
							
						
 
							
							
								
							
							
						
@@ -180,7 +180,7 @@ class OrderModel {
    return 0;
  }
  
  public static function search($filter, $limit=false) {
  public static function search($filter, $limit=false, $withId = false) {
    $items = [];
    $db = FronkDB::singleton();
    
							
								
							
							
								
							
							
						
@@ -210,7 +210,7 @@ class OrderModel {
    if(is_array($limit) && count($limit)) {
      if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
        $sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
      } elseif(is_numeric($count)) {
      } elseif(is_numeric($limit['count'])) {
        $sql .= " LIMIT ".$limit['count'];
      }
    }
							
							
							
								
							
						
@@ -218,7 +218,11 @@ class OrderModel {
    $res = $db->query($sql);
    if($db->num_rows($res)) {
      while($data = $db->fetch_object($res)) {
        $items[] = new Order($data);
          if($withId) {
              $items[$data->id] = new Order($data);
          } else {
              $items[] = new Order($data);
          }
      }
    }