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

[Y] R service新增参数 & 修改清算文件

Browse Source
master
taylor.dang 5 years ago
parent bcafcdcb29
commit eea73c3b20
12 changed files with 157 additions and 115 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>1.3.3</version> <version>1.3.4</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.4.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>

49
src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
Unescape View File

@ -47,4 +47,53 @@ public class RSvcMchBean {
* 商户名称 * 商户名称
*/ */
private String merchantName; private String merchantName;
/**
* 公司地址 address
*/
private String address;
/**
* 联系人 contact_person
*/
private String contactPerson;
/**
* 联系人电话 contact_phone
*/
private String contactPhone;
/**
* 联系人邮箱 contact_email
*/
private String contactEmail;
/**
* 银行账户名称
*/
private String accountName;
/**
* bsb
*/
private String bsbNumber;
/**
* 银行账户号码
*/
private String accountNo;
/**
* 银行注册地址
*/
private String registeredAddress;
/**
* 银行电话
*/
private String telNumber;
/**
* abn
*/
private String abn;
} }

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

@ -46,11 +46,16 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
result.put("enc_data", new JSONObject() { result.put("enc_data", new JSONObject() {
{ {
put("credentialCode", encData(svcMchBean.getCredentialCode(), key, svcInfo.getString("channel_pub_key"))); put("credentialCode", encData(svcMchBean.getCredentialCode(), key, svcInfo.getString("channel_pub_key")));
put("payHost", encData(svcMchBean.getPayHost(), key, svcInfo.getString("channel_pub_key"))); put("payHost", encData(svcMchBean.getPayHost(), key, svcInfo.getString("channel_pub_key")));
put("partnerCode", encData(svcMchBean.getPartnerCode(), key, svcInfo.getString("channel_pub_key"))); put("partnerCode", encData(svcMchBean.getPartnerCode(), key, svcInfo.getString("channel_pub_key")));
put("merchantNumber", encData(svcMchBean.getMerchantNumber(), key, svcInfo.getString("channel_pub_key"))); put("merchantNumber", encData(svcMchBean.getMerchantNumber(), key, svcInfo.getString("channel_pub_key")));
} }
}); });
result.remove("credentialCode");
result.remove("payHost");
result.remove("partnerCode");
result.remove("merchantNumber");
result.put("nonce_str", aesKeyStr); result.put("nonce_str", aesKeyStr);
result.put("timestamp", System.currentTimeMillis()); result.put("timestamp", System.currentTimeMillis());
result = JSONObject.parseObject(JSON.toJSONString(result), Feature.OrderedField); result = JSONObject.parseObject(JSON.toJSONString(result), Feature.OrderedField);

28
src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
Unescape View File

