|
@@ -216,7 +216,8 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
|
|
|
private var successfulPaymentsNumber = 0
|
|
|
private var license1 = ""
|
|
|
private var licenseAI1 = ""
|
|
|
-
|
|
|
+ private var isApplyCoupon: Bool = false
|
|
|
+
|
|
|
@objc static func currentFirstTrialWC(_ productId: String) -> KMPurchaseEmbeddedWindowController {
|
|
|
if currentWindowController != nil {
|
|
|
currentWindowController.productID = productId
|
|
@@ -773,7 +774,11 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
|
|
|
couponView.isHidden = false
|
|
|
} else {
|
|
|
discountView.isHidden = false
|
|
|
- couponView.isHidden = true
|
|
|
+ if self.discountScale == "" && self.discountAmount == "" {
|
|
|
+ couponView.isHidden = true
|
|
|
+ } else {
|
|
|
+ couponView.isHidden = false
|
|
|
+ }
|
|
|
}
|
|
|
discountLayoutConstraint.constant = discountView.isHidden ? -CGRectGetHeight(discountView.bounds) : 8
|
|
|
}
|
|
@@ -1486,6 +1491,11 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
|
|
|
guard let self = self else { return }
|
|
|
// let wc = KMEmbeddedPaymentPopWC.init(windowNibName: "KMEmbeddedPaymentPopWC")
|
|
|
self.embeddedPaymentPopWC = KMEmbeddedPaymentPopWC.currentFirstTrialWC(urlPath)
|
|
|
+ if paymentMethod == .paddle {
|
|
|
+ self.embeddedPaymentPopWC?.isPaddle = true
|
|
|
+ self.embeddedPaymentPopWC?.countryCode = countryAbbreviationValues[paddlePopUpButton.indexOfSelectedItem]
|
|
|
+ self.embeddedPaymentPopWC?.postCode = paddleTextField.stringValue
|
|
|
+ }
|
|
|
self.embeddedPaymentPopWC?.showWindow(nil)
|
|
|
self.embeddedPaymentPopWC?.callback = { isClose in
|
|
|
// let alert = NSAlert()
|