"On sale" price parsing fix

That's all folks!
Maxx53 · Jul 29, 2014 · 5d52ebd · 5d52ebd · JayDzz · Aug 27, 2014
1 parent 1e20863
commit 5d52ebd
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 247 deletions.
diff --git a/scr/SCMBot/Main.cs b/scr/SCMBot/Main.cs
@@ -202,8 +202,6 @@ private void LoadSettings(bool loadtabs)
             settingsForm.stopFundsBox.Text = MainScanItem.LogItem.DoFracture(settings.StopFunds.ToString());
             stopfundsVal = settings.StopFunds;
 
-            settingsForm.FeeCheckBox.Checked = settings.withFee;
-
             settingsForm.playSndCheckBox.Checked = settings.playSnd;
 
             settingsForm.resDelayBox.Text = settings.resellDelay.ToString();
@@ -330,8 +328,6 @@ private void SaveSettings(bool savetabs)
             settings.StopFunds = Convert.ToInt32(SteamSite.GetSweetPrice(settingsForm.stopFundsBox.Text));
             stopfundsVal = settings.StopFunds;
 
-            settings.withFee = settingsForm.FeeCheckBox.Checked;
-
             settings.Language = settingsForm.intLangComboBox.SelectedItem.ToString();
 
             settings.formParams = new MainFormParams(lastFrmSize, lastFrmPos, this.WindowState, 
@@ -1211,12 +1207,26 @@ private void button1_Click(object sender, EventArgs e)
                 if (comboBox3.SelectedIndex == 8)
                 {
                     steam_srch.LoadOnSale = true;
+                    SellButton.Text = Strings.RemSell;
+                    steam_srch.isRemove = true;
+                    textBox1.Clear();
+                    textBox3.Clear();
+                    textBox1.ReadOnly = true;
+                    textBox3.ReadOnly = true;
+                    button2.Enabled = false;
                 }
                 else
                 {
                     steam_srch.LoadOnSale = false;
                     steam_srch.invApp = comboBox3.SelectedIndex;
+                    SellButton.Text = Strings.Sell;
+                    steam_srch.isRemove = false;
+                    textBox1.ReadOnly = false;
+                    textBox3.ReadOnly = false;
                 }
+
+                SellButton.Enabled = false;
+                InventoryList.Items.Clear();
                 steam_srch.loadInventory();
 
             } else
@@ -1247,11 +1257,7 @@ private void SellButton_Click(object sender, EventArgs e)
                 var ouritem = filteredInvList[InventoryList.CheckedItems[i].Index];
                 if ((ouritem.Marketable) && (ouritem.Price != "0"))
                 {
-                    string truePrice = ouritem.Price;
-
-                    if (settings.withFee)
-                        truePrice = CalcWithFee(truePrice);
-                    steam_srch.toSellList.Add(new SteamSite.ItemToSell(ouritem.AssetId, truePrice));
+                    steam_srch.toSellList.Add(new SteamSite.ItemToSell(ouritem.AssetId, CalcWithFee(ouritem.Price)));
                 }
             }
 
@@ -1445,22 +1451,7 @@ private void searchBox_KeyUp(object sender, KeyEventArgs e)
 
         private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (comboBox3.SelectedIndex == 8)
-            {
-                SellButton.Text = Strings.RemSell;
-                steam_srch.isRemove = true;
-                textBox1.Clear();
-                textBox1.ReadOnly = true;
-                button2.Enabled = false;
-            }
-            else
-            {
-                SellButton.Text = Strings.Sell;
-                steam_srch.isRemove = false;
-                textBox1.ReadOnly = false;
-            }
 
-            SellButton.Enabled = false;
 
         }
 

diff --git a/scr/SCMBot/Properties/Settings.Designer.cs b/scr/SCMBot/Properties/Settings.Designer.cs
diff --git a/scr/SCMBot/SettingsFrm.Designer.cs b/scr/SCMBot/SettingsFrm.Designer.cs
diff --git a/scr/SCMBot/SettingsFrm.cs b/scr/SCMBot/SettingsFrm.cs
@@ -63,5 +63,7 @@ private void SettingsFrm_Load(object sender, EventArgs e)
         }
 
 
+
+
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,5 +63,7 @@ private void SettingsFrm_Load(object sender, EventArgs e)
		}




		}
		}