@ -799,7 +799,9 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
analysis.put("total_credit", total_credit.setScale(2, RoundingMode.HALF_UP)); analysis.put("total_credit", total_credit.setScale(2, RoundingMode.HALF_UP));
analysis.put("total_debit", total_debit.setScale(2, RoundingMode.HALF_UP)); analysis.put("total_debit", total_debit.setScale(2, RoundingMode.HALF_UP));
analysis.put("net_amount", net_amount_credit.subtract(net_amount_debit).setScale(2, RoundingMode.HALF_UP)); analysis.put("net_amount", net_amount_credit.subtract(net_amount_debit).setScale(2, RoundingMode.HALF_UP));
analysis.put("clearing_amount", net_amount_credit.subtract(net_amount_debit).setScale(2, RoundingMode.HALF_UP));
analysis.put("tax_amount", tax_amount.setScale(2, RoundingMode.HALF_UP)); analysis.put("tax_amount", tax_amount.setScale(2, RoundingMode.HALF_UP));
analysis.put("total_surcharge", total_charge_credit.subtract(total_charge_debit).setScale(2, RoundingMode.HALF_UP));
analysis.put("total_charge", total_charge_credit.subtract(total_charge_debit).add(tax_amount).setScale(2, RoundingMode.HALF_UP)); analysis.put("total_charge", total_charge_credit.subtract(total_charge_debit).add(tax_amount).setScale(2, RoundingMode.HALF_UP));
analysis.put("gross_amount", total_credit.subtract(total_debit).setScale(2, RoundingMode.HALF_UP)); analysis.put("gross_amount", total_credit.subtract(total_debit).setScale(2, RoundingMode.HALF_UP));
dayAnalysisMap.put(entry.getKey(), analysis); dayAnalysisMap.put(entry.getKey(), analysis);
@ -837,15 +839,13 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
int rowNum = 0; int rowNum = 0;
Row row = sheet.createRow(rowNum); Row row = sheet.createRow(rowNum);
String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency", String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency",
"Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No"}; "Input Amount", "Total Amount", "Clearing Amount(AUD)", "Sruchange Rate", "Surcharge(AUD)", "GST(AUD)", "Settle Amount(AUD)", "Remark", "Dev No"};
String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"}; String[] analysis = {"Total Credit(AUD)", "Total Debit(AUD)", "Gross Amount(AUD)", "Total GST(AUD)", "Total Charge(AUD)", "Net Amount(AUD)"};
for (int i = 0; i < title.length; i++) { for (int i = 0; i < title.length; i++) {
row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]); row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]);
} }
JSONObject channels = clearTransation.getJSONObject("channels"); JSONObject channels = clearTransation.getJSONObject("channels");
JSONObject device;
String clientDevId = "";
for (Object o : clearTransation.getJSONArray("report")) { for (Object o : clearTransation.getJSONArray("report")) {
JSONObject settle = (JSONObject) o; JSONObject settle = (JSONObject) o;
if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) { if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) {
@ -887,17 +887,23 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
cell.setCellStyle(!"Credit".equals(settle.getString("transaction_type"))?analysisStyle2:null); cell.setCellStyle(!"Credit".equals(settle.getString("transaction_type"))?analysisStyle2:null);
row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(channels.getString(settle.getString("channel")) == null ? "" row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(channels.getString(settle.getString("channel")) == null ? ""
: channels.getJSONObject(settle.getString("channel")).getBigDecimal("rate").toPlainString() + "%"); : channels.getJSONObject(settle.getString("channel")).getBigDecimal("rate").toPlainString() + "%");
cell = row.createCell(12, Cell.CELL_TYPE_STRING); //手续费 + gst
row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("total_surcharge") == null ? ""
: settle.getBigDecimal("total_surcharge").setScale(2, RoundingMode.DOWN).toPlainString());
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(settle.getBigDecimal("tax_amount") == null ? ""
: settle.getBigDecimal("tax_amount").setScale(2, RoundingMode.DOWN).toPlainString());
cell = row.createCell(14, Cell.CELL_TYPE_STRING);
cell.setCellValue(settle.getBigDecimal("settle_amount") == null ? "" cell.setCellValue(settle.getBigDecimal("settle_amount") == null ? ""
: "Credit".equals(settle.getString("transaction_type")) ? : "Credit".equals(settle.getString("transaction_type")) ?
settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString() : settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString() :
"-" + settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString()); "-" + settle.getBigDecimal("settle_amount").setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
cell.setCellStyle(!"Credit".equals(settle.getString("transaction_type")) ? analysisStyle2 : null); cell.setCellStyle(!"Credit".equals(settle.getString("transaction_type")) ? analysisStyle2 : null);
row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("order_detail")); row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("order_detail"));
device = clientDeviceMapper.find(settle.getString("dev_id")); String clientDevId = StringUtils.defaultString(settle.getString("dev_id"), "-");
JSONObject device = clientDeviceMapper.find(settle.getString("dev_id"));
if (device != null) if (device != null)
clientDevId = device.getString("client_dev_id"); clientDevId = device.getString("client_dev_id");
row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId); row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(clientDevId);
} }
row = sheet.createRow(++rowNum); row = sheet.createRow(++rowNum);
for (int i = 0; i < analysis.length; i++) { for (int i = 0; i < analysis.length; i++) {
@ -909,9 +915,9 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_payment")); row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_payment"));
row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_refund")); row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_refund"));
row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("gross_amount")); row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("gross_amount"));
row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getBigDecimal("total_charge").add(clearTransation.getBigDecimal("tax_amount")).toPlainString()); row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("tax_amount"));
row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("clearing_amount")); row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_charge"));
row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("clearing_amount"));
wb.write(ous); wb.write(ous);
ous.flush(); ous.flush();
} catch (IOException e) { } catch (IOException e) {

11
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -6187,6 +6187,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
svcMchBean.setLogo(mchInfo.getString("logo_url")); svcMchBean.setLogo(mchInfo.getString("logo_url"));
svcMchBean.setIndustryCode(mchInfo.getString("industry")); svcMchBean.setIndustryCode(mchInfo.getString("industry"));
svcMchBean.setIndustryName(findByLookupCode(mchInfo.getString("industry")).getString("lookup_value")); svcMchBean.setIndustryName(findByLookupCode(mchInfo.getString("industry")).getString("lookup_value"));
svcMchBean.setAddress(mchInfo.getString("address"));
svcMchBean.setRegisteredAddress(mchInfo.getString("bank_address"));
svcMchBean.setContactPerson(mchInfo.getString("contact_person"));
svcMchBean.setContactPhone(mchInfo.getString("contact_phone"));
svcMchBean.setContactEmail(mchInfo.getString("contact_email"));
svcMchBean.setBsbNumber(mchInfo.getString("bsn_no"));
svcMchBean.setAccountNo(mchInfo.getString("account_no"));
svcMchBean.setAccountName(mchInfo.getString("account_name"));
svcMchBean.setTelNumber(mchInfo.getString("bank_phone"));
svcMchBean.setAbn(mchInfo.getString("abn"));
return svcMchBean; return svcMchBean;
} }

