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

src/main/java/com/style24/front/biz/web/TsfCallcenterController.java

@@ -206,7 +206,7 @@ public class TsfCallcenterController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 문의유형
-		mav.addObject("counselClsfList", rendererService.getCommonCodeList("G059", "Y", new String[] {"G596"}));
+		mav.addObject("counselClsfList", rendererService.getCommonCodeList("G059", "Y"));
 
 		mav.setViewName(super.getDeviceViewName("callcenter/OneToOneQnaRegisterForm"));
 

src/main/java/com/style24/front/biz/web/TsfCommonController.java

@@ -109,19 +109,11 @@ public class TsfCommonController extends TsfBaseController {
 	 */
 	@PostMapping("/file/upload")
 	@ResponseBody
-	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException, ImageProcessingException, MetadataException {
+	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException{
 		if (StringUtils.isEmpty(policy)) {
 			policy = "default";
 		}
-		int orientation = 1;
-		Metadata metadata = ImageMetadataReader.readMetadata(convert(file));
 		
-		Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
-		if(directory != null) {
-			orientation = directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
-		}
-		
-		log.info("orientation: {}", orientation);
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload." + policy + ".target.path"), subDir);
 
 		GagaFileUploadUtil fuUtil = new GagaFileUploadUtil(targetPath, Long.parseLong(env.getProperty("upload." + policy + ".max.size")), env.getProperty("upload." + policy + ".allow.extension"), env.getProperty("upload." + policy + ".view"));

src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -834,7 +834,7 @@
 		<if test="cpnId != null and cpnId != ''">
 		AND C.CPN_ID  = #{cpnId}
 		</if>
-		AND C.CPN_TYPE IN ('G230_11','G230_30')
+		AND C.CPN_TYPE IN ('G230_11','G230_30','G230_20')
 		AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		AND NOW()  <![CDATA[<=]]>  IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
 		AND (CASE WHEN 'P' = #{frontGb} THEN C.DC_PVAL

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -33,7 +33,7 @@
 				if (_osType === 'A') {
 					 window.style24.getPushList();
 				} else if (_osType === 'I') {
-
+					window.webkit.messageHandlers.getPushList.postMessage({"dummy":"dummy"});
 				}
 			} else {
 				$('#notice').addClass('nodata');
@@ -41,6 +41,9 @@
 	});
 
 	var pushListInfo = function (pushList) {
+		if (_osType === 'I') {
+			alert("pushList : " + pushList);
+		}
 		if (!gagajf.isNull(pushList)) {
 			let pushListJosn = JSON.parse(pushList);
 			let html = '';
@@ -65,7 +68,7 @@
 				html += '                </span>\n';
 				html += '            </dd>\n'
 				html += '        </dl>\n'
-				html += '    </a>';
+				html += '    </a>\n';
 				html += '</div>\n'
 			});
 			$('#notice').removeClass('nodata');

src/main/webapp/WEB-INF/views/mob/app/SettingFormMob.html

@@ -171,11 +171,11 @@
 				fnSetAppPush('OFF');
 				fnSetAdPush('OFF');
 				appAgreeYn = 'N';
+				$('#btnMkSetting').prop('checked', false);
 			}
 			if (isLogin) {
 				if (appAgreeYn === 'N') { // 마케팅도 N 처리
 					fnUpdatePush('N', 'N');
-					$('#btnMkSetting').prop('checked', false);
 				} else {
 					fnAppPushAgreeUpdate('Y');
 				}

src/main/webapp/WEB-INF/views/mob/callcenter/NoticeFormMob.html

@@ -89,7 +89,7 @@
 				tag += '					</div>\n';
 				tag += '					<div class="lap2"><span>' + item.noticeTitle.escapeHtml() + '</span></div>\n';
 				tag += '				</div>\n';
-				tag += '				<span class="data">' + item.regDt.toDate("YYYYMMDD").format("YYYY.MM.DD") + '</span>\n';
+				tag += '				<span class="data">' + item.regDt + '</span>\n';
 				tag += '			</div>\n';
 				tag += '		</a>\n';
 				tag += '	</div>\n';

src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -114,7 +114,7 @@
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span>' + item.noticeTitle.escapeHtml() + '</span>\n';
 				tag += '				</div>\n';
-				tag += '				<span class="data">' + item.regDt.toDate("YYYYMMDD").format("YYYY.MM.DD") + '</span>\n';
+				tag += '				<span class="data">' + item.regDt + '</span>\n';
 				tag += '			</div>\n';
 				tag += '		</a>\n';
 				tag += '	</div>\n';