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

sys_org add state

Browse Source
master
yuan 6 years ago
parent 89a183e35f
commit 9553f8e61d
6 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File

1
src/db/modify.sql
Unescape View File

@ -684,3 +684,4 @@ INSERT INTO `sys_configs` VALUES ('payment.ali.per_order_limit', 10000,null);
update sys_clients set contact_phone = concat('+61',contact_phone) where create_time >'2018-06-01' and source = 4
alter table sys_org add COLUMN `state` varchar(20) DEFAULT NULL COMMENT '州 (使用标准码 NSW,QLD,WA,VIC,ACT,NT,TAS,SA)';

9
src/main/java/au/com/royalpay/payment/manage/organizations/beans/OrgInfo.java
Unescape View File

@ -42,6 +42,7 @@ public class OrgInfo {
private Double min_jd_rate;
private Double min_alipayonline_rate;
private Double min_hf_rate;
private String state;
public JSONObject toJsonParam() {
JSONObject param = new JSONObject();
@ -301,4 +302,12 @@ public class OrgInfo {
public void setMin_hf_rate(Double min_hf_rate) {
this.min_hf_rate = min_hf_rate;
}
public String getState() {
return state;
}
public void setState(String state) {
this.state = state;
}
}

9
src/main/ui/static/config/organizations/organizations.js
Unescape View File

@ -85,8 +85,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
};
$scope.listOrgs(1);
}]);
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org) {
app.controller('orgDetailCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org','stateMap', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org,stateMap) {
$scope.types = angular.copy(types);
$scope.states = stateMap.configs();
$scope.commission_types = angular.copy(commission_types);
$scope.org = angular.copy(org.data);
if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
@ -191,8 +192,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
})
}
}]);
app.controller('orgDetailParentCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org) {
app.controller('orgDetailParentCtrl', ['$scope', '$http', '$state', 'Upload', '$uibModal','commonDialog', 'org','stateMap', function ($scope, $http, $state, Upload,$uibModal,commonDialog, org,stateMap) {
$scope.types = angular.copy(types);
$scope.states = stateMap.configs();
$scope.commission_types = angular.copy(commission_types);
$scope.org = angular.copy(org.data);
if (($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && $scope.currentUser.org_id) {
@ -289,9 +291,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
})
}*/
}]);
app.controller('newOrgCtrl', ['$scope', '$http', '$state', 'Upload', 'commonDialog', function ($scope, $http, $state, Upload, commonDialog) {
app.controller('newOrgCtrl', ['$scope', '$http', '$state', 'Upload', 'commonDialog','stateMap', function ($scope, $http, $state, Upload, commonDialog,stateMap) {
$scope.types = angular.copy(types);
$scope.commission_types = angular.copy(commission_types);
$scope.states = stateMap.configs();
$scope.uploadLogo = function (file) {
if (file == null) {
return;

11
src/main/ui/static/config/organizations/templates/new_org.html
Unescape View File

@ -32,6 +32,17 @@
</p>
</div>
</div>
<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>
<div class="col-sm-8">
<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">
<option value="">Please Choose</option>
</select>
</div>
</div>
<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>

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

@ -44,6 +44,16 @@
</p>
</div>
</div>
<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>
<div class="col-sm-8">
<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">
<option value="">Please Choose</option>
</select>
</div>
</div>
<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>
<div class="col-sm-8">

10
src/main/ui/static/config/organizations/templates/org_detail_parent.html
Unescape View File

@ -181,6 +181,16 @@
</p>
</div>
</div>
<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>
<div class="col-sm-8">
<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">
<option value="">Please Choose</option>
</select>
</div>
</div>
<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>
<div class="col-sm-8">

Write Preview
Loading…
Cancel
Save