Bladeren bron

no message

ducnt 3 weken geleden
bovenliggende
commit
268d28ec1d

+ 1 - 1
SicboSub/SicboSub.Api/Properties/PublishProfiles/FolderProfile.pubxml

@@ -12,7 +12,7 @@
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <ProjectGuid>cbf3997b-fd6f-4b3a-bf85-ab39fe7a18aa</ProjectGuid>
     <SelfContained>true</SelfContained>

+ 1 - 1
SicboSub/SicboSub.StartProcedure/Properties/PublishProfiles/FolderProfile.pubxml

@@ -7,7 +7,7 @@
     <PublishDir>E:\Ex_publish\Natcom_SicboSub\procedure</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

+ 31 - 4
SicboSub/SicboSub.Web/Language/Language.Designer.cs

@@ -249,6 +249,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Konfime retire.
+        /// </summary>
+        public static string Confirmwithdraw {
+            get {
+                return ResourceManager.GetString("Confirmwithdraw", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Felisitasyon.
         /// </summary>
@@ -303,6 +312,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Èske ou vle retire kòb ou?.
+        /// </summary>
+        public static string Doyouwanttowithdraw {
+            get {
+                return ResourceManager.GetString("Doyouwanttowithdraw", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Retre.
         /// </summary>
@@ -448,7 +466,7 @@ namespace SicboSub.Web.Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to OTP Verification.
+        ///   Looks up a localized string similar to Verifikasyon OTP.
         /// </summary>
         public static string OTPVerification {
             get {
@@ -493,7 +511,7 @@ namespace SicboSub.Web.Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Play Now.
+        ///   Looks up a localized string similar to Jwe kounye a.
         /// </summary>
         public static string PlayNow {
             get {
@@ -501,6 +519,15 @@ namespace SicboSub.Web.Language {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tanpri antre OTP yo te voye sou telefòn ou an..
+        /// </summary>
+        public static string PleaseentertheOTPsenttoyourphone {
+            get {
+                return ResourceManager.GetString("PleaseentertheOTPsenttoyourphone", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Prim.
         /// </summary>
@@ -646,7 +673,7 @@ namespace SicboSub.Web.Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Success.
+        ///   Looks up a localized string similar to Siksè.
         /// </summary>
         public static string Success {
             get {
@@ -754,7 +781,7 @@ namespace SicboSub.Web.Language {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Value.
+        ///   Looks up a localized string similar to Valè.
         /// </summary>
         public static string Value {
             get {

+ 13 - 4
SicboSub/SicboSub.Web/Language/Language.resx

@@ -340,13 +340,13 @@
     <value>Femen</value>
   </data>
   <data name="Value" xml:space="preserve">
-    <value>Value</value>
+    <value>Valè</value>
   </data>
   <data name="Rank" xml:space="preserve">
     <value>Rank</value>
   </data>
   <data name="Success" xml:space="preserve">
-    <value>Success</value>
+    <value>Siksè</value>
   </data>
   <data name="Failed" xml:space="preserve">
     <value>Failed</value>
@@ -355,15 +355,24 @@
     <value>Echek</value>
   </data>
   <data name="PlayNow" xml:space="preserve">
-    <value>Play Now</value>
+    <value>Jwe kounye a</value>
   </data>
   <data name="Buynow" xml:space="preserve">
     <value>Achte kounye a</value>
   </data>
   <data name="OTPVerification" xml:space="preserve">
-    <value>OTP Verification</value>
+    <value>Verifikasyon OTP</value>
   </data>
   <data name="Exchange" xml:space="preserve">
     <value>Retre</value>
   </data>
+  <data name="Confirmwithdraw" xml:space="preserve">
+    <value>Konfime retire</value>
+  </data>
+  <data name="Doyouwanttowithdraw" xml:space="preserve">
+    <value>Èske ou vle retire kòb ou?</value>
+  </data>
+  <data name="PleaseentertheOTPsenttoyourphone" xml:space="preserve">
+    <value>Tanpri antre OTP yo te voye sou telefòn ou an.</value>
+  </data>
 </root>

+ 9 - 0
SicboSub/SicboSub.Web/Language/Language.vi.resx

@@ -366,4 +366,13 @@
   <data name="Exchange" xml:space="preserve">
     <value>Exchange</value>
   </data>
+  <data name="Confirmwithdraw" xml:space="preserve">
+    <value>Confirm withdraw</value>
+  </data>
+  <data name="Doyouwanttowithdraw" xml:space="preserve">
+    <value>Do you want to withdraw?</value>
+  </data>
+  <data name="PleaseentertheOTPsenttoyourphone" xml:space="preserve">
+    <value>Please enter the OTP sent to your phone</value>
+  </data>
 </root>

+ 2 - 2
SicboSub/SicboSub.Web/Properties/PublishProfiles/FolderProfile.pubxml

@@ -2,7 +2,7 @@
 <!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
@@ -12,7 +12,7 @@
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <ProjectGuid>81272015-fbbc-41ec-a3b4-0014631f267d</ProjectGuid>
     <SelfContained>true</SelfContained>

+ 4 - 4
SicboSub/SicboSub.Web/Views/Home/Index.cshtml

@@ -232,7 +232,7 @@
                     
                     <div class="withdraw-info">
                         <span class="withdraw-info-label">@Language.TotalValueToday</span>
-                        <span class="withdraw-info-value">100 @Language.HTG</span>
+                        <span class="withdraw-info-value">500 @Language.HTG</span>
                     </div>
                     
                     <div class="withdraw-info">
@@ -286,7 +286,7 @@
         <div class="popup-container confirm-popup">
             <!-- Header -->
             <div class="popup-header">
-                <span class="popup-title">Confirm withdraw</span>
+                <span class="popup-title">@Language.Confirmwithdraw</span>
             </div>
             
             <!-- Close Button -->
@@ -298,7 +298,7 @@
             
             <!-- Confirm Content -->
             <div class="confirm-content">
-                <p class="confirm-message">Do you want to withdraw?</p>
+                <p class="confirm-message">@Language.Doyouwanttowithdraw</p>
                 <p class="withdraw-amount-display"><span id="withdrawAmountHtg" class="amount-highlight">0</span> @Language.HTG</p>
                 
                 <div class="withdraw-details">
@@ -334,7 +334,7 @@
             </button>
 
             <div class="otp-content">
-                <p>Please enter the OTP sent to your phone</p>
+            <p> @Language.PleaseentertheOTPsenttoyourphone</p>
                 <!-- 6 OTP Boxes -->
                 <div class="otp-inputs" id="otpInputContainer">
                     <input type="text" class="otp-box" maxlength="1" data-index="0" />

+ 3 - 1
SicboSubWs/SicboSubWs/src/com/vas/webservices/SicboSubWs.java

@@ -180,6 +180,7 @@ public class SicboSubWs extends WebserviceAbstract {
             listRegInday = db.getRegisterInday(msisdn, productInfo.getProductName());
             if (listRegInday != null && listRegInday.size() > 0) {
                 registered = true;
+                db.addTurnSpin(msisdn,productInfo.getNumberSpin());
             }
 
             logger.info("Register success " + msisdn + ", fee " + fee + ", account " + accountInfo.getMsisdn() + ", pack = " + productInfo.getProductName());
@@ -205,7 +206,7 @@ public class SicboSubWs extends WebserviceAbstract {
                 reg.setChannel("MPS");
                 reg = updateRegRenew(reg, productInfo);
                 db.iInsertRegisterInfo(reg);
-
+                
             } else {
                 logger.info("register again reg_info " + msisdn);
                 reg = listRegInday.get(0);
@@ -722,6 +723,7 @@ public class SicboSubWs extends WebserviceAbstract {
                                 reg.setChannel("WEB");
                                 reg = updateRegRenew(reg, productInfo);
                                 db.iInsertRegisterInfo(reg);
+                                db.addTurnSpin(msisdn,productInfo.getNumberSpin());
                             } else {
                                 reg = listRegInday.get(0);
                                 db.iInsertRegisterInfo(reg);