issue #11 Remove carts when loading app full.

procentric/application/hoteltv.welcome.css

@@ -13,19 +13,6 @@ body {
     z-index: 1;
 }
 
-.startup {
-    top: 0px;
-    left: 0px;
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    padding: 0px;
-    /* background-image: url(./images/hoteltv_service_preparing.png); */
-    background-image: url(./images/hoteltv_service_preparing_joson.jpg);
-    background-size: cover;
-    background-repeat: no-repeat;
-}
-
 .welcome .frame {
     position: absolute;
     top: 0px;

procentric/application/lib/hoteltv.api.js

@@ -802,7 +802,7 @@ HotelTV.api = (function() {
                 "mac_wifi": "",
                 "mac_bt": "",
                 "speed": 0,
-                "manufacture": "LG",
+                "manufacture": _dev_inf['manufacture'],
                 "model": "",
                 "hw_ver": "1.00",
                 "sw_ver": "1.1.5",

procentric/application/lib/hoteltv.js

@@ -130,6 +130,12 @@ function __fxn_Set_DebugOpt() {
     console.log("OPT" + navigator.appVersion);
     if (navigator.appVersion.includes("Web0S") == true) {
         HotelTV.dbginfo['emulator'] = false;
+        HotelTV.devinfo['manufacture'] = "LG";
+        HotelTV.devinfo['tvOS'] = "Web0S";
+    } else if (navigator.appVersion.includes("Tizen") == true) {
+        HotelTV.dbginfo['emulator'] = false;
+        HotelTV.devinfo['manufacture'] = "SAMSUNG";
+        HotelTV.devinfo['tvOS'] = "Tizen";
     } else {
         HotelTV.dbginfo['emulator'] = true;
     }
@@ -209,7 +215,7 @@ HotelTV.Init = async function() {
                     $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`);
                 },
                 "cb_eoe": function() {
-                    setTimeout(HotelTV.hcap.Reboot(), 500);
+                    setTimeout(HotelTV.hcap.Reboot, 500);
                 }
             });
     }
@@ -236,7 +242,7 @@ HotelTV.Init = async function() {
                     $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                 },
                 "cb_eoe": function() {
-                    setTimeout(HotelTV.hcap.Reboot(), 500);
+                    setTimeout(HotelTV.hcap.Reboot, 500);
                 }
             });
     }
@@ -270,7 +276,7 @@ HotelTV.Init = async function() {
                             $('.error #countdown #message').text(`System will be reboot in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.Reboot(), 500);
+                            setTimeout(HotelTV.hcap.Reboot, 500);
                         }
                     });
                 return;
@@ -291,7 +297,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -314,7 +320,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -343,7 +349,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -366,7 +372,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -401,7 +407,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -424,7 +430,7 @@ HotelTV.Init = async function() {
                         $('.error #countdown #message').text(`The Device ID is ${HotelTV.devinfo.serial_number}.\r\n\r\nSystem will be reboot in ${_tmval} second...`);
                     },
                     "cb_eoe": function() {
-                        setTimeout(HotelTV.hcap.Reboot(), 500);
+                        setTimeout(HotelTV.hcap.Reboot, 500);
                     }
                 });
         }
@@ -493,7 +499,6 @@ HotelTV.LoadWelCome = async function() {
     HotelTV.dbginfo = await JSON.parse(sessionStorage.getItem("dbginfo"));
     HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
     HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
-    //HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
     //STEP#03:API Module INIT
     await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number);
     HotelTV.settings = await JSON.parse(sessionStorage.getItem("settings"));
@@ -628,7 +633,6 @@ HotelTV.LoadAppFull = async function() {
     HotelTV.devinfo = await JSON.parse(sessionStorage.getItem("devinfo"));
     HotelTV.svrinfo = await JSON.parse(sessionStorage.getItem("svrinfo"));
     HotelTV.services = await JSON.parse(sessionStorage.getItem("services"));
-    //HotelTV.state = await JSON.parse(sessionStorage.getItem("state"));
 
     //STEP#02: Init HotelTV API
     await HotelTV.api.Init(HotelTV.svrinfo.ipaddr, HotelTV.svrinfo.port, HotelTV.devinfo.model_name.substring(2, HotelTV.devinfo.model_name.length - 1), HotelTV.devinfo.serial_number);
@@ -650,13 +654,15 @@ HotelTV.LoadAppFull = async function() {
     }
 
     try {
+        let _result = await HotelTV.api.DeleteAmenityCarts(null);
         HotelTV.carts.amenity = await HotelTV.api.GetAmenityCarts(null);
     } catch (_error) {
         console.error("Display Error page for get amenity carts info");
     }
 
-    HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts();
     try {
+        let _result = await HotelTV.api.DeleteRoomserviceCarts(null);
+        HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts();
     } catch (_error) {
         console.error("Display Error page for get roomservicec carts info");
     }

procentric/application/lib/hoteltv.ui_appfull.js

@@ -492,9 +492,14 @@ HotelTV.ui_appfull = (function() {
                 }, 1000);
                 HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.notice.event.external_input.hdmi_connected[_state.lang], 5);
             }else{
-                $('body,html').fadeIn(500);
-                _state.menu.stage.cur = _state.menu.stage.prev;
-                _state.menu.stage.prev = null;
+                if ( $('body,html').css('display')=="none" ){
+                    $('body,html').fadeIn(500);
+
+                    if ( _state.menu.stage.prev!=null ){
+                        _state.menu.stage.cur = _state.menu.stage.prev;
+                        _state.menu.stage.prev = null;
+                    }
+                }
             }
         }
     }