2
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
Unescape View File

@ -375,6 +375,8 @@
<![CDATA[ <![CDATA[
SELECT t.client_id,DATE(t.transaction_time) clearing_time, SELECT t.client_id,DATE(t.transaction_time) clearing_time,
ifnull(cd.report_date,date(t.transaction_time)) report_date, ifnull(cd.report_date,date(t.transaction_time)) report_date,
cd.tax_amount,
cd.total_charge,
SUM(t.clearing_amount) total, SUM(t.clearing_amount) total,
sum(if(LOCATE('MERCHANT',t.system_transaction_id),t.clearing_amount,0)) income, sum(if(LOCATE('MERCHANT',t.system_transaction_id),t.clearing_amount,0)) income,
sum(if(LOCATE('SURCHARGE',t.system_transaction_id),t.clearing_amount,0)) fee, sum(if(LOCATE('SURCHARGE',t.system_transaction_id),t.clearing_amount,0)) fee,

15
src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
Unescape View File

@ -51,13 +51,24 @@
sc.company_name, sc.company_name,
ifnull( sc.logo_url, "NONE" ) logo_url, ifnull( sc.logo_url, "NONE" ) logo_url,
sc.industry, sc.industry,
industry CONCAT( sc.address, ' ', sc.state, ' ', sc.suburb, ' ', sc.country ) mch_address,
sc.contact_person,
sc.contact_phone,
sc.contact_email,
IFNULL( sc.abn, sc.acn ) abn,
sba.bsb_no,
sba.account_name,
sba.account_no,
IFNULL( sba.address, 'NONE' ) bank_address,
'NONE' bank_phone
FROM FROM
sys_accounts sa, sys_accounts sa,
sys_clients sc sys_clients sc,
sys_bank_accounts sba
WHERE WHERE
sa.account_id = #{account_id} sa.account_id = #{account_id}
AND sc.client_id = sa.client_id AND sc.client_id = sa.client_id
AND sc.client_id = sba.client_id
AND sc.is_valid = 1 AND sc.is_valid = 1
AND sa.is_valid = 1 AND sa.is_valid = 1
</select> </select>

2
src/main/ui/static/boot/manager-bootv2.js
Unescape View File

@ -69,7 +69,7 @@ require(['angular', 'jquery'], function (angular, $) {
boot(user); boot(user);
}, },
error: function (jqXHR) { error: function (jqXHR) {
if (jqXHR.status == 403) { if (jqXHR.status === 403) {
location.href = 'm_login.html?f=' + encodeURIComponent(location.href); location.href = 'm_login.html?f=' + encodeURIComponent(location.href);
} }
} }

4
src/main/ui/static/commons/services/clearingDetailService.js
Unescape View File

@ -30,10 +30,6 @@ define(['../app','decimal'], function (app,Decimal) {
app.controller('clearingDetailCtrl', ['$scope', 'detail', 'is_partner','client_id','detailId','$http', function ($scope, detail, is_partner,client_id,detailId,$http) { app.controller('clearingDetailCtrl', ['$scope', 'detail', 'is_partner','client_id','detailId','$http', function ($scope, detail, is_partner,client_id,detailId,$http) {
$scope.ctrl = {channel: null,day:null}; $scope.ctrl = {channel: null,day:null};
$scope.report = detail.data; $scope.report = detail.data;
$scope.report.total_charge = Decimal.add($scope.report.total_charge,$scope.report.tax_amount).toFixed(2);
angular.forEach($scope.report.channels,function (e) {
e.total_charge = Decimal.add(e.total_charge,e.tax_amount).toFixed(2);
});
$scope.is_partner = is_partner; $scope.is_partner = is_partner;
$scope.channelAndDayOfAnalysis = function () { $scope.channelAndDayOfAnalysis = function () {
$http.get('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId+'/analysis/'+$scope.ctrl.channel).then(function (resp) { $http.get('/client/clean_logs/' + client_id + '/settlement_logs/' + detailId+'/analysis/'+$scope.ctrl.channel).then(function (resp) {

9
src/main/ui/static/payment/tradelog/partner-settlement-log.js
Unescape View File

@ -43,7 +43,6 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
} }
}); });
$scope.params.client_ids = angular.copy($scope.clientIds); $scope.params.client_ids = angular.copy($scope.clientIds);
$scope.loadSettlementLogs(1);
}) })
} }
@ -118,9 +117,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}); });
} }
return url; return url;
} };
$scope.loadSettlementLogs(1);
$scope.chooseLast7Days(); $scope.chooseLast7Days();
$scope.exportSettlementLogs = function(pattern) { $scope.exportSettlementLogs = function(pattern) {
@ -180,7 +177,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.isAll = false; $scope.isAll = false;
$scope.showLevel3Clients = false; $scope.showLevel3Clients = false;
} }
$scope.loadSettlementLogs(); $scope.loadSettlementLogs(1);
}; };
$scope.chooseLevel3Client = function (client) { $scope.chooseLevel3Client = function (client) {
@ -193,7 +190,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.params.client_ids = [client.client_id]; $scope.params.client_ids = [client.client_id];
$scope.isLevel3All = false; $scope.isLevel3All = false;
} }
$scope.loadSettlementLogs(); $scope.loadSettlementLogs(1);
}; };
$scope.getClearingTransactions = function (client_id, detailId) { $scope.getClearingTransactions = function (client_id, detailId) {

73
src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
Unescape View File

@ -85,6 +85,11 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Tax Amount</span>
<span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.tax_amount|currency:''"></span>
<span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].tax_amount|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Total Charge</span> <span class="col-xs-6 text-bold">Total Charge</span>
<span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.total_charge|currency:''"></span> <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.total_charge|currency:''"></span>
@ -98,59 +103,19 @@
<div class="col-xs-6 col-sm-3" ng-if="!is_partner"> <div class="col-xs-6 col-sm-3" ng-if="!is_partner">
<span class="col-xs-6 text-bold">RoyalPay Charge</span> <span class="col-xs-6 text-bold">RoyalPay Charge</span>
<span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.royalpay_charge|currency:''"></span> <span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.royalpay_charge|currency:''"></span>
<span ng-if="ctrl.channel!=null" class="col-xs-6" ng-bind="report.channels[ctrl.channel].royalpay_charge|currency:''"></span> <span ng-if="ctrl.channel!=null" class="col-xs-6"
ng-bind="report.channels[ctrl.channel].royalpay_charge|currency:''"></span>
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Net Amount</span> <span class="col-xs-6 text-bold">Net Amount</span>
<span ng-if="ctrl.channel==null" class="col-xs-6" ng-bind="report.clearing_amount|currency:''"></span> <span ng-if="ctrl.channel==null" class="col-xs-6"
ng-bind="report.clearing_amount|currency:''"></span>
<span ng-if="ctrl.channel!=null" class="col-xs-6" <span ng-if="ctrl.channel!=null" class="col-xs-6"
ng-bind="report.channels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge|currency:''"></span> ng-bind="(report.channels[ctrl.channel].gross_amount - report.channels[ctrl.channel].total_charge-report.channels[ctrl.channel].tax_amount)|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3" ng-if="!ctrl.channel">
<span class="col-xs-6 text-bold">Tax Amount</span>
<span class="col-xs-6" ng-bind="report.tax_amount|currency:''"></span>
</div> </div>
</div> </div>
</div> </div>
</uib-tab> </uib-tab>
<!-- <uib-tab heading="Analysis" ng-if="ctrl.channel!=null" ng-click="ctrl.day=''">
<div class="box-body">
<div class="row">
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Total Credit</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_credit|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Total Debit</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_debit|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Gross Amount</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].gross_amount|currency:''"></span>
</div>
</div>
<div class="row">
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Total Charge</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].total_charge|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3" ng-if="!is_partner">
<span class="col-xs-6 text-bold">Channel Charge</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].third_charge|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3" ng-if="!is_partner">
<span class="col-xs-6 text-bold">RoyalPay Charge</span>
<span class="col-xs-6" ng-bind="report.channels[ctrl.channel].royalpay_charge|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Net Amount</span>
<span class="col-xs-6"
ng-bind="report.channels[ctrl.channel].gross_amount-report.channels[ctrl.channel].total_charge|currency:''"></span>
</div>
</div>
</div>
</uib-tab>-->
<uib-tab ng-repeat="(key,analysis) in channelAndDayMap" heading="{{key}}" ng-click="ctrl.day=key"> <uib-tab ng-repeat="(key,analysis) in channelAndDayMap" heading="{{key}}" ng-click="ctrl.day=key">
<div class="box-body" > <div class="box-body" >
<div class="row"> <div class="row">
@ -169,25 +134,17 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Total Charge</span> <span class="col-xs-6 text-bold">Tax Amount</span>
<span class="col-xs-6" ng-bind="analysis.total_charge|currency:''"></span> <span class="col-xs-6" ng-bind="analysis.tax_amount|currency:''"></span>
</div>
<div class="col-xs-6 col-sm-3" ng-if="!is_partner">
<span class="col-xs-6 text-bold">Channel Charge</span>
<span class="col-xs-6" ng-bind="analysis.wechat_charge|currency:''"></span>
</div> </div>
<div class="col-xs-6 col-sm-3" ng-if="!is_partner"> <div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">RoyalPay Charge</span> <span class="col-xs-6 text-bold">Total Charge</span>
<span class="col-xs-6" ng-bind="analysis.royalpay_charge|currency:''"></span> <span class="col-xs-6" ng-bind="analysis.total_surcharge|currency:''"></span>
</div> </div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
<span class="col-xs-6 text-bold">Net Amount</span> <span class="col-xs-6 text-bold">Net Amount</span>
<span class="col-xs-6" ng-bind="analysis.net_amount|currency:''"></span> <span class="col-xs-6" ng-bind="analysis.net_amount|currency:''"></span>
</div> </div>
<div class="col-xs-6 col-sm-3" ng-if="!ctrl.channel">
<span class="col-xs-6 text-bold">Tax Amount</span>
<span class="col-xs-6" ng-bind="analysis.tax_amount|currency:''"></span>
</div>
</div> </div>
</div> </div>
</uib-tab> </uib-tab>

