Kaynağa Gözat

Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

eskim 5 yıl önce
ebeveyn
işleme
f26c410003

+ 2 - 2
src/main/resources/config/application-dev.yml

@@ -82,8 +82,8 @@ pg:
         js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
         server: false
         site:
-            cd: T0000
-            key: 3grptw1.zW0GSo4PQdaGvsF__
+            cd: U3476
+            key:
             name: ISTYLE TEST
         log.level: 3
         module.type: 01

+ 2 - 2
src/main/resources/config/application-locd.yml

@@ -82,8 +82,8 @@ pg:
         js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
         server: false
         site:
-            cd: T0000
-            key: 3grptw1.zW0GSo4PQdaGvsF__
+            cd: U3476
+            key:
             name: ISTYLE TEST
         log.level: 3
         module.type: 01

+ 2 - 2
src/main/resources/config/application-tsit.yml

@@ -62,8 +62,8 @@ pg:
         js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
         server: false
         site:
-            cd: T0000
-            key: 3grptw1.zW0GSo4PQdaGvsF__
+            cd: U3476
+            key:
             name: ISTYLE TEST
         log.level: 3
         module.type: 01

+ 1 - 1
src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -919,7 +919,7 @@
 				i++;
 			});
 
-			if(contentsLoc=='SMM011'){
+			if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
 				var thisIdx = $(this).find("input[name=tableIdx]").val();
 				strVar1 = $(this).find("input:radio[name=tvPlayer"+thisIdx+"]:checked").val();
 				strVar2 = $(this).find("input[name=tvMediaKey"+thisIdx+"]").val();