Skip to content
Permalink
Browse files

Merge branch 'MPN' into MPN_Integration

# Conflicts:
#	BDSM DAO/src/bdsmhost/dao/BdsmEtaxPaymXrefDao.java
#	Bdsm FIX/src/bdsm/service/ETaxService.java
#	Bdsm Model/src/bdsm/model/BdsmEtaxPaymXref.java
#	Bdsm Model/src/bdsm/model/ETaxInquiryBillingResp.java
#	Bdsm Model/src/bdsm/model/EtaxPaymentXrefReq.java
#	Bdsm01/src/java/bdsm/dialog/json/Dialog32101Action.java
#	Bdsm01/src/java/bdsm/web/menu32101/Menu32101ActionTemp.java
#	Bdsm01/src/java/bdsm/web/menu32102/Menu32102Action.java
#	Bdsm01/web/WEB-INF/32101/main.jsp
#	Bdsm01/web/WEB-INF/classes/ApplicationResources.properties
#	Bdsm01/web/WEB-INF/classes/struts.xml
#	BdsmHost01/src/java/bdsmhost/web/ETaxAction.java
  • Loading branch information
BDSM BDSM
BDSM authored and BDSM committed Oct 3, 2019
2 parents a2a4a8e + 8de416f commit 2bba3c3ff2375050e655c299d4f0680cacaf336a
@@ -15,7 +15,6 @@
import bdsm.model.EtaxPaymentXrefResp;
import bdsm.model.ETaxReInquiryBillingReq;
import bdsm.model.ETaxReInquiryBillingResp;

import static bdsm.util.EncryptionUtil.getAES;
import static bdsm.util.EncryptionUtil.hashSHA256;

@@ -63,6 +62,7 @@
private DecimalFormat decF = new DecimalFormat("#");
private SimpleDateFormat datF1 = new SimpleDateFormat("yyyyMMddHHmmss");
private SimpleDateFormat datF2 = new SimpleDateFormat("dd/MMM/yyyy HH:mm:ss");
private SimpleDateFormat datF3 = new SimpleDateFormat("MMddyy");

private BdsmEtaxPaymXref epv;
private MasterLimitEtax limVal;
@@ -72,6 +72,12 @@ public void setStan(String stan) {
private String ntpn;
private String stan;

private String accountType;
private String accountNo;
private String ntb;
private String ntpn;
private String stan;

private String cashIdType;
private String cashBranchGL;
private String cashCustomerType;
@@ -567,5 +573,37 @@ public void setKppnAccountName(String kppnAccountName) {
this.kppnAccountName = kppnAccountName;
}

/**
* @return the accountType
*/
public String getAccountType() {
return accountType;
}

/**
* @param accountType the accountType to set
*/
public void setAccountType(String accountType) {
this.accountType = accountType;
}

/**
* @return the accountNo
*/
public String getAccountNo() {
return accountNo;
}

/**
* @param accountNo the accountNo to set
*/
public void setAccountNo(String accountNo) {
this.accountNo = accountNo;
}

@Override
public String toString() {
return "ETaxInquiryBillingResp{" + "refNo=" + refNo + ", accountType=" + accountType + ", accountNo=" + accountNo + ", branchCode=" + branchCode + ", costCenter=" + costCenter + ", userId=" + userId + ", djpTS=" + djpTS + ", billingInfo=" + billingInfo + ", ccy=" + ccy + ", amount=" + amount + ", responseCode=" + responseCode + ", responseDesc=" + responseDesc + '}';
}

}
@@ -108,7 +108,7 @@ public String doEdit() {
@Override
public String doDelete() {
throw new UnsupportedOperationException("Not supported yet.");
}
}

