bereskan pengecekan newversion

lib/src/layouts/auth/qr.dart

@@ -62,11 +62,7 @@ class _NewQrPageState extends State<NewQrPage> {
         setState(() {
           companyName = lics['companyName']??'';
           serialNumber = lics['serialNumber']??'';
-          if(U.newServerVersion(1754624839)){
-            lang = lics['_validLang'] ?? [];
-          } else if(1698720817 <= lics['serverVersion']){
-            lang = lics['languages'] != null ? lics['languages'].split(',') : [];
-          }
+          lang = lics['_validLang'] ?? [];
         });
       }
     }

lib/src/layouts/functions/history.dart

@@ -123,7 +123,7 @@ class HistoryFunction{
         }
 
         // If no internet connection and selected status is On going and filter button is Queued, display pending data.
-        if(historyModule.activeTab().name == "ongoing" && (selectedFilter == 'none' || selectedFilter == 'queue') && U.newServerVersion(1709864293) && !U.getInternetStatus()){
+        if(historyModule.activeTab().name == "ongoing" && (selectedFilter == 'none' || selectedFilter == 'queue') && !U.getInternetStatus()){
           List pendingList = sharedPreferencesManager.isKeyExists(SharedPreferencesManager.keyPendingData)!?jsonDecode(sharedPreferencesManager.getString(SharedPreferencesManager.keyPendingData)!):[];
           historyModule.setPendingData(pendingList);
         }

lib/src/layouts/functions/home.dart

@@ -76,13 +76,7 @@ class HomeFunction{
 
         var profile = userModule.profile();
         if(profile['topMenu']['show'] != null && profile['topMenu']['show'] == true) {
-          if(U.newServerVersion(1709864293)){
-            getTopMenuNew();
-          }
-          else{
-            getTopMenu();
-            getReqGroup();
-          }
+          getTopMenuNew();
         }
         if(profile['specialOffer'] != null && profile['specialOffer']['show'] == true) getSpecialOffer(context);
         if(profile['frequentlyRequested'] != null && profile['frequentlyRequested']['show'] == true) getFrequentlyRequested();
@@ -328,13 +322,7 @@ class HomeFunction{
   onRefresh(BuildContext context){
     var profile = userModule.profile();
     if(profile['topMenu']['show'] != null && profile['topMenu']['show'] == true) {
-      if(U.newServerVersion(1709864293)){
-        getTopMenuNew();
-      }
-      else{
-        getTopMenu();
-        getReqGroup();
-      }
+      getTopMenuNew();
     }
     if(profile['specialOffer'] != null && profile['specialOffer']['show'] == true) getSpecialOffer(context);
     if(profile['frequentlyRequested'] != null && profile['frequentlyRequested']['show'] == true) getFrequentlyRequested();

lib/src/layouts/functions/request.dart

@@ -44,24 +44,14 @@ class RequestFunction{
           search = ',{"f":["$subject","LIKE","%$_keyword%"]}';
         }
 
-        if(U.newServerVersion(1709864293)){
-          if(widget.groupCode != null){
-            url = '/api/requests/search/custom';
-            group = ',{"f":["${U.servantDisplay()?'servantGroupCode':'requestGroup.code'}","EQ","${widget.groupCode}"]}';
-            filter = '{"and":[{"or":[{"f":["scope","EQ","ALL"]},{"f":["scope","EQ","${widget.scope}"]}]}$search$group]}';
-          }
-          else{
-            url = '/api/requests/search/menu';
-            filter = '{"and":[{"or":[{"f":["scope","EQ","ALL"]},{"f":["scope","EQ","${widget.scope}"]}]}$search]}';
-          }
+        if(widget.groupCode != null){
+          url = '/api/requests/search/custom';
+          group = ',{"f":["${U.servantDisplay()?'servantGroupCode':'requestGroup.code'}","EQ","${widget.groupCode}"]}';
+          filter = '{"and":[{"or":[{"f":["scope","EQ","ALL"]},{"f":["scope","EQ","${widget.scope}"]}]}$search$group]}';
         }
         else{
-          if(widget.groupCode != null){
-            group = ',{"f":["${U.servantDisplay()?'servantGroupCode':'requestGroup.code'}","EQ","${widget.groupCode}"]}';
-          }
-
-          filter = '{"and":[{"or":[{"f":["scope","EQ","ALL"]},{"f":["scope","EQ","${widget.scope}"]}]}$search$group$tenant]}';
-          url = '/api/requests/search/custom';
+          url = '/api/requests/search/menu';
+          filter = '{"and":[{"or":[{"f":["scope","EQ","ALL"]},{"f":["scope","EQ","${widget.scope}"]}]}$search]}';
         }
 
         String key = '$url-$filter';
@@ -159,7 +149,7 @@ class RequestFunction{
       'assetCode': asset
     };
 
-    if(!kIsWeb && U.newServerVersion(1709864293) && !U.getInternetStatus()){
+    if(!kIsWeb && !U.getInternetStatus()){
       closeLoading(context);
       sendRequestNoInternet(context, widget, controllerLocation, controllerNote, data: data, others: false);
     }
@@ -213,7 +203,7 @@ class RequestFunction{
       }]
     };
 
-    if(!kIsWeb && U.newServerVersion(1709864293) && !U.getInternetStatus()){
+    if(!kIsWeb && !U.getInternetStatus()){
       closeLoading(context);
       sendRequestNoInternet(context, widget, controllerLocation, controllerNote, data: data, others: true);
     }

lib/src/layouts/mobile/banner_detail.dart

@@ -22,7 +22,7 @@ class _MobBannerDetailPageState extends State<MobBannerDetailPage> {
 
   @override
   void initState() {
-    if(U.newServerVersion(1719194415) && widget.data['videoId'] != null){
+    if(widget.data['videoId'] != null){
       _controller = YoutubePlayerController.fromVideoId(
         videoId: widget.data['videoId'],
         autoPlay: true,
@@ -58,7 +58,7 @@ class _MobBannerDetailPageState extends State<MobBannerDetailPage> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    U.newServerVersion(1719194415) && widget.data['videoId'] != null ? YoutubePlayer(
+                    widget.data['videoId'] != null ? YoutubePlayer(
                       controller: _controller,
                       aspectRatio: 16 / 9,
                     ) : widget.data['image'] != null ? ClipRRect(

lib/src/layouts/mobile/history_detail.dart

@@ -427,7 +427,7 @@ class _MobHistoryDetailPageState extends State<MobHistoryDetailPage> {
                               children: [
                                 // SizedBox(height: 16),
                                 divider(opacity: 0.05),
-                                U.newServerVersion(1716187681) && list['action'] != null && list['action'].trim() != '' ? Column(
+                                list['action'] != null && list['action'].trim() != '' ? Column(
                                   children: [
                                     SizedBox(height: 16),
                                     textHorizontal('action'.tr(), list['action'])

lib/src/layouts/mobile/menu_history.dart

@@ -260,7 +260,7 @@ class _MobHistoryPageState extends State<MobHistoryPage> with TickerProviderStat
     return SingleChildScrollView(
       child: Column(
         children: [
-          U.newServerVersion(1709864293) && !U.getInternetStatus() ? Column(
+          !U.getInternetStatus() ? Column(
             children: List.generate(dataPending.length, (i) {
               return GestureDetector(
                 child: Container(
@@ -486,11 +486,11 @@ class _MobHistoryPageState extends State<MobHistoryPage> with TickerProviderStat
                                   child: Text('rateReq'.tr(), style: TextStyle(color: secondaryColor, fontSize: 14), overflow: TextOverflow.ellipsis),
                                 ),
                                 onTap: () {
-                                  U.newServerVersion(1716279633) ? navigateTo(context, MobHistoryRatingPage(historyModule.dataRequests()[i])).then((tempRating) {
+                                  navigateTo(context, MobHistoryRatingPage(historyModule.dataRequests()[i])).then((tempRating) {
                                     if(tempRating != null){
                                       historyModule.setSatisfaction(i, tempRating);
                                     }
-                                  }) : rateMission(context, historyModule.dataRequests()[i], i);
+                                  });
                                 },
                               ) : !historyFunction.isAutoResponse(dataRequest[i]) ? Row(
                                 children: [

lib/src/layouts/mobile/menu_home.dart

@@ -97,7 +97,7 @@ class _MobHomePageState extends State<MobHomePage> with WidgetsBindingObserver {
       showTopMenu = true;
     }
 
-    _localeIndex = U.newServerVersion(1754624839) ? U.getLangIndex(context.locale.toString()) : context.locale.toString();
+    _localeIndex = U.getLangIndex(context.locale.toString());
 
     return userModuleListen.user().isNotEmpty ? Scaffold(
       backgroundColor: backgroundColor,
@@ -268,13 +268,7 @@ class _MobHomePageState extends State<MobHomePage> with WidgetsBindingObserver {
                                         
                                                       var profile = userModule.profile();
                                                       if(profile['topMenu']['show'] != null && profile['topMenu']['show'] == true) {
-                                                        if(U.newServerVersion(1709864293)){
-                                                          homeFunc.getTopMenuNew();
-                                                        }
-                                                        else{
-                                                          homeFunc.getTopMenu();
-                                                          homeFunc.getReqGroup();
-                                                        }
+                                                        homeFunc.getTopMenuNew();
                                                       }
                                                       if(profile['specialOffer'] != null && profile['specialOffer']['show'] == true) homeFunc.getSpecialOffer(context);
                                                       if(profile['frequentlyRequested'] != null && profile['frequentlyRequested']['show'] == true) homeFunc.getFrequentlyRequested();

lib/src/layouts/web/banner_detail.dart

@@ -22,7 +22,7 @@ class _WebBannerDetailPageState extends State<WebBannerDetailPage> {
   @override
   void initState() {
     if(mounted){
-      if(U.newServerVersion(1719194415) && widget.data['videoId'] != null){
+      if(widget.data['videoId'] != null){
         _controller = YoutubePlayerController.fromVideoId(
           videoId: widget.data['videoId'],
           autoPlay: true,
@@ -69,7 +69,7 @@ class _WebBannerDetailPageState extends State<WebBannerDetailPage> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  U.newServerVersion(1719194415) && widget.data['videoId'] != null ? YoutubePlayer(
+                  widget.data['videoId'] != null ? YoutubePlayer(
                     controller: _controller,
                     aspectRatio: 16 / 9,
                   ) : widget.data['image'] != null ? ClipRRect(

lib/src/layouts/web/menu_history.dart

@@ -513,7 +513,7 @@ class _WebHistoryPageState extends State<WebHistoryPage> with TickerProviderStat
                                   child: Text('rateReq'.tr(), style: TextStyle(color: secondaryColor, fontSize: 14), overflow: TextOverflow.ellipsis),
                                 ),
                                 onTap: () {
-                                  U.newServerVersion(1716279633) ? rateMissionNew(context, historyModule.dataRequests()[i], i) : rateMission(context, historyModule.dataRequests()[i], i);
+                                  rateMissionNew(context, historyModule.dataRequests()[i], i);
                                 },
                               ) : !historyFunction.isAutoResponse(dataRequest[i]) ? Row(
                                 children: [

lib/src/layouts/web/menu_home.dart

@@ -254,13 +254,7 @@ class _WebHomePageState extends State<WebHomePage> {
 
                                                     var profile = Provider.of<UserModule>(context, listen: false).profile();
                                                     if(profile['topMenu']['show'] != null && profile['topMenu']['show'] == true) {
-                                                      if(U.newServerVersion(1709864293)){
-                                                        homeFunc.getTopMenuNew();
-                                                      }
-                                                      else{
-                                                        homeFunc.getTopMenu();
-                                                        homeFunc.getReqGroup();
-                                                      }
+                                                      homeFunc.getTopMenuNew();
                                                     }
                                                     if(profile['specialOffer'] != null && profile['specialOffer']['show'] == true) homeFunc.getSpecialOffer(context);
                                                     if(profile['frequentlyRequested'] != null && profile['frequentlyRequested']['show'] == true) homeFunc.getFrequentlyRequested();

lib/src/layouts/web/request_create.dart

@@ -301,7 +301,7 @@ class _WebReqCreatePageState extends State<WebReqCreatePage> {
                                     onTap: ()=>pickupImageNew(),
                                   ),
                                   // Text("MBUH ==> ${U.newServerVersion(1736473802)} X ${U.retServerVersion()}"),
-                                  U.newServerVersion(1736473802) ? Column(
+                                  Column(
                                     crossAxisAlignment: CrossAxisAlignment.start,
                                     children: [
                                       SizedBox(height: 32),
@@ -362,8 +362,8 @@ class _WebReqCreatePageState extends State<WebReqCreatePage> {
                                           )
                                       )
                                     ],
-                                  ) : SizedBox(),
-                                  U.newServerVersion(1741166029) ? Column(
+                                  ),
+                                  Column(
                                     crossAxisAlignment: CrossAxisAlignment.start,
                                     children: [
                                       SizedBox(height: 32),
@@ -390,7 +390,7 @@ class _WebReqCreatePageState extends State<WebReqCreatePage> {
                                         ),
                                       )
                                     ],
-                                  ) : SizedBox(),
+                                  ),
                                 ],
                               ),
                             ],

lib/src/utils/U.dart

@@ -316,7 +316,7 @@ class U {
     try {
       var dt = await ApiAuthProvider().getJsonDataNoAuth(url);
       _serverVersion = dt['serverVersion'];
-      validLang = newServerVersion(1754624839) ? dt["_validLang"] : dt['languages'];
+      validLang = dt["_validLang"];
       CacheMan.writeData(url, _serverVersion);
       _versionReady.complete();
     } catch (error) {
@@ -356,7 +356,7 @@ class U {
     return validLang;
   }
 
-  static newServerVersion(int version){
+  static XnewServerVersion(int version){
     return version <= _serverVersion;
   }
 
@@ -391,11 +391,9 @@ class U {
 
   static Map _otherLabelList = {};
   static getOtherLabelList(BuildContext context) async{
-    if(newServerVersion(1725245109)){
-      var res = await ApiAuthProvider().getData('/api/systemSettings/search/additional', {'key': 'request-for-other'});
-      if(res != null){
-        _otherLabelList = res;
-      }
+    var res = await ApiAuthProvider().getData('/api/systemSettings/search/additional', {'key': 'request-for-other'});
+    if(res != null){
+      _otherLabelList = res;
     }
   }