Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kyaw_Min_Khant:5163ce284017102d7dbb4bff386b787ec202d42e
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
..
compare: Kyaw_Min_Khant:122c526cc91a10bfd6dad6dbd24380d8e1114cbc
Branches Tags
Kyaw_Min_Khant:merge_latest_SIT
Kyaw_Min_Khant:auto_print_disable
Kyaw_Min_Khant:refund_fix
Kyaw_Min_Khant:production_1.0
Kyaw_Min_Khant:merge-latest
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:mpu_latest
Kyaw_Min_Khant:merge_with_mpu
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:merge
Kyaw_Min_Khant:master
Kyaw_Min_Khant:main

No commits in common. "5163ce284017102d7dbb4bff386b787ec202d42e" and "122c526cc91a10bfd6dad6dbd24380d8e1114cbc" have entirely different histories.
5163ce2840 ... 122c526cc9

8 changed files with 4 additions and 61 deletions
Show Stats Expand all files Collapse all files

4
app/build.gradle
View File

@ -14,8 +14,8 @@ android {
applicationId "com.utsmm.kbz"
minSdk 24
targetSdk 33
versionCode 7
versionName "1.06"
versionCode 6
versionName "1.05"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

5
app/src/main/java/com/utsmm/kbz/util/tms/TMSSetupsImpl.java
View File

@ -156,10 +156,6 @@ public class TMSSetupsImpl implements TMSSetups{
SystemParamsOperation.getInstance().setMerchantAddress2("");
}
if(siriusResponse.getAddress3() != null && siriusResponse.getAddress3().isEmpty()){
SystemParamsOperation.getInstance().setMerchantAddress3("");
}
init();
if(siriusMerchant != null) {
@ -167,7 +163,6 @@ public class TMSSetupsImpl implements TMSSetups{
SystemParamsOperation.getInstance().setMerchantName(siriusMerchant.getName());
SystemParamsOperation.getInstance().setMerchantAddress(siriusMerchant.getAddress());
SystemParamsOperation.getInstance().setMerchantAddress2(siriusMerchant.getAddress2());
SystemParamsOperation.getInstance().setMerchantAddress3(siriusMerchant.getAddress3());
SystemParamsOperation.getInstance().setMerchantPhoneNo(siriusMerchant.getMobile());
SystemParamsOperation.getInstance().setTerminalName(siriusMerchant.getDescription());
SystemParamsOperation.getInstance().setTerminalIdForEreceipt(siriusTerminal.getId());

11
baselib/src/main/java/com/utsmyanmar/baselib/network/model/sirius/SiriusMerchant.java
View File

@ -12,19 +12,16 @@ public class SiriusMerchant {
private String address2;
private String address3;
private String phone;
private String mobile;
public SiriusMerchant(String id, String name, String description, String address,String address2, String address3,String phone,String mobile) {
public SiriusMerchant(String id, String name, String description, String address,String address2,String phone,String mobile) {
this.id = id;
this.name = name;
this.description = description;
this.address = address;
this.address2 = address2;
this.address3 = address3;
this.phone = phone;
this.mobile = mobile;
}
@ -45,12 +42,6 @@ public class SiriusMerchant {
return address2;
}
public String getAddress3(){ return address3; }
public void setAddress3(String address3){
this.address3 = address3;
}
public String getPhone() {
return phone;
}

11
baselib/src/main/java/com/utsmyanmar/baselib/network/model/sirius/SiriusResponse.java
View File

@ -1,7 +1,5 @@
package com.utsmyanmar.baselib.network.model.sirius;
import android.text.TextUtils;
import java.util.List;
public class SiriusResponse {
@ -14,8 +12,6 @@ public class SiriusResponse {
private String address2;
private String address3;
private SiriusMerchant merchant;
private List<SiriusHost> hosts;
@ -24,12 +20,11 @@ public class SiriusResponse {
private SiriusTerminal terminal;
public SiriusResponse(String serial, String ecrKey,String address,String address2, SiriusMerchant merchant, List<SiriusHost> hosts, List<SiriusProperty> properties, SiriusTerminal terminal, String address3) {
public SiriusResponse(String serial, String ecrKey,String address,String address2, SiriusMerchant merchant, List<SiriusHost> hosts, List<SiriusProperty> properties, SiriusTerminal terminal) {
this.serial = serial;
this.ecrKey = ecrKey;
this.address = address;
this.address2 = address2;
this.address3 = address3;
this.merchant = merchant;
this.hosts = hosts;
this.properties = properties;
@ -44,8 +39,6 @@ public class SiriusResponse {
this.address2 = address2;
}
public void setAddress3(String address3) { this.address3 = address3; }
public String getAddress() {
return address;
}
@ -54,8 +47,6 @@ public class SiriusResponse {
return address2;
}
public String getAddress3(){ return address3; }
public void setSerial(String serial) {
this.serial = serial;
}

6
paylibs/src/main/java/com/utsmyanmar/paylibs/print/PrintReceipt.java
View File

@ -174,13 +174,11 @@ public class PrintReceipt {
String merchantName = "";
String merchantAddress = "";
String merchantAddress2 = "";
String merchantAddress3 = "";
String merchantPhoneNo = "";
merchantName = SystemParamsOperation.getInstance().getMerchantName();
merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress();
merchantAddress2 = SystemParamsOperation.getInstance().getMerchantAddress2();
merchantAddress3 = SystemParamsOperation.getInstance().getMerchantAddress3();
merchantPhoneNo = SystemParamsOperation.getInstance().getMerchantPhoneNo();
if (TextUtils.equals(merchantName, "") || merchantName == null) {
@ -192,9 +190,6 @@ public class PrintReceipt {
if (TextUtils.equals(merchantAddress2, "") || merchantAddress2 == null) {
merchantAddress2 = "MERCHANT ADDRESS2";
}
if (TextUtils.equals(merchantAddress3, "") || merchantAddress3 == null) {
merchantAddress3 = "MERCHANT ADDRESS3";
}
if (TextUtils.equals(merchantPhoneNo, "") || merchantPhoneNo == null) {
merchantPhoneNo = "MERCHANT PHONENO";
}
@ -210,7 +205,6 @@ public class PrintReceipt {
sunmiPrinterService.setFontSize(textSize, innerResultCallback);
sunmiPrinterService.printText(merchantAddress + "\n", innerResultCallback);
sunmiPrinterService.printText(merchantAddress2 + "\n", innerResultCallback);
sunmiPrinterService.printText(merchantAddress3 + "\n", innerResultCallback);
sunmiPrinterService.printText(merchantPhoneNo + "\n", innerResultCallback);
sunmiPrinterService.lineWrap(1, innerResultCallback);
} catch (RemoteException e) {

7
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -879,16 +879,13 @@ public abstract class BaseXPrint {
String merchantName = "";
String merchantAddress = "";
String merchantAddress2 = "";
String merchantAddress3 = "";
String merchantPhoneNo = "";
String terminalName = "";
merchantName = SystemParamsOperation.getInstance().getMerchantName();
receiptHeader = SystemParamsOperation.getInstance().getReceiptHeader();
merchantAddress = SystemParamsOperation.getInstance().getMerchantAddress();
merchantAddress2 = SystemParamsOperation.getInstance().getMerchantAddress2();
merchantAddress3 = SystemParamsOperation.getInstance().getMerchantAddress3();
merchantPhoneNo = SystemParamsOperation.getInstance().getMerchantPhoneNo();
terminalName = SystemParamsOperation.getInstance().getTerminalName();
@ -901,9 +898,6 @@ public abstract class BaseXPrint {
if (TextUtils.equals(merchantAddress2, "") || merchantAddress2 == null) {
merchantAddress2 = "MERCHANT ADDRESS2";
}
if (TextUtils.equals(merchantAddress3, "") || merchantAddress3 == null) {
merchantAddress3 = "MERCHANT ADDRESS3";
}
// if (TextUtils.equals(merchantPhoneNo, "") || merchantPhoneNo == null) {
// merchantPhoneNo = "MERCHANT PHONENO";
// }
@ -915,7 +909,6 @@ public abstract class BaseXPrint {
printer.appendPrnStr(terminalName, fontNormal, AlignEnum.CENTER, false);
printer.appendPrnStr(merchantAddress, fontNormal, AlignEnum.CENTER,false);
printer.appendPrnStr(merchantAddress2, fontNormal, AlignEnum.CENTER,false);
printer.appendPrnStr(merchantAddress3, fontNormal, AlignEnum.CENTER,false);
// printer.appendPrnStr(merchantPhoneNo, fontNormal, AlignEnum.CENTER,false);
// emptyLine(1);
// dashBreak();

11
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java
View File

@ -989,12 +989,6 @@ public class SystemParamsOperation {
saveSystemParamsSettings(params);
}
public void setMerchantAddress3(String merchantAddress3){
SystemParamsSettings params = getSystemParamsSettings();
params.setMerchantAddress3(merchantAddress3);
saveSystemParamsSettings(params);
}
public void setMerchantPhoneNo(String merchantPhoneNo) {
SystemParamsSettings params = getSystemParamsSettings();
params.setMerchantPhoneNo(merchantPhoneNo);
@ -1693,9 +1687,4 @@ public class SystemParamsOperation {
SystemParamsSettings paramsSettings = getSystemParamsSettings();
return paramsSettings.getSecHostId();
}
public String getMerchantAddress3() {
SystemParamsSettings paramsSettings = getSystemParamsSettings();
return paramsSettings.getMerchantAddress3();
}
}

10
paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java
View File

@ -67,8 +67,6 @@ public class SystemParamsSettings implements Serializable {
private String merchantAddress2 = "";
private String merchantAddress3 = "";
private String merchantPhoneNo = "";
private String systemPassword = "";
@ -864,14 +862,6 @@ public class SystemParamsSettings implements Serializable {
this.merchantAddress2 = merchantAddress2;
}
protected void setMerchantAddress3(String merchantAddress3){
this.merchantAddress3 = merchantAddress3;
}
protected String getMerchantAddress3(){
return merchantAddress3;
}
protected String getMerchantAddress2() {
return merchantAddress2;
}