thanh toán ví trên website

website/Areas/LotteryV2/Views/Home/BuyTicket.cshtml

@@ -314,13 +314,11 @@ else
                 <span class="min-w-0 flex-1"><span class="block text-[16px] font-black text-[#171A24]">@Lang.payment_main_account</span><span class="mt-0.5 block text-[12px] font-semibold text-gray-500">@Lang.payment_main_account_desc</span></span>
                 <span class="flex h-8 w-8 items-center justify-center rounded-full bg-gray-100 text-gray-400 transition group-hover:bg-[#EE0033] group-hover:text-white"><i class="fa-solid fa-chevron-right text-[12px]"></i></span>
             </button>
-            <!--
             <button type="button" onclick="selectPaymentChannel('@Constants.NATCASH_WALLET_TICKET')" class="group flex w-full items-center gap-4 rounded-[20px] border-2 border-transparent bg-white p-4 text-left shadow-[0_5px_18px_rgba(31,41,55,0.07)] transition hover:-translate-y-0.5 hover:border-[#0A9800] active:scale-[0.98]">
                 <span class="flex h-12 w-12 shrink-0 items-center justify-center rounded-2xl bg-[#E7F8E6] text-[21px] text-[#0A9800]"><i class="fa-solid fa-wallet"></i></span>
                 <span class="min-w-0 flex-1"><span class="flex items-center gap-2 text-[16px] font-black text-[#171A24]">@Lang.payment_wallet <span class="rounded-full bg-[#E7F8E6] px-2 py-0.5 text-[9px] font-black text-[#0A9800]">PIN</span></span><span class="mt-0.5 block text-[12px] font-semibold text-gray-500">@Lang.payment_wallet_desc</span></span>
                 <span class="flex h-8 w-8 items-center justify-center rounded-full bg-gray-100 text-gray-400 transition group-hover:bg-[#0A9800] group-hover:text-white"><i class="fa-solid fa-chevron-right text-[12px]"></i></span>
             </button>
-            -->
             <p class="pt-1 text-center text-[11px] font-semibold text-gray-400"><i class="fa-solid fa-shield-halved mr-1 text-[#0A9800]"></i>@Lang.payment_security_message</p>
         </div>
     </div>

website/Areas/Millions/Views/Home/BuyTicket.cshtml

@@ -339,11 +339,10 @@ else
             <button type="button" onclick="selectPaymentChannel('@Constants.BASIC_WALLET_TICKET')" class="group flex w-full items-center gap-4 rounded-[20px] border-2 border-transparent bg-white p-4 text-left shadow-[0_5px_18px_rgba(31,41,55,0.07)] transition hover:-translate-y-0.5 hover:border-[#0062FF] active:scale-[0.98]">
                 <span class="flex h-12 w-12 shrink-0 items-center justify-center rounded-2xl bg-[#E7F0FF] text-[21px] text-[#0062FF]"><i class="fa-solid fa-mobile-screen-button"></i></span><span class="min-w-0 flex-1"><span class="block text-[16px] font-black text-[#171A24]">@Lang.payment_main_account</span><span class="mt-0.5 block text-[12px] font-semibold text-gray-500">@Lang.payment_main_account_desc</span></span><span class="flex h-8 w-8 items-center justify-center rounded-full bg-gray-100 text-gray-400 transition group-hover:bg-[#0062FF] group-hover:text-white"><i class="fa-solid fa-chevron-right text-[12px]"></i></span>
             </button>
-            <!--
+            
             <button type="button" onclick="selectPaymentChannel('@Constants.NATCASH_WALLET_TICKET')" class="group flex w-full items-center gap-4 rounded-[20px] border-2 border-transparent bg-white p-4 text-left shadow-[0_5px_18px_rgba(31,41,55,0.07)] transition hover:-translate-y-0.5 hover:border-[#0A9800] active:scale-[0.98]">
                 <span class="flex h-12 w-12 shrink-0 items-center justify-center rounded-2xl bg-[#E7F8E6] text-[21px] text-[#0A9800]"><i class="fa-solid fa-wallet"></i></span><span class="min-w-0 flex-1"><span class="flex items-center gap-2 text-[16px] font-black text-[#171A24]">@Lang.payment_wallet <span class="rounded-full bg-[#E7F8E6] px-2 py-0.5 text-[9px] font-black text-[#0A9800]">PIN</span></span><span class="mt-0.5 block text-[12px] font-semibold text-gray-500">@Lang.payment_wallet_desc</span></span><span class="flex h-8 w-8 items-center justify-center rounded-full bg-gray-100 text-gray-400 transition group-hover:bg-[#0A9800] group-hover:text-white"><i class="fa-solid fa-chevron-right text-[12px]"></i></span>
             </button>
-             -->
             <p class="pt-1 text-center text-[11px] font-semibold text-gray-400"><i class="fa-solid fa-shield-halved mr-1 text-[#0A9800]"></i>@Lang.payment_security_message</p>
         </div>
     </div>

website/Controllers/HomeController.cs

@@ -123,17 +123,17 @@ namespace LotteryWebApp.Controllers
             HomeIndex_ViewModel model = new HomeIndex_ViewModel();
             try
             {
-                if (
-                    CheckAuthToken()
-                    && HttpContext.Session.GetString("ShowChooseAppAfterLogin") == "1"
-                )
-                {
-                    HttpContext.Session.Remove("ShowChooseAppAfterLogin");
-                    log.Info("Manual login fallback: redirecting /Home to /Account/ChooseApp");
-                    return Redirect(
-                        GetParameter(Constants.SUB_DOMAIN) + "/Account/ChooseApp"
-                    );
-                }
+                //if (
+                //    CheckAuthToken()
+                //    && HttpContext.Session.GetString("ShowChooseAppAfterLogin") == "1"
+                //)
+                //{
+                //    HttpContext.Session.Remove("ShowChooseAppAfterLogin");
+                //    log.Info("Manual login fallback: redirecting /Home to /Account/ChooseApp");
+                //    return Redirect(
+                //        GetParameter(Constants.SUB_DOMAIN) + "/Account/ChooseApp"
+                //    );
+                //}
 
                 HttpContext.Session.SetComplexData("navigator", Constants.HOME_NAVIGATOR);
 
@@ -145,14 +145,12 @@ namespace LotteryWebApp.Controllers
                 // check auto login ?uuid=681471d23b83f0a463e2dd5671ea0fc5
                 // ?uuid=681471d23b83f0a463e2dd5671ea0fc5&mcuid=6c6948a89908d83aec8c05be256970a1&mcapp=mocha
 
-<<<<<<< HEAD
                 if (
                     !CheckAuthToken()
                     || token != null
                     || uuid != null
                     || phonenumber != null
                 )
-=======
                 if (CheckAuthToken())
                 {
                     return Redirect(
@@ -161,7 +159,6 @@ namespace LotteryWebApp.Controllers
                 }
 
                 if (!CheckAuthToken())
->>>>>>> websiteNoNatCash
                 {
                     //String uri = HttpContext.Request.QueryString.ToUriComponent().ToString();
                     log.Info("UUID: " + uuid);