Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Louis'-Pharmacy_CNSA212-FP/PharmacyDataTier.cs

Louis'-Pharmacy_CNSA212-FP/PharmacyDataTier.cs

@@ -1023,6 +1023,34 @@ namespace Louis__Pharmacy_CNSA212_FP
 
         }
 
+        public static void PastRefills(string rxNum)
+        {
+            try
+            {
+                myConn.Open();
+
+                cmdString.Parameters.Clear();
+
+                cmdString.Connection = myConn;
+                cmdString.CommandType = CommandType.StoredProcedure;
+                cmdString.CommandTimeout = 1500;
+
+                cmdString.CommandText = "PastRefills";
+
+                cmdString.Parameters.Add("@Prescription_id", SqlDbType.VarChar, 11).Value = rxNum;
+
+                cmdString.ExecuteNonQuery();
+            }
+            catch (Exception ex)
+            {
+                throw new ArgumentException(ex.Message);
+            }
+            finally
+            {
+                myConn.Close();
+            }
+        }
+
         public static void FillComboBox(string table, string ValueMember, string displayMember, ComboBox myComboBox)
         {
             try

Louis'-Pharmacy_CNSA212-FP/frmRefillAdd.cs

@@ -77,6 +77,7 @@ namespace Louis__Pharmacy_CNSA212_FP
                 rxNum = txtRxNumber.Text.Trim();
 
                 PharmacyDataTier.AddRefill(refillID, date, patientID, medicationID, rxNum);
+                PharmacyDataTier.PastRefills(rxNum);
             }
             else
             {