160528

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -422,7 +422,12 @@
     NSDictionary* infoDict =[[NSBundle mainBundle] infoDictionary];
     NSString* build =[infoDict objectForKey:@"CFBundleVersion"];
     NSString* version =[infoDict objectForKey:@"CFBundleShortVersionString"];
+
+#ifdef BUILD_HMLG
+    NSString* versionNum = [NSString stringWithFormat:@"HMLG %@ Build %@",version,build];
+#else
     NSString* versionNum = [NSString stringWithFormat:@"npd %@ Build %@",version,build];
+#endif
     
     [self initMenuItems];
     self.homeViewController =[ self.storyboard instantiateViewControllerWithIdentifier:@"HomeViewController"];
@@ -436,12 +441,15 @@
     self.contactListViewController.assig_icon = true;
     self.contactListViewController.reset_icon = false;
     self.contactListViewController.ui_type = CONTACT_LIST;
-    
+    __block MainViewController *brself= self;
     self.contactListViewController.returnValue = ^(NSMutableDictionary* value,NSIndexPath* source){
         
         appDelegate.contact_id=[value valueForKey:@"customer_cid"];
         appDelegate.customerInfo = value;
         
+
+        [brself switchToCart:nil];
+        
         //            [self handle_action_return:value indexPath:indexPath action:ACTION_FILL_SECTION];
         
         //
@@ -450,7 +458,7 @@
     };
     
     //Capturing strongly  warring;
-    __block MainViewController *brself= self;
+    
     
     self.orderViewController.selectOrder=^(NSMutableDictionary* order_detail){
         //main view 下打开order
@@ -1636,7 +1644,7 @@
     [self.sideMenuItems addObject:map.copy];
 
     
-    if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
+  //  if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {
         [map setValue:@"Offline Setting" forKey:@"title"];
         [map setValue:@"rect_market_news" forKey:@"img"];
@@ -1666,6 +1674,10 @@
     [self.sideMenuItems addObject:map.copy];
     
     
+#ifdef BUILD_HMLG
+#endif
+    
+#ifdef BUILD_NPD
     [map setValue:@"NPD Website" forKey:@"title"];
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
@@ -1677,7 +1689,7 @@
     [map setValue:@"Simplified Buying Program" forKey:@"title"];
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
-    
+ #endif   
     
 
     
@@ -2062,7 +2074,7 @@
         
         UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:aboutVC] ;
         
-        
+
         
         
         

RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m

@@ -43,7 +43,7 @@
     
     
     
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onBackClick:)];
@@ -60,14 +60,14 @@
                                                    target:self
                                                    action:@selector(onActionClick:)];//[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Edit", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onOpenOrderClick:)];
     
-    self.btnshare.tintColor = UIColorFromRGB(0x996633);
+   // self.btnshare.tintColor = UIColorFromRGB(0x996633);
     
     self.btnemail =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"mail"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                      style:UIBarButtonItemStylePlain
                                                     target:self
                                                     action:@selector(onEmailClick:)];// [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Commit", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCommitOrderClick:)];
     
-    self.btnemail.tintColor = UIColorFromRGB(0x996633);
+  //  self.btnemail.tintColor = UIColorFromRGB(0x996633);
     
     // self.btnSend = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Email", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onSendMailClick:)];
     
@@ -77,7 +77,7 @@
                                                        style:UIBarButtonItemStylePlain
                                                       target:self
                                                       action:@selector(onSaveClick:)];
-    self.btnsave.tintColor = UIColorFromRGB(0x996633);
+   // self.btnsave.tintColor = UIColorFromRGB(0x996633);
     
     
     UIBarButtonItem *fixedItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];

RedAnt ERP Mobile/common/Functions/PDF+Web/WebViewController.m

@@ -41,13 +41,13 @@
     
     
     
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onBackClick:)];
     //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
     //    closeButton.title = @"Close";
-    closeButton.tintColor = UIColorFromRGB(0x996633);
+ //   closeButton.tintColor = UIColorFromRGB(0x996633);
     self.navigationItem.leftBarButtonItem = closeButton;
     
     

RedAnt ERP Mobile/iSales-NPD/AppDelegate.h

@@ -11,8 +11,10 @@
 #import "ScanApiHelper.h"
 //#import "MainViewController.h"
 #import "ActiveViewController.h"
+#import "OfflineSettingViewController.h"
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate,ScanApiHelperDelegate>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate,ScanApiHelperDelegate , NSURLConnectionDataDelegate>
 
 @property (strong, nonatomic) UIWindow *window;
 @property (strong,nonatomic) NSString* user;
@@ -71,6 +73,7 @@
 @property bool alert_sold_in_quantities;
 @property(readonly) bool price_hidden;
 
+
 -(void) set_priceHidden:(bool)price_hidden;
 
 -(void) set_main_button_panel;
@@ -82,7 +85,18 @@
 @property (strong , nonatomic) NSString* ipad_perm;
 
 -(void) update_count_mark;
-
+// downloader
+
+@property (nonatomic, strong) OfflineSettingViewController *settingUI;
+@property (nonatomic, strong) NSFileHandle *fileHandle;
+@property (nonatomic, assign) long long currentLength; //>>写入文件的长度
+@property (nonatomic, assign) long long fileLength; //>>文件长度
+@property (nonatomic, strong) NSString *fileName;   //>>文件名
+@property (nonatomic, strong) NSURLConnection *connection;
+@property double file_progress;
+@property (strong, nonatomic) NSString* downloadlog;
+@property bool downloading;
+-(void) add_downloadlog:(NSString*) newtext;
 //scanner
 #define API_START 1
 #define API_STOP 3

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -10,6 +10,9 @@
 #import "UILabel+FontAppearance.h"
 #import "MainViewController.h"
 #import "PDFViewController.h"
