merge fix

TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationGridComponent.razor

@@ -54,38 +54,38 @@
     <DetailRowTemplate>
         <DxTabs>
             <DxTabPage Text="Prices">
-                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductByTransferDestinationId" ContextIds="new [] {((TransferDestination)context.DataItem).Id}" KeyboardNavigationEnabled="true" />
+                <TransferDestinationToProductDetailGridComponent GetAllTag="SignalRTags.GetTransferDestinationToProductsByTransferDestinationId" ContextIds="new [] {((TransferDestination)context.DataItem).Id}" KeyboardNavigationEnabled="true" />
             </DxTabPage>            
         </DxTabs>
     </DetailRowTemplate>
-    <EditFormTemplate Context="EditFormContext">
+    <EditFormTemplate Context="editFormContext">
         @{
-            var transfer = (TransferDestination)EditFormContext.EditModel;
+            var transfer = (TransferDestination)editFormContext.EditModel;
         }
         <DxFormLayout CssClass="w-100">
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.DestinationName) ColSpanMd="6">
-                @EditFormContext.GetEditor("Name")
+                @editFormContext.GetEditor("Name")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Destination) ColSpanMd="6">
-                @EditFormContext.GetEditor("Description")
+                @editFormContext.GetEditor("Description")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.DestinationAddress) ColSpanMd="6">
-                @EditFormContext.GetEditor("AddressString")
+                @editFormContext.GetEditor("AddressString")
             </DxFormLayoutItem>            
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Price) ColSpanMd="6">
-                @EditFormContext.GetEditor("Price")
+                @editFormContext.GetEditor("Price")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Price) ColSpanMd="6">
-                @EditFormContext.GetEditor("Price2")
+                @editFormContext.GetEditor("Price2")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Price) ColSpanMd="6">
-                @EditFormContext.GetEditor("Price3")
+                @editFormContext.GetEditor("Price3")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Price) ColSpanMd="6">
-                @EditFormContext.GetEditor("ProductCommis")
+                @editFormContext.GetEditor("ProductCommis")
             </DxFormLayoutItem>
             <DxFormLayoutItem Caption=@localizer.GetString(ResourceKeys.Price) ColSpanMd="6">
-                @EditFormContext.GetEditor("ExtraPrice")
+                @editFormContext.GetEditor("ExtraPrice")
             </DxFormLayoutItem>
 
         </DxFormLayout>