@Override
public Object getModel() {
@@ -150,10 +150,6 @@
<hr class="ui-widget-content" />
</fieldset>
</s:form>





<div id="divETaxAkhir"></div>
<div id="divETaxPelunasanMessage"></div>
@@ -1736,7 +1732,6 @@
}
function setStateReInq(state) {
$("#frmMainReInquiry_state").val(state);
}
jQuery(document).ready(function () {
var currentState = <s:property value="%{state}" />;
@@ -969,10 +969,14 @@ label.etax.stan=STAN
label.etax.paymentTime=Tanggal dan Jam Bayar
label.etax.status=Status Transaksi
label.etax.tanggalBuku=Tanggal Buku

label.etax.tanggalTransaksi=Tanggal Transaksi
label.etax.reffNo=No Ref Transaksi
label.etax.responseCode=Response Code
label.etax.responseDescription=Response Description

label.etax.reffNo=No Ref Transaksi

label.etax.fieldset.legend.billing.payment=DATA PEMBAYARAN
label.etax.fieldset.legend.billing.details.reinquiry.legend.djp=REINQUIRY KODE BILLING SETORAN PAJAK
label.etax.fieldset.legend.billing.details.reinquiry.legend.djbc=REINQUIRY KODE BILLING SETORAN BEA DAN CUKAI
@@ -135,7 +135,9 @@
<result name="30503" type="chain">30503_input</result>
<result name="31301" type="chain">31301_input</result>
<result name="31302" type="chain">31302_input</result>
<!-- TAX -->
<result name="32101" type="chain">32101_input</result>
<!-- End of TAX -->
<result name="input">/WEB-INF/menu/menu.jsp</result>
<!--result name="input">/WEB-INF/menu/menu_static2.jsp</result>-->
<result name="error">/WEB-INF/menu/error.jsp</result>
@@ -965,6 +967,8 @@
<result name="blank">/WEB-INF/blank.jsp</result>
<result name="inquiryAcct">/WEB-INF/32101/inquiryAccount.jsp</result>
</action>
<!-- Menu 32101 end -->

<action name="32102_*" method="{1}" class="bdsm.web.menu32102.Menu32102Action">
<interceptor-ref name="tokenTimerStack" />
<result name="buttons">/WEB-INF/32102/buttons.jsp</result>
@@ -4,6 +4,8 @@
import bdsm.fcr.model.BaCcyCode;
import bdsm.fcr.model.ChAcctMast;
import bdsm.fcr.model.GLMaster;
import bdsm.model.MasterLimitEtax;
import bdsmhost.dao.MasterLimitEtaxDao;
import bdsmhost.dao.BdsmEtaxPaymXrefDao;
import bdsm.model.BdsmEtaxPaymXref;
import bdsm.fcr.service.AccountService;
@@ -13,7 +15,6 @@
import bdsm.model.ETaxInquiryBillingResp;
import bdsm.model.ETaxReInquiryBillingReq;
import bdsm.model.ETaxReInquiryBillingResp;
import bdsm.model.MasterLimitEtax;
import bdsm.model.Parameter;
import bdsmhost.fcr.dao.DataMasterDAO;
import bdsm.service.ETaxService;
@@ -48,6 +49,8 @@
private ETaxInquiryBillingReq inquiryReq;
private ETaxInquiryBillingResp etax;
private MasterLimitEtax limVal;
private ETaxReInquiryBillingReq reInquiryReq;
private ETaxReInquiryBillingResp reInquiryResp;
private List currencyList;
private String accountNo;
private HashMap accountDetail;
@@ -113,6 +116,32 @@ public String inquiryBilling() {
return SUCCESS;
}

public String reInquiryBilling() {
LOGGER.info("BILLING ID: " + getBillingId());

try {
reInquiryReq = new ETaxReInquiryBillingReq();
reInquiryReq.setBillingId(billingId);
reInquiryReq.setBranchCode("09233");
reInquiryReq.setCostCenter("09233");
reInquiryReq.setUserId("ebanking");

ETaxService etaxService = new ETaxService(this.getHSession());
this.reInquiryResp = etaxService.reinquiryBilling(reInquiryReq);

// get credit account
//getCreditAccount();

} catch (Exception ex) {
this.getLogger().info("Exception: " + ex, ex);
return this.quitOfError(this.getErrorMessageFromException(ex));
}

this.getLogger().info("reInquiryResp: " + this.reInquiryResp);

return SUCCESS;
}

public String reInquiryBilling() {
LOGGER.info("BILLING ID: " + getBillingId());

@@ -412,6 +441,7 @@ public void setGlMaster(GLMaster glMaster) {
this.glMaster = glMaster;
}


/**
* @return the epv
*/
@@ -508,6 +538,22 @@ public MasterLimitEtax getLimVal() {
*/
public void setLimVal(MasterLimitEtax limVal) {
this.limVal = limVal;

public ETaxReInquiryBillingReq getReInquiryReq() {
return reInquiryReq;
}

public void setReInquiryReq(ETaxReInquiryBillingReq reInquiryReq) {
this.reInquiryReq = reInquiryReq;
}

public ETaxReInquiryBillingResp getReInquiryResp() {
return reInquiryResp;
}

public void setReInquiryResp(ETaxReInquiryBillingResp reInquiryResp) {
this.reInquiryResp = reInquiryResp;

}

}

0 comments on commit 2bba3c3

Please sign in to comment.
You can’t perform that action at this time.