Merge pull request #57 from aronhr/Add-Staff-Name-To-Kvittun

Add staff name to kvittun
aronhr · May 11, 2017 · 15d5d3c · 15d5d3c
2 parents 5c35011 + 0c665ee
commit 15d5d3c
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 4 deletions.
diff --git a/Forrit/Client/Client/ApiHelper.cs b/Forrit/Client/Client/ApiHelper.cs
@@ -57,6 +57,7 @@ public class Product
         public string Magn { get; set; }
         public int Verd { get; set; }
         public string Kassakerfi { get; set; }
+        public string Staff { get; set; }
         public override string ToString()
         {
             return Name + " " + Verd.ToString();

diff --git a/Forrit/Client/Client/Form1.Designer.cs b/Forrit/Client/Client/Form1.Designer.cs
diff --git a/Forrit/Client/Client/Form1.cs b/Forrit/Client/Client/Form1.cs
@@ -121,6 +121,36 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
                 case Keys.NumPad9:
                     num_Button_Click(button9, new System.EventArgs());
                     break;
+                case Keys.D0:
+                    num_Button_Click(button0, new System.EventArgs());
+                    break;
+                case Keys.D1:
+                    num_Button_Click(button1, new System.EventArgs());
+                    break;
+                case Keys.D2:
+                    num_Button_Click(button2, new System.EventArgs());
+                    break;
+                case Keys.D3:
+                    num_Button_Click(button3, new System.EventArgs());
+                    break;
+                case Keys.D4:
+                    num_Button_Click(button4, new System.EventArgs());
+                    break;
+                case Keys.D5:
+                    num_Button_Click(button5, new System.EventArgs());
+                    break;
+                case Keys.D6:
+                    num_Button_Click(button6, new System.EventArgs());
+                    break;
+                case Keys.D7:
+                    num_Button_Click(button7, new System.EventArgs());
+                    break;
+                case Keys.D8:
+                    num_Button_Click(button8, new System.EventArgs());
+                    break;
+                case Keys.D9:
+                    num_Button_Click(button9, new System.EventArgs());
+                    break;
                 default:
                     break;
             }
@@ -183,6 +213,7 @@ private void buttonListDel_Click(object sender, EventArgs e)
             }
             ReiknaSamtals();
         }
+
         int samtals = 0;
         private void ReiknaSamtals()
         {
@@ -191,7 +222,7 @@ private void ReiknaSamtals()
             {
                 samtals += p.Verd;
             }
-            labelSamtals.Text = "Samtals " + samtals;
+            labelSamtals.Text = "Samtals: " + samtals;
         }
 
         private void buttonReidufe_Click(object sender, EventArgs e)
@@ -210,9 +241,12 @@ private void SaveKvittun()
             listBox.Items.Clear();
             ReiknaSamtals();
         }
+
         private string GetListText()
         {
             StringBuilder builder = new StringBuilder();
+            string Staff = textBox1.Text;
+            builder.AppendFormat("Starfsmaður: {0}", Staff).AppendLine();
             builder.AppendLine("---------------");
             foreach (Product product in listBox.Items)
             {
@@ -222,7 +256,5 @@ private string GetListText()
             builder.AppendFormat("\t\t{0}", samtals);
             return builder.ToString();
         }
-
-
     }
 }
diff --git a/Forrit/RetailServer/ServiceDesk/ApiHelper.cs b/Forrit/RetailServer/ServiceDesk/ApiHelper.cs
@@ -49,5 +49,6 @@ public class Product
         public string Magn { get; set; }
         public string Verd { get; set; }
         public string Kassakerfi { get; set; }
+        public string Staff { get; set; }
     }
 }