隐藏Notify Me，使Add To Cart与Add To Wish List对齐。

增加Cart与Wish List中Available检测。

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -52,6 +52,8 @@
 
 @property (nonatomic,copy) NSString *print_url;
 
+@property (nonatomic,assign) BOOL available;///<所有Model均有库存，才能Place Order。
+
 @end
 
 @implementation CartViewController
@@ -597,18 +599,36 @@
     [[self navigationController] setNavigationBarHidden:YES animated:NO];
     
 }
+
+- (void)checkProductAvailable:(NSArray *)contents {
+    
+    [contents enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        
+        if ([obj isKindOfClass:[NSDictionary class]]) {
+            
+            NSDictionary *item_json = (NSDictionary *)obj;
+            BOOL isAvailable = ![[item_json valueForKey:@"available"] isEqualToString:@"In Production"] || [[item_json valueForKey:@"available"] integerValue] != 0;
+            self.available = self.available && isAvailable;
+            
+        }
+        
+    }];
+}
+
 -(void) operation_reload_data
 {
     if (self.dataOperationQueue.operationCount > 1) {
         return;
     }
+    __weak typeof(self) weakself = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        if(self.isrefreshing)
+        if(weakself.isrefreshing)
             return;
         
-        self.itemListTable.hidden = true;
-        self.label_net_err.hidden=true;
-        self.isrefreshing=true;
+        weakself.available = YES;
+        weakself.itemListTable.hidden = true;
+        weakself.label_net_err.hidden=true;
+        weakself.isrefreshing=true;
         //    [self.content_data removeAllObjects];
         // [self.itemListTable reloadData];
         //    UIRefreshControl *reF = (UIRefreshControl *)[self.view viewWithTag:200];
@@ -617,15 +637,15 @@
         //
         //    reF.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
         
-        self.mum.center = self.view.center;
-        self.mum.hidden = YES;
+        weakself.mum.center = weakself.view.center;
+        weakself.mum.hidden = YES;
 //        [self.mum startAnimating];
         DebugLog(@"reloading...");
         UIAlertView *loadingView = [RAUtils waiting_alert:@"Please Wait" title:@"Loading"];
         
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             DebugLog(@"BEGIN LOAD CART");
-            NSDictionary* cart_json = [iSalesNetwork request_Cart:self.sortIndex];
+            NSDictionary* cart_json = [iSalesNetwork request_Cart:weakself.sortIndex];
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 //
@@ -633,48 +653,52 @@
                 [loadingView dismissWithClickedButtonIndex:0 animated:YES];
                 
                 //            self.content_data = [cart_json mutableCopy];
-                self.freejson = [cart_json objectForKey:@"freeGiveaway"];
-                self.notes = [cart_json valueForKey:@"general_note"];
-                self.content_arr = [RAUtils dictionary2array:cart_json count_fields:@"count" item_mark:@"item_" items_mark:nil];
-                self.currentOrderIsMerged = [[cart_json valueForKey:@"is_merged_order"] boolValue];
-                [self.itemListTable reloadData];
-                self.print_url = [cart_json valueForKey:@"cart_print_url"];
+                weakself.freejson = [cart_json objectForKey:@"freeGiveaway"];
+                weakself.notes = [cart_json valueForKey:@"general_note"];
+                weakself.content_arr = [RAUtils dictionary2array:cart_json count_fields:@"count" item_mark:@"item_" items_mark:nil];
+                weakself.currentOrderIsMerged = [[cart_json valueForKey:@"is_merged_order"] boolValue];
+                [weakself.itemListTable reloadData];
+                weakself.print_url = [cart_json valueForKey:@"cart_print_url"];
                 
-                [self refresh_total];
+                
+                [weakself checkProductAvailable:weakself.content_arr];
+
+                
+                [weakself refresh_total];
                 
                 int result=[[cart_json valueForKey:@"result"] intValue];
                 
-                if (self.dataOperationQueue.operationCount > 1) {
-                    self.isrefreshing=false;
+                if (weakself.dataOperationQueue.operationCount > 1) {
+                    weakself.isrefreshing=false;
                     return;
                 }
                 
                 if(result==2||result==1||result==0)
                 {
                     
-                    [self.edit_select_arr removeAllObjects];
+                    [weakself.edit_select_arr removeAllObjects];
                     
-                    self.itemListTable.hidden = false;
+                    weakself.itemListTable.hidden = false;
                     UIApplication * app = [UIApplication sharedApplication];
                     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
-                    appDelegate.cart_count =self.content_arr.count;//[[self.content_data valueForKey:@"count"] intValue];
-                    self.itemListTable.hidden=false;
-                    if(self.onFinishLoad)
-                        self.onFinishLoad();
+                    appDelegate.cart_count =weakself.content_arr.count;//[[self.content_data valueForKey:@"count"] intValue];
+                    weakself.itemListTable.hidden=false;
+                    if(weakself.onFinishLoad)
+                        weakself.onFinishLoad();
                 }
                 else
                     if(result==RESULT_NET_ERROR)
                     {
-                        self.label_net_err.hidden=false;
-                        self.itemListTable.hidden=true;
+                        weakself.label_net_err.hidden=false;
+                        weakself.itemListTable.hidden=true;
                     }
                     else
                     {
                         if(result!=1)
-                            [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Cart" controller:self] ;
+                            [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Cart" controller:weakself] ;
                     }
                 
-                self.isrefreshing=false;
+                weakself.isrefreshing=false;
                 DebugLog(@"FINISH LOAD CART");
                 
             });
@@ -809,9 +833,18 @@
 {
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if (appDelegate.user_type == USER_ROLE_CUSTOMER) {
+        
+        
         if (![Singleton sharedInstance].permissions_edit_order) {
             return;
         }
+        
+//        if (!self.available) {
+//            
+//            [RAUtils message_alert:@"There are some products is not available" title:@"Warning" controller:self];
+//            return;
+//        }
+        
     }
     
 //    NSMutableArray* checked = [[NSMutableArray alloc] init];

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -965,61 +965,66 @@ self.isrefreshing=false;
        
         if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
             cell.btnaddPortfolio.hidden = YES;
-//            CGRect wishListFrame = cell.btnaddWish.frame;
-//            CGRect cartFrame = cell.btnaddCart.frame;
-//            cartFrame.origin.x = wishListFrame.origin.x;
-//            cell.btnaddCart.frame = cartFrame;
-            __weak typeof(self) weakself = self;
-            cell.notifyMeBlock = ^{
-                
-                NSString *emailAddr = [appDelegate.customerInfo valueForKey:@"customer_email"];
-                
-                if (!emailAddr.length) {
-                    
-                    [self showEmailAddrBox];
-                    
-                } else {
-                    
-                    UIAlertView *waitting_alert = [RAUtils waiting_alert:@"Sending Email" title:@"Waitting"];
-                    dispatch_async(dispatch_get_global_queue(0,0), ^{
-                       
-                        NSDictionary *dic = [iSalesNetwork notifyModel:self.product_id emailAddr:nil];
-                            
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                            
-                            [waitting_alert dismissWithClickedButtonIndex:0 animated:YES];
-                            
-                            if ([[dic valueForKey:@"result"] integerValue] != RESULT_TRUE) {
-                                
-                                UIAlertController *errorAlertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:[NSString stringWithFormat:@"The email send to %@ failed",emailAddr] preferredStyle:UIAlertControllerStyleAlert];
-                                UIAlertAction *action = [UIAlertAction actionWithTitle:@"ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-                                    
-                                }];
-                                
-                                [errorAlertVC addAction:action];
-                                [weakself presentViewController:errorAlertVC animated:YES completion:nil];
-                            
-                            } else {
-                                
-                            }
-                        });
-                        
-                        
-                    });
-                    
-                }
-                
-            };
-            
-            cell.btnNotifyMe.layer.borderColor = [UIColor blackColor].CGColor;
-            cell.btnNotifyMe.layer.borderWidth = 1.0f;
-            cell.btnNotifyMe.layer.cornerRadius = 3.0f;
-            cell.btnNotifyMe.layer.masksToBounds = YES;
-            NSString *qtyStr = [section_json valueForKey:@"Availability"];
-            if ([qtyStr isEqualToString:@"In Production"] || [qtyStr isEqualToString:@"0"] ) {
-                cell.btnaddCart.enabled = NO;
-            }
             
