Selaa lähdekoodia

Merge branch 'eskim' into develop

eskim 4 vuotta sitten
vanhempi
commit
de3936398d

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -1299,7 +1299,7 @@
 		     INNER JOIN TB_FREEGIFT_VAL C ON B.FREEGIFT_SQ = C.FREEGIFT_SQ
 		                                  AND B.FREEGIFT_SECTION_SQ = C.FREEGIFT_SECTION_SQ
 		                                  AND C.DEL_YN = 'N'
-		                                  AND C.LEFT_QTY - C.ITEM_QTY > 0 -- 사은품 잔여수량
+		                                  AND C.LEFT_QTY - C.ITEM_QTY >= 0 -- 사은품 잔여수량
 		     INNER JOIN TB_FREE_GOODS F ON F.PRODUCT_NO = C.PRODUCT_NO
 		                                AND F.USE_YN = 'Y'
 		 )

+ 1 - 6
src/main/webapp/ux/style24_link.js

@@ -1525,18 +1525,13 @@ function cfnSendToKakao(linkUrl, linkNm, linkImg) {
 
 function cfnSendToKakaoMob(linkUrl, linkNm, linkImg) {
 	
-	if (_frontGb != "A") {
-		cfnSendToKakao(linkUrl, linkNm, linkImg);
-		return false;
-	}
 	
 	// Kakao Key
 	if ( kakaoInitCnt == 0 ) {
 		Kakao.init(_kakaoDomainKey);
 		kakaoInitCnt++;
 	}
-	Kakao.Link.createDefaultButton({
-		container: '#kakao-link-btn',
+	Kakao.Link.sendDefault({
 		objectType: 'feed',
 		content: {
 			title: "[STYLE24]\n" + linkNm,