Browse Source

【内嵌支付】修复“选择支付方式并点击Continue to Pay后,左侧的内容要禁用,用户切换支付方式后激活使用”

wanjun 6 months ago
parent
commit
103ab728de

+ 26 - 3
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -39,7 +39,8 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     @IBOutlet weak var amountView2: NSView!
     @IBOutlet weak var originalPriceLabel2: NSTextField! // 原价
     @IBOutlet weak var discountPriceLabel2: NSTextField! // 折扣
-
+    @IBOutlet weak var aiAddOnButton1: NSButton!
+    
     @IBOutlet weak var extendedView: NSView!
     @IBOutlet weak var extendedButton: NSButton!
     @IBOutlet weak var extendedLabel: NSTextField!
@@ -51,7 +52,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     @IBOutlet weak var amountView3: NSView!
     @IBOutlet weak var originalPriceLabel3: NSTextField! // 原价
     @IBOutlet weak var discountPriceLabel3: NSTextField! // 折扣
-    
+    @IBOutlet weak var extendedButton1: NSButton!
     
     @IBOutlet weak var couponButton: NSButton!
     @IBOutlet weak var couponBox: NSBox!
@@ -214,6 +215,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         paymentMethod = .paypal
         priceRefresh()
         
+        confirmPayment(isConfirm: false)
         self.window?.delegate = self;
     }
     
@@ -814,6 +816,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     }
     
     @IBAction func payButtonAction(_ sender: NSButton) {
+        confirmPayment(isConfirm: false)
         paymentMethod = KMPaymentType(rawValue: uint32(sender.tag)) ?? .paypal
     }
     
@@ -952,7 +955,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                 return
             }
         }
-        
+        confirmPayment(isConfirm: true)
         if paymentMethod == .paypal {
             paypalBox.fillColor = NSColor(named: "KMPurchaseBoxColor1") ?? NSColor.blue
         } else if paymentMethod == .paddle {
@@ -1471,6 +1474,26 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         }
     }
     
+    private func confirmPayment(isConfirm: Bool) {
+        if isConfirm {
+            removeButton1.isEnabled = false
+            addButton1.isEnabled = false
+            aiAddOnButton1.isEnabled = false
+            extendedButton1.isEnabled = false
+            couponButton.isEnabled = false
+            coupomTextField.isEnabled = false
+            applyButton.isEnabled = false
+        } else {
+            removeButton1.isEnabled = true
+            addButton1.isEnabled = true
+            aiAddOnButton1.isEnabled = true
+            extendedButton1.isEnabled = true
+            couponButton.isEnabled = true
+            coupomTextField.isEnabled = true
+            applyButton.isEnabled = true
+        }
+    }
+    
     // MARK: Show Methods
     
 //    @IBAction private func dismissSheet(_ sender: NSButton) {

+ 2 - 0
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.xib

@@ -14,6 +14,7 @@
                 <outlet property="addButton2" destination="fhV-YM-nNC" id="zz2-6X-oot"/>
                 <outlet property="addButton3" destination="gZ7-bj-dxC" id="zgq-3d-bNX"/>
                 <outlet property="aiAddOnButton" destination="lDe-WV-H1b" id="5Ou-sJ-eVI"/>
+                <outlet property="aiAddOnButton1" destination="SoM-sc-hgO" id="IJA-fa-Rcz"/>
                 <outlet property="aiAddOnLabel" destination="ORZ-Op-6Fo" id="jcd-LJ-uKh"/>
                 <outlet property="aiAddOnView" destination="A4x-fh-Pac" id="fcm-NE-WPd"/>
                 <outlet property="alipayButton" destination="HXS-6q-4NR" id="Q8R-QA-pn3"/>
@@ -43,6 +44,7 @@
                 <outlet property="errorLabelTopLayout" destination="5gD-hZ-xNI" id="d9E-JR-FjO"/>
                 <outlet property="errorView" destination="W7H-2A-riS" id="bXz-uh-WFx"/>
                 <outlet property="extendedButton" destination="MbO-7o-ibN" id="NZR-8e-sHP"/>
+                <outlet property="extendedButton1" destination="Ygz-9t-jR6" id="wnO-XW-sI2"/>
                 <outlet property="extendedImageView" destination="dIC-52-LvS" id="XXJ-IK-24m"/>
                 <outlet property="extendedLabel" destination="hdH-sT-Zjy" id="CSU-f3-wES"/>
                 <outlet property="extendedView" destination="DDi-AB-k2w" id="Yo4-09-7cG"/>