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

Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

Browse Source
master
wangning 7 years ago
parent 1a81591c93 f06eb372dd
commit a7519cf5ee
9 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -388,7 +388,7 @@ public class RetailAppServiceImp implements RetailAppService {
query.setGateway_app("11");
String clientType = device.getString("client_type");
DeviceRegister register = deviceSupport.findRegister(clientType);
Assert.notNull(register);
Assert.notNull(register,"Device is not registered");
int client_id = device.getIntValue("client_id");
JSONObject client = clientManager.getClientInfo(client_id);
String timezone = client.getString("timezone");
@ -779,7 +779,7 @@ public class RetailAppServiceImp implements RetailAppService {
Date now = new Date();
JSONObject res = merchantInfoProvider.clientCurrentRate(clientId, now, "Wechat");
JSONObject client = clientManager.getClientInfo(clientId);
Assert.notNull(client);
Assert.notNull(client,"Client is null");
JSONObject[] channels = new JSONObject[3];
@ -804,7 +804,7 @@ public class RetailAppServiceImp implements RetailAppService {
Date now = new Date();
JSONObject res = merchantInfoProvider.clientCurrentRate(clientId, now, "Wechat");
JSONObject client = clientManager.getClientInfo(clientId);
Assert.notNull(client);
Assert.notNull(client,"Client is null");
ArrayList<JSONObject> channels = new ArrayList<>();
if (client.getBigDecimal("customer_surcharge_rate") != null) {
@ -1095,7 +1095,7 @@ public class RetailAppServiceImp implements RetailAppService {
if (params.getString("type").equals("Merchant")) {
for (String partner_code : codes) {
JSONObject client = clientManager.getClientInfoByMoniker(partner_code);
Assert.notNull(client);
Assert.notNull(client,"Client is null");
List<JSONObject> tokens = clientDeviceTokenMapper.listTokensByClient_id(client.getInteger("client_id"));
if (null != tokens && tokens.size() > 0) {
for (final JSONObject devToken : tokens) {

2
src/main/ui/index.html
Unescape View File

@ -111,7 +111,7 @@
ng-class="{'sidebar-collapse':hideSideBar,'sidebar-open':hideSideBar}">
<div class="polaroid" ng-if="currentUser==null">
<div class="rotate_left">
<img class="dh" src="static/images/christmas.png" alt="royalpay" style="width: 200px;height:200px;margin-top: 10%;
<img class="dh" src="static/images/r_logo.svg" alt="royalpay" style="width: 150px;height:150px;margin-top: 10%;
margin-bottom: 10%;"/>
<p style="color: #666">Easy Business，Easy Pay</p>
</div>

4
src/main/ui/login.html
Unescape View File

@ -126,8 +126,8 @@
<!-- /.login-logo -->
<div class="login-box-body login-box-bg">
<a href="#" class="qrcode-target qrcode-target-show" id="app-btn" title="扫码登录" seed="authcenter-qrshow"></a>
<p style="text-align: center;"><img src="static/images/christmas.png"
style="width: 70%"></p>
<p style="text-align: center;"><img src="static/images/rp_logo_vertical.svg"
style="width: 80%;margin-top: -15%;margin-bottom: -10%;"></p>
<p style="text-align: center;font-size:20px;">Easy Business，Easy Payment</p>
<div id="qrdiv" hidden style="width: 70%;margin-left: 13%;">

2
src/main/ui/m_login.html
Unescape View File

@ -55,7 +55,7 @@
<!-- /.login-logo -->
<div class="login-box-body login-box-bg">
<p style="text-align: center;"><img src="static/images/christmas.png" style="width: 70%;"></p>
<p style="text-align: center;"><img src="static/images/rp_logo_vertical.svg" style="width: 80%;margin-top: -15%;margin-bottom: -10%;"></p>
<p style="text-align: center;font-size:20px;">Easy Business，Easy Payment</p>

2
src/main/ui/manage.html
Unescape View File

@ -80,7 +80,7 @@
ng-class="{'sidebar-collapse':hideSideBar,'sidebar-open':hideSideBar}">
<div class="polaroid" ng-if="currentUser==null">
<div class="rotate_left">
<img class="dh" src="static/images/christmas.png" alt="RoyalPay" style="width:200px;height:200px;margin-top: 10%;
<img class="dh" src="static/images/r_logo.svg" alt="RoyalPay" style="width:150px;height:150px;margin-top: 10%;
margin-bottom: 10%;"/>
<p style="color: #666">To Be The Best QRCode Payment Service Provider!</p>
</div>

6
src/main/ui/static/analysis/settle_report.js
Unescape View File

@ -13,7 +13,9 @@ define(['angular', 'decimal','uiRouter','./report/analysis-report'], function (a
}]);
app.controller('settleFinancialReportCtrl', ['$scope', '$http', '$filter', function ($scope, $http, $filter) {
$scope.params = {year: new Date().getFullYear()};
$scope.availableYears = [new Date().getFullYear() - 1, new Date().getFullYear()];
$scope.initMonth = function (year) {
$scope.params.year = year;
$scope.months = [];
for (var i = 1; i < 13; i++) {
var mon = '00' + i;
@ -21,9 +23,9 @@ define(['angular', 'decimal','uiRouter','./report/analysis-report'], function (a
$scope.months.push(year + '-' + mon);
}
};
$scope.initMonth($scope.params.year);
$scope.initMonth(new Date().getFullYear());
$scope.hasReport = function (mon) {
var start = '2017-02';
var start = '2017-02';//todo modify in different country
var end = $filter('date')(new Date(), 'yyyy-MM');
return start <= mon && end >= mon
};

9
src/main/ui/static/analysis/templates/settle_report.html
Unescape View File

@ -1,7 +1,14 @@
<section class="content">
<div class="box box-default">
<div class="box-header" ng-bind="params.year"></div>
<div class="box-header">
<div uib-dropdown>
<button class="btn btn-primary" uib-dropdown-toggle type="button" ng-bind="params.year"></button>
<ul class="dropdown-menu" uib-dropdown-menu role="menu">
<li ng-repeat="year in availableYears" role="menuitem"><a role="button" ng-click="initMonth(year)" ng-bind="year"></a></li>
</ul>
</div>
</div>
<div class="box-body">
<div class="row">
<div class="col-xs-3" ng-repeat="mon in months">

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

@ -41,7 +41,9 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
app.controller('bdPrizeRootCtrl', ['$scope', '$http', '$uibModal', 'commonDialog', function ($scope, $http, $uibModal, commonDialog) {
$scope.params = {year: new Date().getFullYear()};
$scope.availableYears = [new Date().getFullYear() - 1, new Date().getFullYear()];
$scope.initMonth = function (year) {
$scope.params.year = year;
$scope.months = [];
for (var i = 1; i < 13; i++) {
var mon = '00' + i;
@ -68,7 +70,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
$scope.reportMonths = resp.data.data;
})
};
$scope.getYearReports($scope.params.year);
$scope.getYearReports(new Date().getFullYear());
$scope.generateReport = function () {
commonDialog.confirm({
title: 'Warning',
@ -193,6 +195,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
// $scope.bdmon;
// $scope.newSwitch;
$scope.initMonth = function (year) {
$scope.params.year = year;
$scope.months = [];
for (var i = 1; i < 13; i++) {
var mon = '00' + i;
@ -200,9 +203,9 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
$scope.months.push(year + '-' + mon);
}
};
$scope.initMonth($scope.params.year);
$scope.initMonth(new Date().getFullYear());
$scope.hasReport = function (mon) {
var start = '2017-01';
var start = '2017-01';//todo change for different country
var end = $filter('date')(new Date(), 'yyyy-MM');
return start <= mon && end >= mon
};

9
src/main/ui/static/config/bdprize/templates/bd_prize_root.html
Unescape View File

@ -16,7 +16,14 @@
</div>
</div>
<div class="box box-default" ng-if="'1000'|withRole">
<div class="box-header" ng-bind="params.year"></div>
<div class="box-header">
<div uib-dropdown>
<button class="btn btn-primary" uib-dropdown-toggle type="button" ng-bind="params.year"></button>
<ul class="dropdown-menu" uib-dropdown-menu role="menu">
<li ng-repeat="year in availableYears" role="menuitem"><a role="button" ng-click="getYearReports(year)" ng-bind="year"></a></li>
</ul>
</div>
</div>
<div class="box-body">
<div class="row">
<div class="col-xs-2" ng-repeat="mon in months">

Write Preview
Loading…
Cancel
Save