Skip to content

Commit 2f0027c

Browse files
rupy1014rupy1014
committed
정기결제 alias card_rebill 추가, 기존 subscript_card 와 같음
1 parent 93e0539 commit 2f0027c

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

‎bootpay/bootpay.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />

‎bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@ private String getMethodString(Method method) {
309309
return "";
310310
case SUBSCRIPT_CARD:
311311
return "card_rebill";
312+
case CARD_REBILL:
313+
return "card_rebill";
312314
case SUBSCRIPT_PHONE:
313315
return "phone_rebill";
314316
case AUTH:

‎bootpay/src/main/java/kr/co/bootpay/enums/Method.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public enum Method {
77
VBANK,
88
PHONE,
99
AUTH, // 본인인증
10-
// CARD_REBILL,
10+
CARD_REBILL, // 정기결제, SUBSCRIPT_CARD 와 똑같다
1111
SUBSCRIPT_CARD, // 정기결제
1212
SUBSCRIPT_PHONE, // 정기결제
1313
EASY, // 간편결제

‎bootpay/src/main/java/kr/co/bootpay/valid/PGAvailable.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
public class PGAvailable {
1414
private static Map<PG, List<Method>> pgData = new HashMap<PG, List<Method>> () {{
15-
put(PG.KCP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD));
16-
put(PG.DANAL, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD, Method.AUTH));
15+
put(PG.KCP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD, Method.CARD_REBILL));
16+
put(PG.DANAL, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD, Method.CARD_REBILL, Method.AUTH));
1717
put(PG.INICIS, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
1818
put(PG.NICEPAY, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.KAKAO));
1919
put(PG.PAYAPP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.KAKAO, Method.NPAY));
2020
put(PG.LGUP, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
21-
put(PG.KAKAO, Arrays.asList(Method.EASY, Method.SUBSCRIPT_CARD));
21+
put(PG.KAKAO, Arrays.asList(Method.EASY, Method.SUBSCRIPT_CARD, Method.CARD_REBILL));
2222
put(PG.PAYCO, Arrays.asList(Method.EASY));
2323
put(PG.EASYPAY, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
2424
put(PG.KICC, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
2525
put(PG.JTNET, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
2626
put(PG.TPAY, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK));
2727
put(PG.MOBILIANS, Arrays.asList(Method.PHONE));
28-
put(PG.PAYLETTER, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD));
28+
put(PG.PAYLETTER, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.SUBSCRIPT_CARD, Method.CARD_REBILL));
2929
put(PG.ONESTORE, Arrays.asList(Method.PHONE, Method.CARD, Method.BANK, Method.VBANK, Method.EASY_BANK, Method.EASY_CARD));
3030
}};
3131

@@ -145,6 +145,8 @@ public static String methodToString(Method method) {
145145
return "";
146146
case SUBSCRIPT_CARD:
147147
return "card_rebill";
148+
case CARD_REBILL:
149+
return "card_rebill";
148150
case SUBSCRIPT_PHONE:
149151
return "phone_rebill";
150152
case AUTH:

‎sample/sample.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
3131
<exclude-output />
3232
<content url="file://$MODULE_DIR$">
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
3533
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />

‎sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ void goPGPay() {
7979
Bootpay.init(getFragmentManager())
8080
.setContext(this)
8181
.setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
82-
.setPG(PG.DANAL) // 결제할 PG 사
83-
.setMethod(Method.CARD)
82+
.setPG(PG.PAYLETTER) // 결제할 PG 사
83+
.setMethod(Method.CARD_REBILL)
8484
.setBootExtra(bootExtra)
8585
.setBootUser(bootUser)
8686
// .setOrderId("1234")
@@ -90,7 +90,7 @@ void goPGPay() {
9090
//.isShowAgree(true)
9191
.setName("bootpay kb card test") // 결제할 상품명
9292
.setOrderId("1232352354") // 결제 고유번호
93-
.setPrice(1000) // 결제할 금액
93+
// .setPrice(1000) // 결제할 금액
9494
.setAccountExpireAt("2019-07-16")
9595
.addItem("마우스", 1, "ITEM_CODE_MOUSE", 500) // 주문정보에 담길 상품정보, 통계를 위해 사용
9696
.addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 500, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용

0 commit comments

Comments
 (0)