Merge remote-tracking branch 'origin/jsh77b' into xodud1202

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -32,20 +32,6 @@
 	<!-- 고객정보 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
-			<tr style="height:30px;">
-				<th>custNm</th>
-				<th>email</th>
-				<th>cellPhnno</th>
-				<th>recipNm</th>
-				<th>recipPhnno</th>
-				<th>recipZipcode</th>
-				<th>recipBaseAddr</th>
-				<th>recipDtlAddr</th>
-				<th>delvMemo</th>
-				<th>sexGb</th>
-				<th>birthYmd</th>
-				<th>giftPackYn</th>
-			</tr>
 			<tr style="height:30px;">
 				<td class="custNm"></td>
 				<td class="email"></td>
@@ -66,12 +52,6 @@
 	
 	<!-- 사은품정보 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
-		<tr style="height:30px;">
-			<th>freegiftValArr</th>
-			<th>freegiftUsePointArr</th>
-			<th>freegiftSqArr</th>
-			<th>freegiftGoodsArr</th>
-		</tr>
 		<tr style="height:30px;">
 			<td class="freegiftValArr"></td>
 			<td class="freegiftUsePointArr"></td>
@@ -83,43 +63,6 @@
 	
 	<!-- 주문상세금액 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
-		<tr style="height:30px;">
-			<th>cartSq</th>
-			<th style="display:none">goodsNm</th>
-			<th>goodsCd</th>
-			<th>goodsType</th>
-			<th>itemCd</th>
-			<th>optCd</th>
-			<th style="display:none">optCd1</th>
-			<th style="display:none">optCd2</th>
-			<th style="display:none">itemQtyr</th>
-			<th>orgCurrPrice</th>
-			<th>cpn1CpnSq</th>
-			<th>cpn1DcAmt</th>
-			<th>optAddPrice</th>
-			<th>goodsQty</th>
-			<th>ordAmt</th>
-			<th>tmtb1Sq</th>
-			<th>tmtb1DcAmt</th>
-			<th>tmtb2Sq</th>
-			<th>tmtb2DcAmt</th>
-			<th>goodsCpnSq</th>
-			<th>goodsCpnDcAmt</th>
-			<th>cartCpnSq</th>
-			<th>cartCpnDcAmt</th>
-			<th>prePntDcAmt1</th>
-			<th>dcSumAmt</th>
-			<th>pntDcAmt1</th>
-			<th>gfcdUseAmt1</th>
-			<th>realOrdAmt1</th>
-			<th>savePntAmt1</th>
-			<th>shotDelvYn</th>
-			<th>foreignYn</th>
-			<th>orderMadeYn</th>
-			<th>delvFeeCd</th>
-			<th>pntPrate</th>
-			<th>pntMrate</th>
-		</tr>
 		<th:block th:each="delvAllCart, index : ${delvAllCartList}">
 			<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
 				<th:block th:each="goods, i : ${delvAllCart}">
@@ -180,13 +123,6 @@
 	
 	<!-- 배송단위목록 -->
 	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
-		<tr style="height:30px;">
-			<th>supplyCompCd</th>
-			<th>delvFeeCd</th>
-			<th>delvFee</th>
-			<th>delvCpnSq</th>
-			<th>delvCpnDcAmt</th>
-		</tr>
 		<th:block th:each="delvFeeCd, index : ${delvFeeCdList}">
 			<tr style="height:30px;">
 				<td class="supplyCompCd" th:text="${delvFeeCd.supplyCompCd}"></td>
@@ -201,25 +137,6 @@
 	
 	<!-- 주문금액합계 -->
 	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo" id="orderSumAmtInfo">
