bổ sung cột cho báo cáo daily

Kitty_Fall/Kitty_Fall/Database/Database/ModelContext.cs

@@ -1808,6 +1808,14 @@ public partial class ModelContext : DbContext
                 .HasDefaultValueSql("0")
                 .HasColumnType("NUMBER")
                 .HasColumnName("BUY_ON_WEB");
+            entity.Property(e => e.RevenueBuyMps)
+                .HasDefaultValueSql("0")
+                .HasColumnType("NUMBER")
+                .HasColumnName("REVENUE_BUY_MPS");
+            entity.Property(e => e.RevenueBuyWeb)
+                .HasDefaultValueSql("0")
+                .HasColumnType("NUMBER")
+                .HasColumnName("REVENUE_BUY_WEB");
             entity.Property(e => e.Bonus)
                 .HasDefaultValueSql("0")
                 .HasColumnType("NUMBER")

Kitty_Fall/Kitty_Fall/Database/Database/ReportByTime.cs

@@ -19,6 +19,10 @@ public partial class ReportByTime
 
     public decimal? BuyOnMps { get; set; }
 
+    public decimal? RevenueBuyMps { get; set; }
+
+    public decimal? RevenueBuyWeb { get; set; }
+
     public decimal? UserActive { get; set; }
 
     public decimal? UserActiveTotal { get; set; }

Kitty_Fall/Kitty_Fall/Kitty_Fall.Cms/Controllers/DailyReportController.cs

@@ -84,7 +84,11 @@ public class DailyReportController : CmsAuthorizedController
                 DangKy = x.UserActive ?? 0,
                 Huy = x.UserInactive ?? 0,
                 DoanhThu = x.Revenue ?? 0,
-                CongTien = x.Bonus ?? 0
+                CongTien = x.Bonus ?? 0,
+                BuyOnWeb = x.BuyOnWeb ?? 0,
+                BuyOnMps = x.BuyOnMps ?? 0,
+                RevenueBuyMps = x.RevenueBuyMps ?? 0,
+                RevenueBuyWeb = x.RevenueBuyWeb ?? 0
             })
             .ToListAsync();
 

Kitty_Fall/Kitty_Fall/Kitty_Fall.Cms/Models/ReportByTimesViewModel.cs

@@ -26,4 +26,12 @@ public class ReportByTimesItemViewModel
     public decimal DoanhThu { get; set; }
 
     public decimal CongTien { get; set; }
+
+    public decimal BuyOnWeb { get; set; }
+
+    public decimal BuyOnMps { get; set; }
+
+    public decimal RevenueBuyMps { get; set; }
+
+    public decimal RevenueBuyWeb { get; set; }
 }

Kitty_Fall/Kitty_Fall/Kitty_Fall.Cms/Views/DailyReport/Index.cshtml

@@ -58,7 +58,11 @@
                                 <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">Registrations</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.DangKy)</div></div>
                                 <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">Cancellations</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.Huy)</div></div>
                                 <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">Revenue</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.DoanhThu)</div></div>
-                                <div class="col-span-2 rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">Bonus</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.CongTien)</div></div>
+                                <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">Bonus</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.CongTien)</div></div>
+                                <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">BUY_ON_WEB</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.BuyOnWeb)</div></div>
+                                <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">BUY_ON_MPS</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.BuyOnMps)</div></div>
+                                <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">REVENUE_BUY_MPS</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.RevenueBuyMps)</div></div>
+                                <div class="rounded-2xl bg-white px-3 py-2"><div class="text-gray-500">REVENUE_BUY_WEB</div><div class="mt-1 font-semibold text-gray-900">@FormatNumber(item.RevenueBuyWeb)</div></div>
                             </div>
                         </div>
                     }
@@ -77,6 +81,10 @@
                                     <th class="px-4 py-3">Cancellations</th>
                                     <th class="px-4 py-3">Revenue</th>
                                     <th class="px-4 py-3">Bonus</th>
+                                    <th class="px-4 py-3">BUY_ON_WEB</th>
+                                    <th class="px-4 py-3">BUY_ON_MPS</th>
+                                    <th class="px-4 py-3">REVENUE_BUY_MPS</th>
+                                    <th class="px-4 py-3">REVENUE_BUY_WEB</th>
                                 </tr>
                             </thead>
                             <tbody class="divide-y divide-gray-100 bg-white text-sm text-gray-700">
@@ -89,6 +97,10 @@
                                         <td class="whitespace-nowrap px-4 py-4">@FormatNumber(item.Huy)</td>
                                         <td class="whitespace-nowrap px-4 py-4 font-semibold text-gray-900">@FormatNumber(item.DoanhThu)</td>
                                         <td class="whitespace-nowrap px-4 py-4">@FormatNumber(item.CongTien)</td>
+                                        <td class="whitespace-nowrap px-4 py-4">@FormatNumber(item.BuyOnWeb)</td>
+                                        <td class="whitespace-nowrap px-4 py-4">@FormatNumber(item.BuyOnMps)</td>
+                                        <td class="whitespace-nowrap px-4 py-4 font-semibold text-gray-900">@FormatNumber(item.RevenueBuyMps)</td>
+                                        <td class="whitespace-nowrap px-4 py-4 font-semibold text-gray-900">@FormatNumber(item.RevenueBuyWeb)</td>
                                     </tr>
                                 }
                             </tbody>