Skip to content

Commit f45c4d0

Browse files
author
ehowlsla
committed
bootpay 3.0 api update
1 parent a2d7a1a commit f45c4d0

File tree

14 files changed

+130
-87
lines changed

14 files changed

+130
-87
lines changed

‎BootpayPG.swift‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// BootpayPG.swift
3+
// Alamofire
4+
//
5+
// Created by YoonTaesup on 2019. 7. 22..
6+
//
7+
8+
public struct BootpayPG {
9+
public static let KCP = "kcp"
10+
public static let DANAL = "danal"
11+
public static let INICIS = "inicis"
12+
public static let NICEPAY = "nicepay"
13+
public static let LGUP = "lgup"
14+
public static let PAYAPP = "payapp"
15+
public static let KAKAO = "kakao"
16+
public static let PAYCO = "payco"
17+
public static let KICC = "kicc"
18+
public static let EASYPAY = "kicc"
19+
public static let JTNET = "tpay"
20+
public static let TPAY = "tpay"
21+
public static let MOBILIANS = "mobilians"
22+
public static let PAYLETTER = "payletter"
23+
public static let BOOTPAY = "bootpay"
24+
}

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/Pods/Target Support Files/SwiftyBootpay/SwiftyBootpay-Info.plist‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/SwiftyBootpay/NativeController.swift‎

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,11 @@ class NativeController: UIViewController {
157157
$0.params = customParams // 커스텀 변수
158158
$0.application_id = "5b9f51264457636ab9a07cdd"
159159
// $0.user_info = bootUser
160-
$0.pg = "danal" // 결제할 PG사
160+
$0.pg = "payletter" // 결제할 PG사
161161
// $0.account_expire_at = "2018-09-25" // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
162162
// $0.method = "card" // 결제수단
163-
$0.methods = ["card", "phone"]
163+
$0.method = "card"
164+
// $0.methods = ["card", "phone"]
164165
$0.sms_use = true
165166
$0.ux = "BOOTPAY_REMOTE_FORM"
166167
}
@@ -293,7 +294,6 @@ extension NativeController {
293294

294295
func presentBootpayController() {
295296

296-
297297
// 통계정보를 위해 사용되는 정보
298298
// 주문 정보에 담길 상품정보로 배열 형태로 add가 가능함
299299
let item1 = BootpayItem().params {
@@ -329,41 +329,29 @@ extension NativeController {
329329
$0.phone = "010-1234-4567"
330330
}
331331

332-
// print(bootUser.toJSONString())
333-
334-
// let userInfo: [String: String] = [
335-
// "username": "사용자 이름",
336-
// "email": "user1234@gmail.com",
337-
// "addr": "사용자 주소",
338-
// "phone": "010-1234-4567"
339-
// ]
340-
341-
let request = BootpayRequest()
342-
request.params {
343-
$0.price = 1000 // 결제할 금액
344-
$0.name = "블링\"블링's 마스카라" // 결제할 상품명
345-
$0.order_id = "1234_1234_124" // 결제 고유번호
346-
$0.params = customParams // 커스텀 변수
347-
// $0.user_info = bootUser
348-
$0.pg = "payletter" // 결제할 PG사
349-
// $0.account_expire_at = "2018-09-25" // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
350-
// $0.method = "card" // 결제수단
351-
$0.show_agree_window = false
352-
$0.method = "card"
353-
$0.ux = "PG_DIALOG"
354-
// $0.methods = ["card", "phone"]
355-
// $0.sendable = self // 이벤트를 처리할 protocol receiver
356-
// $0.extra.quotas = [0,2,3] // // 5만원 이상일 경우 할부 허용범위 설정 가능, (예제는 일시불, 2개월 할부, 3개월 할부 허용)
357-
}
332+
let request = BootpayRequest()
333+
request.params {
334+
$0.price = 1000 // 결제할 금액
335+
$0.name = "블링\"블링's 마스카라" // 결제할 상품명
336+
$0.order_id = "1234_1234_124" // 결제 고유번호
337+
$0.params = customParams // 커스텀 변수
338+
// $0.user_info = bootUser
339+
$0.pg = BootpayPG.DANAL // 결제할 PG사
340+
// $0.account_expire_at = "2018-09-25" // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
341+
// $0.method = "card" // 결제수단
342+
$0.show_agree_window = false
343+
$0.method = BootpayMethod.PHONE
344+
$0.ux = BootpayUX.PG_DIALOG
345+
}
358346

359-
let extra = BootpayExtra()
360-
extra.quotas = [0, 2, 3]
347+
let extra = BootpayExtra()
348+
extra.quotas = [0, 2, 3] // 5만원 이상일 경우 할부 허용범위 설정 가능, (예제는 일시불, 2개월 할부, 3개월 할부 허용)
361349

362-
var items = [BootpayItem]()
363-
items.append(item1)
364-
items.append(item2)
350+
var items = [BootpayItem]()
351+
items.append(item1)
352+
items.append(item2)
365353

366-
Bootpay.request(self, sendable: self, request: request, user: bootUser, items: items, extra: extra)
354+
Bootpay.request(self, sendable: self, request: request, user: bootUser, items: items, extra: extra, addView: true)
367355
}
368356
}
369357

‎SwiftyBootpay.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'SwiftyBootpay'
11-
s.version = '3.0.42'
11+
s.version = '3.0.43'
1212
s.summary = 'PG Plugin For Swift'
1313

1414
# This description is used to generate tags and improve search results.

‎SwiftyBootpay/Classes/Bootpay.swift‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,20 @@ class BootpayDefault {
8888
vc.dismiss(animated: true, completion: nil)
8989
}
9090

91-
public static func request(_ viewController: UIViewController, sendable: BootpayRequestProtocol?, request: BootpayRequest, user: BootpayUser? = nil, items: [BootpayItem]? = nil, extra: BootpayExtra? = nil, smsPayload: SMSPayload? = nil, remoteForm: RemoteOrderForm? = nil, remotePre: RemoteOrderPre? = nil) {
91+
public static func request(_ viewController: UIViewController, sendable: BootpayRequestProtocol?, request: BootpayRequest, user: BootpayUser? = nil, items: [BootpayItem]? = nil, extra: BootpayExtra? = nil, smsPayload: SMSPayload? = nil, remoteForm: RemoteOrderForm? = nil, remotePre: RemoteOrderPre? = nil, addView: Bool? = false) {
9292

9393
if(!checkValid(request: request, user: user, items: items, extra: extra, smsPayload: smsPayload, remoteForm: remoteForm, remotePre: remotePre)) { return }
9494

9595
switch request.ux {
96-
case BootpayUX.PG_DIALOG.rawValue:
96+
case BootpayUX.PG_DIALOG:
97+
request_dialog(viewController, sendable: sendable, request: request, user: user, items: items, extra: extra, smsPayload: smsPayload, addView: addView)
98+
case BootpayUX.PG_SUBSCRIPT:
9799
request_dialog(viewController, sendable: sendable, request: request, user: user, items: items, extra: extra, smsPayload: smsPayload)
98-
case BootpayUX.PG_SUBSCRIPT.rawValue:
99-
request_dialog(viewController, sendable: sendable, request: request, user: user, items: items, extra: extra, smsPayload: smsPayload)
100-
case BootpayUX.BOOTPAY_REMOTE_LINK.rawValue:
100+
case BootpayUX.BOOTPAY_REMOTE_LINK:
101101
request_link(request, items: items, user: user, extra: extra, smsPayload: smsPayload)
102-
case BootpayUX.BOOTPAY_REMOTE_FORM.rawValue:
102+
case BootpayUX.BOOTPAY_REMOTE_FORM:
103103
request_form(request, user: user, items: items, extra: extra, smsPayload: smsPayload, remoteForm: remoteForm)
104-
case BootpayUX.BOOTPAY_REMOTE_PRE.rawValue:
104+
case BootpayUX.BOOTPAY_REMOTE_PRE:
105105
request_pre(request, user: user, items: items, extra: extra, smsPayload: smsPayload, remotePre: remotePre)
106106
default:
107107
return
@@ -114,7 +114,7 @@ class BootpayDefault {
114114
return true
115115
}
116116

117-
public static func request_dialog(_ viewController: UIViewController, sendable: BootpayRequestProtocol?, request: BootpayRequest, user: BootpayUser? = nil, items: [BootpayItem]? = nil, extra: BootpayExtra? = nil, smsPayload: SMSPayload? = nil) {
117+
public static func request_dialog(_ viewController: UIViewController, sendable: BootpayRequestProtocol?, request: BootpayRequest, user: BootpayUser? = nil, items: [BootpayItem]? = nil, extra: BootpayExtra? = nil, smsPayload: SMSPayload? = nil, addView: Bool? = false) {
118118

119119
// sharedInstance.vc.request = request
120120
// if let user = user { sharedInstance.vc.user = user }
@@ -130,7 +130,11 @@ class BootpayDefault {
130130
if let extra = extra { sharedInstance.vc?.extra = extra }
131131
if let sendable = sendable { sharedInstance.vc?.sendable = sendable }
132132
if let items = items { sharedInstance.vc?.items = items }
133-
viewController.present(sharedInstance.vc!, animated: true, completion: nil)
133+
if (addView == true) {
134+
viewController.view.addSubview(sharedInstance.vc!.view)
135+
} else {
136+
viewController.present(sharedInstance.vc!, animated: true, completion: nil)
137+
}
134138
}
135139

136140
public static func request_link(_ request: BootpayRequest, items: [BootpayItem]?, user: BootpayUser?, extra: BootpayExtra?, smsPayload: SMSPayload?) {

‎SwiftyBootpay/Classes/BootpayExtra.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class BootpayExtra: NSObject, BootpayParams, Mappable {
1414
@objc public var quotas = [Int]() //할부허용 범위 (5만원 이상 구매시)
1515
@objc public var app_scheme = "" //app2app 결제시 return 받을 intent scheme
1616
@objc public var app_scheme_host = "" //app2app 결제시 return 받을 intent scheme host
17-
@objc public var ux = "" //로켓페이 옵션 등 다양한 용도로 사용이 가능하다
17+
@objc public var ux = "" //다양한 결제시나리오를 지원하기 위한 용도로 사용됨
1818

1919
public override init() {}
2020
public required init?(map: Map) {

‎SwiftyBootpay/Classes/BootpayItem.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import ObjectMapper
1212
//MARK: Bootpay Models
1313
public class BootpayItem: NSObject, BootpayParams, Mappable {
1414
public override init() {}
15-
@objc public var item_name = ""
16-
@objc public var qty: Int = 0
17-
@objc public var unique = ""
18-
@objc public var price = Double(0)
19-
@objc public var cat1 = ""
20-
@objc public var cat2 = ""
21-
@objc public var cat3 = ""
15+
@objc public var item_name = "" //아이템 이름
16+
@objc public var qty: Int = 0 //상품 판매된 수량
17+
@objc public var unique = "" //상품의 고유 PK
18+
@objc public var price = Double(0) //상품 하나당 판매 가격
19+
@objc public var cat1 = "" //카테고리 상
20+
@objc public var cat2 = "" //카테고리 중
21+
@objc public var cat3 = "" //카테고리 하
2222

2323
// public override init() {}
2424
public required init?(map: Map) {

‎SwiftyBootpay/Classes/BootpayMethod.swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// BootpayMethod.swift
3+
// Alamofire
4+
//
5+
// Created by YoonTaesup on 2019. 7. 22..
6+
//
7+
8+
public struct BootpayMethod {
9+
public static let CARD = "card"; // card isp
10+
public static let CARD_SIMPLE = "card_simple"; // card 수기결제
11+
public static let BANK = "bank"; // 계좌이체
12+
public static let VBANK = "vbank"; // 가상계좌
13+
public static let PHONE = "phone"; // 휴대폰 소액결제
14+
public static let SUBSCRIPT_CARD = "card_rebill"; // 카드 정기결제
15+
public static let SUBSCRIPT_PHONE = "phone_rebill"; // 휴대폰 정기결제
16+
public static let AUTH = "auth"; // 본인인증
17+
public static let EASY = "easy"; // 간편결제
18+
19+
}

‎SwiftyBootpay/Classes/BootpayStatItem.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import ObjectMapper
99
public class BootpayStatItem: NSObject, Mappable, BootpayParams {
1010
public override init() {}
1111

12-
@objc public var item_name = ""
13-
@objc public var item_img = ""
14-
@objc public var unique = ""
15-
@objc public var cat1 = ""
16-
@objc public var cat2 = ""
17-
@objc public var cat3 = ""
12+
@objc public var item_name = "" //상품명
13+
@objc public var item_img = "" //상품이미지 주소
14+
@objc public var unique = "" //상품의 고유 PK
15+
@objc public var cat1 = "" //카테고리 상
16+
@objc public var cat2 = "" //카테고리 중
17+
@objc public var cat3 = "" //카테고리 하
1818

1919
public required init?(map: Map) {
2020
}

0 commit comments

Comments
 (0)