Merge remote-tracking branch 'origin/develop' into card007

# Conflicts:
#	src/main/webapp/WEB-INF/views/mob/common/fragments/HeadMob.html

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -921,6 +921,17 @@
 							$("#cartInfoForm").submit();
 						}
 					}
+					
+					// 광고스크립트
+					var fbqContents = [];
+					$.each(list, function(idx, item) {
+						fbqContents.push({id:item.goodsCd, quantity:item.goodsQty+''});
+					});
+					fbq('track', 'InitiateCheckout', {
+						value : sumRealPayAmt,
+						currency : 'KRW',
+						contents : fbqContents
+					});
 				}
 
 				let info = list[listIndex];

src/main/webapp/WEB-INF/views/mob/common/fragments/HeadMob.html

@@ -187,4 +187,4 @@
 	<!--// Cosem Log Gathering Script V.2.0 -->
 </head>
 	
-</html>
+</html>

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -65,7 +65,7 @@
 									<div class="swiper-slide" th:each="item, status : ${mdPickGoodsList}">
 										<div class="item_prod">
 											<div class="item_state">
-												<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ${item.goodsFullNm}, ithrCd='', contentsLoc='SOM002', planDtlSq=''">관심상품 추가</button>
+												<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, goodsNm=${item.goodsFullNm}, ithrCd='', contentsLoc='SOM002', planDtlSq=''">관심상품 추가</button>
 												<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SOM002');">
 													<div class="itemPic">
 														<th:block th:each="option,idx:${item.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -1044,7 +1044,18 @@
 						$("#cartInfoForm").submit();
 					}
 				}
-			}
+				
+				// 광고스크립트
+				var fbqContents = [];
+				$.each(list, function(idx, item) {
+					fbqContents.push({id:item.goodsCd, quantity:item.goodsQty+''});
+				});
+				fbq('track', 'InitiateCheckout', {
+					value : sumRealPayAmt,
+					currency : 'KRW',
+					contents : fbqContents
+				});
+		}
 
 			let info = list[listIndex];
 			let removeCartSq = 0, updateCartSq = 0, goodsQty = 0;

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

@@ -424,6 +424,7 @@ var fnGoToOrderDetail = function(param) {
 <script th:inline="javascript">
 var orderDetailList 	= [[${orderDetailList}]]; // 주문상세목록
 var criteoItems			= [];
+var fbqItems			= [];
 
 window._eglqueue = window._eglqueue || [];
 
@@ -434,6 +435,7 @@ for (i=0 ; i<orderDetailList.length ; i++) {
 	var ordQty 		= orderDetailList[i].ordQty;
 	_eglqueue.push(['addVar', 'orderItems', {itemId:goodsCd, price:currPrice, quantity:ordQty}]);
 	criteoItems.push({id: orderDetailList[i].goodsCd, price: orderDetailList[i].currPrice+'', quantity: orderDetailList[i].ordQty+''});
+	fbqItems.push({id: orderDetailList[i].goodsCd, quantity: orderDetailList[i].ordQty+''});
 }
 /* END LOOP */
 
@@ -483,6 +485,16 @@ x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
 </script>
 <!-- END Criteo 세일즈 태그 -->
 
+<!-- 픽셀 -->
+<script th:inline="javascript">
+	fbq('track', 'Purchase', {
+		value: [[${realOrdSumAmt}]],
+		currency: 'KRW',
+		contents: fbqItems,
+		content_type: 'product'
+	});
+</script>
+
 </th:block>
 </body>
 </html>