diff --git a/app/build.gradle b/app/build.gradle index 10ce0c6..3329610 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,6 +51,7 @@ android { buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"' buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"' + buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"' buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"' buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"15cadeea4ba94ff7b091c9a10f4bf4a6"' } @@ -62,6 +63,7 @@ android { buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"' buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"' + buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"' buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"' buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"ae18ade3afcf4086bd4397726eb0654c"' } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt index 27b356e..f50f274 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentActivity.kt @@ -159,12 +159,24 @@ class CanPaymentActivity : BaseActivity( private fun requestPayment(chargeId: Long) { val payload = Payload() - .setApplicationId(BuildConfig.BOOTPAY_APP_ID) + .setApplicationId( + if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) { + BuildConfig.BOOTPAY_APP_ID + } else { + BuildConfig.BOOTPAY_APP_HECTO_ID + } + ) .setOrderId("$chargeId") .setOrderName(canResponse!!.title) .setPrice(canResponse!!.price.toDouble()) .setTaxFree(0.toDouble()) - .setPg("웰컴페이먼츠") + .setPg( + if (viewModel.paymentMethodLiveData.value!! == PaymentMethod.PHONE) { + "웰컴페이먼츠" + } else { + "세틀뱅크" + } + ) .setMethod(viewModel.paymentMethodLiveData.value!!.method) Bootpay.init(this, this) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt index 5d4d966..f9b9a69 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/payment/CanPaymentTempActivity.kt @@ -151,7 +151,7 @@ class CanPaymentTempActivity : BaseActivity( .setUsername(SharedPreferenceManager.nickname) val payload = Payload() - .setApplicationId(BuildConfig.BOOTPAY_APP_ID) + .setApplicationId(BuildConfig.BOOTPAY_APP_HECTO_ID) .setOrderId("$chargeId") .setOrderName(title) .setPrice((can * 110).toDouble()) diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index bbac86f..4ffd524 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -268,6 +268,7 @@ - 대표자 : 이재형\n\n - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호\n\n - 사업자등록번호 : 870-81-03220\n\n +- 통신판매업신고 : 제2024-성남분당B-1012호\n\n - 고객센터 : 02.2055.1477\n\n - 대표 이메일 : sodalive.official@gmail.com " diff --git a/app/src/main/res/layout/fragment_audio_content_main.xml b/app/src/main/res/layout/fragment_audio_content_main.xml index 0b8ca79..80885d2 100644 --- a/app/src/main/res/layout/fragment_audio_content_main.xml +++ b/app/src/main/res/layout/fragment_audio_content_main.xml @@ -333,6 +333,7 @@ - 대표자 : 이재형\n\n - 주소 : 경기도 성남시 분당구 황새울로335번길 10, 5층 563A호\n\n - 사업자등록번호 : 870-81-03220\n\n +- 통신판매업신고 : 제2024-성남분당B-1012호\n\n - 고객센터 : 02.2055.1477\n\n - 대표 이메일 : sodalive.official@gmail.com" android:textColor="@color/color_777777"