...

Back/Back.csproj

@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <Reference Include="Service">
-      <HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
+      <HintPath>..\..\Dlls\Service.dll</HintPath>
     </Reference>
   </ItemGroup>
 

Back/Controllers/OrdersController.cs

@@ -99,7 +99,7 @@ namespace Back.Controllers
                     return NotFound();
 
                 //permission
-                order.OrderItems = item.promotionDetails.Select(s => new OrderItem
+                order.OrderItems = item.promotionDetails.Where(w=>w.CreditAmount>0).Select(s => new OrderItem
                 {
                     APrice = pricing.Where(w => w.PermissionID == s.PermissionID).Select(c => c.Price).FirstOrDefault(),
                     PermissionID = s.PermissionID,
@@ -115,17 +115,18 @@ namespace Back.Controllers
                 if (pro == null)
                     return NotFound();
 
-                order.OrderItems=new List<OrderItem>()
+                order.OrderItems = pro.PromotionDetails.Select(s => new OrderItem
                 {
-                   new OrderItem()
-                   {
-                      PromotionID=pro.ID,
-                      APrice=pro.PromotionDetails.Sum(s=>s.TPrice),
-                      CreditAmount=1,
-                      Tax=0,
-                      Discount=0
-                   }
-                };
+                    APrice =s.APrice,
+                    PermissionID = s.PermissionID,
+                    PromotionID=s.PromotionID,
+                    Discount = 0,
+                    Tax = 0,
+                    CreditAmount = s.CreditAmount
+                }).ToList();
+
+
+               
             }
 
           var result= await _servOrders.AddOrder(order);

Back/Services/ServOrders.cs

@@ -40,7 +40,7 @@ namespace Back.Services
                       Status = w.Status,
                       TDiscount = w.TDiscount,
                       TPrice = w.TPrice,
-                      TTax = w.TPrice,
+                      TTax = w.TTax,
                       lstDiscount = w.lstDiscount,
                   }).Paging(itemSerach.PageIndex,itemSerach.PageSize);
         }
@@ -57,9 +57,8 @@ namespace Back.Services
                     Discount=s.Discount,
                     ID = s.ID,
                     Tax = s.Tax,
-                    Type= s.PermissionID.HasValue && !s.PromotionID.HasValue ? "سرویس" : !s.PermissionID.HasValue && s.PromotionID.HasValue ? "تعرفه" : "نامشخص",
-                    IDForType = s.PermissionID.HasValue && !s.PromotionID.HasValue ? s.PermissionID.Value : !s.PermissionID.HasValue && s.PromotionID.HasValue ? s.PromotionID.Value : 0,
-                    Title = s.PermissionID.HasValue && !s.PromotionID.HasValue ? s.Permission.Title : !s.PermissionID.HasValue && s.PromotionID.HasValue ? s.Promotion.Name : "",
+                    IDForType =  s.PermissionID.Value ,
+                    Title =  s.Permission.Title ,
                 }).ToListAsync();
         }
         public async Task<Order> GetOrder(int OrderID, int CompanyID)