【综合】订单页面价格调整

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -556,7 +556,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             
             prmiumLabel.stringValue = String(format: "%@ %@", abbreviation, fullString)
             original1 = Float(showOrgPriceString()) ?? 0
-            discount1 = Float(showPayPriceString()) ?? 0
+            discount1 = Float(showOrgShowPriceString()) ?? 0
             paySum = discount1
             discount = listPrice - paySum
         }
@@ -590,7 +590,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
 
             prmiumLabel.stringValue = String(format: "%@ %@", abbreviation, fullString)
             original1 = Float(showOrgPriceString()) ?? 0
-            discount1 = Float(showPayPriceString()) ?? 0
+            discount1 = Float(showOrgShowPriceString()) ?? 0
             paySum = discount1
             discount = listPrice - paySum
         }
@@ -618,7 +618,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
 
             prmiumLabel.stringValue = String(format: "%@ %@", abbreviation, fullString)
             original1 = Float(showOrgPriceString()) ?? 0
-            discount1 = Float(showPayPriceString()) ?? 0
+            discount1 = Float(showOrgShowPriceString()) ?? 0
             paySum = discount1
             discount = listPrice - paySum
         }
@@ -1072,6 +1072,8 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                 
                 wechatPayButton.isHidden = true
                 alipayButton.isHidden = true
+                
+                prodocumentView.isHidden = true
             } else {
                 addButton1.isEnabled = true
                 removeButton1.isEnabled = true
@@ -1079,6 +1081,8 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                 
                 wechatPayButton.isHidden = false
                 alipayButton.isHidden = false
+                
+                prodocumentView.isHidden = false
             }
             
             if(newValue == "advanced-annual-subscription-trail" ||

PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4310,3 +4310,5 @@
 
 "Password cannot exceed 30 characters." = "密碼不能超過30個字元。";
 "Auto-renewal | 50 credits/month | Cancel anytime" = "自動續訂｜每月50點｜可隨時取消";
+
+"USD" = "CNY";