diff --git a/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java b/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java index a42f930..4d1bca5 100644 --- a/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java +++ b/src/main/java/com/ns/mobile/website/biz/dto/SellInfoDto.java @@ -38,6 +38,8 @@ public class SellInfoDto extends BaseDto{ String formula; String payBackBank; String payBackNumber; + String etc; + String guestKinds; long installment; long phoneId; @@ -90,6 +92,8 @@ public class SellInfoDto extends BaseDto{ .disclosureSubsidyYn(sellInfo.isDisclosureSubsidyYn()) .cashRebate(sellInfo.getCashRebate()) .addRebate(sellInfo.getAddRebate()) + .etc(sellInfo.getEtc()) + .guestKinds(sellInfo.getGuestKinds()) .build(); sellInfoDto.base(sellInfo); diff --git a/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java b/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java index 2fcd1c1..a5245b7 100644 --- a/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java +++ b/src/main/java/com/ns/mobile/website/biz/entity/SellInfo.java @@ -34,6 +34,8 @@ public class SellInfo extends BaseEntity{ private String formula; private String payBackBank; private String payBackNumber; + private String etc; + private String guestKinds; private long installment; private long phoneId; diff --git a/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java index bd9f733..9d724d8 100644 --- a/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java +++ b/src/main/java/com/ns/mobile/website/biz/model/sell/SellAddInfoParameter.java @@ -37,7 +37,9 @@ public class SellAddInfoParameter{ private String payBackDay; private String payBackBank; private String payBackNumber; - + private String etc; + private String guestKinds; + private long factoryPrice; private long disclosureSubsidy; private long addRebate; diff --git a/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java index ecab588..de21f0e 100644 --- a/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java +++ b/src/main/java/com/ns/mobile/website/biz/service/impl/SellInfoServiceImpl.java @@ -135,6 +135,8 @@ public class SellInfoServiceImpl implements SellInfoService{ .disclosureSubsidyYn(parameter.isDisclosureSubsidyYn()) .cashRebate(parameter.getCashRebate()) .addRebate(parameter.getAddRebate()) + .etc(parameter.getEtc()) + .guestKinds(parameter.getGuestKinds()) .build(); sellInfoRepository.save(sellInfo); diff --git a/src/main/resources/static/res/front/js/biz/sell/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js index a7f240b..fa667da 100644 --- a/src/main/resources/static/res/front/js/biz/sell/add.js +++ b/src/main/resources/static/res/front/js/biz/sell/add.js @@ -42,7 +42,9 @@ let appVue = new Vue({ disclosureSubsidy: '', disclosureSubsidyYn: false, addRebate: '', - cashRebate: '' + cashRebate: '', + etc: '', + guestKind: '' }, mounted: function () { this.init(); @@ -174,18 +176,20 @@ let appVue = new Vue({ payBackYn : $this.payBackYn, payBackBank : $this.payBackBank, payBackNumber : $this.payBackNumber, - disclosureSubsidyYn : $this.disclosureSubsidyYn + disclosureSubsidyYn : $this.disclosureSubsidyYn, + etc : $this.etc, + guestKind : $this.guestKind } console.log(parameter); - /*nscompany.mobile.api.sell.add(parameter, function (success, message, data) { + nscompany.mobile.api.sell.add(parameter, function (success, message, data) { if (!success) { alert(message); return false; } alert("저장 되었습니다."); location.reload(); - });*/ + }); }, openingDayBlur: function (){ let $this = this; @@ -301,6 +305,12 @@ let appVue = new Vue({ })); $('#subRatePlan').selectpicker('refresh'); + //시리얼 입력 여부 + if($this.info.businessPartnerList[index].serialYn){ + $("#serialNumber").removeAttr('disabled'); + }else{ + $("#serialNumber").attr('disabled', 'disabled'); + } }, formulaChange: function(e){ let $this = this; diff --git a/src/main/resources/static/res/front/js/lib/bootstrap-select.js b/src/main/resources/static/res/front/js/lib/bootstrap-select.js index 7e43d69..3c3f9bd 100644 --- a/src/main/resources/static/res/front/js/lib/bootstrap-select.js +++ b/src/main/resources/static/res/front/js/lib/bootstrap-select.js @@ -3349,7 +3349,7 @@ that.$menuInner.find('.active a').trigger('click', true); // retain active class $this.trigger('focus'); -debugger; + if (!that.options.liveSearch) { // Prevent screen from scrolling if the user hits the spacebar e.preventDefault(); diff --git a/src/main/webapp/WEB-INF/view/sell/add.jsp b/src/main/webapp/WEB-INF/view/sell/add.jsp index 1ba2fc4..25b281f 100644 --- a/src/main/webapp/WEB-INF/view/sell/add.jsp +++ b/src/main/webapp/WEB-INF/view/sell/add.jsp @@ -250,10 +250,22 @@ + +