admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-03-09 01:04:57 +00:00
parent 14ed2ac111
commit 6a902e7279
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -1274,6 +1274,8 @@ namespace AyaNova.PlugIn.V8
PickListAutoComplete pl = PickListAutoComplete.GetList("**", "contract"); PickListAutoComplete pl = PickListAutoComplete.GetList("**", "contract");
progress.Append("Exporting " + pl.Count.ToString() + " " + ObjectTypeName + "s"); progress.Append("Exporting " + pl.Count.ToString() + " " + ObjectTypeName + "s");
RatePickList RateList = RatePickList.GetList(false);
foreach (PickListAutoComplete.PickListAutoCompleteInfo i in pl) foreach (PickListAutoComplete.PickListAutoCompleteInfo i in pl)
{ {
if (!progress.KeepGoing) return; if (!progress.KeepGoing) return;
@@ -1300,15 +1302,28 @@ namespace AyaNova.PlugIn.V8
d.travelRatesOverrideType = 1; d.travelRatesOverrideType = 1;
dynamic dServiceRateItems = new JArray(); dynamic dServiceRateItems = new JArray();
dynamic dTravelRateItems = new JArray();
foreach (ContractRate cr in c.Rates) foreach (ContractRate cr in c.Rates)
{ {
dynamic dcr = new JObject(); if (RateList.Contains(cr.RateID))
dcr.serviceRateId = Getv7v8IdMap(cr.RateID, "ServiceRate for Contract " + d.name); {
dServiceRateItems.Add(dcr); dynamic dcr = new JObject();
if (RateList[cr.RateID].RateType == RateTypes.Service)
{
dcr.serviceRateId = Getv7v8IdMap(cr.RateID, "ServiceRate for Contract " + d.name);
dServiceRateItems.Add(dcr);
}
else
{
dcr.travelRateId = Getv7v8IdMap(cr.RateID, "TravelRate for Contract " + d.name);
dTravelRateItems.Add(dcr);
}
}
} }
d.serviceRateItems = dServiceRateItems; d.serviceRateItems = dServiceRateItems;
d.travelRateItems = dTravelRateItems;
TagFromv7Guid(c.RegionID, tags); TagFromv7Guid(c.RegionID, tags);
SetTags(d, tags); SetTags(d, tags);