|
|
@@ -101,24 +101,11 @@
|
|
|
<h4>배송정보</h4>
|
|
|
<div id="gridDeliveryAddrInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
|
|
|
|
|
|
- <table style="width:100%;">
|
|
|
- <colgroup>
|
|
|
- <col style="width:65%;"/>
|
|
|
- <col/>
|
|
|
- </colgroup>
|
|
|
- <tbody>
|
|
|
- <tr>
|
|
|
- <td style="width:916px;display:inline-block">
|
|
|
- <h4>결제정보</h4>
|
|
|
- <div id="gridPaymentInfo" style="width:100%; height: 100px;" class="ag-theme-balham"></div>
|
|
|
- </td>
|
|
|
- <td style="">
|
|
|
- <h4>배송비정보</h4>
|
|
|
- <div id="gridDeliveryFeeInfo" style="width:100%; height: 100px;" class="ag-theme-balham"></div>
|
|
|
- </td>
|
|
|
- <tr>
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
+ <h4>배송비정보</h4>
|
|
|
+ <div id="gridDeliveryFeeInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
|
|
|
+
|
|
|
+ <h4>결제정보</h4>
|
|
|
+ <div id="gridPaymentInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
|
|
|
|
|
|
<div id="wrapOrderChange">
|
|
|
<h4>(취소/반품/교환) 요청 정보</h4>
|
|
|
@@ -136,28 +123,6 @@
|
|
|
<div id="gridOrderMemoInfo" style="width:100%; height: 100px;" class="ag-theme-balham"></div>
|
|
|
</div>
|
|
|
|
|
|
- <!--
|
|
|
- <table style="width:100%;">
|
|
|
- <colgroup>
|
|
|
- <col style="width:65%;"/>
|
|
|
- <col/>
|
|
|
- </colgroup>
|
|
|
- <tbody>
|
|
|
- <tr>
|
|
|
- <td style="width:916px;display:inline-block">
|
|
|
- <h4>상담내역</h4>
|
|
|
- <div id="gridOrderCounselInfo" style="width:100%; height: 100px;" class="ag-theme-balham"></div>
|
|
|
- </td>
|
|
|
- <td style="">
|
|
|
- <h4>관리자메모</h4>
|
|
|
- <button type="button" id="btnCreateOrderMemo" class="btn btnRight btn-base btn-sm" style="margin-left:10px;"> +</button>
|
|
|
- <div id="gridOrderMemoInfo" style="width:100%; height: 100px;" class="ag-theme-balham"></div>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- </tbody>
|
|
|
- </table>
|
|
|
- -->
|
|
|
-
|
|
|
</form>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -182,6 +147,8 @@ var allCanYn = [[${allCanYn}]]; // 배송지수정가능여부
|
|
|
var orderGoodsCnt = [[${orderGoodsInfo.size()}]]; // 주문상세정보
|
|
|
var orderFreeGiftCnt = [[${orderFreeGiftInfo.size()}]]; // 주문사은품정보
|
|
|
var orderDeliveryAddrCnt = [[${orderDeliveryAddrInfo.size()}]]; // 배송정보
|
|
|
+var orderDeliveryFeeCnt = [[${orderDeliveryFeeInfo.size()}]]; // 배송비정보
|
|
|
+var orderPaymentCnt = [[${orderPaymentInfo.size()}]]; // 결제정보
|
|
|
var orderChangeCnt = [[${orderChangeInfo.size()}]]; // 취소/반품/교환요청 정보
|
|
|
var orderRefundCnt = [[${orderRefundInfo.size()}]]; // 환불정보
|
|
|
var roleCd = [[${sessionInfo.roleCd}]]; // 권한코드
|
|
|
@@ -189,7 +156,7 @@ var roleCd = [[${sessionInfo.roleCd}]]; // 권한코드
|
|
|
// 2021.05.12
|
|
|
var hiddenTemp = true;
|
|
|
if (userNo == "24" || userNo == "33" || userNo == "8") {
|
|
|
- hiddenTemp = false;
|
|
|
+// hiddenTemp = false;
|
|
|
}
|
|
|
|
|
|
</script>
|
|
|
@@ -511,7 +478,9 @@ var columnDefsGoodsInfo = [
|
|
|
}
|
|
|
},
|
|
|
{headerName: "출고처" , field: "delvLocNm" , width: 120, cellClass: 'text-center'},
|
|
|
- {headerName: "배송지번호" , field: "delvAddrSq" , width: 120, cellClass: 'text-center'}
|
|
|
+ {headerName: "배송지번호" , field: "delvAddrSq" , width: 120, cellClass: 'text-center'},
|
|
|
+ {headerName: "업체명" , field: "supplyCompNm" , width: 180, cellClass: 'text-center'},
|
|
|
+ {headerName: "배송정책코드", field: "delvFeeCdGrp" , width: 120, cellClass: 'text-center'}
|
|
|
]
|
|
|
}
|
|
|
];
|
|
|
@@ -698,11 +667,11 @@ var gridOptionsPaymentInfo = gagaAgGrid.getGridOptions(columnDefsPaymentInfo);
|
|
|
|
|
|
// 5.배송비
|
|
|
var columnDefsDeliveryFeeInfo = [
|
|
|
- {headerName: "배송비종류" , field: "delvFeeGbNm", width: 120, cellClass: 'text-center'},
|
|
|
+ {headerName: "배송비종류" , field: "delvFeeGbNm", width: 150, cellClass: 'text-center'},
|
|
|
{
|
|
|
headerName : "배송비"
|
|
|
, field : "delvFee"
|
|
|
- , width : 100
|
|
|
+ , width : 120
|
|
|
, cellClass : 'text-right'
|
|
|
, valueFormatter : function (params) {
|
|
|
return params.value.addComma();
|
|
|
@@ -717,10 +686,19 @@ var columnDefsDeliveryFeeInfo = [
|
|
|
return params.value.addComma();
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ headerName : "상품권사용배송비"
|
|
|
+ , field : "delvGfcdUseAmt"
|
|
|
+ , width : 120
|
|
|
+ , cellClass : 'text-right'
|
|
|
+ , valueFormatter : function (params) {
|
|
|
+ return params.value.addComma();
|
|
|
+ }
|
|
|
+ },
|
|
|
{
|
|
|
headerName : "실제배송비"
|
|
|
, field : "realDelvAmt"
|
|
|
- , width : 100
|
|
|
+ , width : 120
|
|
|
, cellClass : 'text-right'
|
|
|
, valueFormatter : function (params) {
|
|
|
return params.value.addComma();
|
|
|
@@ -730,12 +708,14 @@ var columnDefsDeliveryFeeInfo = [
|
|
|
{
|
|
|
headerName : "배송비정산일시"
|
|
|
, field : "delvUsacDt"
|
|
|
- , width : 140
|
|
|
+ , width : 150
|
|
|
, cellClass : 'text-center'
|
|
|
, cellRenderer: function(params) {
|
|
|
return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
|
|
|
}
|
|
|
- }
|
|
|
+ },
|
|
|
+ {headerName: "업체명" , field: "supplyCompNm", width: 180, cellClass: 'text-center'},
|
|
|
+ {headerName: "배송정책코드" , field: "delvFeeCd", width: 120, cellClass: 'text-center'}
|
|
|
];
|
|
|
var gridOptionsDeliveryFeeInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryFeeInfo);
|
|
|
|
|
|
@@ -776,19 +756,24 @@ var columnDefsOrderChangeInfo = [
|
|
|
*/
|
|
|
|
|
|
// 2021.06.29 변경구분값으로 변경
|
|
|
- // 취소요청
|
|
|
- if (params.data.chgGb == "G680_20") {
|
|
|
- rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
- }
|
|
|
- // 반품요청
|
|
|
- else if (params.data.chgGb == "G680_30") {
|
|
|
- rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
- }
|
|
|
- // 교환요청
|
|
|
- else if (params.data.chgGb == "G680_40") {
|
|
|
- rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
- }
|
|
|
- else {
|
|
|
+ // 2021.07.19 as-is 변경정보는 TB_ORDER_DETAIL_ITEM_HST 정보가 존재하지 않음
|
|
|
+ if (params.data.chgItemCnt > 0) {
|
|
|
+ // 취소요청
|
|
|
+ if (params.data.chgGb == "G680_20") {
|
|
|
+ rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
+ }
|
|
|
+ // 반품요청
|
|
|
+ else if (params.data.chgGb == "G680_30") {
|
|
|
+ rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
+ }
|
|
|
+ // 교환요청
|
|
|
+ else if (params.data.chgGb == "G680_40") {
|
|
|
+ rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ rtnStr = params.value;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
rtnStr = params.value;
|
|
|
}
|
|
|
|
|
|
@@ -1050,6 +1035,8 @@ $(document).ready(function () {
|
|
|
var orderDeliveryAddrHeight = 40 + (38 * orderDeliveryAddrCnt);
|
|
|
var orderChangeHeight = 40 + (38 * orderChangeCnt);
|
|
|
var orderRefundHeight = 40 + (38 * orderRefundCnt);
|
|
|
+ var orderDeliveryFeeHeight = 40 + (38 * orderDeliveryFeeCnt);
|
|
|
+ var orderPaymentHeight = 40 + (38 * orderPaymentCnt);
|
|
|
|
|
|
$("#gridOrderGoodsInfo").css("height" , orderGoodsHeight+"px");
|
|
|
$("#gridOrderFreeGiftInfo").css("height" , orderFreeGiftHeight+"px");
|
|
|
@@ -1057,6 +1044,9 @@ $(document).ready(function () {
|
|
|
$("#gridOrderChangeInfo").css("height" , orderChangeHeight+"px");
|
|
|
$("#gridOrderRefundInfo").css("height" , orderRefundHeight+"px");
|
|
|
|
|
|
+ $("#gridDeliveryFeeInfo").css("height" , orderDeliveryFeeHeight+"px");
|
|
|
+ $("#gridPaymentInfo").css("height" , orderPaymentHeight+"px");
|
|
|
+
|
|
|
$('#orderDetailContents').css("width", "97%").css("height", "96%");
|
|
|
|
|
|
// 메모등록
|
|
|
@@ -1388,7 +1378,6 @@ var fnSweetTracker = function (shipCompCd, invoiceNo) {
|
|
|
|
|
|
};
|
|
|
|
|
|
-
|
|
|
// 카드전표 영수증 조회
|
|
|
var fnReceiptPage = function (tid) {
|
|
|
var fullUrl = "https://npg.nicepay.co.kr/issue/IssueLoader.do?TID=" + tid + "&type=0";
|
eskim