Button to create Order from Preorder

application/Order/OrderController.php

@@ -359,7 +359,7 @@ class OrderController extends mfBaseController {
     return $new_filter;
   }
   
-  protected function addAction() {
+  public function addAction() {
     //var_dump($this->request->filter);exit;
     
     
@@ -393,9 +393,9 @@ class OrderController extends mfBaseController {
           $products[$pn->product_id] = $pn->product;
         }
       }
-      
+
     }
-    
+
     $order = $this->layout()->get("order");
     if($order) {
       foreach($order->products as $op) {
@@ -404,7 +404,7 @@ class OrderController extends mfBaseController {
         }
       }
     }
-    
+
     $this->layout()->set("products", $products);
     
     $countries = CountryModel::getAll();
@@ -969,6 +969,12 @@ class OrderController extends mfBaseController {
         }
         
         $product_data = [];
+        if(array_key_exists("preorder_id", $p) && $p["preorder_id"]) {
+            $product_data["preorder_id"] = $p["preorder_id"];
+        }
+        if(array_key_exists("oaid", $p) && $p["oaid"]) {
+          $product_data["oaid"] = $p["oaid"];
+        }
         $product_data["order_id"] = $new_id;
         $product_data["product_id"] = $p["product_id"];
         $product_data['amount'] = (!empty($p['amount'])) ? $p['amount'] : 1;