Added upgrade checkbox to Order

application/Order/OrderController.php

@@ -462,6 +462,10 @@ class OrderController extends mfBaseController {
       $order_data['finish_after_comment'] = $r->finish_after_comment;
     }
     
+    $order_data['upgrade'] = 0;
+    if($r->upgrade === "1") {
+      $order_data['upgrade'] = 1;
+    }
     
     $send_to_bill_email = false;
     $order_data['edit_by'] = $this->me->id;
@@ -574,6 +578,8 @@ class OrderController extends mfBaseController {
         }
         $product_data["billing_period"] = $p["billing_period"];
         
+        $product_data['upgrade'] = $order_data['upgrade'];
+        
         
         $require_term = false;
         if(array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $prod->attributes) && $prod->attributes[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 1) {

application/Order/OrderModel.php

@@ -3,6 +3,7 @@
 class OrderModel {
   public $owner_id;
   public $billingaddress_id;
+  public $upgrade;
   public $partner_number;
   public $order_date;
   public $finish_date;
@@ -270,6 +271,14 @@ class OrderModel {
       }
     }
     
+    if(array_key_exists("upgrade", $filter)) {
+      if($filter['upgrade'] == 1) {
+        $where .= " AND `Order`.upgrade = 1";
+      } else {
+        $where .= " AND `Order`.upgrade = 0";
+      }
+    }
+    
     if(array_key_exists("name", $filter)) {
       $name = FronkDB::singleton()->escape($filter['name']);
       if($name) {