+#import "ZipArchive.h"
+#import "DefaultAppearance.h"
+
 @implementation AppDelegate
 {
 #ifdef USE_SOFTSCAN
@@ -364,6 +367,7 @@
 //}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [DefaultAppearance init_appearance];
 //    NSString* order_filter_source_path =[[NSBundle mainBundle]  pathForResource:@"status_filter_cadedate" ofType:@"json" ];
 //    /var/folders/65/j0_0c8rx66zb29cjnjndr11r0000gn/T/AppIconMaker/appicon.png
 //    
@@ -515,6 +519,256 @@
 //    
 //    //注册成功，将deviceToken保存到应用服务器数据库中
 //}
+#pragma mark - background download
+-(bool)isdownloading:(NSString*) file
+{
+    return true;
+}
+-(long long)getcurrentLength:(NSString*) file
+{
+    return self.currentLength;
+}
+
+-(void)handle_download:(NSString *)url start:(bool) start type:(NSString*) type
+{
+    
+   
+    NSString* file_name=[url lastPathComponent];
+    //暂停<->开始转换
+    
+ //   bool isdownloading = [self isdownloading:file_name];
+    if (start) {//开始下载
+        NSURL* _url = [NSURL URLWithString:@"https://rate.apexshipping.com/temp/apache-tomcat-8.0.22.zip"];
+        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:_url];
+        
+        //设置请求头（GET）
+        NSString *range = [NSString stringWithFormat:@"bytes=%lld-",  [self getcurrentLength:file_name]];
+        [request setValue:range forHTTPHeaderField:@"Range"];
+        
+        self.connection = [NSURLConnection connectionWithRequest:request delegate:self];
+    }else{ //暂停
+        
+        [self.connection cancel];
+        self.connection = nil;
+    }
+}
+-(void) check_offline
+{
+    
+    
+    
+    NSMutableDictionary* json=[[iSalesNetwork  check_Offline:nil] mutableCopy];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        //  [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+        NSString* vid=[json valueForKey:@"vid"];
+        //                        sleep(3);
+        //UIAlertView * waitalert1 = [RAUtils waiting_alert:@"Please wait..." title:@"Server is preparing data for you"];
+        
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            __block bool preparing = true;
+            while (preparing) {
+                sleep(10);
+                
+                
+                
+                NSMutableDictionary* download_json=[[iSalesNetwork  download_Offline:vid] mutableCopy];
+                
+                dispatch_sync(dispatch_get_main_queue(), ^{
+                    
+                    
+                    int aaa=123;
+                    
+                    if([[download_json valueForKey:@"result"] intValue]==2)
+                    {
+                        preparing = false;
+                        //   [waitalert1 dismissWithClickedButtonIndex:0 animated:FALSE];
+                    }
+                    else if([[download_json valueForKey:@"result"] intValue]==1)
+                    {
+                        // preparing.
+                    }
+                    else
+                    {
+                        //wrong.
+                        preparing = false;
+                        //  [waitalert1 dismissWithClickedButtonIndex:0 animated:FALSE];
+                        //  [RAUtils message_alert:@"Download data wrong, canceled." title:@"Offline" controller:self] ;
+                        
+                    }
+                    
+                    
+                });
+                
+                
+                
+            }
+        });
+        
+        
+        
+        
+        
+        
+    });
+    
+    
+}
+-(void) download_offline:(NSMutableDictionary*) source
+{
+    int size= [[source valueForKey:@"size"] intValue] /1024/1024;
+    long long freespace=[RAUtils freeDiskSpaceInMegaBytes];
+    if(size+500>freespace)
+    {
+        //size not enough.
+        return ;
+    }
+    int count = [[source valueForKey:@"count"] intValue];
+    for (int i = 0;i<count;i++)
+    {
+        NSDictionary* itemjson = [source objectForKey:[NSString stringWithFormat:@"item_%d",i]];
+        NSString* url = [itemjson valueForKey:@"url"];
+        NSString* type = [itemjson valueForKey:@"type"];
+        [self handle_download:url start:true  type:type];
+        
+        
+        
+    }
+}
+-(void) add_downloadlog:(NSString*) newtext
+{
+    if(!self.downloading)
+        return;
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString* date;
+        NSDateFormatter* formatter = [[NSDateFormatter alloc]init];
+        [formatter setDateFormat:@"YYYY-MM-dd hh:mm:ss"];
+        date = [formatter stringFromDate:[NSDate date]];
+        
+        
+        if(newtext.length<=0)
+            return;
+        NSString* text = self.log;
+        if(text.length==0)
+            text=@"";
+        text = [NSString stringWithFormat:@"%@%@----------%@\n",text,date,newtext];
+        self.downloadlog = text;
+        
+       
+        [self.settingUI onLogUpdate];
+    });
+}
+-(void)unpack
+{
+    
+    //NSLog(_fileName);
+    ///Users/Ray/Library/Developer/CoreSimulator/Devices/0852B217-599B-41C2-95BA-4755B02B7FA0/data/Containers/Data/Application/FC6AC5D0-2ADF-4A3B-935D-059078622031/Library/Caches/apache-tomcat-8.0.22.zip
+    //文件路径
+//    NSString *caches = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
+    NSString* temp = NSTemporaryDirectory();
+    NSString *zipFile = [temp stringByAppendingPathComponent:self.fileName];
+    ZipArchive* zip = [[ZipArchive alloc] init];
+    
+    
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+    NSString *cachefolder = [paths objectAtIndex:0];
+    NSString *img_cache = [cachefolder stringByAppendingPathComponent:@"img_cache"];
+//    
+//    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+//    NSString *documentPath = ([paths count] > 0) ? [paths objectAtIndex:0] : nil;
+    //NSString* zipFile = [documentPath stringByAppendingString:@"/images.zip"] ;
+    NSString* unZipTo = img_cache;//[documentPath stringByAppendingString:@"/images"] ;
+    
+    NSLog(@"path: %@",unZipTo);
+    if( [zip UnzipOpenFile:zipFile Password:@"#UL$dc01"] ){
+        BOOL result = [zip UnzipFileTo:unZipTo overWrite:YES];
+        if( NO==result ){
+            //添加代码
+        }
+        [zip UnzipCloseFile];
+    }
+    // [zip release];
+}
+#pragma mark - NSURLConnectionDataDelegate
+
+/**
+ *请求失败
+ */
+-(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error{
+    
+    NSLog(@"error");
+}
+/**
+ *接收到服务器的响应
+ */
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response{
+    
+    NSHTTPURLResponse* httpresponse = (NSHTTPURLResponse *)response;
+    
+    if (httpresponse.statusCode == 206) {//！！！断点续传的状态码为206
+        
+        if (self.currentLength) {
+            return;
+        }
+        
+        //获取下载文件大小
+        self.fileLength = response.expectedContentLength;
+        
+        //获取文件名
+        self.fileName = response.suggestedFilename;
+        
+        //文件路径
+        NSString *caches = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
+        
+        NSString *filePath = [caches stringByAppendingPathComponent:_fileName];
+        
+        //创建一个空的文件到沙盒
+        NSFileManager *fileManager = [NSFileManager defaultManager];
+        [fileManager createFileAtPath:filePath contents:nil attributes:nil];
+        
+        //创建一个用来写数据的文件句柄
+        self.fileHandle = [NSFileHandle fileHandleForWritingAtPath:filePath];
+    }else{
+        
+        [self.connection cancel];
+        self.connection = nil;
+        NSLog(@"该文件不存在");
+    }
+    
+}
+
+/**
+ *接收到服务器返回的数据（可能被调用多次）
+ */
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data{
+    
+    //移动到文件末尾
+    [self.fileHandle seekToEndOfFile];
+    
+    //写入数据到文件
+    [self.fileHandle writeData:data];
+    
+    self.currentLength += data.length;
+    
+    //更新画面中的进度
+    
+    double progress = (double)self.currentLength/self.fileLength;
+    self.file_progress = progress;
+}
+
+/**
+ *服务器返回数据完了
+ */
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection{
+    
+    self.currentLength = 0;
+    self.fileLength = 0;
+    [self.fileHandle closeFile];
+    self.fileHandle = nil;
+    [self unpack];
+}
 #pragma mark - Scaner
 -(void)onTimer: (NSTimer*)theTimer{
     if(theTimer==ScanApiConsumer){

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

@@ -283,7 +283,7 @@
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Kx0-AQ-Y5o" userLabel="MenuButton">
                                         <rect key="frame" x="0.0" y="20" width="48" height="48"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Button" image="menu_open"/>
+                                        <state key="normal" image="menu_open"/>
                                         <connections>
                                             <action selector="onmenuButtonClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="8Jk-HI-USO"/>
                                         </connections>
@@ -620,7 +620,7 @@
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TuI-Vt-j1J" userLabel="description">
-                                                    <rect key="frame" x="113" y="10" width="360" height="100"/>
+                                                    <rect key="frame" x="128" y="10" width="360" height="100"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="22"/>
                                                     <nil key="highlightedColor"/>
@@ -706,6 +706,12 @@
                                         </connections>
                                     </barButtonItem>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="kYW-Rm-bdN"/>
+                                    <barButtonItem title="Edit" id="T2m-46-CKL">
+                                        <connections>
+                                            <action selector="onEditClick:" destination="NiN-ww-FY4" id="doo-S7-wSN"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="bKX-A5-ZLj"/>
                                     <barButtonItem title="Create Portfolio" id="2hz-YX-gc5">
                                         <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <connections>
@@ -846,8 +852,8 @@
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_signin">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Sign in" backgroundImage="btn_signin">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -933,75 +939,8 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="DetailTopicCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailTopicCell" id="zzF-db-bsq" customClass="DetailTopicCell">
-                                        <rect key="frame" x="0.0" y="49.5" width="768" height="600"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zzF-db-bsq" id="rZ0-x8-h3B">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="600"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Refreshing...
Please wait." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bSP-hh-M2A">
-                                                    <rect key="frame" x="285" y="50" width="198" height="87"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" id="z6w-ak-dlg">
-                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="597"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="aEA-hG-YW5">
-                                                        <size key="itemSize" width="175" height="234"/>
-                                                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                                                    </collectionViewFlowLayout>
-                                                    <cells>
-                                                        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="RelatedModelCell" id="VCx-HU-rs7" customClass="CategoryCellSmall">
-                                                            <rect key="frame" x="0.0" y="0.0" width="175" height="234"/>
-                                                            <autoresizingMask key="autoresizingMask"/>
-                                                            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                                                                <rect key="frame" x="0.0" y="0.0" width="175" height="234"/>
-                                                                <autoresizingMask key="autoresizingMask"/>
-                                                                <subviews>
-                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="9J8-tL-gBr">
-                                                                        <rect key="frame" x="1" y="1" width="173" height="172"/>
-                                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                                    </imageView>
-                                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jtl-cL-nvH" userLabel="Label -description">
-                                                                        <rect key="frame" x="8" y="195" width="159" height="21"/>
-                                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                                                        <nil key="highlightedColor"/>
-                                                                    </label>
-                                                                </subviews>
-                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                            </view>
-                                                            <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                            <connections>
-                                                                <outlet property="cellDescription" destination="Jtl-cL-nvH" id="26Y-Hu-DJi"/>
-                                                                <outlet property="cellImageView" destination="9J8-tL-gBr" id="XUe-Dm-Gjt"/>
-                                                            </connections>
-                                                        </collectionViewCell>
-                                                    </cells>
-                                                    <connections>
-                                                        <outlet property="dataSource" destination="zzF-db-bsq" id="xjl-8j-CIm"/>
-                                                        <outlet property="delegate" destination="zzF-db-bsq" id="amO-Fu-C1E"/>
-                                                    </connections>
-                                                </collectionView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="refreshLabel" destination="bSP-hh-M2A" id="pLF-vj-sGa"/>
-                                            <outlet property="topicCollectionView" destination="z6w-ak-dlg" id="gAo-7T-KFb"/>
-                                        </connections>
-                                    </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailHeaderCell" rowHeight="550" id="PCZ-Ci-oQf" customClass="DetailHeaderCell">
-                                        <rect key="frame" x="0.0" y="649.5" width="768" height="550"/>
+                                        <rect key="frame" x="0.0" y="49.5" width="768" height="550"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PCZ-Ci-oQf" id="DiR-eY-PiR">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="549.5"/>
@@ -1014,22 +953,6 @@
                                                     <fontDescription key="fontDescription" type="system" pointSize="21"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AHJ-EJ-V5A">
-                                                    <rect key="frame" x="600" y="460" width="133" height="39"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <state key="normal" backgroundImage="btn_addtowish">
-                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </state>
-                                                    <userDefinedRuntimeAttributes>
-                                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                            <integer key="value" value="15"/>
-                                                        </userDefinedRuntimeAttribute>
-                                                    </userDefinedRuntimeAttributes>
-                                                    <connections>
-                                                        <action selector="add_toWatchList:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="3NR-H3-EhB"/>
-                                                    </connections>
-                                                </button>
                                                 <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="3" id="dlZ-DL-v21">
                                                     <rect key="frame" x="50" y="466" width="320" height="37"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
@@ -1122,20 +1045,15 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8bl-N2-vQ8">
-                                                    <rect key="frame" x="633" y="487" width="85" height="30"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8bl-N2-vQ8">
+                                                    <rect key="frame" x="450" y="503" width="133" height="39"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <state key="normal" title="Share">
+                                                    <state key="normal" title="Add to portfolio" backgroundImage="btn_addtoportfolio">
+                                                        <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
-                                                    <userDefinedRuntimeAttributes>
-                                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                            <integer key="value" value="15"/>
-                                                        </userDefinedRuntimeAttribute>
-                                                    </userDefinedRuntimeAttributes>
                                                     <connections>
-                                                        <action selector="onShareClick:" destination="uDC-5C-ME6" eventType="touchUpInside" id="y0F-SR-s3V"/>
+                                                        <action selector="add_toPortfolio:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="yMW-JU-cyk"/>
                                                     </connections>
                                                 </button>
                                                 <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" id="CbC-vM-IGL">
@@ -1167,10 +1085,11 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="P9c-rP-A3n">
-                                                    <rect key="frame" x="450" y="460" width="133" height="39"/>
+                                                    <rect key="frame" x="450" y="432" width="283" height="65"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <state key="normal" backgroundImage="btn_addtocart">
+                                                    <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                                                    <state key="normal" title="Add to cart" backgroundImage="btn_addtocart_large">
+                                                        <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
                                                     <connections>
@@ -1210,11 +1129,29 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AHJ-EJ-V5A">
+                                                    <rect key="frame" x="600" y="503" width="133" height="39"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <state key="normal" title="Add to wish list" backgroundImage="btn_addtowish">
+                                                        <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                            <integer key="value" value="15"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                    <connections>
+                                                        <action selector="add_toWatchList:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="3NR-H3-EhB"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <connections>
                                             <outlet property="btnaddCart" destination="P9c-rP-A3n" id="Ne1-hV-blS"/>
+                                            <outlet property="btnaddPortfolio" destination="8bl-N2-vQ8" id="OME-qi-bAh"/>
                                             <outlet property="btnaddWish" destination="AHJ-EJ-V5A" id="MWP-hv-a4g"/>
                                             <outlet property="count_Label" destination="U9s-Ng-Fzb" id="WZo-1v-DoQ"/>
                                             <outlet property="cqyt_label" destination="g3j-Vx-s9x" id="cC2-Dd-4xI"/>
@@ -1239,11 +1176,78 @@
                                             <outlet property="stepper" destination="CbC-vM-IGL" id="nAb-Jl-hM8"/>
                                         </connections>
                                     </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" restorationIdentifier="DetailTopicCell" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailTopicCell" id="zzF-db-bsq" customClass="DetailTopicCell">
+                                        <rect key="frame" x="0.0" y="599.5" width="768" height="600"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zzF-db-bsq" id="rZ0-x8-h3B">
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Refreshing...
Please wait." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bSP-hh-M2A">
+                                                    <rect key="frame" x="285" y="50" width="198" height="87"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" id="z6w-ak-dlg">
+                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="597"/>
+                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="aEA-hG-YW5">
+                                                        <size key="itemSize" width="175" height="234"/>
+                                                        <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                                        <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                                        <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                                    </collectionViewFlowLayout>
+                                                    <cells>
+                                                        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="RelatedModelCell" id="VCx-HU-rs7" customClass="CategoryCellSmall">
+                                                            <rect key="frame" x="0.0" y="0.0" width="175" height="234"/>
+                                                            <autoresizingMask key="autoresizingMask"/>
+                                                            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                                                <rect key="frame" x="0.0" y="0.0" width="175" height="234"/>
+                                                                <autoresizingMask key="autoresizingMask"/>
+                                                                <subviews>
+                                                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="9J8-tL-gBr">
+                                                                        <rect key="frame" x="1" y="1" width="173" height="172"/>
+                                                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                                    </imageView>
+                                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jtl-cL-nvH" userLabel="Label -description">
+                                                                        <rect key="frame" x="8" y="195" width="159" height="21"/>
+                                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                </subviews>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                                            </view>
+                                                            <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <connections>
+                                                                <outlet property="cellDescription" destination="Jtl-cL-nvH" id="26Y-Hu-DJi"/>
+                                                                <outlet property="cellImageView" destination="9J8-tL-gBr" id="XUe-Dm-Gjt"/>
+                                                            </connections>
+                                                        </collectionViewCell>
+                                                    </cells>
+                                                    <connections>
+                                                        <outlet property="dataSource" destination="zzF-db-bsq" id="xjl-8j-CIm"/>
+                                                        <outlet property="delegate" destination="zzF-db-bsq" id="amO-Fu-C1E"/>
+                                                    </connections>
+                                                </collectionView>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="refreshLabel" destination="bSP-hh-M2A" id="pLF-vj-sGa"/>
+                                            <outlet property="topicCollectionView" destination="z6w-ak-dlg" id="gAo-7T-KFb"/>
+                                        </connections>
+                                    </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailImageCell" id="gSx-f2-mrB" customClass="DetailImageCell">
                                         <rect key="frame" x="0.0" y="1199.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gSx-f2-mrB" id="k28-H7-ddZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="600"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -1251,7 +1255,7 @@
                                         <rect key="frame" x="0.0" y="1799.5" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hYM-aE-rjR" id="o59-aa-UU2">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EOR-Ov-zPZ">
@@ -1334,15 +1338,13 @@
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NU1-5F-jwF">
                                                     <rect key="frame" x="0.0" y="221" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name&amp;Description" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MH1-gs-ba5">
                                                     <rect key="frame" x="0.0" y="191" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="x9x-qb-ApL">
@@ -1369,7 +1371,7 @@
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
-                                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <size key="customSize" width="180" height="251"/>
                                         <connections>
                                             <outlet property="cellImageView" destination="x9x-qb-ApL" id="hKH-JG-dHy"/>
@@ -1396,15 +1398,13 @@
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="r5v-jF-1ZF">
                                                     <rect key="frame" x="0.0" y="410" width="369" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name&amp;Description" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ixj-DS-Xvu">
                                                     <rect key="frame" x="0.0" y="380" width="369" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="24"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="KD9-gq-Htz">
@@ -1426,7 +1426,7 @@
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
-                                        <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <size key="customSize" width="369" height="440"/>
                                         <connections>
                                             <outlet property="cellImageView" destination="Uuf-NG-kvA" id="EFv-Ac-MiN"/>
@@ -1453,7 +1453,7 @@
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="drL-KU-Xb0">
                                                     <rect key="frame" x="123" y="90" width="495" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name&amp;Description" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RBh-7V-VX2">
@@ -1499,7 +1499,7 @@
                                     <outlet property="delegate" destination="O3B-N1-SIn" id="OVU-Nr-zqU"/>
                                 </connections>
                             </collectionView>
-                            <view contentMode="scaleToFill" id="M2M-p8-Hpm">
+                            <view contentMode="scaleToFill" id="M2M-p8-Hpm" customClass="CategoryHeaderView">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
@@ -2521,7 +2521,9 @@
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jew-M1-our">
                                         <rect key="frame" x="624" y="83" width="126" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" backgroundImage="btn_placeorder"/>
+                                        <state key="normal" title="Place Order" backgroundImage="btn_placeorder">
+                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </state>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
                                                 <integer key="value" value="15"/>
@@ -2531,6 +2533,14 @@
                                             <action selector="onPlaceOrder:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="oox-kf-LJE"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="HXI-1Z-Yo5">
+                                        <rect key="frame" x="514" y="83" width="100" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <state key="normal" title="Cancel Order"/>
+                                        <connections>
+                                            <action selector="OnCancelOrderClicked:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="DrG-rG-O9C"/>
+                                        </connections>
+                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" id="R1S-km-dYZ">
                                         <rect key="frame" x="15" y="45" width="170" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -2827,14 +2837,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ED9-4r-9oA" userLabel="time">
-                                                    <rect key="frame" x="543" y="23" width="210" height="21"/>
+                                                    <rect key="frame" x="542" y="23" width="208" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xob-hv-8gJ" userLabel="name">
-                                                    <rect key="frame" x="224" y="8" width="311" height="50"/>
+                                                    <rect key="frame" x="223" y="8" width="312" height="50"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -5101,8 +5111,8 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="I9q-85-TbU">
                                 <rect key="frame" x="19" y="570" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_cancel">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Cancel" backgroundImage="btn_cancel">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -5127,7 +5137,9 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="XzI-Mu-MXq">
                                 <rect key="frame" x="209" y="570" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_reset"/>
+                                <state key="normal" title="Reset" backgroundImage="btn_reset">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </state>
                                 <connections>
                                     <action selector="onResetClick:" destination="CpN-Ut-Elb" eventType="touchUpInside" id="RVD-g4-uBh"/>
                                 </connections>
@@ -5135,8 +5147,8 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="KG1-Xe-P4d">
                                 <rect key="frame" x="418" y="570" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_search">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Search" backgroundImage="btn_search">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -5198,7 +5210,7 @@
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ver_info" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9uM-pF-Snb">
-                                        <rect key="frame" x="86" y="222" width="303" height="21"/>
+                                        <rect key="frame" x="86" y="222" width="362" height="21"/>
                                         <autoresizingMask key="autoresizingMask" 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="calibratedRGB"/>
@@ -5234,6 +5246,9 @@ Email: redantsupport@united-us.net</string>
                     <size key="freeformSize" width="480" height="320"/>
                     <connections>
                         <outlet property="labelVer" destination="9uM-pF-Snb" id="w6i-3H-P3Y"/>
+                        <outlet property="label_appname" destination="bFj-iV-Tgz" id="5pi-9d-5VC"/>
+                        <outlet property="label_company" destination="sEn-Yk-cgN" id="UkK-yi-48n"/>
+                        <outlet property="tvcompany" destination="i5E-vh-w1y" id="D29-hZ-QTT"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="EBs-5K-X2c" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -5620,7 +5635,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="Eyx-Zr-PLO" customClass="RTLabel">
-                                                    <rect key="frame" x="0.0" y="-5" width="750" height="32"/>
+                                                    <rect key="frame" x="-0.5" y="-5.5" width="750" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </view>
@@ -6055,14 +6070,20 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="6iP-k7-v7K">
-                                        <rect key="frame" x="715" y="7" width="44" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Select"/>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="rW9-48-YEo">
+                                        <rect key="frame" x="268" y="7" width="51" height="31"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <connections>
-                                            <action selector="onSelectClick:" destination="yq3-iF-ow0" eventType="touchUpInside" id="uD6-EL-llr"/>
+                                            <action selector="onMatchFullChanged:" destination="yq3-iF-ow0" eventType="valueChanged" id="ngR-Mb-hjH"/>
                                         </connections>
-                                    </button>
+                                    </switch>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Turn on to search exact word " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yFN-y2-Ir3">
+                                        <rect key="frame" x="323" y="12" width="232" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 Items" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gK2-JX-k9J">
                                         <rect key="frame" x="296" y="13" width="175" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
@@ -6070,6 +6091,14 @@ Email: redantsupport@united-us.net</string>
                                         <color key="textColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <searchBar contentMode="redraw" searchBarStyle="minimal" placeholder="Enter keyword" id="gSN-FM-qOJ">
+                                        <rect key="frame" x="15" y="0.0" width="240" height="44"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                        <connections>
+                                            <outlet property="delegate" destination="yq3-iF-ow0" id="Sj2-T9-hJ5"/>
+                                        </connections>
+                                    </searchBar>
                                     <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="h1O-Fb-m6b" userLabel="Display_large">
                                         <rect key="frame" x="669" y="6" width="32" height="32"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
@@ -6080,14 +6109,6 @@ Email: redantsupport@united-us.net</string>
                                             <action selector="onChangeDisplay:" destination="yq3-iF-ow0" eventType="touchUpInside" id="fLr-vK-haK"/>
                                         </connections>
                                     </button>
-                                    <searchBar contentMode="redraw" searchBarStyle="minimal" placeholder="Enter keyword" id="gSN-FM-qOJ">
-                                        <rect key="frame" x="15" y="4" width="240" height="44"/>
-                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                        <textInputTraits key="textInputTraits"/>
-                                        <connections>
-                                            <outlet property="delegate" destination="yq3-iF-ow0" id="Sj2-T9-hJ5"/>
-                                        </connections>
-                                    </searchBar>
                                     <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="dg2-bt-X7f" userLabel="Display_small">
                                         <rect key="frame" x="624" y="6" width="32" height="32"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
@@ -6107,6 +6128,14 @@ Email: redantsupport@united-us.net</string>
                                             <action selector="onChangeDisplay:" destination="O3B-N1-SIn" eventType="touchUpInside" id="OA2-FF-K0V"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="6iP-k7-v7K">
+                                        <rect key="frame" x="715" y="7" width="44" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                        <state key="normal" title="Select"/>
+                                        <connections>
+                                            <action selector="onSelectClick:" destination="yq3-iF-ow0" eventType="touchUpInside" id="uD6-EL-llr"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </view>
@@ -6172,6 +6201,7 @@ Email: redantsupport@united-us.net</string>
                         <outlet property="searchBar" destination="gSN-FM-qOJ" id="jSU-lk-f2f"/>
                         <outlet property="selectToolbar" destination="QuX-fm-1EK" id="MiJ-dj-L15"/>
                         <outlet property="selectallBtn" destination="sBd-1t-dfF" id="vN5-09-32c"/>
+                        <outlet property="switch_matchfull" destination="rW9-48-YEo" id="eRI-oh-qFt"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="pPE-76-z2Z" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -6231,15 +6261,24 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="N1s-I8-bJv" customClass="RTLabel">
-                                                    <rect key="frame" x="15" y="8" width="738" height="29"/>
+                                                    <rect key="frame" x="15" y="8" width="627" height="28"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </view>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="yn8-x9-aNh">
+                                                    <rect key="frame" x="717" y="2" width="43" height="40"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                    <state key="normal" image="assign"/>
+                                                    <connections>
+                                                        <action selector="onAssignClick:" destination="znh-Hg-fGG" eventType="touchUpInside" id="EyO-F0-BIm"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <connections>
+                                            <outlet property="btn_assign" destination="yn8-x9-aNh" id="H4N-8f-QQn"/>
                                             <outlet property="rtlabel" destination="N1s-I8-bJv" id="T55-di-PMc"/>
                                         </connections>
                                     </tableViewCell>
@@ -6786,8 +6825,8 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_retrieve">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Retrieve" backgroundImage="btn_retrieve">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -6876,8 +6915,8 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_save">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Save" backgroundImage="btn_save">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -6947,7 +6986,7 @@ Email: redantsupport@united-us.net</string>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rSL-hV-BoQ">
                                                     <rect key="frame" x="0.0" y="410" width="369" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -6999,7 +7038,7 @@ Email: redantsupport@united-us.net</string>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HSu-nc-ciB">
                                                     <rect key="frame" x="0.0" y="221" width="180" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -7061,7 +7100,7 @@ Email: redantsupport@united-us.net</string>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f9n-2Z-4Ae">
                                                     <rect key="frame" x="123" y="90" width="495" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name&amp;Description" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WOx-6s-YzR">
@@ -7150,14 +7189,14 @@ Email: redantsupport@united-us.net</string>
                                         </connections>
                                     </button>
                                     <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 Items" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EhH-is-sN0">
-                                        <rect key="frame" x="472" y="15" width="175" height="21"/>
+                                        <rect key="frame" x="72" y="15" width="175" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="1YX-kt-LbG">
-                                        <rect key="frame" x="21" y="11" width="35" height="30"/>
+                                        <rect key="frame" x="520" y="11" width="35" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" backgroundImage="filter"/>
                                         <connections>
@@ -7811,8 +7850,8 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_save">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Save" backgroundImage="btn_save">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -7870,8 +7909,8 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_save">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Save" backgroundImage="btn_save">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -7982,8 +8021,8 @@ Email: redantsupport@united-us.net</string>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="EEc-ga-lhk">
                                 <rect key="frame" x="20" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_reset">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Reset" backgroundImage="btn_reset">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -7997,8 +8036,8 @@ Email: redantsupport@united-us.net</string>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="ihu-vW-d0a">
                                 <rect key="frame" x="418" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_ok">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="OK" backgroundImage="btn_ok">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -8037,8 +8076,8 @@ Email: redantsupport@united-us.net</string>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="njU-8s-bxi">
                                 <rect key="frame" x="189" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                <state key="normal" backgroundImage="btn_ok">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="OK" backgroundImage="btn_ok">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
@@ -8082,15 +8121,15 @@ Email: redantsupport@united-us.net</string>
             <objects>
                 <viewController storyboardIdentifier="PortfolioEditQTYViewController" title="Edit Available QTY" useStoryboardIdentifierAsRestorationIdentifier="YES" id="LhD-eu-RdF" userLabel="PortfolioEditQTYViewController" customClass="PortfolioEditQTYViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="gd5-tU-V8m">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="xnN-1o-b5j">
-                                <rect key="frame" x="358" y="270" width="102" height="30"/>
+                                <rect key="frame" x="358" y="430" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_save">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Save" backgroundImage="btn_save">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -8103,21 +8142,21 @@ Email: redantsupport@united-us.net</string>
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Available QTY" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ePh-2A-r7b">
-                                <rect key="frame" x="60" y="196" width="112" height="26"/>
+                                <rect key="frame" x="60" y="53" width="112" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mNA-Kx-pon" userLabel="new price">
-                                <rect key="frame" x="223" y="220" width="213" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Line Note" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9eL-xq-rV3">
+                                <rect key="frame" x="60" y="271" width="112" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" tag="199" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="QTY" minimumFontSize="17" clearButtonMode="whileEditing" id="b0D-zg-gh2">
-                                <rect key="frame" x="180" y="194" width="240" height="30"/>
+                                <rect key="frame" x="180" y="51" width="240" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -8127,14 +8166,14 @@ Email: redantsupport@united-us.net</string>
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Available QTY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="J9S-ON-BZC">
-                                <rect key="frame" x="60" y="237" width="280" height="21"/>
+                                <rect key="frame" x="60" y="99" width="280" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="MQQ-OM-NAc">
-                                <rect key="frame" x="348" y="232" width="53" height="30"/>
+                                <rect key="frame" x="348" y="94" width="53" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Refresh"/>
                                 <connections>
@@ -8142,21 +8181,21 @@ Email: redantsupport@united-us.net</string>
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price $" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dPj-Xl-JKC">
-                                <rect key="frame" x="60" y="39" width="90" height="26"/>
+                                <rect key="frame" x="60" y="148" width="90" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Discount %" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ztv-QE-aTE">
-                                <rect key="frame" x="60" y="91" width="90" height="26"/>
+                                <rect key="frame" x="60" y="189" width="90" height="26"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Price" minimumFontSize="17" clearButtonMode="whileEditing" id="ezN-vF-6te">
-                                <rect key="frame" x="158" y="33" width="262" height="30"/>
+                                <rect key="frame" x="158" y="142" width="262" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -8166,21 +8205,14 @@ Email: redantsupport@united-us.net</string>
                                 </connections>
                             </textField>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price after discount:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="l82-Kw-BDq">
-                                <rect key="frame" x="60" y="138" width="155" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WbW-HI-0PK" userLabel="new price">
-                                <rect key="frame" x="223" y="138" width="213" height="21"/>
+                                <rect key="frame" x="60" y="230" width="155" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <textField opaque="NO" clipsSubviews="YES" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Discount" minimumFontSize="17" clearButtonMode="whileEditing" id="CS6-19-nwK">
-                                <rect key="frame" x="158" y="85" width="262" height="30"/>
+                                <rect key="frame" x="158" y="187" width="262" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -8189,6 +8221,27 @@ Email: redantsupport@united-us.net</string>
                                     <outlet property="delegate" destination="LhD-eu-RdF" id="rK5-UN-AT7"/>
                                 </connections>
                             </textField>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Smc-AX-cPb">
+                                <rect key="frame" x="60" y="20" width="360" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" id="DaX-ZG-fqt">
+                                <rect key="frame" x="158" y="269" width="262" height="127"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
+                            </textView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="WbW-HI-0PK" userLabel="new price">
+                                <rect key="frame" x="223" y="230" width="213" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
@@ -8200,7 +8253,7 @@ Email: redantsupport@united-us.net</string>
                         </barButtonItem>
                     </navigationItem>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <size key="freeformSize" width="480" height="320"/>
+                    <size key="freeformSize" width="480" height="480"/>
                     <connections>
                         <outlet property="buttonRefresh" destination="MQQ-OM-NAc" id="r4H-hu-tcp"/>
                         <outlet property="editDiscount" destination="CS6-19-nwK" id="dzW-0q-ElE"/>
@@ -8208,11 +8261,14 @@ Email: redantsupport@united-us.net</string>
                         <outlet property="editQTY" destination="b0D-zg-gh2" id="v26-sy-X3M"/>
                         <outlet property="labelNewPrice" destination="WbW-HI-0PK" id="vVe-vg-VQi"/>
                         <outlet property="labelQueryQTY" destination="J9S-ON-BZC" id="pYu-H1-SN9"/>
+                        <outlet property="label_multiItems" destination="Smc-AX-cPb" id="haI-aH-t82"/>
+                        <outlet property="labelpriceafter" destination="l82-Kw-BDq" id="HXx-5P-4un"/>
+                        <outlet property="tv_linenote" destination="DaX-ZG-fqt" id="12T-jx-hdw"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="n81-vt-NbO" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2604" y="-1596"/>
+            <point key="canvasLocation" x="2595" y="-1708"/>
         </scene>
         <!--UserList-->
         <scene sceneID="Wq4-cC-3aA">
@@ -8226,8 +8282,8 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="358" y="270" width="102" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" backgroundImage="btn_cancel">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Cancel" backgroundImage="btn_cancel">
+                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <userDefinedRuntimeAttributes>
@@ -8252,7 +8308,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NOt-hZ-Ysa">
-                                                    <rect key="frame" x="15" y="0.0" width="410" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="410" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -8293,7 +8349,9 @@ Email: redantsupport@united-us.net</string>
         <image name="about" width="96" height="96"/>
         <image name="add_180" width="180" height="180"/>
         <image name="album" width="48" height="48"/>
-        <image name="btn_addtocart" width="133" height="39"/>
+        <image name="assign" width="40" height="40"/>
+        <image name="btn_addtocart_large" width="283" height="65"/>
+        <image name="btn_addtoportfolio" width="133" height="39"/>
         <image name="btn_addtowish" width="133" height="39"/>
         <image name="btn_cancel" width="102" height="30"/>
         <image name="btn_ok" width="102" height="30"/>
@@ -8304,12 +8362,12 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_search" width="102" height="30"/>
         <image name="btn_signin" width="102" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="72" height="72"/>
-        <image name="category" width="72" height="72"/>
+        <image name="cart_empty" width="96" height="96"/>
+        <image name="category" width="96" height="96"/>
         <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
         <image name="close" width="32" height="32"/>
-        <image name="contact" width="72" height="72"/>
+        <image name="contact" width="96" height="96"/>
         <image name="filter" width="32" height="32"/>
         <image name="layout_list" width="40" height="40"/>
         <image name="layout_small" width="40" height="40"/>
@@ -8318,10 +8376,10 @@ Email: redantsupport@united-us.net</string>
         <image name="mark_cart_32" width="32" height="32"/>
         <image name="mark_closeout_32" width="32" height="32"/>
         <image name="mark_wish_32" width="32" height="32"/>
-        <image name="menu_open" width="72" height="72"/>
+        <image name="menu_open" width="36" height="36"/>
         <image name="newcustomer" width="32" height="32"/>
         <image name="neworder" width="40" height="40"/>
-        <image name="npd_logo" width="69" height="50"/>
+        <image name="npd_logo" width="69" height="10"/>
         <image name="order" width="72" height="72"/>
         <image name="pick_bg" width="280" height="280"/>
         <image name="profle" width="64" height="64"/>
@@ -8333,6 +8391,6 @@ Email: redantsupport@united-us.net</string>
         <image name="select" width="32" height="32"/>
         <image name="share" width="40" height="40"/>
         <image name="upload" width="48" height="48"/>
-        <image name="wishlist" width="72" height="72"/>
+        <image name="wishlist" width="96" height="96"/>
     </resources>
 </document>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15C50" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -9,76 +9,104 @@
         <scene sceneID="Zkb-7X-Ajq">
             <objects>
                 <viewController storyboardIdentifier="OfflineSettingViewController" title="Offline Setting" useStoryboardIdentifierAsRestorationIdentifier="YES" id="FG7-WW-Z5X" customClass="OfflineSettingViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="WBc-9G-Yaz"/>
-                        <viewControllerLayoutGuide type="bottom" id="noq-Op-se1"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="fxo-pq-FSo">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Enable Offline Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iMj-3v-3eE">
-                                <rect key="frame" x="20" y="33" width="181" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable Offline Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="iMj-3v-3eE">
+                                <rect key="frame" x="20" y="25" width="181" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9fI-uo-0D5">
-                                <rect key="frame" x="282" y="28" width="51" height="31"/>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="9fI-uo-0D5">
+                                <rect key="frame" x="217" y="20" width="51" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <connections>
                                     <action selector="onChangeOfflineSwitch:" destination="FG7-WW-Z5X" eventType="valueChanged" id="F0c-jb-lQb"/>
                                 </connections>
                             </switch>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Last sync" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o7T-n9-rhA">
-                                <rect key="frame" x="20" y="89" width="202" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Last sync" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="o7T-n9-rhA">
+                                <rect key="frame" x="20" y="74" width="91" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mAv-YK-pnD">
-                                <rect key="frame" x="282" y="89" width="186" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="02/28/2016" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="mAv-YK-pnD">
+                                <rect key="frame" x="217" y="74" width="111" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Cache size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4VN-I0-qDk">
-                                <rect key="frame" x="20" y="143" width="181" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cache size" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4VN-I0-qDk">
+                                <rect key="frame" x="20" y="123" width="91" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdt-hI-Mna">
-                                <rect key="frame" x="231" y="272" width="115" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kcI-2q-g1r">
+                                <rect key="frame" x="20" y="172" width="91" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Kdt-hI-Mna">
+                                <rect key="frame" x="663" y="167" width="85" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Submit local"/>
                             </button>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="e5o-kf-vgO">
-                                <rect key="frame" x="20" y="432" width="728" height="282"/>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" id="e5o-kf-vgO">
+                                <rect key="frame" x="20" y="291" width="728" height="713"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" fixedFrame="YES" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vOC-FT-Ods">
-                                <rect key="frame" x="35" y="416" width="713" height="2"/>
-                            </progressView>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jns-5C-X4w">
-                                <rect key="frame" x="462" y="85" width="143" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="jns-5C-X4w">
+                                <rect key="frame" x="616" y="70" width="132" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Update offline data"/>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vzg-50-bc2">
-                                <rect key="frame" x="404" y="277" width="82" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3.22GB" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="J6c-cK-Ihd">
+                                <rect key="frame" x="217" y="123" width="111" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Vzg-50-bc2">
+                                <rect key="frame" x="666" y="119" width="82" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Clear cache"/>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J6c-cK-Ihd">
-                                <rect key="frame" x="282" y="143" width="186" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20160228231919" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Avj-sE-gE6">
+                                <rect key="frame" x="217" y="172" width="147" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="sDs-06-tny">
+                                <rect key="frame" x="20" y="252" width="68" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" id="vOC-FT-Ods">
+                                <rect key="frame" x="20" y="281" width="728" height="2"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            </progressView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
-                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="iPad"/>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
                     <connections>
                         <outlet property="btn_checkupdate" destination="jns-5C-X4w" id="TPE-6V-eWn"/>
                         <outlet property="btn_clearcache" destination="Vzg-50-bc2" id="FQa-mv-uRb"/>
@@ -92,7 +120,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="hdi-ff-J4b" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="693" y="471"/>
+            <point key="canvasLocation" x="887" y="803"/>
         </scene>
     </scenes>
 </document>