msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
master
luoyang 5 years ago
parent 7c15d9fd28 a3b43675af
commit 39812be745
14 changed files with 254 additions and 411 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>1.4.12</version>
<version>1.4.13</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

47
src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java
Unescape View File

@ -3,8 +3,8 @@ package au.com.royalpay.payment.manage.merchants.beans;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
/**
@ -95,12 +95,7 @@ public class ClientRegisterInfo {
private String country;
@Pattern(regexp = "^((Australia/West)|(Australia/Eucla)|(Australia/North)|(Australia/South)|(Australia/Brisbane)|(Australia/Melbourne)|(Australia/LHI))$", message = "error.payment.valid.invalid_timezone")
private String timezone;
private String jdindustry;
private String royalpayindustry;
private String hfindustry;
private String lakalapayindustry;
private String lakalapaygoods;
private String lakalapaysettle;
private String referrer_id;
private String referrer_name;
@ -364,14 +359,6 @@ public class ClientRegisterInfo {
this.alipayIndustry = alipayIndustry;
}
public String getJdindustry() {
return jdindustry;
}
public void setJdindustry(String jdindustry) {
this.jdindustry = jdindustry;
}
public String getRoyalpayindustry() {
return royalpayindustry;
}
@ -412,14 +399,6 @@ public class ClientRegisterInfo {
this.merchant_video_url = merchant_video_url;
}
public String getHfindustry() {
return hfindustry;
}
public void setHfindustry(String hfindustry) {
this.hfindustry = hfindustry;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
@ -444,30 +423,6 @@ public class ClientRegisterInfo {
return client_pay_desc;
}
public String getLakalapayindustry() {
return lakalapayindustry;
}
public void setLakalapayindustry(String lakalapayindustry) {
this.lakalapayindustry = lakalapayindustry;
}
public String getLakalapaygoods() {
return lakalapaygoods;
}
public void setLakalapaygoods(String lakalapaygoods) {
this.lakalapaygoods = lakalapaygoods;
}
public String getLakalapaysettle() {
return lakalapaysettle;
}
public void setLakalapaysettle(String lakalapaysettle) {
this.lakalapaysettle = lakalapaysettle;
}
public String getRepresentativePerson() {
return representativePerson;
}

5
src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java
Unescape View File

@ -7,10 +7,8 @@ import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
import au.com.royalpay.payment.tools.http.HttpUtils;
import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -21,11 +19,10 @@ import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import java.lang.reflect.Method;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
/**
* Created by yixian on 2016-06-25.

5
src/main/resources/application.properties
Unescape View File

@ -4,7 +4,7 @@ spring.profiles.active=dev,alipay,bestpay,jd,wechat,rpay,yeepay
env.company=RoyalPay
multipart.max-file-size=10Mb
multipart.max-file-size=10MB
spring.datasource.test-while-idle=true
#连接池检测释放周期
@ -156,3 +156,6 @@ apple.message.apns.file=
apple.message.apns.password=
android.message.appkey=
android.message.secret=
spring.servlet.multipart.max-file-size=20MB
spring.servlet.multipart.max-request-size=20MB

26
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
Unescape View File

@ -1111,18 +1111,30 @@
SELECT
sum(so.total) as total_amount,
sum(so.orders) as orders,
<if test="industry != null and industry=='1'.toString()">
SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.total,0)) as industry_total_amount,
SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.orders,0)) as industry_orders,
convert(SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.total,0))/sum( so.total )*100,decimal(15,2)) as amount_pcent,
convert(SUM(IF((c.royalpayindustry =1 or c.royalpayindustry like '100%'),so.orders,0))/sum( so.orders )*100,decimal(15,2)) as order_pcent,
</if>
<if test="industry == null or industry=='0'.toString()">
sum(so.total) as industry_total_amount,
sum(so.orders) as industry_orders,
100 as amount_pcent,
100 as order_pcent,
</if>
<if test="industry != null and industry!='0'.toString()">
<bind name="industry" value="industry+'%'"/>
SUM(IF(c.royalpayindustry like #{industry},so.total,0)) as industry_total_amount,
SUM(IF(c.royalpayindustry like #{industry},so.orders,0)) as industry_orders,
convert(SUM(IF(c.royalpayindustry like #{industry},so.total,0))/sum( so.total )*100,decimal(15,2)) as amount_pcent,
convert(SUM(IF(c.royalpayindustry like #{industry},so.orders,0))/sum( so.orders )*100,decimal(15,2)) as order_pcent,
</if>
DATE_FORMAT(so.date, '%Y-%m-%d' ) as trans_date
FROM
statistics_customer_order so
inner JOIN sys_clients c ON so.client_id = c.client_id
AND c.is_valid = 1
<if test="industry != null and industry=='1'.toString()">
AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
</if>
<if test="industry != null and industry!='0'.toString() and industry!='1'">
<bind name="industry" value="industry +'%'"/>
AND c.royalpayindustry like #{industry}
</if>
and so.date >= #{from}
and so.date &lt; #{to}
and so.client_id!=0

251
src/main/ui/static/analysis/transaction/analysis-transaction.js
Unescape View File

@ -1,7 +1,7 @@
/**
* Created by yishuqian on 24/05/2017.
*/
define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angular) {
define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','echarts'], function (angular,echarts) {
'use strict';
var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
@ -445,12 +445,13 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
$scope.params = {industry: 0};
$scope.today = new Date();
$scope.pagination = {limit:20};
$scope.royalpay_label = '全部';
$scope.loadRoyalpayindustry = function () {
$http.get('/static/data/royalpayindustry.json').then(function (resp) {
$scope.royalpayindustry = resp.data;
var selectAll = {
"label": "All",
"label": "全部",
"mccCode": "0",
"children":{}
};
@ -462,6 +463,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
$scope.onRoyalPayIndustrySelect = function (selectedItem) {
$scope.params.royalpay_label = selectedItem.label;
$scope.royalpay_label = selectedItem.label;
$scope.params.industry = selectedItem.mccCode;
$scope.doAnalysis();
};
@ -500,55 +502,248 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
$scope.params.from = monthBegin;
$scope.doAnalysis();
};
var amountAnalysis = {
var orderOption = {
chart: {
yAxis: {
splitLine: {show: true},
axisLine: {
lineStyle: {
color: '#000'
}
}
},
backgroundColor: '#fff',
tooltip: {
trigger: 'axis',
formatter: '{b}:AUD {c}'
},
yAxis: {
type: 'value',
name: '交易金额(AUD)'
axisPointer: {
type: 'shadow'
},
formatter: '总订单数 : {c0}<br />' +
'行业订单数 : {c1}<br /> ' +
'占比 : {c4}%'
},
color: colors
legend: {
data: ['当日总订单数', '行业订单数'],
textStyle: {
color: '#000'
}
}
},
xAxis: {
basic: {
type: 'category',
boundaryGap: false
axisLine: {
lineStyle: {
color: '#000'
}
}
},
key: 'trans_date'
},
series: [
series: [{
basic: {
label:{
normal: {
show: true,
position: 'outside',
offset: [0, 0],
textStyle: {
fontSize: 15,
fontFamily: 'Arial'
}
}},
name: '当日总订单数',
type: 'line',
smooth: true,
showAllSymbol: true,
symbol: 'emptyCircle',
symbolSize: 5
},
column: {key: 'orders'}
}, {
basic: {
label:{
normal: {
show: true,
position: 'right',
offset: [0, 0],
textStyle: {
fontSize: 15,
fontFamily: 'Arial'
}
}},
name: '行业订单数',
type: 'bar',
barWidth: 10,
itemStyle: {
barBorderRadius: 5,
color: '#14c8d4'
}
},
column: {key: 'industry_orders'}
}, {
basic: {
name: '当日总订单数',
type: 'bar',
barGap: '-100%',
barWidth: 10,
z: -12,
itemStyle: {
color: '#fff'
}
},
column: {key: 'orders'}
}, {
basic: {
name: '当日总订单数',
type: 'pictorialBar',
symbol: 'rect',
itemStyle: {
color: '#0f375f'
},
symbolRepeat: true,
symbolSize: [12, 4],
symbolMargin: 1,
z: -10
},
column: {key: 'orders'}
},
{
basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true},
column: {key: 'total_amount'}
basic: {
name: 'pcent',
type: 'pictorialBar',
symbol: 'rect',
itemStyle: {
color: '#fff'
},
symbolRepeat: true,
symbolSize: [12, 4],
symbolMargin: 1,
z: -10
},
column: {key: 'order_pcent'}
}
]
};
var ordersAnalysis = {
var amountOption = {
chart: {
yAxis: {
splitLine: {show: true},
axisLine: {
lineStyle: {
color: '#000'
}
}
},
backgroundColor: '#fff',
tooltip: {
trigger: 'axis',
formatter: '{b}:AUD {c}'
},
yAxis: {
type: 'value',
name: '订单数'
axisPointer: {
type: 'shadow'
},
formatter: '总交易额 : AUD {c0}<br />' +
'行业交易额 : AUD {c1}<br /> ' +
'占比 : {c4}%'
},
color: colors
legend: {
data: ['当日总交易额', '行业交易额'],
textStyle: {
color: '#000'
}
}
},
xAxis: {
basic: {
type: 'category',
boundaryGap: false
axisLine: {
lineStyle: {
color: '#000'
}
}
},
key: 'trans_date'
},
series: [
series: [{
basic: {
label:{
normal: {
show: true,
position: 'outside',
offset: [0, 0],
textStyle: {
fontSize: 15,
fontFamily: 'Arial'
}
}},
name: '当日总交易额',
type: 'line',
smooth: true,
showAllSymbol: true,
symbol: 'emptyCircle',
symbolSize: 5
},
column: {key: 'total_amount'}
}, {
basic: {
label:{
normal: {
show: true,
position: 'right',
offset: [0, 0],
textStyle: {
fontSize: 12,
fontFamily: 'Arial'
}
}},
name: '行业交易额',
type: 'bar',
barWidth: 10,
itemStyle: {
barBorderRadius: 5,
color: '#14c8d4'
}
},
column: {key: 'industry_total_amount'}
}, {
basic: {
name: '当日总交易额',
type: 'bar',
barGap: '-100%',
barWidth: 10,
z: -12,
itemStyle: {
color: '#fff'
}
},
column: {key: 'total_amount'}
}, {
basic: {
name: '当日总交易额',
type: 'pictorialBar',
symbol: 'rect',
itemStyle: {
color: '#0f375f'
},
symbolRepeat: true,
symbolSize: [12, 4],
symbolMargin: 1,
z: -10
},
column: {key: 'total_amount'}
},
{
basic: {type: 'line', label: {normal: {show: true}}, showAllSymbols: true},
column: {key: 'orders'}
basic: {
name: 'pcent',
type: 'pictorialBar',
symbol: 'rect',
itemStyle: {
color: '#fff'
},
symbolRepeat: true,
symbolSize: [12, 4],
symbolMargin: 1,
z: -10
},
column: {key: 'amount_pcent'}
}
]
};
@ -565,8 +760,8 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
delete params.royalpay_label;
$http.get('/analysis/rp_industry/echarts', {params: params}).then(function (resp) {
$scope.analysisData = resp.data;
$scope.amountAnalysis = chartParser.parse(amountAnalysis, resp.data);
$scope.ordersAnalysis = chartParser.parse(ordersAnalysis, resp.data);
$scope.amountAnalysis = chartParser.parse(amountOption, resp.data);
$scope.ordersAnalysis = chartParser.parse(orderOption, resp.data);
$scope.future_loading = false;
$scope.chooseDay = $filter('date')($scope.params.from, 'yyyy-MM-dd');
$scope.loadTopTransPartners(1);

90
src/main/ui/static/payment/partner/templates/add_partner.html
Unescape View File

@ -1308,26 +1308,6 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
<label class="control-label col-sm-2" for="jdindustry-input">
*JDPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="jdindustry"
ng-model="partner.jdindustry"
id="jdindustry-input" required
ng-options="industry.value as industry.label for industry in jdindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.jdindustryindustry.$error"
ng-if="partnerForm.jdindustryindustry.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
<label class="control-label col-sm-2" for="industry-input">
@ -1366,76 +1346,6 @@
</div>
</div>
<div class="form-group" ng-if="(10|withRole) || (1|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8">
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapayindustry.$invalid && partnerForm.lakalapayindustry.$dirty}">
<label class="control-label col-sm-2" for="lakalapayindustry-input">
*LakalaPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapayindustry"
ng-model="partner.lakalapayindustry"
id="lakalapayindustry-input" required
ng-options="industry.value as industry.label for industry in lakalapayindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapayindustry.$error"
ng-if="partnerForm.lakalapayindustry.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaygoods.$invalid && partnerForm.lakalapaygoods.$dirty}">
<label class="control-label col-sm-2" for="lakalapaygoods-input">
*LakalaPay Category</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaygoods"
ng-model="partner.lakalapaygoods"
id="lakalapaygoods-input" required
ng-options="industry.value as industry.label for industry in lakalapaygoods">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaygoods.$error"
ng-if="partnerForm.lakalapaygoods.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaysettle.$invalid && partnerForm.lakalapaysettle.$dirty}">
<label class="control-label col-sm-2" for="lakalapaysettle-input">
*LakalaPay Settlement Code</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaysettle"
ng-model="partner.lakalapaysettle"
id="lakalapaysettle-input" required
ng-options="industry.value as industry.label for industry in lakalapaysettle">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaysettle.$error"
ng-if="partnerForm.lakalapaysettle.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
</div>
</div>
</div>

90
src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html
Unescape View File

@ -1172,27 +1172,6 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
<label class="control-label col-sm-2" for="jdindustry-input">
*JDPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="jdindustry"
ng-model="partner.jdindustry"
id="jdindustry-input" required
ng-options="industry.value as industry.label for industry in jdindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.jdindustryindustry.$error"
ng-if="partnerForm.jdindustryindustry.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
<label class="control-label col-sm-2" for="industry-input">
@ -1231,75 +1210,6 @@
</div>
</div>
<div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8" >
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry |partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapayindustry.$invalid && partnerForm.lakalapayindustry.$dirty}">
<label class="control-label col-sm-2" for="lakalapayindustry-input">
*LakalaPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapayindustry"
ng-model="partner.lakalapayindustry"
id="lakalapayindustry-input" required
ng-options="industry.value as industry.label for industry in lakalapayindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapayindustry.$error"
ng-if="partnerForm.lakalapayindustry.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaygoods.$invalid && partnerForm.lakalapaygoods.$dirty}">
<label class="control-label col-sm-2" for="lakalapaygoods-input">
*LakalaPay Category</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaygoods"
ng-model="partner.lakalapaygoods"
id="lakalapaygoods-input" required
ng-options="industry.value as industry.label for industry in lakalapaygoods">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaygoods.$error"
ng-if="partnerForm.lakalapaygoods.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaysettle.$invalid && partnerForm.lakalapaysettle.$dirty}">
<label class="control-label col-sm-2" for="lakalapaysettle-input">
*LakalaPay Settlement Code</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaysettle"
ng-model="partner.lakalapaysettle"
id="lakalapaysettle-input" required
ng-options="industry.value as industry.label for industry in lakalapaysettle">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaysettle.$error"
ng-if="partnerForm.lakalapaysettle.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
</div>
</div>

49
src/main/ui/static/payment/partner/templates/partner_detail.html
Unescape View File

@ -1035,16 +1035,6 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">JDPay Industry</label>
<div class="col-sm-10">
<p class="form-control-static industry-p"
ng-bind="partner.jdindustry|partner_jd_industry"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group">
<div class="col-sm-5">
<label class="control-label col-sm-5">Wechat Industry</label>
@ -1079,45 +1069,6 @@
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group" ng-if="partner.hfindustry&&(('10'|withRole) || ('1'|withRole))">
<label class="control-label col-sm-2">HF Industry</label>
<div class="col-sm-10">
<p class="form-control-static industry-p" ng-if="partner.hfindustry">
{{partner.hfindustry| partner_hf_industry}}
&nbsp;&nbsp;&nbsp;({{partner.hfindustry}})
</p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group" ng-if="sysconfig.active_channels.indexOf('LakalaPay')!=-1">
<label class="control-label col-sm-2">LakalaPay Industry</label>
<div class="col-sm-10">
<p class="form-control-static industry-p"
ng-bind="partner.lakalapayindustry|partner_lakala_industry"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group" ng-if="sysconfig.active_channels.indexOf('LakalaPay')!=-1">
<label class="control-label col-sm-2">LakalaPay Category</label>
<div class="col-sm-10">
<p class="form-control-static industry-p"
ng-bind="partner.lakalapaygoods"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
<div class="form-group" ng-if="sysconfig.active_channels.indexOf('LakalaPay')!=-1">
<label class="control-label col-sm-2">LakalaPay Settlement Code</label>
<div class="col-sm-10">
<p class="form-control-static industry-p"
ng-bind="partner.lakalapaysettle |partner_lakala_settle"></p>
<i class="fa fa-check-square-o check-i" aria-hidden="true"
ng-if="$root.complianceCheck.clientInfo"></i>
</div>
</div>
</div>
</div>
</div>

90
src/main/ui/static/payment/partner/templates/partner_edit.html
Unescape View File

@ -1168,26 +1168,6 @@
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.jdindustry.$invalid && partnerForm.jdindustry.$dirty}">
<label class="control-label col-sm-2" for="jdindustry-input">
*JDPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="jdindustry"
ng-model="partner.jdindustry"
id="jdindustry-input" required
ng-options="industry.value as industry.label for industry in jdindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.jdindustryindustry.$error"
ng-if="partnerForm.jdindustryindustry.$dirty">
<p class="small text-danger" ng-message="required">Required
Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.industry.$invalid && partnerForm.industry.$dirty}">
<label class="control-label col-sm-2" for="industry-input">
@ -1226,76 +1206,6 @@
</div>
</div>
<div class="form-group" ng-if="('10'|withRole) || ('1'|withRole)">
<label class="control-label col-sm-2"
for="hf_category">HF Industry</label>
<div class="col-sm-8" >
<input class="form-control" id="hf_category" required
name="hf_label" readonly
ng-model="partner.hfindustry|partner_hf_industry"
multi-level-select-popup="hfindustry"
on-select="onHfIndustrySelect($selected)"
chose-one-level="false">
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapayindustry.$invalid && partnerForm.lakalapayindustry.$dirty}">
<label class="control-label col-sm-2" for="lakalapayindustry-input">
*LakalaPay Industry</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapayindustry"
ng-model="partner.lakalapayindustry"
id="lakalapayindustry-input" required
ng-options="industry.value as industry.label for industry in lakalapayindustry">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapayindustry.$error"
ng-if="partnerForm.lakalapayindustry.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaygoods.$invalid && partnerForm.lakalapaygoods.$dirty}">
<label class="control-label col-sm-2" for="lakalapaygoods-input">
*LakalaPay Category</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaygoods"
ng-model="partner.lakalapaygoods"
id="lakalapaygoods-input" required
ng-options="industry.value as industry.label for industry in lakalapaygoods">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaygoods.$error"
ng-if="partnerForm.lakalapaygoods.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
<div class="form-group"
ng-class="{'has-error':partnerForm.lakalapaysettle.$invalid && partnerForm.lakalapaysettle.$dirty}">
<label class="control-label col-sm-2" for="lakalapaysettle-input">
*LakalaPay Settlement Code</label>
<div class="col-sm-8">
<select class="form-control" name="lakalapaysettle"
ng-model="partner.lakalapaysettle"
id="lakalapaysettle-input" required
ng-options="industry.value as industry.label for industry in lakalapaysettle">
<option value="">Please Choose</option>
</select>
<div ng-messages="partnerForm.lakalapaysettle.$error"
ng-if="partnerForm.lakalapaysettle.$dirty">
<p class="small text-danger" ng-message="required">
Required Field</p>
</div>
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save