fix #2003

LiveHelperChat · May 9, 2024 · c35af61 · c35af61
1 parent 700a232
commit c35af61
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/lhc_web/design/defaulttheme/js/js_static/7860b2322693217000e499b70447fa0c.js b/lhc_web/design/defaulttheme/js/js_static/7860b2322693217000e499b70447fa0c.js
diff --git a/lhc_web/design/defaulttheme/js/js_static/7860b2322693217000e499b70447fa0c.js.map b/lhc_web/design/defaulttheme/js/js_static/7860b2322693217000e499b70447fa0c.js.map
diff --git a/lhc_web/design/defaulttheme/js/widgetv2/react.app.js b/lhc_web/design/defaulttheme/js/widgetv2/react.app.js
diff --git a/lhc_web/design/defaulttheme/js/widgetv2/react.app.js.map b/lhc_web/design/defaulttheme/js/widgetv2/react.app.js.map
diff --git a/lhc_web/design/defaulttheme/tpl/pagelayouts/userchat2.php b/lhc_web/design/defaulttheme/tpl/pagelayouts/userchat2.php
@@ -103,14 +103,14 @@
 ) : ?>
     <?php if (!isset($Result['voice_call'])) : ?>
         <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/vendor.ie.js')?>?v=a3"></script>
-        <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/react.app.ie.js')?>?t=325"></script>
+        <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/react.app.ie.js')?>?t=326"></script>
     <?php else : ?>
         <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/voice/voice.call.js')?>?t=3"></script>
     <?php endif; ?>
 <?php else : ?>
     <?php if (!isset($Result['voice_call'])) : ?>
         <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/vendor.js')?>?v=a3"></script>
-        <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/react.app.js')?>?t=325"></script>
+        <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/widgetv2/react.app.js')?>?t=326"></script>
         <?php else : ?>
         <script <?php isset($Result['app_scope']) ? print 'scope="' . htmlspecialchars($Result['app_scope']) . '"' : '' ?> src="<?php echo erLhcoreClassDesign::design('js/voice/voice.call.js')?>?t=2"></script>
     <?php endif; ?>

diff --git a/lhc_web/design/defaulttheme/widget/react-app/src/reducers/chatWidgetReducer.js b/lhc_web/design/defaulttheme/widget/react-app/src/reducers/chatWidgetReducer.js
@@ -172,7 +172,9 @@ const chatWidgetReducer = (state = initialState, action) => {
         }
 
         case IS_ONLINE : {
-            return state.set('isOnline',action.data);
+            return state.set('isOnline',action.data)
+                 .setIn(['onlineData','fetched'], false)
+                 .setIn(['offlineData','fetched'], false);
         }
 
         case OFFLINE_FIELDS_UPDATED : {

diff --git a/lhc_web/modules/lhwidgetrestapi/onlinesettings.php b/lhc_web/modules/lhwidgetrestapi/onlinesettings.php
@@ -1005,13 +1005,12 @@ function renderMessage($paramsRender, $theme) {
             'pre_chat_html',
             'operator_profile'
          ] as $attrOverride) {
-    if (isset($requestPayload['chat_ui'][$attrOverride])) {
+    if (isset($requestPayload['chat_ui'][$attrOverride]) && !isset($chat_ui[$attrOverride])) {
         $chat_ui[$attrOverride] = $requestPayload['chat_ui'][$attrOverride];
     }
 }
 
 
-
 if (isset($requestPayload['chat_ui']['intro_message']) || isset($requestPayload['chat_ui']['intro_message_html'])) {
     $chat_ui['cmmsg_widget'] = renderMessage($requestPayload['chat_ui'], $theme);
 }

diff --git a/lhc_web/modules/lhwidgetrestapi/settings.php b/lhc_web/modules/lhwidgetrestapi/settings.php
@@ -538,7 +538,7 @@
 $outputResponse['wv'] = 224;
 
 // React APP versions
-$outputResponse['v'] = 325;
+$outputResponse['v'] = 326;
 
 $outputResponse['hash'] = sha1(erLhcoreClassIPDetect::getIP() . $ts . erConfigClassLhConfig::getInstance()->getSetting( 'site', 'secrethash' ));
 $outputResponse['hash_ts'] = $ts;