diff --git a/BodyshopUploader/Properties/AssemblyInfo.cs b/BodyshopUploader/Properties/AssemblyInfo.cs index 88e01d2..0f8b984 100644 --- a/BodyshopUploader/Properties/AssemblyInfo.cs +++ b/BodyshopUploader/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.1.0")] +[assembly: AssemblyVersion("1.1.2.0")] [assembly: AssemblyFileVersion("1.0.0.0")] //Setting Squirrel Aware Version. [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")] \ No newline at end of file diff --git a/BodyshopUploader/Releases/RELEASES b/BodyshopUploader/Releases/RELEASES index b07dd36..b5b6f31 100644 --- a/BodyshopUploader/Releases/RELEASES +++ b/BodyshopUploader/Releases/RELEASES @@ -1,3 +1,5 @@ 21080F2A8D8BEC1B0EAD01141BBBC56A69E120EB RomeOnlinePartner-1.1.0-full.nupkg 5957137 9E08BA6C1E2DB1295696713165AB25AADE94875F RomeOnlinePartner-1.1.1-delta.nupkg 98643 -26F725C795EC01893BC36E5FC59F4ADFD390F88A RomeOnlinePartner-1.1.1-full.nupkg 5958856 \ No newline at end of file +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 diff --git a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs index 5e86ec8..0e921f1 100644 --- a/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs +++ b/BodyshopUploader/Utils/Decoder/EstimateDecoder.cs @@ -661,6 +661,8 @@ namespace RomeOnlinePartner.Utils.Decoder "LBR_TX_TY5", "LBR_TX_IN5" }); + + var pflObj = new JObject(); for (int i = 0; i < reader.RecordCount; i++) { var readValues = reader.NextRecord(); @@ -712,25 +714,31 @@ namespace RomeOnlinePartner.Utils.Decoder logger.Error("Unknown type value present in PFL file. {0}:{1}", readValues[0].ToString(), readValues[2]); break; } + + dynamic pfl_x = new JObject(); + pfl_x.lbr_type = readValues[0];//LBR_TYPE + pfl_x.lbr_desc = readValues[1];//LBR_DESC + pfl_x.lbr_rate = readValues[2];//LBR_RATE + pfl_x.lbr_tax_in = readValues[3];//LBR_TAX_IN + pfl_x.lbr_taxp = readValues[4];//LBR_TAXP + pfl_x.lbr_adjp = readValues[5];//LBR_ADJP + pfl_x.lbr_tx_ty1 = readValues[6];//LBR_TX_TY1 + pfl_x.lbr_tx_in1 = readValues[7];//LBR_TX_IN1 + pfl_x.lbr_tx_ty2 = readValues[8];//LBR_TX_TY2 + pfl_x.lbr_tx_in2 = readValues[9];//LBR_TX_IN2 + pfl_x.lbr_tx_ty3 = readValues[10];//LBR_TX_TY3 + pfl_x.lbr_tx_in3 = readValues[11];//LBR_TX_IN3 + pfl_x.lbr_tx_ty4 = readValues[12];//LBR_TX_TY4 + pfl_x.lbr_tx_in4 = readValues[13];//LBR_TX_IN4 + pfl_x.lbr_tx_ty5 = readValues[14];//LBR_TX_TY5 + pfl_x.lbr_tx_in5 = readValues[15];//LBR_TX_IN5 + + pflObj[readValues[0].ToString()] = pfl_x; } - //j.lbr_type = readValues[0];//LBR_TYPE - //j.lbr_desc = readValues[1];//LBR_DESC - //j.lbr_rate = readValues[2];//LBR_RATE - //j.lbr_tax_in = readValues[3];//LBR_TAX_IN - //j.lbr_taxp = readValues[4];//LBR_TAXP - //j.lbr_adjp = readValues[5];//LBR_ADJP - //j.lbr_tx_ty1 = readValues[6];//LBR_TX_TY1 - //j.lbr_tx_in1 = readValues[7];//LBR_TX_IN1 - //j.lbr_tx_ty2 = readValues[8];//LBR_TX_TY2 - //j.lbr_tx_in2 = readValues[9];//LBR_TX_IN2 - //j.lbr_tx_ty3 = readValues[10];//LBR_TX_TY3 - //j.lbr_tx_in3 = readValues[11];//LBR_TX_IN3 - //j.lbr_tx_ty4 = readValues[12];//LBR_TX_TY4 - //j.lbr_tx_in4 = readValues[13];//LBR_TX_IN4 - //j.lbr_tx_ty5 = readValues[14];//LBR_TX_TY5 - //j.lbr_tx_in5 = readValues[15];//LBR_TX_IN5 + j.cieca_pfl = pflObj; + reader.Dispose(); return true;