@@ -588,6 +593,16 @@ HotelTV.ui_appfull = (function() {
         }
     }
 
+    const __uifxn_AppFull_getOrderMenuName = function(_objCtgyInfo){
+        let _state = HotelTV.state;
+        for (__jj = 1; __jj <= _objCtgyInfo.length; __jj++) {
+            if ( _objCtgyInfo[__jj].name=="ORDER" ) {
+                return _objCtgyInfo[__jj].title[_state.lang];
+            }
+        }
+        return "ORDER";
+    }
+
     /**
      * HotelTV UI[AppFull] Wrapper Function::> register hotkey for amenity service
      */
@@ -597,12 +612,21 @@ HotelTV.ui_appfull = (function() {
         let _amenity = null;
         let _roomservice = null;
 
+        let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
+        if ( _elAmPupOoderRoot.css('display')!="none" ){
+            _elAmPupOoderRoot.hide();
+        }
+
+        let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
+        if ( _elRsPupOoderRoot.css('display')!="none" ){
+            _elRsPupOoderRoot.hide();
+        }
+
 
         if (!_opening.amenity) {
             return;
         }
         _amenity = _opening.amenity;
-
         // HOTKEY정보를 state에 기록
         if (!(_amenity.button in _state.hotkey.mm)) {
             _state.hotkey.mm[_amenity.button] = {
@@ -621,10 +645,7 @@ HotelTV.ui_appfull = (function() {
             };
         }
 
-        let _elAmPupOoderRoot = $('.popup .amenity').children('.order');
-        if ( _elAmPupOoderRoot.css('display')!="none" ){
-            _elAmPupOoderRoot.hide();
-        }
+
 
 
 
@@ -632,7 +653,6 @@ HotelTV.ui_appfull = (function() {
             return;
         }
         _roomservice = _opening.roomService;
-
         // HOTKEY정보를 state에 기록
         if (!(_roomservice.button in _state.hotkey.mm)) {
             _state.hotkey.mm[_roomservice.button] = {
@@ -651,10 +671,6 @@ HotelTV.ui_appfull = (function() {
             };
         }
 
-        let _elRsPupOoderRoot = $('.popup .roomservice').children('.order');
-        if ( _elRsPupOoderRoot.css('display')!="none" ){
-            _elRsPupOoderRoot.hide();
-        }
         return;
     }
 
@@ -1323,15 +1339,6 @@ HotelTV.ui_appfull = (function() {
 
             try {
                 _elAmCtgyBgMenuItemCartWin.fadeOut(200, async function() {
-                    const ____getOrderMenuName = function(){
-                        for (__jj = 1; __jj <= _aminfo_ctgy.length; __jj++) {
-                            if ( _aminfo_ctgy[__jj].name=="ORDER" ) {
-                                return _aminfo_ctgy[__jj].title[_state.lang];
-                            }
-                        }
-                        return "ORDER";
-                    }
-
                     let _str_result_message = null;
                     // Remove All element under winleft&winright div
                     __ifxn_removeAmSelectedItemCartWinElement();
@@ -1345,7 +1352,7 @@ HotelTV.ui_appfull = (function() {
                     } finally {
                         if ( _result !=null ) {
                             console.log(`Success to order Amenity cart::>`);
-                            _str_result_message = _trTbl.ui.amenity.message.orderSuccess[_state.lang].replace('__MENU__', ____getOrderMenuName());
+                            _str_result_message = _trTbl.ui.amenity.message.orderSuccess[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
                             _elAmCtgyBgMenuItemCartWinOrderWin.children('#message').text(_str_result_message);
                             _elAmCtgyBgMenuItemCartWinOrderWin.fadeIn(500, async function() {
                                 try{
@@ -1483,7 +1490,6 @@ HotelTV.ui_appfull = (function() {
 
                 case "enter": {
                     if ( _str_curBtnID=='btn_ordernow' ){
-                        console.log("TODO::>> ORDERING NOW...");
                         __ifxn_processAmCartOrder(
                             function() {
                                 //Return to menu
@@ -1628,6 +1634,9 @@ HotelTV.ui_appfull = (function() {
             {
                 case "enter": {
                     _elAmCtgyBgMenuItemWin.find('.amctgyItem').first().addClass("focus");
+                    __amctgyItemStatus.idx = 0;
+                    __amctgyItemStatus.scroll_TOfset = 0;
+                    _elAmCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200);
                     __ifxn_updateAmItemDesc(__amctgyItemStatus.idx);
                 } break;
 
@@ -1651,10 +1660,12 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
-                        __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
 
-                        //스크롤 에니메이션 수행
-                        _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        if ( _elTbl_AmItem.children('#record').find('tr').first().position().top<0 ){
+                            __amctgyItemStatus.scroll_TOfset -= _elTblTr_AmItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -1681,10 +1692,11 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __amctgyItemStatus.idx = _elTblTr_AmItemNext.prop('rowIndex');
-                        __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
-
-                        //스크롤 에니메이션 수행
-                        _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        if ( __amctgyItemStatus.idx>=12 ){
+                            __amctgyItemStatus.scroll_TOfset += _elTblTr_AmItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_AmItem.children('#record').animate({ scrollTop: __amctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateAmItemDesc(__amctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -2012,10 +2024,20 @@ HotelTV.ui_appfull = (function() {
                                 _elAmCtgySel.trigger('next.owl', [700]);
                             } else if (event.keyCode == gRmtKey.enter) {
                                 // 카테고리 화면 빌드 및 화면 전환
-                                _state.menu.stage.cur = "amenity_ctgy_item_sel";
-                                __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_sel");
-                                __uifxn_AppFull_DrawAmItemSeletion("enter");
+                                if ( __status_am_specific.category_sel.cur in Object.keys(_aminfo_ctgy) ){
+                                    if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
+                                    }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
+                                        let __str_notify_msg = _trTbl.ui.amenity.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
+                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                                    }else{
+                                        _state.menu.stage.cur = "amenity_ctgy_item_sel";
+                                        __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_sel");
+                                        __uifxn_AppFull_DrawAmItemSeletion("enter");
+                                    }
+                                }
                             } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawAmOrderList('hide');
                                 // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
                                 if (_hndl_tmrAmenityThumbAni != null) {
                                     clearInterval(_hndl_tmrAmenityThumbAni);
@@ -2052,6 +2074,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -2060,6 +2083,51 @@ HotelTV.ui_appfull = (function() {
                                 _elAmCtgySel.trigger('prev.owl', [700]);
                             } else if (event.keyCode == gRmtKey.right) {
                                 _elAmCtgySel.trigger('next.owl', [700]);
+                            } else if (event.keyCode == gRmtKey.enter) {
+                                let __str_notify_msg = _trTbl.ui.amenity.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_aminfo_ctgy));
+                                HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                            } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawAmOrderList('hide');
+
+                                // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
+                                if (_hndl_tmrAmenityThumbAni != null) {
+                                    clearInterval(_hndl_tmrAmenityThumbAni);
+                                    _hndl_tmrAmenityThumbAni = null;
+                                    console.log("TMR(AMENITY CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
+                                }
+
+                                //카트 비움 및 사용자 가이드 지움.
+                                __ifxn_clrearAmCarts();
+                                __uifxn_AppFull_DrawAmUserGuide("destroy");
+
+                                // 어메니티 -> 메인 메뉴로 귀환
+                                $(document.activeElement).off('keydown');
+                                _elMainMenu.show(function() {
+                                    $('#lst_mmsel').trigger('translate.owl.carousel', [0]);
+                                });
+
+                                _elAmCtgySel.off('refresh.owl.carousel');
+                                _elAmCtgySel.off('change.owl.carousel');
+                                _elAmCtgySel.off('changed.owl.carousel');
+                                _elAmCtgySel.off('translate.owl.carousel');
+
+                                _elAmCtgyBg.owlCarousel('destroy');
+                                _elAmCtgySel.owlCarousel('destroy');
+
+                                _elAmCtgySel.children('div').remove();
+                                _elAmCtgyBg.children('div').remove();
+                                _elAmPupRoot.children('.bg').hide();
+                                _elAmPupRoot.children('.slider').hide();
+
+                                setTimeout(function() {
+                                    $('.main').fadeIn(1000, () => {
+                                        _state.menu.stage.cur = "main";
+                                        $('.main').addClass("depth_mm");
+                                        __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
+                                        __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
+                                    });
+                                }, 500);
                             }
                         } else if (_state.menu.stage.cur == "amenity_ctgy_item_sel") {
                             if (event.keyCode == gRmtKey.left) {
@@ -2080,7 +2148,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "amenity_ctgy_item_cart";
                                     __uifxn_AppFull_DrawAmUserGuide("amenity_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.amenity.message.notinservice[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "amenity_ctgy_item_cart") {
@@ -2155,13 +2223,15 @@ HotelTV.ui_appfull = (function() {
                 if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "CARTS" ){
                     console.log("TODO::> Draw Carts");
                 }else if ( _aminfo_ctgy[__status_am_specific.category_sel.cur].name == "ORDER" ){
-                    console.log("TODO::> Draw Order");
                     __uifxn_AppFull_DrawAmOrderList('build');
                     _state.menu.stage.prev = _state.menu.stage.cur;
                     _state.menu.stage.cur = "amenity_ctgy_orderlists";
                 }else{
                     __uifxn_AppFull_DrawAmOrderList('hide');
                     if ( _state.menu.stage.prev!=null ){
+                        if ( _state.menu.stage.prev=="preparing_amenity" ){
+                            _state.menu.stage.prev="amenity_ctgy_sel";
+                        }
                         _state.menu.stage.cur = _state.menu.stage.prev;
                     }
                 }
@@ -2806,15 +2876,6 @@ HotelTV.ui_appfull = (function() {
 
             try {
                 _elRsCtgyBgMenuItemCartWin.fadeOut(200, async function() {
-                    const ____getOrderMenuName = function(){
-                        for (__jj = 1; __jj <= _rsinfo_ctgy.length; __jj++) {
-                            if ( _rsinfo_ctgy[__jj].name=="ORDER" ) {
-                                return _rsinfo_ctgy[__jj].title[_state.lang];
-                            }
-                        }
-                        return "ORDER";
-                    }
-
                     let _str_result_message = null;
                     // Remove All element under winleft&winright div
                     __ifxn_removeRsSelectedItemCartWinElement();
@@ -2828,7 +2889,7 @@ HotelTV.ui_appfull = (function() {
                     } finally {
                         if ( _result !=null ) {
                             console.log(`Success to order Roomservice cart::>`);
-                            _str_result_message = _trTbl.ui.roomservice.message.orderSuccess[_state.lang].replace('__MENU__', ____getOrderMenuName());
+                            _str_result_message = _trTbl.ui.roomservice.message.orderSuccess[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
                             _elRsCtgyBgMenuItemCartWinOrderWin.children('#message').text(_str_result_message);
                             _elRsCtgyBgMenuItemCartWinOrderWin.fadeIn(500, async function() {
                                 try{
@@ -2966,7 +3027,6 @@ HotelTV.ui_appfull = (function() {
 
                 case "enter": {
                     if ( _str_curBtnID=='btn_ordernow' ){
-                        console.log("TODO::>> ORDERING NOW...");
                         __ifxn_processRsCartOrder(
                             function() {
                                 //Return to menu
@@ -3111,6 +3171,10 @@ HotelTV.ui_appfull = (function() {
             {
                 case "enter": {
                     _elRsCtgyBgMenuItemWin.find('.rsctgyItem').first().addClass("focus");
+                    //인덱스 및 스크롤 초기화
+                    __rsctgyItemStatus.idx = 0;
+                    __rsctgyItemStatus.scroll_TOfset = 0;
+                    _elRsCtgyBgMenuItemWin.find('.tbl_record').children('#record').animate({ scrollTop: 0 }, 200);
                     __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx);
                 } break;
 
@@ -3134,10 +3198,12 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
-                        __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
 
-                        //스크롤 에니메이션 수행
-                        _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        if ( _elTbl_RsItem.children('#record').find('tr').first().position().top<0 ){
+                            __rsctgyItemStatus.scroll_TOfset -= _elTblTr_RsItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -3164,10 +3230,11 @@ HotelTV.ui_appfull = (function() {
 
                         // 테이블 ROW인덱스와 스크롤 OFFSET계산
                         __rsctgyItemStatus.idx = _elTblTr_RsItemNext.prop('rowIndex');
-                        __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
-
-                        //스크롤 에니메이션 수행
-                        _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        if ( __rsctgyItemStatus.idx>=12 ){
+                            __rsctgyItemStatus.scroll_TOfset += _elTblTr_RsItemNext.prop('scrollHeight');
+                            //스크롤 에니메이션 수행
+                            _elTbl_RsItem.children('#record').animate({ scrollTop: __rsctgyItemStatus.scroll_TOfset }, 200);
+                        }
 
                         __ifxn_updateRsItemDesc(__rsctgyItemStatus.idx, function() {
                             if ( _isNeedSoldOutMask==true ){
@@ -3496,10 +3563,21 @@ HotelTV.ui_appfull = (function() {
                                 _elRsCtgySel.trigger('next.owl', [700]);
                             } else if (event.keyCode == gRmtKey.enter) {
                                 // 카테고리 화면 빌드 및 화면 전환
-                                _state.menu.stage.cur = "roomservice_ctgy_item_sel";
-                                __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_sel");
-                                __uifxn_AppFull_DrawRsItemSeletion("enter");
+                                if ( __status_rs_specific.category_sel.cur in Object.keys(_rsinfo_ctgy) ){
+                                    if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
+                                        console.log("TODO::> NOTIFY cannot enter item sel on CARTS");
+                                    }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
+                                        let __str_notify_msg = _trTbl.ui.roomservice.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
+                                        HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                                    }else{
+                                        _state.menu.stage.cur = "roomservice_ctgy_item_sel";
+                                        __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_sel");
+                                        __uifxn_AppFull_DrawRsItemSeletion("enter");
+                                    }
+                                }
                             } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawRsOrderList('hide');
+
                                 // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
                                 if (_hndl_tmrRoomserviceThumbAni != null) {
                                     clearInterval(_hndl_tmrRoomserviceThumbAni);
@@ -3535,6 +3613,7 @@ HotelTV.ui_appfull = (function() {
                                         $('.main').addClass("depth_mm");
                                         __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
                                         __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
                                     });
                                 }, 500);
                             }
@@ -3543,6 +3622,50 @@ HotelTV.ui_appfull = (function() {
                                 _elRsCtgySel.trigger('prev.owl', [700]);
                             } else if (event.keyCode == gRmtKey.right) {
                                 _elRsCtgySel.trigger('next.owl', [700]);
+                            } else if (event.keyCode == gRmtKey.enter) {
+                                let __str_notify_msg = _trTbl.ui.roomservice.message.invalidCategory[_state.lang].replace('__MENU__', __uifxn_AppFull_getOrderMenuName(_rsinfo_ctgy));
+                                HotelTV.ui_utils.ShowNotificationMsgBalloon(__str_notify_msg, 5);
+                            } else if (event.keyCode == gRmtKey.back) {
+                                __uifxn_AppFull_DrawRsOrderList('hide');
+
+                                // 카테고리 폼의 썸네일 에니메이션용 타이머 제거
+                                if (_hndl_tmrRoomserviceThumbAni != null) {
+                                    clearInterval(_hndl_tmrRoomserviceThumbAni);
+                                    _hndl_tmrRoomserviceThumbAni = null;
+                                    console.log("TMR(ROOMSERVICE CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
+                                }
+                                //카트 비움 및 사용자 가이드 지움.
+                                __ifxn_clrearRsCarts();
+                                __uifxn_AppFull_DrawRsUserGuide("destroy");
+
+                                // 룸서비스 -> 메인 메뉴로 귀환
+                                $(document.activeElement).off('keydown');
+                                _elMainMenu.show(function() {
+                                    $('#lst_mmsel').trigger('translate.owl.carousel', [0]);
+                                });
+
+                                _elRsCtgySel.off('refresh.owl.carousel');
+                                _elRsCtgySel.off('change.owl.carousel');
+                                _elRsCtgySel.off('changed.owl.carousel');
+                                _elRsCtgySel.off('translate.owl.carousel');
+
+                                _elRsCtgyBg.owlCarousel('destroy');
+                                _elRsCtgySel.owlCarousel('destroy');
+
+                                _elRsCtgySel.children('div').remove();
+                                _elRsCtgyBg.children('div').remove();
+                                _elRsPupRoot.children('.bg').hide();
+                                _elRsPupRoot.children('.slider').hide();
+
+                                setTimeout(function() {
+                                    $('.main').fadeIn(1000, () => {
+                                        _state.menu.stage.cur = "main";
+                                        $('.main').addClass("depth_mm");
+                                        __uifxn_AppFull_HotKey_ShowBtnOnMM(true);
+                                        __uifxn_AppFull_TopWidjetShow(true);
+                                        _state.menu.stage.prev = null;
+                                    });
+                                }, 500);
                             }
                         } else if (_state.menu.stage.cur == "roomservice_ctgy_item_sel") {
                             if (event.keyCode == gRmtKey.left) {
@@ -3563,7 +3686,7 @@ HotelTV.ui_appfull = (function() {
                                     _state.menu.stage.cur = "roomservice_ctgy_item_cart";
                                     __uifxn_AppFull_DrawRsUserGuide("roomservice_ctgy_item_cart");
                                 } else {
-                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.system.ott_service_not_ready[_state.lang], 5);
+                                    HotelTV.ui_utils.ShowNotificationMsgBalloon(_trTbl.ui.roomservice.message.notinservice[_state.lang], 5);
                                 }
                             }
                         } else if (_state.menu.stage.cur == "roomservice_ctgy_item_cart") {
@@ -3638,13 +3761,15 @@ HotelTV.ui_appfull = (function() {
                 if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "CARTS" ){
                     console.log("TODO::> Draw Carts");
                 }else if ( _rsinfo_ctgy[__status_rs_specific.category_sel.cur].name == "ORDER" ){
-                    console.log("TODO::> Draw Order");
                     __uifxn_AppFull_DrawRsOrderList('build');
                     _state.menu.stage.prev = _state.menu.stage.cur;
                     _state.menu.stage.cur = "roomservice_ctgy_orderlists";
                 }else{
                     __uifxn_AppFull_DrawRsOrderList('hide');
                     if ( _state.menu.stage.prev!=null ){
+                        if ( _state.menu.stage.prev=="preparing_roomservice" ){
+                            _state.menu.stage.prev="roomservice_ctgy_sel";
+                        }
                         _state.menu.stage.cur = _state.menu.stage.prev;
                     }
                 }
@@ -4302,7 +4427,7 @@ HotelTV.ui_appfull = (function() {
                                 let uri_video = $($('.main .mypage .bg .owl-carousel .owl-item.active .ctz_mv_ctrl')[0]).attr('video_url');
                                 if (uri_video != null) {
                                     _state.menu.stage.prev = _state.menu.stage.cur;
-                                    _state.menu.stage.cur = "mypage_replay_welcome_vod"
+                                    _state.menu.stage.cur = "mypage_replay_welcome_vod";
                                     HotelTV.hcap.MediaPlay(
                                         uri_video,
                                         "",
@@ -5756,58 +5881,38 @@ HotelTV.ui_appfull = (function() {
                 //KEY이벤트 발생이 8초 이내인경우
                 //SHOW USER GUIDE TIPS
                 let show_stages = ["hotkey_mm_red", "hotkey_mm_green", "hotkey_mm_yellow", "hotkey_mm_blue", "main", "sub", "ctzgen", "tvCtgShow", "tvCtgHide", "mypage_select_menu"];
-                let sz_msg = null;
                 if (show_stages.includes(_state.menu.stage.cur) == true) {
+                    const ___ifxn_updateGuideMsg = function(_szMsg) {
+                        if ($('.guide>.tips').attr("value") != _szMsg) {
+                            $('.guide>.tips').attr("value", _szMsg);
+                            $('.guide>.tips').html(_szMsg);
+                        }
+                    }
                     switch (_state.menu.stage.cur) {
                         case "hotkey_mm_red":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                             break;
                         case "hotkey_mm_green":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                             break;
                         case "hotkey_mm_yellow":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                             break;
                         case "hotkey_mm_blue":
-                            sz_msg = _trTbl.ui.guide.navi_brochure[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_brochure[_state.lang]);
                             break;
                         case "main":
-                            //sz_msg = _trTbl.ui.guide.navi_menu[_state.lang] || "";
-                            sz_msg = _trTbl.ui.guide.navi_menu[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_menu[_state.lang]);
                             break;
                         case "sub":
-                            sz_msg = _trTbl.ui.guide.navi_menu[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_menu[_state.lang]);
                             break;
                         case "ctzgen":
-                            sz_msg = _trTbl.ui.guide.navi_ctz[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_ctz[_state.lang]);
                             break;
                         case "tvCtgShow":
                         case "tvCtgHide":
-                            sz_msg = _trTbl.ui.guide.navi_tvchannel[_state.lang];
-                            if ($('.guide>.tips').text() != sz_msg) {
-                                $('.guide>.tips').text(sz_msg);
-                            }
+                            ___ifxn_updateGuideMsg(_trTbl.ui.guide.navi_tvchannel[_state.lang]);
                             break;
                     }
 
@@ -6615,6 +6720,7 @@ HotelTV.ui_appfull = (function() {
                     }
                 } else if (_evt.keyCode == gRmtKey.yellow) {
                     // YELLOW BUTTON
+                    console.log("YELLOW::>");
                     if ("yellow" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
                             if (_state.hotkey.mm.yellow.type == "brochure") {
@@ -6625,10 +6731,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.yellow.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("YELLOW::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.yellow.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("YELLOW::>ROOMSERVICEC");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -6636,6 +6744,7 @@ HotelTV.ui_appfull = (function() {
                         HotelTV.api.ReportEvent([{'power': true, 'location':{'conId':_state.hotkey.mm['yellow'].id}}])
                     }
                 } else if (_evt.keyCode == gRmtKey.blue) {
+                    console.log("BLUE::>");
                     // BLUE BUTTON
                     if ("blue" in _state.hotkey.mm) {
                         $('.guide>.tips').stop().animate({ backgroundColor: "rgba(0,0,0,0.8)" }, 500, function() {
@@ -6647,10 +6756,12 @@ HotelTV.ui_appfull = (function() {
                                 });
                             } else if (_state.hotkey.mm.blue.type == "amenity") {
                                 if (_opening.amenity) {
+                                    console.log("BLUE::>AMENITY");
                                     __uifxn_AppFull_BuildAmenity();
                                 }
                             } else if (_state.hotkey.mm.blue.type == "roomservice") {
                                 if (_opening.roomService) {
+                                    console.log("BLUE::>ROOMSERVICE");
                                     __uifxn_AppFull_BuildRoomservice();
                                 }
                             }
@@ -7013,13 +7124,13 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
-            } else if (_evt == "GUEST-CHECKIN") {
+            } else if (_evt == "COMMAND-GUEST-CHECKIN") {
 
-            } else if (_evt == "GUEST-CHECKOUT") {
+            } else if (_evt == "COMMAND-GUEST-CHECKOUT") {
                 let _tmval = 30;
                 let _state = HotelTV.state;
                 let _trTbl = HotelTV.translation;
@@ -7038,13 +7149,13 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
-            } else if (_evt == "GUEST-UPDATE") {
+            } else if (_evt == "COMMAND-GUEST-UPDATE") {
 
-            } else if (_evt == "GUEST-ROOMCHANGE") {
+            } else if (_evt == "COMMAND-GUEST-ROOMCHANGE") {
                 let _tmval = 30;
                 let _state = HotelTV.state;
                 let _trTbl = HotelTV.translation;
@@ -7063,7 +7174,7 @@ HotelTV.ui_appfull = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });

procentric/application/lib/hoteltv.ui_welcome.js

@@ -147,8 +147,8 @@ HotelTV.ui_welcome = (function() {
      */
     function __uifxn_WC_OnNetEvt(_evt) {
         let _state = HotelTV.state;
-        console.log("network_event_received = " + _evt.eventType);
-        let _typeNetEvt = _evt.eventType;
+        console.log("network_event_received = " + _evt['eventType']);
+        let _typeNetEvt = _evt['eventType'];
 
         switch (_typeNetEvt) {
             case hcap.network.NetworkEventType.ABLE_REACH_DNS:
@@ -385,13 +385,13 @@ HotelTV.ui_welcome = (function() {
                         }
                     }
                 } else if (_state.menu.stage.cur == "playWelcomeMovie") {
-                    if (_evt.keyCode == 413) {
+                    if (_evt.keyCode == gRmtKey.stop) {
                         // STOP KEY Event
                         if (_media_status == 'playing') {
                             _media_status = 'preparing_stop_playing';
                             var _evt = new Event('media_event_received');
-                            _evt.eventType = "play_end_need_destory";
-                            _evt.command_id = "event";
+                            _evt['command_id'] = "media_ctrl_event";
+                            _evt['eventType'] = "play_end_need_destory";
                             document.dispatchEvent(_evt);
                         }
                     } else {
@@ -404,7 +404,7 @@ HotelTV.ui_welcome = (function() {
                                 }, 3000);
                             } else {
                                 const _evt = new Event('media_event_received');
-                                _evt['command_id'] = "media_event_received";
+                                _evt['command_id'] = "media_ctrl_event";
                                 _evt['eventType'] = "play_stop_requtested";
                                 document.dispatchEvent(_evt);
                             }
@@ -479,7 +479,7 @@ HotelTV.ui_welcome = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
@@ -504,7 +504,7 @@ HotelTV.ui_welcome = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });
@@ -529,7 +529,7 @@ HotelTV.ui_welcome = (function() {
                             $('.error #countdown #message').text(`System will be shutdown in ${_tmval} second...`);
                         },
                         "cb_eoe": function() {
-                            setTimeout(HotelTV.hcap.PwrOff(), 500);
+                            setTimeout(HotelTV.hcap.PwrOff, 500);
                             HotelTV.api.ReportEvent([{'power': false, 'location':null}])
                         }
                     });

procentric/application/theme/HJS00001/hoteltv.app.full.popup.css

@@ -125,7 +125,7 @@
     width: 15px;
     border: 2px solid rgba(80, 80, 80, 0.8);
     filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }
 
 
@@ -225,7 +225,7 @@
     width: 15px;
     border: 2px solid rgba(80, 80, 80, 0.8);
     filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }
 
 
@@ -325,7 +325,7 @@
     width: 15px;
     border: 2px solid rgba(80, 80, 80, 0.8);
     filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }
 
 
@@ -425,7 +425,7 @@
     width: 15px;
     border: 2px solid rgba(80, 80, 80, 0.8);
     filter: drop-shadow(0 1px 2px rgb(0, 0, 0));
-    background: none;
+    /* background: none; */
 }
 
 
@@ -535,7 +535,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#title {
-    width: 45%;
+    width: 42%;
     float: left;
     /* text-align: left; */
     padding: 0 0px 0 20px;
@@ -547,7 +547,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_header tbody tr>#status {
-    width: 35%;
+    width: 38%;
     float: left;
     padding: 0px 30px 0 0px;
 }
@@ -564,7 +564,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
     overflow-y: auto;
     display: block;
 }
@@ -610,7 +610,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#title {
-    width: 45%;
+    width: 42%;
     float: left;
     padding: 0px 0px 0px 20px;
     text-overflow: ellipsis;
@@ -624,7 +624,7 @@
 }
 
 .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#status {
-    width: 35%;
+    width: 38%;
     float: left;
     /* text-align: right; */
     padding: 0px 30px 0 0px;
@@ -828,7 +828,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -849,7 +849,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -892,7 +892,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -1055,6 +1055,8 @@
     width: 50%;
     float: left;
     padding: 0px 0px 0px 20px;
+    text-overflow: ellipsis;
+    overflow: hidden;
 }
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.cart_table>.tbl_record tbody tr>.cartItem>#quantity {
@@ -1109,7 +1111,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1120,7 +1122,7 @@
 
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1128,7 +1130,7 @@
 }
 
 .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1290,8 +1292,9 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
-    color: rgb(245,245,245);
+    padding: 0px 20px 0px 48px;
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
     line-height: 32px;
     font-size: 32px;
     z-index: 1;
@@ -1539,7 +1542,7 @@
     height: 65px;
     width: 96%;
     margin: 12px 2% 0px 2%;
-    padding: 4px 2% 0px 2%;
+    padding: 18px 2% 0px 2%;
     display: flex;
     float: left;
     flex-direction: row;
@@ -1550,7 +1553,7 @@
 
 
 .popup .amenity .order .winleft>.summary>#label{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100px;
     font-size: 48px;
@@ -1558,7 +1561,7 @@
 }
 
 .popup .amenity .order .winleft>.summary>#value{
-    line-height: 65px;
+    line-height: 40px;
     width: 50%;
     height: 100%;
     font-size: 52px;
@@ -1714,7 +1717,7 @@
 }
 
 .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody {
-    /* height: 285px; */
+    height: 670px;
     overflow-y: auto;
     display: block;
 }
@@ -1978,7 +1981,7 @@
     line-height: 137px;
     width: 50%;
     height: 60%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
     background-image: url(./images/quantity_edit_arrow.png);
@@ -1999,7 +2002,7 @@
     line-height: 91px;
     width: 50%;
     height: 40%;
-    font-size: 52px;
+    font-size: 40px;
     text-align: center;
     color: rgba(218,165,32,1.0);
 }
@@ -2042,7 +2045,7 @@
     padding: 0px 30px 0px 30px;
     overflow: hidden;
     text-align: center;
-    font-size: 32px;
+    font-size: 38px;
     color: rgba(51,51,51,1.0);
 }
 
@@ -2440,8 +2443,9 @@
     width: 100%;
     height: 132px;
     margin: 0;
-    padding: 0px 20px 0px 20px;
-    color: rgb(245,245,245);
+    padding: 0px 20px 0px 48px;
+    /* color: rgb(245,245,245); */
+    color: rgb(181, 218, 16);
     line-height: 32px;
     font-size: 32px;
     z-index: 1;

procentric/application/wellcome.html

@@ -7,7 +7,6 @@
     <link rel="stylesheet" href="/procentric/application/css/owlcarousel/owl.theme.default.min.css">
     <link rel="stylesheet" href="/procentric/application/theme/hoteltv.ui_utils.css">
     <link rel="stylesheet" href="/procentric/application/theme/hoteltv.error.css">
-    <!-- <link rel="stylesheet" href="hoteltv.welcome.css"> -->
     <title>CENTIRM LG-PROCENTRIC HOTEL SERVICE</title>
 </head>