-		<tr style="height:30px;">
-			<th>orgGoodsSumAmt</th>
-			<th>delvSumAmt</th>
-			<th>freegiftUsePnt</th>
-			<th>cpn1DcSumAmt</th>
-			<th>ordSumAmt</th>
-			<th>tmtb1DcSumAmt</th>
-			<th>tmtb2DcSumAmt</th>
-			<th>tmtbDcSumAmt</th>
-			<th>goodsCpnDcSumAmt</th>
-			<th>cartCpnDcSumAmt</th>
-			<th>delvCpnDcSumAmt</th>
-			<th>cpnDcSumAmt</th>
-			<th>prePntDcAmt</th>
-			<th>pntDcSumAmt</th>
-			<th>gfcdUseSumAmt</th>
-			<th>realOrdSumAmt</th>
-			<th>savePntSumAmt</th>
-		</tr>
 		<tr style="height:30px;">
 			<td class="orgGoodsSumAmt">0</td>
 			<td class="delvSumAmt" th:text="${sumDelvFee}"></td>
@@ -2279,7 +2196,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -34,19 +34,6 @@
 	<!-- 주문자정보 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
 		<tbody>
-			<tr style="height:30px;">
-				<th>custNm</th>
-				<th>email</th>
-				<th>cellPhnno</th>
-				<th>recipNm</th>
-				<th>recipPhnno</th>
-				<th>recipZipcode</th>
-				<th>recipBaseAddr</th>
-				<th>recipDtlAddr</th>
-				<th>delvMemo</th>
-				<th>sexGb</th>
-				<th>birthYmd</th>
-			</tr>
 			<tr style="height:30px;">
 				<td class="custNm"></td>
 				<td class="email"></td>
@@ -66,12 +53,6 @@
 	
 	<!-- 사은품정보 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="freegiftInfo">
-		<tr style="height:30px;">
-			<th>freegiftValArr</th>
-			<th>freegiftUsePointArr</th>
-			<th>freegiftSqArr</th>
-			<th>freegiftGoodsArr</th>
-		</tr>
 		<tr style="height:30px;">
 			<td class="freegiftValArr"></td>
 			<td class="freegiftUsePointArr"></td>
@@ -83,43 +64,6 @@
 	
 	<!-- 주문상세금액 -->
 	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
-		<tr style="height:30px;">
-			<th>cartSq</th>
-			<th style="display:none">goodsNm</th>
-			<th>goodsCd</th>
-			<th>goodsType</th>
-			<th>itemCd</th>
-			<th>optCd</th>
-			<th style="display:none">optCd1</th>
-			<th style="display:none">optCd2</th>
-			<th style="display:none">itemQtyr</th>
-			<th>orgCurrPrice</th>
-			<th>cpn1CpnSq</th>
-			<th>cpn1DcAmt</th>
-			<th>optAddPrice</th>
-			<th>goodsQty</th>
-			<th>ordAmt</th>
-			<th>tmtb1Sq</th>
-			<th>tmtb1DcAmt</th>
-			<th>tmtb2Sq</th>
-			<th>tmtb2DcAmt</th>
-			<th>goodsCpnSq</th>
-			<th>goodsCpnDcAmt</th>
-			<th>cartCpnSq</th>
-			<th>cartCpnDcAmt</th>
-			<th>prePntDcAmt1</th>
-			<th>dcSumAmt</th>
-			<th>pntDcAmt1</th>
-			<th>gfcdUseAmt1</th>
-			<th>realOrdAmt1</th>
-			<th>savePntAmt1</th>
-			<th>shotDelvYn</th>
-			<th>foreignYn</th>
-			<th>orderMadeYn</th>
-			<th>delvFeeCd</th>
-			<th>pntPrate</th>
-			<th>pntMrate</th>
-		</tr>
 		<th:block th:each="delvAllCart, index : ${delvAllCartList}">
 			<th:block th:if="${delvAllCart != null and #lists.size(delvAllCart) > 0}">
 				<th:block th:each="goods, i : ${delvAllCart}">
@@ -180,13 +124,6 @@
 	
 	<!-- 배송단위목록 -->
 	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
-		<tr style="height:30px;">
-			<th>supplyCompCd</th>
-			<th>delvFeeCd</th>
-			<th>delvFee</th>
-			<th>delvCpnSq</th>
-			<th>delvCpnDcAmt</th>
-		</tr>
 		<th:block th:each="delvFeeCd, index : ${delvFeeCdList}">
 			<tr style="height:30px;">
 				<td class="supplyCompCd" 	th:text="${delvFeeCd.supplyCompCd}"></td>
@@ -2178,7 +2115,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;