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

Merge branch 'develop'

Browse Source
master
AlanFenng 4 years ago
parent 1c66a85d7c dc099e0e96
commit 3ed6c4f178
4 changed files with 880 additions and 738 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>2.3.79</version> <version>2.3.80-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

506
src/main/ui/static/config/organizations/templates/org_detail.html
Unescape View File

@ -1,12 +1,12 @@
<style> <style>
.form-control-float { .form-control-float {
float: left; float: left;
width: 93%; !important; width: 93% !important;
} }
.form-control-span { .form-control-span {
height: 34px; height: 34px;
} }
</style> </style>
<section class="content-header"> <section class="content-header">
<h1 ng-bind="org.name"></h1> <h1 ng-bind="org.name"></h1>
@ -28,28 +28,23 @@
<div class="form-group" ng-class="{'has-error':org_form.name.$invalid && org_form.name.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.name.$invalid && org_form.name.$dirty}">
<label class="control-label col-sm-2" for="org_name_input">Name *</label> <label class="control-label col-sm-2" for="org_name_input">Name *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="org.name" id="org_name_input" name="name" required> <input class="form-control" ng-model="org.name" id="org_name_input" name="name" required />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Logo</label> <label class="control-label col-sm-2">Logo</label>
<div class="col-sm-8"> <div class="col-sm-8">
<p class="form-control-static"> <p class="form-control-static">
<button class="btn btn-primary" type="button" ngf-select="uploadLogo($file)" <button class="btn btn-primary" type="button" ngf-select="uploadLogo($file)" accept="image/*"><i class="fa fa-upload"></i> Upload</button>
accept="image/*">
<i class="fa fa-upload"></i> Upload
</button>
<uib-progressbar value="logoProgress.value" ng-if="logoProgress"> </uib-progressbar> <uib-progressbar value="logoProgress.value" ng-if="logoProgress"> </uib-progressbar>
<img ng-src="{{org.logo}}" class="col-sm-3" ng-if="org.logo"> <img ng-src="{{org.logo}}" class="col-sm-3" ng-if="org.logo" />
</p> </p>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.state.$invalid && org_form.state.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.state.$invalid && org_form.state.$dirty}">
<label class="control-label col-sm-2" for="org_state_input">State *</label> <label class="control-label col-sm-2" for="org_state_input">State *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="state" required ng-model="org.state" <select class="form-control" name="state" required ng-model="org.state" id="org_state_input" ng-options="state.value as state.label for state in states">
id="org_state_input"
ng-options="state.value as state.label for state in states">
<option value="">Please Choose</option> <option value="">Please Choose</option>
</select> </select>
</div> </div>
@ -57,38 +52,48 @@
<div class="form-group" ng-class="{'has-error':org_form.location.$invalid && org_form.location.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.location.$invalid && org_form.location.$dirty}">
<label class="control-label col-sm-2" for="org_location_input">Location *</label> <label class="control-label col-sm-2" for="org_location_input">Location *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="org.location" id="org_location_input" name="location" required> <input class="form-control" ng-model="org.location" id="org_location_input" name="location" required />
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.type.$invalid && org_form.type.$dirty}" <div class="form-group" ng-class="{'has-error':org_form.type.$invalid && org_form.type.$dirty}" ng-if="!('1000000000000'|withRole)">
ng-if="!('1000000000000'|withRole)">
<label class="control-label col-sm-2" for="org_type_input">Type *</label> <label class="control-label col-sm-2" for="org_type_input">Type *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<!--<select class="form-control" ng-model="org.type" ng-init="org.type=0" id="org_type_input">--> <!--<select class="form-control" ng-model="org.type" ng-init="org.type=0" id="org_type_input">-->
<!--<option value="0">代理人</option>--> <!--<option value="0">代理人</option>-->
<!--<option value="1">推荐人</option>--> <!--<option value="1">推荐人</option>-->
<!--</select>--> <!--</select>-->
<select class="form-control" name="type" required ng-model="org.type" <select class="form-control" name="type" required ng-model="org.type" id="org_type_input" ng-options="type.value as type.label for type in types">
id="org_type_input"
ng-options="type.value as type.label for type in types">
<!--<option value="">Please Choose</option>--> <!--<option value="">Please Choose</option>-->
</select> </select>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.commission_type_0.$invalid && org_form.commission_type_0.$dirty}" <div
ng-show="(org.type == 0) || ('1000000000000'|withRole)"> class="form-group"
ng-class="{'has-error':org_form.commission_type_0.$invalid && org_form.commission_type_0.$dirty}"
ng-show="(org.type == 0) || ('1000000000000'|withRole)"
>
<label class="control-label col-sm-2" for="commission_type_0">Commission Type *</label> <label class="control-label col-sm-2" for="commission_type_0">Commission Type *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="commission_type_0" required ng-model="org.commission_type" id="commission_type_0" <select
ng-options="commission_type.value as commission_type.label for commission_type in commission_types"> class="form-control"
</select> name="commission_type_0"
required
ng-model="org.commission_type"
id="commission_type_0"
ng-options="commission_type.value as commission_type.label for commission_type in commission_types"
></select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="senior_parent_org_id">Senior Partner </label> <label class="control-label col-sm-2" for="senior_parent_org_id">Senior Partner </label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="senior_parent_org_id" ng-model="org.senior_parent_org_id" id="senior_parent_org_id" <select
ng-options="seniorOrg.org_id as seniorOrg.name for seniorOrg in seniorOrgs"> class="form-control"
name="senior_parent_org_id"
ng-model="org.senior_parent_org_id"
id="senior_parent_org_id"
ng-options="seniorOrg.org_id as seniorOrg.name for seniorOrg in seniorOrgs"
>
<option value="-1">noop</option> <option value="-1">noop</option>
</select> </select>
</div> </div>
@ -97,7 +102,7 @@
<div class="form-group" ng-class="{'has-error':org_form.rate_value.$invalid && org_form.rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rate_value.$invalid && org_form.rate_value.$dirty}">
<label class="control-label col-sm-2" for="rate_value_input">Rate *</label> <label class="control-label col-sm-2" for="rate_value_input">Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rate_value" id="rate_value_input" name="rate_value" max="100" min="0"> <input class="form-control form-control-float" type="number" ng-model="org.rate_value" id="rate_value_input" name="rate_value" max="100" min="0" />
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -107,7 +112,7 @@
<div class="form-group" ng-class="{'has-error':org_form.rate_value.$invalid && org_form.rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rate_value.$invalid && org_form.rate_value.$dirty}">
<label class="control-label col-sm-2" for="rate_value_input_3">Rate *</label> <label class="control-label col-sm-2" for="rate_value_input_3">Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rate_value" id="rate_value_input_3" name="rate_value" max="100" min="0"> <input class="form-control form-control-float" type="number" ng-model="org.rate_value" id="rate_value_input_3" name="rate_value" max="100" min="0" />
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -116,7 +121,16 @@
<div class="form-group" ng-class="{'has-error':org_form.wechat_rate_value.$invalid && org_form.wechat_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.wechat_rate_value.$invalid && org_form.wechat_rate_value.$dirty}">
<label class="control-label col-sm-2" for="wechat_rate_value_input">Wechat Rate *</label> <label class="control-label col-sm-2" for="wechat_rate_value_input">Wechat Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.wechat_rate_value" id="wechat_rate_value_input" name="wechat_rate_value" max="100" min="0" required> <input
class="form-control form-control-float"
type="number"
ng-model="org.wechat_rate_value"
id="wechat_rate_value_input"
name="wechat_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -124,7 +138,33 @@
<div class="form-group" ng-class="{'has-error':org_form.alipay_rate_value.$invalid && org_form.alipay_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.alipay_rate_value.$invalid && org_form.alipay_rate_value.$dirty}">
<label class="control-label col-sm-2" for="alipay_rate_value_input">Alipay Rate *</label> <label class="control-label col-sm-2" for="alipay_rate_value_input">Alipay Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.alipay_rate_value" id="alipay_rate_value_input" name="alipay_rate_value" max="100" min="0" required> <input
class="form-control form-control-float"
type="number"
ng-model="org.alipay_rate_value"
id="alipay_rate_value_input"
name="alipay_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span>
</div>
</div>
<div class="form-group" ng-class="{'has-error':org_form.alipayplus_rate_value.$invalid && org_form.alipayplus_rate_value.$dirty}">
<label class="control-label col-sm-2" for="alipayplus_rate_value_input">AlipayPlus Rate *</label>
<div class="col-sm-8">
<input
class="form-control form-control-float"
type="number"
ng-model="org.alipayplus_rate_value"
id="alipayplus_rate_value_input"
name="alipayplus_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -132,14 +172,31 @@
<div class="form-group" ng-class="{'has-error':org_form.alipayonline_rate_value.$invalid && org_form.alipayonline_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.alipayonline_rate_value.$invalid && org_form.alipayonline_rate_value.$dirty}">
<label class="control-label col-sm-2" for="alipayonline_rate_value_input">AlipayOnline Rate *</label> <label class="control-label col-sm-2" for="alipayonline_rate_value_input">AlipayOnline Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.alipayonline_rate_value" id="alipayonline_rate_value_input" name="alipayonline_rate_value" max="100" min="0" required> <input
class="form-control form-control-float"
type="number"
ng-model="org.alipayonline_rate_value"
id="alipayonline_rate_value_input"
name="alipayonline_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.cb_bankpay_rate_value.$invalid && org_form.cb_bankpay_rate_value.$dirty}">
<label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate</label> <label class="control-label col-sm-2" for="cb_bankpay_rate_value_input">CB BankPay Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.cb_bankpay_rate_value" id="cb_bankpay_rate_value_input" name="cb_bankpay_rate_value" max="100" min="0"> <input
class="form-control form-control-float"
type="number"
ng-model="org.cb_bankpay_rate_value"
id="cb_bankpay_rate_value_input"
name="cb_bankpay_rate_value"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -155,7 +212,16 @@
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_domestic_card_rate_value.$invalid && org_form.rpaypmt_domestic_card_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rpaypmt_domestic_card_rate_value.$invalid && org_form.rpaypmt_domestic_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_domestic_card_rate_value_input">Domestic Card Payment Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_domestic_card_rate_value_input">Domestic Card Payment Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_domestic_card_rate_value" id="rpaypmt_domestic_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required> <input
class="form-control form-control-float"
type="number"
ng-model="org.rpaypmt_domestic_card_rate_value"
id="rpaypmt_domestic_card_rate_value_input"
name="rpaypmt_card_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -164,7 +230,16 @@
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rpaypmt_overseas_card_rate_value.$invalid && org_form.rpaypmt_overseas_card_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">International Card Payment Rate *</label> <label class="control-label col-sm-2" for="rpaypmt_overseas_card_rate_value_input">International Card Payment Rate *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_overseas_card_rate_value" id="rpaypmt_overseas_card_rate_value_input" name="rpaypmt_card_rate_value" max="100" min="0" required> <input
class="form-control form-control-float"
type="number"
ng-model="org.rpaypmt_overseas_card_rate_value"
id="rpaypmt_overseas_card_rate_value_input"
name="rpaypmt_card_rate_value"
max="100"
min="0"
required
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -172,48 +247,95 @@
<div class="form-group" ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.rpaypmt_dd_rate_value.$invalid && org_form.rpaypmt_dd_rate_value.$dirty}">
<label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate</label> <label class="control-label col-sm-2" for="rpaypmt_dd_rate_value_input">Direct Debit Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.rpaypmt_dd_rate_value" id="rpaypmt_dd_rate_value_input" name="rpaypmt_dd_rate_value" max="100" min="0"> <input
class="form-control form-control-float"
type="number"
ng-model="org.rpaypmt_dd_rate_value"
id="rpaypmt_dd_rate_value_input"
name="rpaypmt_dd_rate_value"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
</div> </div>
<div> <div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_wechat_rate.$invalid && org_form.min_wechat_rate.$dirty}">
ng-class="{'has-error':org_form.min_wechat_rate.$invalid && org_form.min_wechat_rate.$dirty}">
<label class="control-label col-sm-2" for="min_wechat_rate_input">Min Wechat Rate</label> <label class="control-label col-sm-2" for="min_wechat_rate_input">Min Wechat Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_wechat_rate" <input
id="min_wechat_rate_input" name="min_wechat_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_wechat_rate"
id="min_wechat_rate_input"
name="min_wechat_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_alipay_rate.$invalid && org_form.min_alipay_rate.$dirty}">
ng-class="{'has-error':org_form.min_alipay_rate.$invalid && org_form.min_alipay_rate.$dirty}">
<label class="control-label col-sm-2" for="min_alipay_rate_input">Min Alipay Rate</label> <label class="control-label col-sm-2" for="min_alipay_rate_input">Min Alipay Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_alipay_rate" <input
id="min_alipay_rate_input" name="min_alipay_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_alipay_rate"
id="min_alipay_rate_input"
name="min_alipay_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span>
</div>
</div>
<div class="form-group" ng-class="{'has-error':org_form.min_alipayplus_rate.$invalid && org_form.min_alipayplus_rate.$dirty}">
<label class="control-label col-sm-2" for="min_alipayplus_rate_input">Min AlipayPlus Rate</label>
<div class="col-sm-8">
<input
class="form-control form-control-float"
type="number"
ng-model="org.min_alipayplus_rate"
id="min_alipayplus_rate_input"
name="min_alipayplus_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_alipayonline_rate.$invalid && org_form.min_alipayonline_rate.$dirty}">
ng-class="{'has-error':org_form.min_alipayonline_rate.$invalid && org_form.min_alipayonline_rate.$dirty}">
<label class="control-label col-sm-2" for="min_alipayonline_rate_input">Min Alipayonline Rate</label> <label class="control-label col-sm-2" for="min_alipayonline_rate_input">Min Alipayonline Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_alipayonline_rate" <input
id="min_alipayonline_rate_input" name="min_alipayonline_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_alipayonline_rate"
id="min_alipayonline_rate_input"
name="min_alipayonline_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}">
ng-class="{'has-error':org_form.min_cb_bankpay_rate.$invalid && org_form.min_cb_bankpay_rate.$dirty}">
<label class="control-label col-sm-2" for="min_cb_bankpay_rate_input">Min CB BankPay Rate</label> <label class="control-label col-sm-2" for="min_cb_bankpay_rate_input">Min CB BankPay Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_cb_bankpay_rate" <input
id="min_cb_bankpay_rate_input" name="min_cb_bankpay_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_cb_bankpay_rate"
id="min_cb_bankpay_rate_input"
name="min_cb_bankpay_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -228,33 +350,51 @@
</div>--> </div>-->
<!-- 卡支付-国内卡最小费率配置 --> <!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_rpaypmt_domestic_card_rate.$invalid && org_form.min_rpaypmt_domestic_card_rate.$dirty}">
ng-class="{'has-error':org_form.min_rpaypmt_domestic_card_rate.$invalid && org_form.min_rpaypmt_domestic_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_domestic_card_rate_input">Min Domestic Card Payment Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_domestic_card_rate_input">Min Domestic Card Payment Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_domestic_card_rate" <input
id="min_rpaypmt_domestic_card_rate_input" name="min_rpaypmt_domestic_card_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_rpaypmt_domestic_card_rate"
id="min_rpaypmt_domestic_card_rate_input"
name="min_rpaypmt_domestic_card_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<!-- 卡支付-国内卡最小费率配置 --> <!-- 卡支付-国内卡最小费率配置 -->
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
ng-class="{'has-error':org_form.min_rpaypmt_overseas_card_rate.$invalid && org_form.min_rpaypmt_overseas_card_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min International Card Payment Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_overseas_card_rate_input">Min International Card Payment Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_overseas_card_rate" <input
id="min_rpaypmt_overseas_card_rate_input" name="min_rpaypmt_overseas_card_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_rpaypmt_overseas_card_rate"
id="min_rpaypmt_overseas_card_rate_input"
name="min_rpaypmt_overseas_card_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.min_rpaypmt_dd_rate.$invalid && org_form.min_rpaypmt_dd_rate.$dirty}">
ng-class="{'has-error':org_form.min_rpaypmt_dd_rate.$invalid && org_form.min_rpaypmt_dd_rate.$dirty}">
<label class="control-label col-sm-2" for="min_rpaypmt_dd_rate_input">Min Direct Debit Rate</label> <label class="control-label col-sm-2" for="min_rpaypmt_dd_rate_input">Min Direct Debit Rate</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control form-control-float" type="number" ng-model="org.min_rpaypmt_dd_rate" <input
id="min_rpaypmt_dd_rate_input" name="min_rpaypmt_dd_rate" max="100" min="0"> class="form-control form-control-float"
type="number"
ng-model="org.min_rpaypmt_dd_rate"
id="min_rpaypmt_dd_rate_input"
name="min_rpaypmt_dd_rate"
max="100"
min="0"
/>
<span class="input-group-addon form-control-span">%</span> <span class="input-group-addon form-control-span">%</span>
</div> </div>
</div> </div>
@ -264,39 +404,36 @@
<div class="form-group" ng-class="{'has-error':org_form.contact_person.$invalid && org_form.contact_person.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.contact_person.$invalid && org_form.contact_person.$dirty}">
<label class="control-label col-sm-2" for="org_contact_person_input">Contact Person *</label> <label class="control-label col-sm-2" for="org_contact_person_input">Contact Person *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="org.contact_person" id="org_contact_person_input" name="contact_person" required> <input class="form-control" ng-model="org.contact_person" id="org_contact_person_input" name="contact_person" required />
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.contact_phone.$invalid && org_form.contact_phone.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.contact_phone.$invalid && org_form.contact_phone.$dirty}">
<label class="control-label col-sm-2" for="org_contact_phone_input">Phone *</label> <label class="control-label col-sm-2" for="org_contact_phone_input">Phone *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="org.contact_phone" id="org_contact_phone_input" name="contact_phone" required> <input class="form-control" ng-model="org.contact_phone" id="org_contact_phone_input" name="contact_phone" required />
</div> </div>
</div> </div>
<div class="form-group" ng-class="{'has-error':org_form.contact_mail.$invalid && org_form.contact_mail.$dirty}"> <div class="form-group" ng-class="{'has-error':org_form.contact_mail.$invalid && org_form.contact_mail.$dirty}">
<label class="control-label col-sm-2" for="org_contact_mail_input">Mail *</label> <label class="control-label col-sm-2" for="org_contact_mail_input">Mail *</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="org.contact_mail" id="org_contact_mail_input" name="contact_mail" required> <input class="form-control" ng-model="org.contact_mail" id="org_contact_mail_input" name="contact_mail" required />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="commission_checkbox">Enable Commission</label> <label class="control-label col-sm-2" for="commission_checkbox">Enable Commission</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="commission_checkbox" type="checkbox" class="checkbox-inline checkbox" ng-model="org.commission"> <input id="commission_checkbox" type="checkbox" class="checkbox-inline checkbox" ng-model="org.commission" />
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.remark.$invalid && org_form.remark.$dirty}">
ng-class="{'has-error':org_form.remark.$invalid && org_form.remark.$dirty}">
<label class="control-label col-sm-2" for="remark-input">Remark</label> <label class="control-label col-sm-2" for="remark-input">Remark</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea class="form-control" ng-model="org.remark" name="remark" <textarea class="form-control" ng-model="org.remark" name="remark" id="remark-input" maxlength="500"></textarea>
id="remark-input" maxlength="500"></textarea>
</div> </div>
</div> </div>
</div> </div>
<div class="btn-group margin-bottom margin-top"> <div class="btn-group margin-bottom margin-top">
<button class="btn btn-success" type="button" ng-click="update(org_form)">Save <button class="btn btn-success" type="button" ng-click="update(org_form)">Save</button>
</button>
<a class="btn btn-danger" role="button" ui-sref="^" ui-sref-opts="{reload:true}">Back</a> <a class="btn btn-danger" role="button" ui-sref="^" ui-sref-opts="{reload:true}">Back</a>
</div> </div>
<!--<button class="btn btn-success col-sm-offset-2" ng-click="update()"><i class="fa fa-save"></i> Update</button>--> <!--<button class="btn btn-success col-sm-offset-2" ng-click="update()"><i class="fa fa-save"></i> Update</button>-->
@ -308,7 +445,7 @@
<form class="navbar-form navbar-left" role="search"> <form class="navbar-form navbar-left" role="search">
<div class="form-group"> <div class="form-group">
<label class="control-label" for="username-filter-input">Username</label> <label class="control-label" for="username-filter-input">Username</label>
<input type="text" class="form-control" ng-model="params.username" placeholder="Username" id="username-filter-input"> <input type="text" class="form-control" ng-model="params.username" placeholder="Username" id="username-filter-input" />
</div> </div>
<div class="form-group" ng-if="'1'|withRole"> <div class="form-group" ng-if="'1'|withRole">
<label class="control-label" for="role-filter-select">Role</label> <label class="control-label" for="role-filter-select">Role</label>
@ -327,19 +464,13 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<button class="btn btn-primary" type="button" ng-click="listManagers(1)"> <button class="btn btn-primary" type="button" ng-click="listManagers(1)"><i class="fa fa-search"></i> Search</button>
<i class="fa fa-search"></i> Search
</button>
</div> </div>
</form> </form>
<div class="navbar-form navbar-right"> <div class="navbar-form navbar-right">
<button class="btn btn-success" type="button" ng-click="newManager()"> <button class="btn btn-success" type="button" ng-click="newManager()"><i class="fa fa-plus"></i> New Manager Account</button>
<i class="fa fa-plus"></i> New Manager Account
</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="box"> <div class="box">
@ -362,7 +493,9 @@
<tr ng-repeat="manager in managers"> <tr ng-repeat="manager in managers">
<td ng-bind="manager.username"></td> <td ng-bind="manager.username"></td>
<td ng-bind="manager.display_name"></td> <td ng-bind="manager.display_name"></td>
<td style="white-space: nowrap;overflow: hidden;text-overflow:ellipsis;"><img ng-src="{{manager.headimg}}" style="height: 30px;width:30px;" class="img-circle" ng-if="manager.headimg"> {{manager.nickname}}</td> <td style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis">
<img ng-src="{{manager.headimg}}" style="height: 30px; width: 30px" class="img-circle" ng-if="manager.headimg" /> {{manager.nickname}}
</td>
<td ng-bind="manager.create_time|date:'yyyy-MM-dd'"></td> <td ng-bind="manager.create_time|date:'yyyy-MM-dd'"></td>
<td ng-bind="manager.email"></td> <td ng-bind="manager.email"></td>
<td> <td>
@ -387,7 +520,8 @@
</table> </table>
</div> </div>
<div class="box-footer" ng-if="managers.length"> <div class="box-footer" ng-if="managers.length">
<uib-pagination class="pagination" <uib-pagination
class="pagination"
total-items="paginationa.totalCount" total-items="paginationa.totalCount"
boundary-links="true" boundary-links="true"
ng-model="paginationa.page" ng-model="paginationa.page"
@ -397,7 +531,8 @@
previous-text="&lsaquo;" previous-text="&lsaquo;"
next-text="&rsaquo;" next-text="&rsaquo;"
first-text="&laquo;" first-text="&laquo;"
last-text="&raquo;"></uib-pagination> last-text="&raquo;"
></uib-pagination>
<div class="row"> <div class="row">
<div class="col-xs-12">Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}</div> <div class="col-xs-12">Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}</div>
</div> </div>
@ -418,21 +553,16 @@
</p> </p>
</div> </div>
</div> </div>
<div class="form-group" <div class="form-group" ng-class="{'has-error':org_form.gateway_short_id.$invalid && org_form.gateway_short_id.$dirty}">
ng-class="{'has-error':org_form.gateway_short_id.$invalid && org_form.gateway_short_id.$dirty}">
<label class="col-sm-2 control-label">RoyalPay Public Key</label> <label class="col-sm-2 control-label">RoyalPay Public Key</label>
<div class="col-sm-10" style="margin-top: 8px;"> <div class="col-sm-10" style="margin-top: 8px">
<a role="button" ng-click="refreshPlatformPubliKey()"> <a role="button" ng-click="refreshPlatformPubliKey()"> View </a>
View
</a>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">Org Public Key</label> <label class="col-sm-2 control-label">Org Public Key</label>
<div class="col-sm-10" style="margin-top: 8px;"> <div class="col-sm-10" style="margin-top: 8px">
<a role="button" ng-click="resetPartnerPubliKey()"> <a role="button" ng-click="resetPartnerPubliKey()"> Upload </a>
Upload
</a>
</div> </div>
</div> </div>
</form> </form>
@ -442,7 +572,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 col-sm-2 control-label">Client Rate Editable</label> <label class="col-xs-4 col-sm-2 control-label">Client Rate Editable</label>
<div class="col-xs-8 col-sm-8"> <div class="col-xs-8 col-sm-8">
<input type="checkbox" ng-model="org.rate_editable" bs-switch switch-change="toggleRateEditable()"> <input type="checkbox" ng-model="org.rate_editable" bs-switch switch-change="toggleRateEditable()" />
</div> </div>
</div> </div>
</form> </form>
@ -451,77 +581,89 @@
<div class="box box-warning" style="border-top-color: #f06101"> <div class="box box-warning" style="border-top-color: #f06101">
<div class="box-body no-padding table-responsive"> <div class="box-body no-padding table-responsive">
<div> <div>
<span style="float: right;font-size: 14px;" class="del_client">禁用</span> <span style="float: right; font-size: 14px" class="del_client">禁用</span>
<span style="float: right;font-size: 14px;" class="pass_timeout">&nbsp;&nbsp;超期提醒&nbsp;&nbsp;</span> <span style="float: right; font-size: 14px" class="pass_timeout">&nbsp;&nbsp;超期提醒&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;" <span style="float: right; font-size: 14px" class="bg-red">&nbsp;&nbsp;等待合规&nbsp;&nbsp;</span>
class="bg-red">&nbsp;&nbsp;等待合规&nbsp;&nbsp;</span> <span style="float: right; font-size: 14px" class="bg-green">&nbsp;&nbsp;绿色通道&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;" <span style="float: right; font-size: 14px">&nbsp;&nbsp;通过&nbsp;&nbsp;</span>
class="bg-green">&nbsp;&nbsp;绿色通道&nbsp;&nbsp;</span>
<span style="float: right;font-size: 14px;">&nbsp;&nbsp;通过&nbsp;&nbsp;</span>
</div> </div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th style="padding: 12px;">Partner Code</th> <th style="padding: 12px">Partner Code</th>
<th style="padding: 12px;">Partner Name</th> <th style="padding: 12px">Partner Name</th>
<th style="padding: 12px;">Sub Mch ID</th> <th style="padding: 12px">Sub Mch ID</th>
<th style="padding: 12px;">Register Time</th> <th style="padding: 12px">Register Time</th>
<th style="padding: 12px;">Compliance Status</th> <th style="padding: 12px">Compliance Status</th>
<th style="padding: 12px;">Organization</th> <th style="padding: 12px">Organization</th>
<th style="padding: 12px;">BD</th> <th style="padding: 12px">BD</th>
<th style="padding: 12px;" ng-if="'client_detail_by_moniker'|withFunc">Operation</th> <th style="padding: 12px" ng-if="'client_detail_by_moniker'|withFunc">Operation</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="partner in partners" <tr
ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}"> ng-repeat="partner in partners"
ng-class="{pass_timeout:partner.pass_timeout,success:partner.source==5,warning:partner.approve_result==5 && ('100'|withRole)}"
>
<td> <td>
<a class="text-primary" role="button" title="Detail" <a
class="text-primary"
role="button"
title="Detail"
ng-click="openClientBoard(partner)" ng-click="openClientBoard(partner)"
ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"> ng-if="(partner.approve_result==1) || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))"
<span ng-bind="partner.client_moniker"></span></a> >
<span ng-bind="partner.client_moniker"></span
></a>
<span ng-bind="partner.client_moniker" ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span> <span ng-bind="partner.client_moniker" ng-if="partner.approve_result!=1 && !(partner.approve_result==2 && (partner.source==1 || partner.source==2))"></span>
<span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span> <span ng-if="partner.is_valid==0" ng-class="{pass_timeout:partner.is_valid==0}">(已禁用)</span>
<i class="fa fa-sitemap" ng-if="partner.parent_client_id" <i class="fa fa-sitemap" ng-if="partner.parent_client_id" title="Sub Partner"></i>
title="Sub Partner"></i> <i
<i class="text-danger fa fa-envelope-o" class="text-danger fa fa-envelope-o"
ng-if="(partner.approve_result==1 || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))) && (partner.approve_email_send==2 || partner.approve_email_send==0)" ng-if="(partner.approve_result==1 || (partner.approve_result == 2 && (partner.source==1 || partner.source==2))) && (partner.approve_email_send==2 || partner.approve_email_send==0)"
title="Init email send failed"></i> title="Init email send failed"
<i class="text-danger fa fa-clock-o" ng-if="partner.temp_sub_merchant" ></i>
title="Using temp Sub Merchant ID"></i> <i class="text-danger fa fa-clock-o" ng-if="partner.temp_sub_merchant" title="Using temp Sub Merchant ID"></i>
</td> </td>
<td ng-bind="partner.short_name"></td> <td ng-bind="partner.short_name"></td>
<td ng-bind="partner.sub_merchant_id"></td> <td ng-bind="partner.sub_merchant_id"></td>
<td ng-bind="partner.create_time"></td> <td ng-bind="partner.create_time"></td>
<td ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}"> <td
ng-class="{'bg-green':(partner.approve_result==2 && (partner.source==1 || partner.source==2)),'bg-red':((partner.open_status==1||partner.open_status==2||partner.open_status==4) && partner.approve_result!=3)||(partner.approve_result==3 && (!partner.open_status || partner.open_status==1 || partner.open_status == 4))||(partner.approve_result==4 && !partner.open_status)||(partner.open_status==10)}"
>
<span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span> <span ng-if="partner.approve_result==1 && partner.approve_time">通过({{partner.approve_time}})</span>
<span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span> <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source!=4">资料完善中</span>
<span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span> <span ng-if="!partner.open_status && !partner.approve_result && partner.approve_result!=5 && partner.source==4">(自助开通)资料完善中</span>
<span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time">自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span> <span ng-if="!partner.open_status && partner.approve_result==2 && partner.approve_time"
>自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}})</span
>
<span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span> <span ng-if="partner.approve_result==0 && partner.approve_time">不通过({{partner.approve_time}})</span>
<span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span> <span ng-if="partner.approve_result==5 && partner.approve_time && partner.refuse_remark">申请打回({{partner.refuse_remark|limitTo:15}})</span>
<span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span> <span ng-if="(partner.open_status==1||partner.open_status==4) && partner.approve_result!=3"
><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span
>
<span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span> <span ng-if="partner.approve_result==3 && (!partner.open_status || partner.open_status==4)">自助开通（等待合规）</span>
<span ng-if="partner.open_status==2">合同制作完成</span> <span ng-if="partner.open_status==2">合同制作完成</span>
<span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span> <span ng-if="partner.open_status==3 && partner.approve_result!=5">等待BD上传材料审核</span>
<span ng-if="partner.open_status==10">绿色通道申请中</span> <span ng-if="partner.open_status==10">绿色通道申请中</span>
<span ng-if="partner.approve_result==4 && !partner.open_status"><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span> <span ng-if="partner.approve_result==4 && !partner.open_status"
><i ng-if="partner.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span
>
</td> </td>
<td ng-bind="partner.org_name"></td> <td ng-bind="partner.org_name"></td>
<td ng-bind="partner.bd_user_name"></td> <td ng-bind="partner.bd_user_name"></td>
<td ng-if="'client_detail_by_moniker'|withFunc"> <td ng-if="'client_detail_by_moniker'|withFunc">
<a class="text-primary" role="button" title="Detail" <a class="text-primary" role="button" title="Detail" ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
<i class="fa fa-search"></i> Detail <i class="fa fa-search"></i> Detail
</a> </a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="box-footer" ng-if="partners.length"> <div class="box-footer" ng-if="partners.length">
<uib-pagination class="pagination" <uib-pagination
class="pagination"
total-items="pagination.totalCount" total-items="pagination.totalCount"
boundary-links="true" boundary-links="true"
ng-model="pagination.page" ng-model="pagination.page"
@ -531,11 +673,10 @@
previous-text="&lsaquo;" previous-text="&lsaquo;"
next-text="&rsaquo;" next-text="&rsaquo;"
first-text="&laquo;" first-text="&laquo;"
last-text="&raquo;"></uib-pagination> last-text="&raquo;"
></uib-pagination>
<div class="row"> <div class="row">
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
Pages:{{pagination.totalPages}}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -546,8 +687,7 @@
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header with-border">商户新增趋势</div> <div class="box-header with-border">商户新增趋势</div>
<div class="box-body"> <div class="box-body">
<div class="chart" echarts="analysis.clients_line" style="height: 300px" <div class="chart" echarts="analysis.clients_line" style="height: 300px" ng-class="{nodata:analysis.clients_line.nodata}"></div>
ng-class="{nodata:analysis.clients_line.nodata}"></div>
</div> </div>
</div> </div>
</div> </div>
@ -557,8 +697,7 @@
<div class="box box-warning"> <div class="box box-warning">
<div class="box-header with-border">交易额趋势</div> <div class="box-header with-border">交易额趋势</div>
<div class="box-body"> <div class="box-body">
<div class="chart" echarts="analysis.trade_line" style="height: 300px" <div class="chart" echarts="analysis.trade_line" style="height: 300px" ng-class="{nodata:analysis.trade_line.nodata}"></div>
ng-class="{nodata:analysis.trade_line.nodata}"></div>
</div> </div>
</div> </div>
</div> </div>
@ -573,42 +712,50 @@
<div class="col-sm-10"> <div class="col-sm-10">
<div class="form-control-static form-inline"> <div class="form-control-static form-inline">
<div style="display: inline-block"> <div style="display: inline-block">
<input class="form-control" id="date-from-input" ng-model="params.begin" <input
uib-datepicker-popup size="10" placeholder="From" class="form-control"
is-open="dateBegin.open" ng-click="dateBegin.open=true" id="date-from-input"
datepicker-options="{maxDate:params.end||today}"> ng-model="params.begin"
uib-datepicker-popup
size="10"
placeholder="From"
is-open="dateBegin.open"
ng-click="dateBegin.open=true"
datepicker-options="{maxDate:params.end||today}"
/>
</div> </div>
~ ~
<div style="display: inline-block"> <div style="display: inline-block">
<input class="form-control" id="date-to-input" ng-model="params.end" <input
uib-datepicker-popup size="10" placeholder="To" class="form-control"
is-open="dateTo.open" ng-click="dateTo.open=true" id="date-to-input"
datepicker-options="{minDate:params.begin,maxDate:today}"> ng-model="params.end"
uib-datepicker-popup
size="10"
placeholder="To"
is-open="dateTo.open"
ng-click="dateTo.open=true"
datepicker-options="{minDate:params.begin,maxDate:today}"
/>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" <a role="button" class="btn btn-default btn-sm" ng-click="chooseToday()">Today</a>
ng-click="chooseToday()">Today</a>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" <a role="button" class="btn btn-default btn-sm" ng-click="chooseYesterday()">Yesterday</a>
ng-click="chooseYesterday()">Yesterday</a>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" <a role="button" class="btn btn-default btn-sm" ng-click="chooseLast7Days()">Last 7 Days</a>
ng-click="chooseLast7Days()">Last 7 Days</a>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="thisMonth()">This <a role="button" class="btn btn-default btn-sm" ng-click="thisMonth()">This Month</a>
Month</a>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="lastMonth()">Last <a role="button" class="btn btn-default btn-sm" ng-click="lastMonth()">Last Month</a>
Month</a>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a role="button" class="btn btn-default btn-sm" ng-click="thisYear()">This <a role="button" class="btn btn-default btn-sm" ng-click="thisYear()">This Year</a>
Year</a>
</div> </div>
<button class="btn btn-success" type="button" ng-click="loadTransactionAmountInOrg()"> <button class="btn btn-success" type="button" ng-click="loadTransactionAmountInOrg()">
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
@ -664,20 +811,16 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="sale in partnerSalesList"> <tr ng-repeat="sale in partnerSalesList">
<td style="text-align: center;font-style: italic;font-size: larger" <td style="text-align: center; font-style: italic; font-size: larger" ng-bind="$index*2+1+'.'"></td>
ng-bind="$index*2+1+'.'"></td>
<td> <td>
<a class="text-primary" role="button" title="Detail" <a class="text-primary" role="button" title="Detail" ui-sref="partners.detail({clientMoniker:sale[0].client_moniker})">
ui-sref="partners.detail({clientMoniker:sale[0].client_moniker})">
{{sale[0].client_moniker}} {{sale[0].client_moniker}}
</a> </a>
</td> </td>
<td ng-bind="sale[0].amount"></td> <td ng-bind="sale[0].amount"></td>
<td style="text-align: center;font-style: italic;font-size: larger" <td style="text-align: center; font-style: italic; font-size: larger" ng-bind="$index * 2 + 2 +'.'"></td>
ng-bind="$index * 2 + 2 +'.'"></td>
<td> <td>
<a class="text-primary" role="button" title="Detail" <a class="text-primary" role="button" title="Detail" ui-sref="partners.detail({clientMoniker:sale[1].client_moniker})">
ui-sref="partners.detail({clientMoniker:sale[1].client_moniker})">
{{sale[1].client_moniker}} {{sale[1].client_moniker}}
</a> </a>
</td> </td>
@ -687,14 +830,10 @@
</table> </table>
<loadingbar ng-if="rank_loading"></loadingbar> <loadingbar ng-if="rank_loading"></loadingbar>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -719,11 +858,7 @@
<tbody> <tbody>
<tr ng-repeat="clientExtracts in client_extarct"> <tr ng-repeat="clientExtracts in client_extarct">
<td ng-bind="clientExtracts.name"></td> <td ng-bind="clientExtracts.name"></td>
<td> <td>{{clientExtracts.year|limitTo:10}} - {{clientExtracts.month|limitTo:10}}</td>
{{clientExtracts.year|limitTo:10}}
-
{{clientExtracts.month|limitTo:10}}
</td>
<td ng-bind="clientExtracts.gross_amount|currency:'AUD'"></td> <td ng-bind="clientExtracts.gross_amount|currency:'AUD'"></td>
<td ng-bind="clientExtracts.total_charge|currency:'AUD'"></td> <td ng-bind="clientExtracts.total_charge|currency:'AUD'"></td>
<td ng-bind="clientExtracts.royalpay_charge|currency:'AUD'"></td> <td ng-bind="clientExtracts.royalpay_charge|currency:'AUD'"></td>
@ -740,7 +875,8 @@
</table> </table>
</div> </div>
<div class="box-footer" ng-if="client_extarct.length"> <div class="box-footer" ng-if="client_extarct.length">
<uib-pagination class="pagination" <uib-pagination
class="pagination"
total-items="paginationc.totalCount" total-items="paginationc.totalCount"
boundary-links="true" boundary-links="true"
ng-model="paginationc.page" ng-model="paginationc.page"
@ -750,7 +886,8 @@
previous-text="&lsaquo;" previous-text="&lsaquo;"
next-text="&rsaquo;" next-text="&rsaquo;"
first-text="&laquo;" first-text="&laquo;"
last-text="&raquo;"></uib-pagination> last-text="&raquo;"
></uib-pagination>
<div class="row"> <div class="row">
<div class="col-xs-12">Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}</div> <div class="col-xs-12">Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}</div>
</div> </div>
@ -758,21 +895,22 @@
</div> </div>
</uib-tab> </uib-tab>
<uib-tab heading="Default Client Profile"> <uib-tab heading="Default Client Profile">
<form name="profileForm" class="form-horizontal"> <form name="profileForm" class="form-horizontal">
<div class="form-group" ng-repeat="field in clientProfileFields"> <div class="form-group" ng-repeat="field in clientProfileFields">
<label class="control-label col-md-3" ng-bind="field.title||field.field"></label> <label class="control-label col-md-3" ng-bind="field.title||field.field"></label>
<div class="col-md-7" ng-class="{'checkbox-inline':field.type=='checkbox'}"> <div class="col-md-7" ng-class="{'checkbox-inline':field.type=='checkbox'}">
<input ng-class="{'checkbox':field.type=='checkbox','form-control':field.type!='checkbox'}" <input
ng-model="field.value" ng-input-name="{{field.field}}" type="{{field.type}}"> ng-class="{'checkbox':field.type=='checkbox','form-control':field.type!='checkbox'}"
ng-model="field.value"
ng-input-name="{{field.field}}"
type="{{field.type}}"
/>
<p ng-if="field.detail" ng-bind="field.detail" class="text-success text-sm"></p> <p ng-if="field.detail" ng-bind="field.detail" class="text-success text-sm"></p>
</div> </div>
</div> </div>
</form> </form>
<button class="btn btn-warning" ng-click="loadClientProfile()"><i class="fa fa-refresh"></i> Reset <button class="btn btn-warning" ng-click="loadClientProfile()"><i class="fa fa-refresh"></i> Reset</button>
</button> <button class="btn btn-success" ng-click="submitClientProfile()"><i class="fa fa-check"></i> Submit</button>
<button class="btn btn-success" ng-click="submitClientProfile()"><i class="fa fa-check"></i> Submit
</button>
</uib-tab> </uib-tab>
</uib-tabset> </uib-tabset>
</div> </div>

4
src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
Unescape View File

@ -397,6 +397,10 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div style="text-align: center">
<a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope"
ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
</div>
</div> </div>
</div> </div>
</div> </div>

2
src/main/ui/static/templates/alipay/v5/payment.js
Unescape View File

@ -234,7 +234,7 @@ $(function () {
$('.pay_button').css({"background-color":"#eee",}).attr('disabled',true); $('.pay_button').css({"background-color":"#eee",}).attr('disabled',true);
$('.bank_button').css({"background-color":"#eee",}).attr('disabled',true); $('.bank_button').css({"background-color":"#eee",}).attr('disabled',true);
}else{ }else{
$('.pay_button').css({"background-color":"#19AD18",}).attr('disabled',false); $('.pay_button').css({"background-color":"#108ee9",}).attr('disabled',false);
$('.bank_button').css({"background-color":"#FF6600",}).attr('disabled',false); $('.bank_button').css({"background-color":"#FF6600",}).attr('disabled',false);
} }
}); });

Write Preview
Loading…
Cancel
Save