22
src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
Unescape View File

@ -134,10 +134,11 @@
<thead> <thead>
<tr> <tr>
<th>Date</th> <th>Date</th>
<th>Transaction Amount</th> <th>Transaction Amount(AUD)</th>
<th>Transfer to Merchant</th> <th>Transfer to Merchant(AUD)</th>
<th>Merchant Service Fee</th> <th>GST(AUD)</th>
<!--<th>Rate</th>--> <th>Total Surcharge(AUD)</th>
<th>Merchant Service Fee(AUD)</th>
<th>Operation</th> <th>Operation</th>
</tr> </tr>
</thead> </thead>
@ -149,13 +150,20 @@
</td> </td>
<td ng-bind="log.total"></td> <td ng-bind="log.total"></td>
<td ng-bind="log.income"></td> <td ng-bind="log.income"></td>
<td ng-bind="log.fee"></td> <td ng-bind="log.tax_amount"></td>
<td ng-bind="log.total_charge"></td>
<td>{{log.fee}}</td>
<!--<td ng-bind="log.rate"></td>--> <!--<td ng-bind="log.rate"></td>-->
<td> <td>
<a role="button" class="text-bold" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)" title="Detail"> <a role="button" class="text-bold"
ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"
ng-click="getClearingTransactions(log.client_id,log.clear_detail_id)"
title="Detail">
<i class="fa fa-list-alt"></i> <i class="fa fa-list-alt"></i>
</a> </a>
<a ng-href="/client/clean_logs/{{log.client_id}}/settlement_logs/{{log.clear_detail_id}}/export" target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'" title="Download"> <a ng-href="/client/clean_logs/{{log.client_id}}/settlement_logs/{{log.clear_detail_id}}/export"
target="_blank" ng-if="(log.clearing_time|limitTo:10) >= '2017-01-12'"
title="Download">
<i class="fa fa-download"></i> <i class="fa fa-download"></i>
</a> </a>
</td> </td>

Write Preview
Loading…
Cancel
Save