|
@@ -463,10 +463,17 @@ class KMProductCompareWC: NSWindowController {
|
|
|
if IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.isTrialPeriod == true {
|
|
|
isTrialPeriod = true
|
|
|
}
|
|
|
- if(!isTrialPeriod &&
|
|
|
- KMMemberInfo.shared.canTrail &&
|
|
|
- model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
- advancedPlanPurchaseLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ if KMMemberInfo.shared.isLogin {
|
|
|
+ if(!isTrialPeriod &&
|
|
|
+ KMMemberInfo.shared.canTrail &&
|
|
|
+ model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
+ advancedPlanPurchaseLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if(!isTrialPeriod &&
|
|
|
+ model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
+ advancedPlanPurchaseLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// AppStore 免费版本
|
|
@@ -494,9 +501,6 @@ class KMProductCompareWC: NSWindowController {
|
|
|
}
|
|
|
#endif
|
|
|
#else
|
|
|
-// if IAPProductsManager.default().fourDevicesAllAccessPack12months_pro.isTrialPeriod == false && KMMemberInfo.shared.canTrail {
|
|
|
-// advancedPlanPurchaseLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
-// }
|
|
|
// AppStore 付费版
|
|
|
if model.state == .pro_Base {
|
|
|
if KMMemberInfo.shared.userScenarioType == .pro_type3 {
|
|
@@ -877,12 +881,21 @@ class KMProductCompareWC: NSWindowController {
|
|
|
value1PurchaseBtnLbl.stringValue = NSLocalizedString("Subscribed", comment: "")
|
|
|
} else {
|
|
|
if(model.isPurchaseSwitch == true) {
|
|
|
- if(!isTrialPeriod_year &&
|
|
|
- KMMemberInfo.shared.canTrail &&
|
|
|
- model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
- value1PurchaseBtnLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ if KMMemberInfo.shared.isLogin {
|
|
|
+ if(!isTrialPeriod_year &&
|
|
|
+ KMMemberInfo.shared.canTrail &&
|
|
|
+ model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
+ value1PurchaseBtnLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ } else {
|
|
|
+ value1PurchaseBtnLbl.stringValue = NSLocalizedString("Subscribe", comment: "")
|
|
|
+ }
|
|
|
} else {
|
|
|
- value1PurchaseBtnLbl.stringValue = NSLocalizedString("Subscribe", comment: "")
|
|
|
+ if(!isTrialPeriod_year &&
|
|
|
+ model.checkSubscriptionOffer(for: IAPProductsManager.default().fourDevicesAllAccessPackNew12months_lite.product) == .freeTrial) {
|
|
|
+ value1PurchaseBtnLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
|
|
|
+ } else {
|
|
|
+ value1PurchaseBtnLbl.stringValue = NSLocalizedString("Subscribe", comment: "")
|
|
|
+ }
|
|
|
}
|
|
|
} else {
|
|
|
value1PurchaseBtnLbl.stringValue = NSLocalizedString("Subscribe", comment: "")
|