diff --git a/BodyshopUploader/Releases/RELEASES b/BodyshopUploader/Releases/RELEASES index b5b6f31..01e1337 100644 --- a/BodyshopUploader/Releases/RELEASES +++ b/BodyshopUploader/Releases/RELEASES @@ -2,4 +2,6 @@ 9E08BA6C1E2DB1295696713165AB25AADE94875F RomeOnlinePartner-1.1.1-delta.nupkg 98643 26F725C795EC01893BC36E5FC59F4ADFD390F88A RomeOnlinePartner-1.1.1-full.nupkg 5958856 637F563749852E516AF4D41E30324FB04499D205 RomeOnlinePartner-1.1.2-delta.nupkg 88517 -A1110AE679B0ABAD08129B41C12399C3C588ABC9 RomeOnlinePartner-1.1.2-full.nupkg 5962013 \ No newline at end of file +A1110AE679B0ABAD08129B41C12399C3C588ABC9 RomeOnlinePartner-1.1.2-full.nupkg 5962013 +BF0B893BC82219F385D83F44994D26AE0D3619CF RomeOnlinePartner-1.1.3-delta.nupkg 64235 +DB8DCD6BD2B3F4CA790A8B25E8DD495144D1D196 RomeOnlinePartner-1.1.3-full.nupkg 5967310 \ No newline at end of file diff --git a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs index f261341..74b2964 100644 --- a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs +++ b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs @@ -1209,14 +1209,14 @@ namespace RomeOnlinePartner.Utils.Decoder j.tax_paint_mat_rt = float.Parse(readValues[14].ToString()) / 100; o.cal_maxdlr = float.Parse(readValues[3].ToString()); o.cal_opcode = readValues[12].ToString(); - materialsObj.mapa = o; + //materialsObj.mapa = o; break; case "MASH": j.rate_mash = float.Parse(readValues[11].ToString()) != 0 ? readValues[11] : readValues[7]; //Use CAL_LBRRTE if exists, otherwise us the pre threshold amt.? j.tax_shop_mat_rt = float.Parse(readValues[14].ToString()) / 100; o.cal_maxdlr = float.Parse(readValues[3].ToString()); o.cal_opcode = readValues[12].ToString(); - materialsObj.mash = o; + // materialsObj.mash = o; break; case "MAHW": //TODO Should the remainder of these be index 7 or 11? j.rate_mahw = float.Parse(readValues[11].ToString()) != 0 ? readValues[11] : readValues[7]; //Use CAL_LBRRTE if exists, otherwise us the pre threshold amt.? @@ -1256,19 +1256,19 @@ namespace RomeOnlinePartner.Utils.Decoder pfm_x.cal_lbrmin = readValues[10];//CAL_LBRMIN pfm_x.cal_lbrrte = readValues[11];//CAL_LBRRTE pfm_x.cal_opcode = readValues[12];//CAL_OPCODE - pfm_x.tax_ind = readValues[13];//TAX_IND + pfm_x.tax_ind = readValues[13]; //TAX_IND pfm_x.mat_taxp = readValues[14];//MAT_TAXP pfm_x.mat_adjp = readValues[15];//MAT_ADJP pfm_x.mat_tx_ty1 = readValues[16];//MAT_TX_TY1 - pfm_x.mat_tx_in1 = readValues[17];//MAT_TX_IN1 + pfm_x.mat_tx_in1 = (string)readValues[17] == "Y" ? true : false; //MAT_TX_IN1 pfm_x.mat_tx_ty2 = readValues[18];//MAT_TX_TY2 - pfm_x.mat_tx_in2 = readValues[19];//MAT_TX_IN2 + pfm_x.mat_tx_in2 = (string)readValues[19] == "Y" ? true : false;//MAT_TX_IN2 pfm_x.mat_tx_ty3 = readValues[20];//MAT_TX_TY3 - pfm_x.mat_tx_in3 = readValues[21];//MAT_TX_IN3 + pfm_x.mat_tx_in3 = (string)readValues[21] == "Y" ? true : false; ;//MAT_TX_IN3 pfm_x.mat_tx_ty4 = readValues[22];//MAT_TX_TY4 - pfm_x.mat_tx_in4 = readValues[23];//MAT_TX_IN4 + pfm_x.mat_tx_in4 = (string)readValues[23] == "Y" ? true : false; ;//MAT_TX_IN4 pfm_x.mat_tx_ty5 = readValues[24];//MAT_TX_TY5 - pfm_x.mat_tx_in5 = readValues[25];//MAT_TX_IN5 + pfm_x.mat_tx_in5 = (string)readValues[25] == "Y" ? true : false; ;//MAT_TX_IN5 materialsObj[readValues[0].ToString()] = pfm_x;