sysadmin/ct-dtv-hx0100-002kwos
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

issue #11 Done Amenity&Room service renewal

Browse Source
This commit is contained in:
Paul Kim
2024-03-18 17:46:56 +09:00
parent 67983df543
commit 91e52f331c
3 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
procentric/application/lib/hoteltv.api.js
View File

@@ -148,7 +148,7 @@ HotelTV.api = (function() {
} }
xhr.onload = function() { xhr.onload = function() {
if (xhr.status === 200 || xhr.status === 201) { if (xhr.status === 200 || xhr.status === 201 || xhr.status === 204) {
_ret.error = false; _ret.error = false;
_ret.data = xhr.response; _ret.data = xhr.response;
resolve(_ret); resolve(_ret);
@@ -556,15 +556,15 @@ HotelTV.api = (function() {
* HotelTV API ::> delete amenity carts info * HotelTV API ::> delete amenity carts info
* @param {string} _cart_id * @param {string} _cart_id
* @returns * @returns
* null: if _item_id isn't null it will return specified info with _item_id * null: 성공하면 리턴값 없음.
* {dictionary} * {dictionary}
*/ */
DeleteAmenityCarts: function(_cart_id) { DeleteAmenityCarts: function(_cart_id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let sz_api_url = __apifxn_get_api_url("delete_carts_amenity"); let sz_api_url = __apifxn_get_api_url("delete_carts_amenity");
__apifxn_CallCmsApi("DELETE", `${sz_api_url}/${_cart_id}`, "DeleteAmenityCarts", null).then(_result => { __apifxn_CallCmsApi("DELETE",_cart_id==null ? `${sz_api_url}` : `${sz_api_url}/${_cart_id}`, "DeleteAmenityCarts", null).then(_result => {
//console.log(`Success::>${_result.data}`); //console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data)); resolve();
}).catch(_error => { }).catch(_error => {
console.error(`Failure::>${_error.reason}`); console.error(`Failure::>${_error.reason}`);
reject(_error.reason); reject(_error.reason);
@@ -704,9 +704,9 @@ HotelTV.api = (function() {
DeleteRoomserviceCarts: function(_cart_id) { DeleteRoomserviceCarts: function(_cart_id) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let sz_api_url = __apifxn_get_api_url("delete_carts_roomservice"); let sz_api_url = __apifxn_get_api_url("delete_carts_roomservice");
__apifxn_CallCmsApi("DELETE", `${sz_api_url}/${_cart_id}`, "DeleteRoomserviceCarts", null).then(_result => { __apifxn_CallCmsApi("DELETE", _cart_id==null ? `${sz_api_url}` : `${sz_api_url}/${_cart_id}`, "DeleteRoomserviceCarts", null).then(_result => {
//console.log(`Success::>${_result.data}`); //console.log(`Success::>${_result.data}`);
resolve(JSON.parse(_result.data)); resolve();
}).catch(_error => { }).catch(_error => {
console.error(`Failure::>${_error.reason}`); console.error(`Failure::>${_error.reason}`);
reject(_error.reason); reject(_error.reason);

56
procentric/application/lib/hoteltv.ui_appfull.js
View File

@@ -591,7 +591,7 @@ HotelTV.ui_appfull = (function() {
/** /**
* HotelTV UI[AppFull] Wrapper Function::> register hotkey for amenity service * HotelTV UI[AppFull] Wrapper Function::> register hotkey for amenity service
*/ */
function __uifxn_AppFull_HotKey_RegisterAmenity() { function __uifxn_AppFull_HotKey_RegisterAmenityRoomservice() {
let _state = HotelTV.state; let _state = HotelTV.state;
let _opening = HotelTV.opening; let _opening = HotelTV.opening;
let _amenity = null; let _amenity = null;
@@ -858,7 +858,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_ItmesRecAmount = document.createElement('div'); var _elDiv_ItmesRecAmount = document.createElement('div');
_elDiv_ItmesRecAmount.setAttribute("id", "amount"); _elDiv_ItmesRecAmount.setAttribute("id", "amount");
_elDiv_ItmesRecAmount.textContent = _objItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]; _elDiv_ItmesRecAmount.textContent = _aminfo_top.currency[_state.lang] + _objItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_ItmesRec.appendChild(_elDiv_ItmesRecAmount); _elDiv_ItmesRec.appendChild(_elDiv_ItmesRecAmount);
@@ -881,7 +881,7 @@ HotelTV.ui_appfull = (function() {
_elDiv_Summary.appendChild(_elDiv_Label); _elDiv_Summary.appendChild(_elDiv_Label);
var _elDiv_Value = document.createElement('div'); var _elDiv_Value = document.createElement('div');
_elDiv_Value.setAttribute("id", "value"); _elDiv_Value.setAttribute("id", "value");
_elDiv_Value.textContent = _order.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]; _elDiv_Value.textContent = _aminfo_top.currency[_state.lang] + _order.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_Summary.appendChild(_elDiv_Value); _elDiv_Summary.appendChild(_elDiv_Value);
_elAmOrderWinleft.append(_elDiv_Summary); _elAmOrderWinleft.append(_elDiv_Summary);
@@ -1022,7 +1022,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_CartItmesRecPrice = document.createElement('div'); var _elDiv_CartItmesRecPrice = document.createElement('div');
_elDiv_CartItmesRecPrice.setAttribute("id", "amount"); _elDiv_CartItmesRecPrice.setAttribute("id", "amount");
_elDiv_CartItmesRecPrice.textContent = _objCartItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]; _elDiv_CartItmesRecPrice.textContent = _aminfo_top.currency[_state.lang] + _objCartItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_CartItmesRec.appendChild(_elDiv_CartItmesRecPrice); _elDiv_CartItmesRec.appendChild(_elDiv_CartItmesRecPrice);
_elTr_CartItmesRec.appendChild(_elDiv_CartItmesRec); _elTr_CartItmesRec.appendChild(_elDiv_CartItmesRec);
@@ -1032,7 +1032,7 @@ HotelTV.ui_appfull = (function() {
// 전체 금액 갱신 // 전체 금액 갱신
let _elAmCtgyBgMenuItemCartTotalAmountValue = _elAmCtgyBgMenuItemCartWinRight.find('.summary').children('#value'); let _elAmCtgyBgMenuItemCartTotalAmountValue = _elAmCtgyBgMenuItemCartWinRight.find('.summary').children('#value');
_elAmCtgyBgMenuItemCartTotalAmountValue.text(_carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]); _elAmCtgyBgMenuItemCartTotalAmountValue.text( _aminfo_top.currency[_state.lang] + _carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","));
} }
} catch ( _err ){ } catch ( _err ){
console.log(`Fail to update::> ${_err}`); console.log(`Fail to update::> ${_err}`);
@@ -1076,7 +1076,7 @@ HotelTV.ui_appfull = (function() {
console.log("error"); console.log("error");
__selected_item_amount_subTotal = "Error"; __selected_item_amount_subTotal = "Error";
} else { } else {
__selected_item_amount_subTotal = __api_resp['amount'][_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]; __selected_item_amount_subTotal = _aminfo_top.currency[_state.lang] + __api_resp['amount'][_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
} }
if ( _elDiv_QuntCtrlFrmAmountValue.length ){ if ( _elDiv_QuntCtrlFrmAmountValue.length ){
@@ -1214,7 +1214,7 @@ HotelTV.ui_appfull = (function() {
let _elDiv_CartWinSummary = document.createElement('div'); let _elDiv_CartWinSummary = document.createElement('div');
_elDiv_CartWinSummary.className = "summary"; _elDiv_CartWinSummary.className = "summary";
_elDiv_CartWinSummary.innerHTML = `<div id="label">${_trTbl.ui.amenity.title.sum[_state.lang].toUpperCase()}</div>`; _elDiv_CartWinSummary.innerHTML = `<div id="label">${_trTbl.ui.amenity.title.sum[_state.lang].toUpperCase()}</div>`;
_elDiv_CartWinSummary.innerHTML += `<div id="value">${_carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]}</div>`; _elDiv_CartWinSummary.innerHTML += `<div id="value">${_aminfo_top.currency[_state.lang] + _carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}</div>`;
_elAmCtgyBgMenuItemCartWinRight.append(_elDiv_CartWinSummary); _elAmCtgyBgMenuItemCartWinRight.append(_elDiv_CartWinSummary);
} }
} }
@@ -1719,6 +1719,15 @@ HotelTV.ui_appfull = (function() {
let _elAmCtgySel = _elAmPupRoot.children('.slider').find('#lst_ctgsel'); let _elAmCtgySel = _elAmPupRoot.children('.slider').find('#lst_ctgsel');
let _elAmUGRoot = _elAmPupRoot.children('.use_guide'); let _elAmUGRoot = _elAmPupRoot.children('.use_guide');
const __ifxn_clrearAmCarts = async function() {
try {
_result = await HotelTV.api.DeleteAmenityCarts(null);
HotelTV.carts.amenity = await HotelTV.api.GetAmenityCarts(null);
} catch ( __err ){
console.log("CALL API::>" + __err);
}
}
// 어메니티 인포 Validation // 어메니티 인포 Validation
if (!_opening.amenity) { if (!_opening.amenity) {
@@ -1871,7 +1880,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_ItmesRecPrice = document.createElement('div'); var _elDiv_ItmesRecPrice = document.createElement('div');
_elDiv_ItmesRecPrice.setAttribute("id", "price"); _elDiv_ItmesRecPrice.setAttribute("id", "price");
_elDiv_ItmesRecPrice.textContent = _objItem.price[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _aminfo_top.currency[_state.lang]; _elDiv_ItmesRecPrice.textContent = _aminfo_top.currency[_state.lang] + _objItem.price[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_ItmesRec.appendChild(_elDiv_ItmesRecPrice); _elDiv_ItmesRec.appendChild(_elDiv_ItmesRecPrice);
@@ -2014,6 +2023,8 @@ HotelTV.ui_appfull = (function() {
console.log("TMR(AMENITY CATEGORY CTZ ANI For Thumbnail)::>Destoried..."); console.log("TMR(AMENITY CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
} }
//카트 비움 및 사용자 가이드 지움.
__ifxn_clrearAmCarts();
__uifxn_AppFull_DrawAmUserGuide("destroy"); __uifxn_AppFull_DrawAmUserGuide("destroy");
// 어메니티 -> 메인 메뉴로 귀환 // 어메니티 -> 메인 메뉴로 귀환
@@ -2330,7 +2341,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_ItmesRecAmount = document.createElement('div'); var _elDiv_ItmesRecAmount = document.createElement('div');
_elDiv_ItmesRecAmount.setAttribute("id", "amount"); _elDiv_ItmesRecAmount.setAttribute("id", "amount");
_elDiv_ItmesRecAmount.textContent = _objItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]; _elDiv_ItmesRecAmount.textContent = _rsinfo_top.currency[_state.lang] + _objItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_ItmesRec.appendChild(_elDiv_ItmesRecAmount); _elDiv_ItmesRec.appendChild(_elDiv_ItmesRecAmount);
@@ -2353,7 +2364,7 @@ HotelTV.ui_appfull = (function() {
_elDiv_Summary.appendChild(_elDiv_Label); _elDiv_Summary.appendChild(_elDiv_Label);
var _elDiv_Value = document.createElement('div'); var _elDiv_Value = document.createElement('div');
_elDiv_Value.setAttribute("id", "value"); _elDiv_Value.setAttribute("id", "value");
_elDiv_Value.textContent = _order.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]; _elDiv_Value.textContent = _rsinfo_top.currency[_state.lang] + _order.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_Summary.appendChild(_elDiv_Value); _elDiv_Summary.appendChild(_elDiv_Value);
_elRsOrderWinleft.append(_elDiv_Summary); _elRsOrderWinleft.append(_elDiv_Summary);
@@ -2494,7 +2505,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_CartItmesRecPrice = document.createElement('div'); var _elDiv_CartItmesRecPrice = document.createElement('div');
_elDiv_CartItmesRecPrice.setAttribute("id", "amount"); _elDiv_CartItmesRecPrice.setAttribute("id", "amount");
_elDiv_CartItmesRecPrice.textContent = _objCartItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]; _elDiv_CartItmesRecPrice.textContent = _rsinfo_top.currency[_state.lang] + _objCartItem.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") ;
_elDiv_CartItmesRec.appendChild(_elDiv_CartItmesRecPrice); _elDiv_CartItmesRec.appendChild(_elDiv_CartItmesRecPrice);
_elTr_CartItmesRec.appendChild(_elDiv_CartItmesRec); _elTr_CartItmesRec.appendChild(_elDiv_CartItmesRec);
@@ -2504,7 +2515,7 @@ HotelTV.ui_appfull = (function() {
// 전체 금액 갱신 // 전체 금액 갱신
let _elRsCtgyBgMenuItemCartTotalAmountValue = _elRsCtgyBgMenuItemCartWinRight.find('.summary').children('#value'); let _elRsCtgyBgMenuItemCartTotalAmountValue = _elRsCtgyBgMenuItemCartWinRight.find('.summary').children('#value');
_elRsCtgyBgMenuItemCartTotalAmountValue.text(_carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]); _elRsCtgyBgMenuItemCartTotalAmountValue.text(_rsinfo_top.currency[_state.lang] + _carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","));
} }
} catch ( _err ){ } catch ( _err ){
console.log(`Fail to update::> ${_err}`); console.log(`Fail to update::> ${_err}`);
@@ -2548,7 +2559,7 @@ HotelTV.ui_appfull = (function() {
console.log("error"); console.log("error");
__selected_item_amount_subTotal = "Error"; __selected_item_amount_subTotal = "Error";
} else { } else {
__selected_item_amount_subTotal = __api_resp['amount'][_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]; __selected_item_amount_subTotal = _rsinfo_top.currency[_state.lang] + __api_resp['amount'][_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
} }
if ( _elDiv_QuntCtrlFrmAmountValue.length ){ if ( _elDiv_QuntCtrlFrmAmountValue.length ){
@@ -2686,7 +2697,7 @@ HotelTV.ui_appfull = (function() {
let _elDiv_CartWinSummary = document.createElement('div'); let _elDiv_CartWinSummary = document.createElement('div');
_elDiv_CartWinSummary.className = "summary"; _elDiv_CartWinSummary.className = "summary";
_elDiv_CartWinSummary.innerHTML = `<div id="label">${_trTbl.ui.roomservice.title.sum[_state.lang].toUpperCase()}</div>`; _elDiv_CartWinSummary.innerHTML = `<div id="label">${_trTbl.ui.roomservice.title.sum[_state.lang].toUpperCase()}</div>`;
_elDiv_CartWinSummary.innerHTML += `<div id="value">${_carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]}</div>`; _elDiv_CartWinSummary.innerHTML += `<div id="value">${_rsinfo_top.currency[_state.lang] + _carts.amount[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}</div>`;
_elRsCtgyBgMenuItemCartWinRight.append(_elDiv_CartWinSummary); _elRsCtgyBgMenuItemCartWinRight.append(_elDiv_CartWinSummary);
} }
} }
@@ -3192,6 +3203,16 @@ HotelTV.ui_appfull = (function() {
let _elRsUGRoot = _elRsPupRoot.children('.use_guide'); let _elRsUGRoot = _elRsPupRoot.children('.use_guide');
const __ifxn_clrearRsCarts = async function() {
try {
await HotelTV.api.DeleteRoomserviceCarts(null);
HotelTV.carts.roomservice = await HotelTV.api.GetRoomserviceCarts(null);
} catch ( __err ){
console.log("CALL API::>" + __err);
}
}
// 룸서비스 인포 Validation // 룸서비스 인포 Validation
if (!_opening.roomService) { if (!_opening.roomService) {
return; return;
@@ -3343,7 +3364,7 @@ HotelTV.ui_appfull = (function() {
var _elDiv_ItmesRecPrice = document.createElement('div'); var _elDiv_ItmesRecPrice = document.createElement('div');
_elDiv_ItmesRecPrice.setAttribute("id", "price"); _elDiv_ItmesRecPrice.setAttribute("id", "price");
_elDiv_ItmesRecPrice.textContent = _objItem.price[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") + _rsinfo_top.currency[_state.lang]; _elDiv_ItmesRecPrice.textContent = _rsinfo_top.currency[_state.lang] + _objItem.price[_state.lang].toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
_elDiv_ItmesRec.appendChild(_elDiv_ItmesRecPrice); _elDiv_ItmesRec.appendChild(_elDiv_ItmesRecPrice);
@@ -3485,7 +3506,8 @@ HotelTV.ui_appfull = (function() {
_hndl_tmrRoomserviceThumbAni = null; _hndl_tmrRoomserviceThumbAni = null;
console.log("TMR(ROOMSERVICE CATEGORY CTZ ANI For Thumbnail)::>Destoried..."); console.log("TMR(ROOMSERVICE CATEGORY CTZ ANI For Thumbnail)::>Destoried...");
} }
//카트 비움 및 사용자 가이드 지움.
__ifxn_clrearRsCarts();
__uifxn_AppFull_DrawRsUserGuide("destroy"); __uifxn_AppFull_DrawRsUserGuide("destroy");
// 룸서비스 -> 메인 메뉴로 귀환 // 룸서비스 -> 메인 메뉴로 귀환
@@ -6442,7 +6464,7 @@ HotelTV.ui_appfull = (function() {
__uifxn_AppFull_BuildBrochure(); __uifxn_AppFull_BuildBrochure();
//Register Amenity&Room service hotkey //Register Amenity&Room service hotkey
__uifxn_AppFull_HotKey_RegisterAmenity(); __uifxn_AppFull_HotKey_RegisterAmenityRoomservice();
//위젯 표시 //위젯 표시
$('.widjet').show(); $('.widjet').show();

8
procentric/application/theme/HJS00001/hoteltv.app.full.popup.css
View File

@@ -613,6 +613,8 @@
width: 45%; width: 45%;
float: left; float: left;
padding: 0px 0px 0px 20px; padding: 0px 0px 0px 20px;
text-overflow: ellipsis;
overflow: hidden;
} }
.popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#price { .popup .amenity .bg .am_item_sel_win .winleft>.tbl_record tbody tr>.amctgyItem>#price {
@@ -984,6 +986,8 @@
float: left; float: left;
/* text-align: left; */ /* text-align: left; */
padding: 0 0px 0 20px; padding: 0 0px 0 20px;
text-overflow: ellipsis;
overflow: hidden;
} }
.popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.cart_table>.tbl_header tbody tr>#quantity { .popup .amenity .bg .owl-carousel .owl-stage .am_item_sel_cart_win .winright>.cart_table>.tbl_header tbody tr>#quantity {
@@ -1759,6 +1763,8 @@
width: 45%; width: 45%;
float: left; float: left;
padding: 0px 0px 0px 20px; padding: 0px 0px 0px 20px;
text-overflow: ellipsis;
overflow: hidden;
} }
.popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody tr>.rsctgyItem>#price { .popup .roomservice .bg .rs_item_sel_win .winleft>.tbl_record tbody tr>.rsctgyItem>#price {
@@ -2197,6 +2203,8 @@
width: 50%; width: 50%;
float: left; float: left;
padding: 0px 0px 0px 20px; padding: 0px 0px 0px 20px;
text-overflow: ellipsis;
overflow: hidden;
} }
.popup .roomservice .bg .owl-carousel .owl-stage .rs_item_sel_cart_win .winright>.cart_table>.tbl_record tbody tr>.cartItem>#quantity { .popup .roomservice .bg .owl-carousel .owl-stage .rs_item_sel_cart_win .winright>.cart_table>.tbl_record tbody tr>.cartItem>#quantity {