merge conflict fix

kgOrdersClient/View.Orders.pas

@@ -248,15 +248,14 @@ procedure TFViewOrders.WebButton1Click(Sender: TObject);
 begin
   if OrderID <> '' then
   begin
-    if not pnlMessage.ElementHandle.hidden then
-      HideNotification;
-
-    ShowSetStatusForm;
-  end
-  else
-    ShowToast('Failure: Please select an order');
+    if OrderID <> '' then
+      ShowSetStatusForm()
+    else
+      ShowToast('Failure: Please select an order');
+  end;
 end;
 
+
 procedure TFViewOrders.WebFormCreate(Sender: TObject);
 // Initializes important values:
 // PageNumber: What page number the user is on IE 1: 1-10, 2: 11-20 etc