diff --git a/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java b/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java index 72504a5..26b1eba 100644 --- a/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java +++ b/app/src/main/java/com/utsmm/kbz/ui/settings/HostConfigFragment.java @@ -113,7 +113,7 @@ public class HostConfigFragment extends DataBindingFragment { return; } printer.setGray(GrayLevelEnum.LEVEL_2); - Typeface typeface = ResourcesCompat.getFont(requireContext(), R.font.consolas_regular); + Typeface typeface = ResourcesCompat.getFont(requireContext(), R.font.consolas_bold); printer.setTypeface(typeface); SystemParamsOperation sp = SystemParamsOperation.getInstance(); diff --git a/app/src/main/res/font/consolas_bold.ttf b/app/src/main/res/font/consolas_bold.ttf new file mode 100644 index 0000000..ef6d555 Binary files /dev/null and b/app/src/main/res/font/consolas_bold.ttf differ diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java index 9821f58..871f35b 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/di/NetworkModule.java @@ -289,8 +289,8 @@ public class NetworkModule { tmsAddress = getTMSUrlFromNative(); } - String baseUrl = tmsAddress.trim() + "/api/v1/"; -// String baseUrl = tmsAddress.trim() + "/"; + String baseUrl = tmsAddress.trim() + "/api/v1/"; //for on prim +// String baseUrl = tmsAddress.trim() + "/"; //for uat final Gson gson = new GsonBuilder().create(); @@ -487,8 +487,8 @@ public Retrofit provideKPayRefundRetrofit(@ApplicationContext Context context) { OkHttpClient client = new OkHttpClient.Builder() .addInterceptor(interceptor) .build(); - String baseUrl = "http://receipt-nest.utsmyanmar.com/"; -// String baseUrl = "https://api-tms-uat.kbzbank.com:8443/receipt/"; + String eReceiptAddress = SystemParamsOperation.getInstance().getEreceiptAddress(); + String baseUrl = eReceiptAddress + "/"; return new Retrofit.Builder() .baseUrl(baseUrl) diff --git a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java index cd41d0d..85c1f90 100644 --- a/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java +++ b/baselib/src/main/java/com/utsmyanmar/baselib/repo/Repository.java @@ -40,6 +40,7 @@ import com.utsmyanmar.baselib.network.model.KPayRefund; import com.utsmyanmar.baselib.repo.local.PayWaveRepository; import com.utsmyanmar.baselib.util.EReceiptHelper; import com.utsmyanmar.paylibs.model.PayDetail; +import com.utsmyanmar.paylibs.utils.LogUtil; import java.util.List; @@ -113,6 +114,7 @@ public class Repository { } public Observable sendReceipt(Object body){ String apiSecret = BuildConfig.ERECEIPT_SECRET; + LogUtil.d("kmk", "receipt secret =>" + apiSecret); String timestamp = String.valueOf(System.currentTimeMillis()); String bodyString = new Gson().toJson(body); String dataToHash = bodyString + apiSecret + timestamp; diff --git a/gradle.properties b/gradle.properties index afcdd41..58bc467 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,4 +29,5 @@ android.useAndroidX=true android.nonTransitiveRClass=true # Disable Android Studio's Jetifier to avoid conflicts android.enableJetifier=false -ERECEIPT_SECRET=y812J21lhha11OS +#ERECEIPT_SECRET=y812J21lhha11OS +ERECEIPT_SECRET=8f4df38d1001bcc4620b5c736c66a03eef4653eb3ba31105faa2f2ee294c4a46 diff --git a/paylibs/src/main/assets/fonts/consolab.ttf b/paylibs/src/main/assets/fonts/consolab.ttf new file mode 100644 index 0000000..ef6d555 Binary files /dev/null and b/paylibs/src/main/assets/fonts/consolab.ttf differ diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java index 8a105e1..b116470 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java @@ -117,7 +117,7 @@ public abstract class BaseXPrint { Resources resources = PayLibsUtils.getInstance().context.getResources(); // Typeface typeface = ResourcesCompat.getFont(PayLibsUtils.getInstance().context, R.font.consolas); // printer.setTypeface(typeface); - printer.setTypeface(Typeface.createFromAsset(PayLibsUtils.getInstance().context.getAssets(), "fonts/ubuntu_mono.ttf")); + printer.setTypeface(Typeface.createFromAsset(PayLibsUtils.getInstance().context.getAssets(), "fonts/consolab.ttf")); printer.setGray(getGrayLevel()); } diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java index 0dd8522..c7ae3b0 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsOperation.java @@ -1649,4 +1649,9 @@ public class SystemParamsOperation { SystemParamsSettings params = getSystemParamsSettings(); return params.getCertificatePassword(); } + + public String getEreceiptAddress() { + SystemParamsSettings params = getSystemParamsSettings(); + return params.getEreceiptAddress(); + } } \ No newline at end of file diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java index 67b2c33..19ef0f4 100644 --- a/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java +++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/utils/core_utils/SystemParamsSettings.java @@ -43,8 +43,10 @@ public class SystemParamsSettings implements Serializable { // private String tmsAddress = "https://tms.smile-mm.com"; // private String tmsAddress = "http://128.199.170.203"; private String tmsAddress = "http://sirius-nest.utsmyanmar.com"; -// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; +// private String tmsAddress = "https://api-tms-uat.kbzbank.com:8443/sirius"; //for uat private String ereceiptAddress = "http://receipt-nest.utsmyanmar.com"; +// String baseUrl = "http://receipt-nest.utsmyanmar.com/"; //for uat + private String terminalCapability = "E0E8C8"; diff --git a/paylibs/src/main/res/font/consolab.ttf b/paylibs/src/main/res/font/consolab.ttf new file mode 100644 index 0000000..ef6d555 Binary files /dev/null and b/paylibs/src/main/res/font/consolab.ttf differ