【内嵌支付】修复“转档包升级，订单页，支付成功后，内嵌支付窗口未自动关闭 & APP状态未自动刷新”

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

@@ -274,7 +274,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             if productType == .ipaConvert {
                 pdfReaderProLabel.stringValue = NSLocalizedString("PDF to Office", comment: "")
                 prmiumLabel.stringValue = NSLocalizedString("Export PDF to Word(.docx), Excel (.xlsx), PowerPoint(.pptx)", comment: "")
-                oneLicenseLabel.isHidden = true
+                oneLicenseLabel.stringValue = NSLocalizedString("and more offline. It's one time purchase.", comment: "")
                 licenseCodeLabel.stringValue = NSLocalizedString("License Code", comment: "")
                 licenseCodeLabel.textColor = NSColor(named: "KMPurchaseTitleColor1")
                 licenseCodeLabel.font = NSFont.SFProTextRegularFont(14.0)
@@ -318,7 +318,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             
             if originalProductID == "com.brother.pdfreaderpro.mac.product_3" {
                 extendedLabel.stringValue = NSLocalizedString("Extended Device Access", comment: "")
-                accessLabel.stringValue = NSLocalizedString("Get access to your plan on up to 2 devices. (Mac or Windows)", comment: "")
+                accessLabel.stringValue = NSLocalizedString("Get access to your plan on up to 2 devices.", comment: "")
                 extendedImageView.isHidden = false
             } else {
                 extendedLabel.stringValue = NSLocalizedString("PDF to Office Pack", comment: "")
@@ -1513,53 +1513,54 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
                         if dataInfo.keys.contains("status") {
                             let status = dataInfo["status"] as? Int
                             if status == 2 {
-                                print("支付验证成功 status == 2")
-                                self.orderID = ""
-                                self.stopPolling()
-                                if dataInfo.keys.contains("license") {
-                                    let license = dataInfo["license"] as? [String]
-                                    if license!.count > 0 {
-                                        self.verificationActivate(license: license![0])
-                                        self.embeddedPaymentPopWC?.close()
-                                        self.embeddedPaymentPopWC = nil
+                                if self.originalProductID == "com.brother.pdfreaderpro.mac.product_2" {
+                                    VerificationManager.default().verification { status, info, error in
+                                        if (error != nil) {
+                                            let alert = NSAlert.init()
+                                            alert.messageText = NSLocalizedString("Failed to Refresh", comment: "")
+                                            alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                                            alert.runModal()
+                                        }
+                                        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
+                                            self.close()
+                                        }
                                     }
-    //                                else {
-    //                                    let alert = NSAlert()
-    //                                    alert.alertStyle = .critical
-    //                                    alert.messageText = NSLocalizedString("Connection Error", comment: "")
-    //                                    alert.informativeText = NSLocalizedString("Get License Code is empty.", comment: "")
-    //                                    alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-    //                                    if alert.responds(to: #selector(alert.beginSheetModal(for:completionHandler:))) {
-    //                                        alert.beginSheetModal(for: self.window!, completionHandler: nil)
-    //                                    } else {
-    //                                        alert.runModal()
-    //                                    }
-    //                                    return
-    //                                }
-                                }
-                                if dataInfo.keys.contains("ai_license") {
-                                    let ai_license = dataInfo["ai_license"] as? [String]
-                                    if ai_license!.count > 0 {
-                                        self.verificationActivateAIInfo(license: ai_license![0])
-                                        self.embeddedPaymentPopWC?.close()
-                                        self.embeddedPaymentPopWC = nil
+                                } else {
+                                    self.orderID = ""
+                                    self.stopPolling()
+                                    if dataInfo.keys.contains("license") {
+                                        let license = dataInfo["license"] as? [String]
+                                        if license!.count > 0 {
+                                            self.verificationActivate(license: license![0])
+                                            self.embeddedPaymentPopWC?.close()
+                                            self.embeddedPaymentPopWC = nil
+                                        }
+                                    }
+                                    if dataInfo.keys.contains("ai_license") {
+                                        let ai_license = dataInfo["ai_license"] as? [String]
+                                        if ai_license!.count > 0 {
+                                            self.verificationActivateAIInfo(license: ai_license![0])
+                                            self.embeddedPaymentPopWC?.close()
+                                            self.embeddedPaymentPopWC = nil
+                                        }
                                     }
-    //                                else {
-    //                                    let alert = NSAlert()
-    //                                    alert.alertStyle = .critical
-    //                                    alert.messageText = NSLocalizedString("Connection Error", comment: "")
-    //                                    alert.informativeText = NSLocalizedString("Get AI License Code is empty.", comment: "")
-    //                                    alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
-    //                                    if alert.responds(to: #selector(alert.beginSheetModal(for:completionHandler:))) {
-    //                                        alert.beginSheetModal(for: self.window!, completionHandler: nil)
-    //                                    } else {
-    //                                        alert.runModal()
-    //                                    }
-    //                                    return
-    //                                }
                                 }
                             } else {
-                                self.startPolling()
+                                if self.originalProductID == "com.brother.pdfreaderpro.mac.product_2" {
+                                    VerificationManager.default().verification { status, info, error in
+                                        if (error != nil) {
+                                            let alert = NSAlert.init()
+                                            alert.messageText = NSLocalizedString("Failed to Refresh", comment: "")
+                                            alert.addButton(withTitle: NSLocalizedString("OK", comment: ""))
+                                            alert.runModal()
+                                        }
+                                        if IAPProductsManager.default().isAvailableAdvancedPDFToOffice() {
+                                            self.close()
+                                        }
+                                    }
+                                } else {
+                                    self.startPolling()
+                                }
                             }
                         }
                     }

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

@@ -117,23 +117,23 @@
             <value key="minSize" type="size" width="970" height="612"/>
             <value key="maxSize" type="size" width="970" height="612"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="970" height="612"/>
+                <rect key="frame" x="0.0" y="0.0" width="975" height="612"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="KwF-AX-si4">
-                        <rect key="frame" x="0.0" y="0.0" width="970" height="612"/>
+                        <rect key="frame" x="0.0" y="0.0" width="975" height="612"/>
                         <view key="contentView" id="Q3j-Ws-XqB">
-                            <rect key="frame" x="0.0" y="0.0" width="970" height="612"/>
+                            <rect key="frame" x="0.0" y="0.0" width="975" height="612"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="l3P-ZG-GJY">
-                                    <rect key="frame" x="0.0" y="0.0" width="970" height="80"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="975" height="80"/>
                                     <view key="contentView" id="v5U-lN-3Ak">
-                                        <rect key="frame" x="0.0" y="0.0" width="970" height="80"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="975" height="80"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="hQ9-hE-7SE">
-                                                <rect key="frame" x="382" y="60" width="206" height="20"/>
+                                                <rect key="frame" x="385" y="60" width="206" height="20"/>
                                                 <subviews>
                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
                                                         <rect key="frame" x="-2" y="2" width="210" height="16"/>
@@ -155,7 +155,7 @@
                                                 </constraints>
                                             </customView>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="pJQ-if-sS8">
-                                                <rect key="frame" x="377" y="8" width="216" height="44"/>
+                                                <rect key="frame" x="380" y="8" width="216" height="44"/>
                                                 <subviews>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="yf6-a4-ZeM">
                                                         <rect key="frame" x="0.0" y="0.0" width="72" height="44"/>
@@ -216,16 +216,16 @@
                                     </constraints>
                                 </box>
                                 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="giK-CT-R0l">
-                                    <rect key="frame" x="0.0" y="86" width="970" height="5"/>
+                                    <rect key="frame" x="0.0" y="86" width="975" height="5"/>
                                 </box>
                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="NWI-HO-4Jh">
-                                    <rect key="frame" x="0.0" y="88" width="970" height="524"/>
+                                    <rect key="frame" x="0.0" y="88" width="975" height="524"/>
                                     <view key="contentView" id="yHo-bZ-A7K">
-                                        <rect key="frame" x="0.0" y="0.0" width="970" height="524"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="975" height="524"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="vmh-tU-E0c">
-                                                <rect key="frame" x="611" y="16" width="335" height="492"/>
+                                                <rect key="frame" x="616" y="16" width="335" height="492"/>
                                                 <subviews>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Dnb-jj-AQO">
                                                         <rect key="frame" x="0.0" y="472" width="335" height="20"/>
@@ -561,13 +561,13 @@
                                                 </constraints>
                                             </customView>
                                             <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="h4u-aQ-6IT">
-                                                <rect key="frame" x="584" y="16" width="5" height="492"/>
+                                                <rect key="frame" x="589" y="16" width="5" height="492"/>
                                             </box>
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="tRc-PM-BHR">
-                                                <rect key="frame" x="24" y="16" width="538" height="492"/>
+                                                <rect key="frame" x="24" y="16" width="543" height="492"/>
                                                 <subviews>
                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
-                                                        <rect key="frame" x="-2" y="476" width="542" height="16"/>
+                                                        <rect key="frame" x="-2" y="476" width="547" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Your Order" id="Ozs-wZ-Jdr">
                                                             <font key="font" usesAppearanceFont="YES"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -575,16 +575,16 @@
                                                         </textFieldCell>
                                                     </textField>
                                                     <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="aGq-d0-5pa">
-                                                        <rect key="frame" x="0.0" y="461" width="538" height="5"/>
+                                                        <rect key="frame" x="0.0" y="461" width="543" height="5"/>
                                                     </box>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="M6b-Qf-5FA">
-                                                        <rect key="frame" x="0.0" y="391" width="538" height="48"/>
+                                                        <rect key="frame" x="0.0" y="391" width="543" height="48"/>
                                                         <subviews>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="nrp-eO-h7F">
-                                                                <rect key="frame" x="0.0" y="0.0" width="264" height="48"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="283" height="48"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-Kh-1ON">
-                                                                        <rect key="frame" x="-2" y="32" width="268" height="16"/>
+                                                                        <rect key="frame" x="-2" y="32" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="PDF Reader Pro for Mac" id="QBk-Qf-dhQ">
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -592,7 +592,7 @@
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cJd-qR-iKJ">
-                                                                        <rect key="frame" x="-2" y="16" width="268" height="16"/>
+                                                                        <rect key="frame" x="-2" y="16" width="287" height="16"/>
                                                                         <textFieldCell key="cell" title="Premium and PDF to Office Converter" id="eqO-Iv-kEM">
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -600,7 +600,7 @@
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2wj-Wg-q7u">
-                                                                        <rect key="frame" x="-2" y="0.0" width="268" height="16"/>
+                                                                        <rect key="frame" x="-2" y="0.0" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="One License for One Mac. One Time Purchase." id="WE0-rH-JkS">
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -612,7 +612,6 @@
                                                                     <constraint firstAttribute="trailing" secondItem="cJd-qR-iKJ" secondAttribute="trailing" id="3x6-rw-r2K"/>
                                                                     <constraint firstItem="cJd-qR-iKJ" firstAttribute="top" secondItem="cMG-Kh-1ON" secondAttribute="bottom" id="64v-Tj-B48"/>
                                                                     <constraint firstAttribute="trailing" secondItem="2wj-Wg-q7u" secondAttribute="trailing" id="7M9-c9-f50"/>
-                                                                    <constraint firstAttribute="width" constant="264" id="LAW-rX-z9a"/>
                                                                     <constraint firstItem="2wj-Wg-q7u" firstAttribute="leading" secondItem="nrp-eO-h7F" secondAttribute="leading" id="M3d-5Z-TAx"/>
                                                                     <constraint firstItem="2wj-Wg-q7u" firstAttribute="top" secondItem="cJd-qR-iKJ" secondAttribute="bottom" id="OyO-C1-mGt"/>
                                                                     <constraint firstItem="cMG-Kh-1ON" firstAttribute="leading" secondItem="nrp-eO-h7F" secondAttribute="leading" id="dde-VT-XEX"/>
@@ -623,7 +622,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Sat-nf-b5q">
-                                                                <rect key="frame" x="335" y="21" width="76" height="27"/>
+                                                                <rect key="frame" x="340" y="21" width="76" height="27"/>
                                                                 <subviews>
                                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="wpz-Yh-9aJ">
                                                                         <rect key="frame" x="0.0" y="6" width="16" height="16"/>
@@ -675,7 +674,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="RLY-aN-DYZ">
-                                                                <rect key="frame" x="468" y="0.0" width="70" height="48"/>
+                                                                <rect key="frame" x="473" y="0.0" width="70" height="48"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JdB-wu-qih">
                                                                         <rect key="frame" x="-2" y="32" width="74" height="16"/>
@@ -706,6 +705,7 @@
                                                         <constraints>
                                                             <constraint firstItem="RLY-aN-DYZ" firstAttribute="leading" secondItem="Sat-nf-b5q" secondAttribute="trailing" constant="57" id="CGa-om-RSD"/>
                                                             <constraint firstItem="nrp-eO-h7F" firstAttribute="top" secondItem="M6b-Qf-5FA" secondAttribute="top" id="CLs-B0-Thc"/>
+                                                            <constraint firstItem="Sat-nf-b5q" firstAttribute="leading" secondItem="nrp-eO-h7F" secondAttribute="trailing" constant="57" id="Eqc-uO-4cA"/>
                                                             <constraint firstAttribute="bottom" secondItem="RLY-aN-DYZ" secondAttribute="bottom" id="Fug-ie-nMs"/>
                                                             <constraint firstAttribute="trailing" secondItem="RLY-aN-DYZ" secondAttribute="trailing" id="Kon-4P-clI"/>
                                                             <constraint firstItem="RLY-aN-DYZ" firstAttribute="top" secondItem="M6b-Qf-5FA" secondAttribute="top" id="Lt0-o9-Vu6"/>
@@ -716,7 +716,7 @@
                                                         </constraints>
                                                     </customView>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="A4x-fh-Pac">
-                                                        <rect key="frame" x="0.0" y="321" width="538" height="50"/>
+                                                        <rect key="frame" x="0.0" y="321" width="543" height="50"/>
                                                         <subviews>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="lDe-WV-H1b">
                                                                 <rect key="frame" x="4" y="22" width="24" height="24"/>
@@ -730,10 +730,10 @@
                                                                 </constraints>
                                                             </button>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="dYr-QE-Sxx">
-                                                                <rect key="frame" x="32" y="4" width="428" height="42"/>
+                                                                <rect key="frame" x="32" y="4" width="433" height="42"/>
                                                                 <subviews>
                                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="vrZ-i2-cO9">
-                                                                        <rect key="frame" x="336" y="15" width="76" height="27"/>
+                                                                        <rect key="frame" x="341" y="15" width="76" height="27"/>
                                                                         <subviews>
                                                                             <button tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="MSF-9T-1cl">
                                                                                 <rect key="frame" x="0.0" y="6" width="16" height="16"/>
@@ -811,7 +811,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="hor-yk-1fT">
-                                                                <rect key="frame" x="464" y="4" width="70" height="42"/>
+                                                                <rect key="frame" x="469" y="4" width="70" height="42"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mG2-BE-Y6m">
                                                                         <rect key="frame" x="-2" y="26" width="74" height="16"/>
@@ -839,7 +839,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="SoM-sc-hgO">
-                                                                <rect key="frame" x="0.0" y="0.0" width="538" height="50"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="543" height="50"/>
                                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="RLD-xB-0t4">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" metaFont="system"/>
@@ -867,10 +867,10 @@
                                                         </constraints>
                                                     </customView>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="DDi-AB-k2w">
-                                                        <rect key="frame" x="0.0" y="259" width="538" height="50"/>
+                                                        <rect key="frame" x="0.0" y="259" width="543" height="50"/>
                                                         <subviews>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="uWl-6n-x7Q">
-                                                                <rect key="frame" x="464" y="4" width="70" height="42"/>
+                                                                <rect key="frame" x="469" y="4" width="70" height="42"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ftc-Ed-JwD">
                                                                         <rect key="frame" x="-2" y="26" width="74" height="16"/>
@@ -898,10 +898,10 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="OKm-hL-M8J">
-                                                                <rect key="frame" x="32" y="4" width="428" height="42"/>
+                                                                <rect key="frame" x="32" y="4" width="433" height="42"/>
                                                                 <subviews>
                                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="I0R-Y0-jgp">
-                                                                        <rect key="frame" x="336" y="15" width="76" height="27"/>
+                                                                        <rect key="frame" x="341" y="15" width="76" height="27"/>
                                                                         <subviews>
                                                                             <button tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="bmO-1e-QTX">
                                                                                 <rect key="frame" x="0.0" y="6" width="16" height="16"/>
@@ -1000,7 +1000,7 @@
                                                                 </constraints>
                                                             </button>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="Ygz-9t-jR6">
-                                                                <rect key="frame" x="0.0" y="0.0" width="538" height="50"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="543" height="50"/>
                                                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="bfE-zn-FkJ">
                                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                     <font key="font" metaFont="system"/>
@@ -1028,13 +1028,13 @@
                                                         </constraints>
                                                     </customView>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="2Hk-KG-FSr">
-                                                        <rect key="frame" x="0.0" y="0.0" width="538" height="144"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="543" height="144"/>
                                                         <subviews>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Imv-vq-rsc">
-                                                                <rect key="frame" x="0.0" y="72" width="538" height="20"/>
+                                                                <rect key="frame" x="0.0" y="72" width="543" height="20"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve4-zf-dcX">
-                                                                        <rect key="frame" x="470" y="2" width="70" height="16"/>
+                                                                        <rect key="frame" x="475" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 79.99" id="PfN-Xw-Qsg">
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1059,7 +1059,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="KXb-Fc-Ihu">
-                                                                <rect key="frame" x="0.0" y="44" width="538" height="20"/>
+                                                                <rect key="frame" x="0.0" y="44" width="543" height="20"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zuM-1n-klX">
                                                                         <rect key="frame" x="-2" y="2" width="58" height="16"/>
@@ -1070,7 +1070,7 @@
                                                                         </textFieldCell>
                                                                     </textField>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n83-tW-ibP">
-                                                                        <rect key="frame" x="470" y="2" width="70" height="16"/>
+                                                                        <rect key="frame" x="475" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 20.00" id="iaA-9a-RmM">
                                                                             <font key="font" metaFont="system"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1087,10 +1087,10 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZY4-l7-Ejn">
-                                                                <rect key="frame" x="0.0" y="0.0" width="538" height="28"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="543" height="28"/>
                                                                 <subviews>
                                                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W9v-hZ-TbY">
-                                                                        <rect key="frame" x="470" y="6" width="70" height="16"/>
+                                                                        <rect key="frame" x="475" y="6" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 59.99" id="zmn-H2-590">
                                                                             <font key="font" usesAppearanceFont="YES"/>
                                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -1115,7 +1115,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="o5K-ag-Vbf">
-                                                                <rect key="frame" x="0.0" y="116" width="538" height="28"/>
+                                                                <rect key="frame" x="0.0" y="116" width="543" height="28"/>
                                                                 <subviews>
                                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="16N-22-eUq">
                                                                         <rect key="frame" x="0.0" y="6" width="45" height="16"/>
@@ -1210,7 +1210,7 @@
                                                                 </constraints>
                                                             </customView>
                                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yok-Ur-JfA">
-                                                                <rect key="frame" x="-2" y="100" width="542" height="16"/>
+                                                                <rect key="frame" x="-2" y="100" width="547" height="16"/>
                                                                 <textFieldCell key="cell" title="Label" id="hyR-5a-ztf">
                                                                     <font key="font" usesAppearanceFont="YES"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>