Fixed recording of orders and order notes

app/Http/Controllers/OrderController.php

@@ -53,7 +53,6 @@ class OrderController extends Controller
 			})
 			->validate();
 
-
 		// Check the plugin details.
 		$po = Product::findOrFail($request->input('product_id'));
 
@@ -103,6 +102,7 @@ class OrderController extends Controller
 		$so->product_id = $request->input('product_id');
 		$so->order_status = 'ORDER-SUBMIT';
 		$so->orderby_id = Auth::id();
+		$so->model = get_class($options);
 
 		if ($options->order_info)
 		{
@@ -117,7 +117,7 @@ class OrderController extends Controller
 			$options->save();
 		}
 
-		Mail::to('deon@graytech.net.au')->queue((new OrderRequest($so))->onQueue('email')); //@todo Get email from DB.
+		Mail::to('help@graytech.net.au')->queue((new OrderRequest($so,$request->input('options.notes')))->onQueue('email')); //@todo Get email from DB.
 		return view('order_received',['o'=>$so]);
 	}
 }

app/Models/AdslPlan.php

@@ -19,6 +19,12 @@ class AdslPlan extends Model
 			'validation'=>'required|string:10',
 			'validation_message'=>'Address is a required field.',
 		],
+		'options.notes'=>[
+			'request'=>'options.notes',
+			'key'=>'order_info.notes',
+			'validation'=>'present',
+			'validation_message'=>'Special Instructions here.',
+		],
 	];
 
 	protected $order_model = Service\Adsl::class;

app/Models/PlanVoip.php

@@ -14,7 +14,7 @@ class PlanVoip extends Model
 		'options.phonenumber'=>[
 			'request'=>'options.phonenumber',
 			'key'=>'service_number',
-			'validation'=>'required|min:10',
+			'validation'=>'required|size:10',
 			'validation_message'=>'Phone Number is a required field.',
 		],
 		'options.supplier'=>[
@@ -29,6 +29,12 @@ class PlanVoip extends Model
 			'validation'=>'required|min:4',
 			'validation_message'=>'Phone Supplier Account Number is a required field.',
 		],
+		'options.notes'=>[
+			'request'=>'options.notes',
+			'key'=>'order_info.notes',
+			'validation'=>'present',
+			'validation_message'=>'Special Instructions here.',
+		],
 	];
 
 	protected $order_model = Service\Voip::class;

app/Models/Service.php

@@ -180,6 +180,7 @@ class Service extends Model
 	{
 		return $this->model ? $this->type->name : NULL;
 	}
+
 	/**
 	 * Return the date for the next invoice
 	 *