+            cell.btnNotifyMe.hidden = YES;
+            CGRect wishListFrame = cell.btnaddWish.frame;
+            CGRect cartFrame = cell.btnaddCart.frame;
+            cartFrame.origin.x = wishListFrame.origin.x;
+            cell.btnaddCart.frame = cartFrame;
+            
+//            __weak typeof(self) weakself = self;
+//            cell.notifyMeBlock = ^{
+//                
+//                NSString *emailAddr = [appDelegate.customerInfo valueForKey:@"customer_email"];
+//                
+//                if (!emailAddr.length) {
+//                    
+//                    [self showEmailAddrBox];
+//                    
+//                } else {
+//                    
+//                    UIAlertView *waitting_alert = [RAUtils waiting_alert:@"Sending Email" title:@"Waitting"];
+//                    dispatch_async(dispatch_get_global_queue(0,0), ^{
+//                       
+//                        NSDictionary *dic = [iSalesNetwork notifyModel:self.product_id emailAddr:nil];
+//                            
+//                        dispatch_async(dispatch_get_main_queue(), ^{
+//                            
+//                            [waitting_alert dismissWithClickedButtonIndex:0 animated:YES];
+//                            
+//                            if ([[dic valueForKey:@"result"] integerValue] != RESULT_TRUE) {
+//                                
+//                                UIAlertController *errorAlertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:[NSString stringWithFormat:@"The email send to %@ failed",emailAddr] preferredStyle:UIAlertControllerStyleAlert];
+//                                UIAlertAction *action = [UIAlertAction actionWithTitle:@"ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+//                                    
+//                                }];
+//                                
+//                                [errorAlertVC addAction:action];
+//                                [weakself presentViewController:errorAlertVC animated:YES completion:nil];
+//                            
+//                            } else {
+//                                
+//                            }
+//                        });
+//                        
+//                        
+//                    });
+//                    
+//                }
+//                
+//            };
+//            
+//            cell.btnNotifyMe.layer.borderColor = [UIColor blackColor].CGColor;
+//            cell.btnNotifyMe.layer.borderWidth = 1.0f;
+//            cell.btnNotifyMe.layer.cornerRadius = 3.0f;
+//            cell.btnNotifyMe.layer.masksToBounds = YES;
+//            NSString *qtyStr = [section_json valueForKey:@"Availability"];
+//            if ([qtyStr isEqualToString:@"In Production"] || [qtyStr isEqualToString:@"0"] ) {
+//                cell.btnaddCart.enabled = NO;
+//            } else {
+//                cell.btnNotifyMe.enabled = NO;
+//            }
+//            
         } else {
             cell.btnNotifyMe.hidden = YES;
         }

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -210,6 +210,14 @@
         bool check = [[item_json valueForKey:@"check"] boolValue];
         if(check)
         {
+            /*
+            if ([[item_json valueForKey:@"available"] isEqualToString:@"In Production"] || [[item_json valueForKey:@"available"] integerValue] == 0) {
+                
+                [RAUtils message_alert:@"There ars some products is not available" title:@"Warning" controller:self];
+                return;
+                
+            }
+             */
             [checked addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"product_id"] intValue]]];
             [checked_iid addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"item_id"] intValue]]];
         }

RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -2594,8 +2594,8 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jew-M1-our" customClass="DefaultImageButton">
-                                        <frame key="frameInset" minY="83" width="126" height="30" maxX="18"/>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jew-M1-our" customClass="DefaultImageButton">
+                                        <frame key="frameInset" minY="85" width="126" height="30" maxX="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" title="Place Order" backgroundImage="btn_placeorder">
                                             <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2610,7 +2610,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="HXI-1Z-Yo5" customClass="DefaultImageButton">
-                                        <frame key="frameInset" minY="83" width="30" height="30" maxX="168"/>
+                                        <frame key="frameInset" minY="85" width="30" height="30" maxX="168"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" title="Cancel Order" backgroundImage="btn_cancelorder">
                                             <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -2703,7 +2703,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="1k1-dx-91p">
-                                        <frame key="frameInset" minY="83" width="46" height="30" maxX="217"/>
+                                        <frame key="frameInset" minY="85" width="46" height="30" maxX="217"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" title="Email"/>
                                         <connections>
@@ -2711,7 +2711,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="xdj-ay-aU1">
-                                        <frame key="frameInset" minY="83" width="46" height="30" maxX="276"/>
+                                        <frame key="frameInset" minY="85" width="46" height="30" maxX="276"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" title="Print"/>
                                         <connections>
@@ -3054,7 +3054,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="66"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="H8t-DU-AtW" id="q6R-9a-SsD">
-                                            <frame key="frameInset" width="768" height="65"/>
+                                            <frame key="frameInset" width="768" height="66"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEB1509140024" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fu3-Bf-ZH2" userLabel="So#">
@@ -3065,14 +3065,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="N3e-hc-gFF" userLabel="price">
-                                                    <frame key="frameInset" minY="23" width="100" maxX="176" maxY="21"/>
+                                                    <frame key="frameInset" minY="23" width="100" maxX="176" maxY="22"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="02/02/2015 10:10:10" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="qf1-u6-uMA" userLabel="date">
-                                                    <frame key="frameInset" minY="11" width="148" maxX="15" maxY="11"/>
+                                                    <frame key="frameInset" minY="11" width="148" maxX="15" maxY="12"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -3093,7 +3093,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99999" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kLZ-2K-sGp">
-                                                    <frame key="frameInset" minY="5" width="100" maxX="176" maxY="39"/>
+                                                    <frame key="frameInset" minY="5" width="100" maxX="176" maxY="40"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -6436,11 +6436,11 @@ Email: redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Vyi-Ez-P2a" id="LVn-pY-YDc">
-                                            <frame key="frameInset" width="768" height="43"/>
+                                            <frame key="frameInset" width="768" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="N1s-I8-bJv" customClass="RTLabel">
-                                                    <frame key="frameInset" minX="15" minY="8" maxX="59" maxY="7"/>
+                                                    <frame key="frameInset" minX="15" minY="8" maxX="59" maxY="8"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -228,7 +228,7 @@
                                         <rect key="frame" x="0.0" y="28" width="768" height="86"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XXr-fU-67o" id="Ohn-hG-mj9">
-                                            <frame key="frameInset" width="768" height="85"/>
+                                            <frame key="frameInset" width="768" height="85.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AIn-eK-sCn">
@@ -241,21 +241,21 @@
                                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hrK-DY-RbO">
                                                     <frame key="frameInset" minX="10" minY="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" image="A7B9BEF5-F3DC-49F5-94E5-BD2FC8B6D07E"/>
-                                                    <state key="selected" image="299439CE-0C46-48DA-88D2-B9D35E868919"/>
+                                                    <state key="normal" image="A4686F55-7B95-48A4-8590-0052A83E62D9"/>
+                                                    <state key="selected" image="4FF1D888-1593-458A-BB0D-0C21D3B0962B"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9S-8N-eqS">
-                                                    <frame key="frameInset" minX="20" width="60.83%" height="22" maxY="15"/>
+                                                    <frame key="frameInset" minX="20" width="60.83%" height="22" maxY="15.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="11/08/2016 17:55:32 PST" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="efa-f8-yHS">
-                                                    <frame key="frameInset" width="200" height="22" maxY="14"/>
+                                                    <frame key="frameInset" width="200" height="22" maxY="14.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -422,7 +422,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="299439CE-0C46-48DA-88D2-B9D35E868919" width="24" height="24">
+        <image name="4FF1D888-1593-458A-BB0D-0C21D3B0962B" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw
@@ -512,7 +512,7 @@ EvIS+hMHEwwTDhMQExUTHRMgEyUTLRMwE0ITRRNKAAAAAAAAAgEAAAAAAAAAQQAAAAAAAAAAAAAAAAAA
 E0w
 </mutableData>
         </image>
-        <image name="A7B9BEF5-F3DC-49F5-94E5-BD2FC8B6D07E" width="24" height="24">
+        <image name="A4686F55-7B95-48A4-8590-0052A83E62D9" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGPT5YJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK4HCBMU
 GR4fIyQrLjE3OlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdzVk5TUmVw