160620

RedAnt ERP Mobile/common/Functions/DefaultAppearance.m

@@ -18,6 +18,10 @@
 #import "CategoryCellNPD.h"
 #import "CommonEditorCellMAction.h"
 #import "DefaultImageButton.h"
+#import "OrderListTableViewCell.h"
+#import "CommonEditorCellModel.h"
+#import "BundleDetailButton.h"
+
 @implementation DefaultAppearance
 +(void)init_appearance
 {
@@ -104,7 +108,18 @@
             return [UIButton appearanceWhenContainedIn: arr_container[0], nil];
         }
     }
-    if([control isEqualToString:@"UISearchBar"])
+    else if([control isEqualToString:@"BundleDetailButton"])
+    {
+        if(container_json==nil)
+            return [BundleDetailButton appearance];
+        else
+        {
+            NSArray* arr_container = [self appearance_container:container_json];
+            return [BundleDetailButton appearanceWhenContainedIn: arr_container[0], nil];
+        }
+    }
+    
+    else if([control isEqualToString:@"UISearchBar"])
     {
         if(container_json==nil)
             return [UISearchBar appearance];
@@ -114,7 +129,7 @@
             return [UISearchBar appearanceWhenContainedIn: arr_container[0], nil];
         }
     }
-    if([control isEqualToString:@"DefaultImageButton"])
+    else if([control isEqualToString:@"DefaultImageButton"])
     {
         if(container_json==nil)
             return [DefaultImageButton appearance];
@@ -302,7 +317,16 @@
         {
             [arr addObject:[CategoryHeaderView class]];
         }
-        if([container isEqualToString:@"CommonEditorCellMAction"])
+        else if([container isEqualToString:@"CommonEditorCellModel"])
+        {
+            [arr addObject:[CommonEditorCellModel class]];
+        }
+        else if([container isEqualToString:@"OrderListTableViewCell"])
+        {
+            [arr addObject:[OrderListTableViewCell class]];
+        }
+        
+        else if([container isEqualToString:@"CommonEditorCellMAction"])
         {
             [arr addObject:[CommonEditorCellMAction class]];
         }

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1088,6 +1088,7 @@
     //  UIApplication * app = [UIApplication sharedApplication];
     //  AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     
+    self.itemSearchViewController.default_filter = nil;
     self.itemSearchViewController.covertype = coverttype;
     self.itemSearchViewController.saved_covertype = coverttype;
     
@@ -1689,7 +1690,7 @@
     [self.sideMenuItems addObject:map.copy];
 
     
-  //  if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
+    if(false&&appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {
         [map setValue:@"Offline Setting" forKey:@"title"];
         [map setValue:@"rect_market_news" forKey:@"img"];
@@ -2152,10 +2153,7 @@
         //[self.sideMenuTable reloadData];
         [self initMenuItems];
         [self hideMenu];
-        //        if([self.current_VC isKindOfClass:[WatchListViewController class]])
-        //            return;
-        //        [self flipFromViewController:self.current_VC toViewController:self.watchListViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
-    }
+     }
     else if([title isEqualToString:@"Hide Price"])
     {
         UIApplication * app = [UIApplication sharedApplication];
@@ -2167,10 +2165,7 @@
         [self initMenuItems];
         //  [self.sideMenuTable reloadData];
         [self hideMenu];
-        //        if([self.current_VC isKindOfClass:[WatchListViewController class]])
-        //            return;
-        //        [self flipFromViewController:self.current_VC toViewController:self.watchListViewController withDirection:UIViewAnimationOptionTransitionCrossDissolve];
-    }
+     }
     
     
     

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

@@ -1108,7 +1108,7 @@
 - (IBAction)OnCancelOrderClicked:(id)sender {
     
     
-    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Cancel Order?" message:@"Canceled order cannot be edit anymore." preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Cancel Order" message:@"Are you sure to cancel the order in cart ?" preferredStyle:UIAlertControllerStyleAlert];
     //block代码块取代了delegate
     
     
@@ -1129,7 +1129,7 @@
                     //if([appDelegate.order_code isEqualToString: [self.content_data[indexPath.row] valueForKey:@"order_code"]])
                     {
                         appDelegate.order_code= nil;
-                        appDelegate.user_type = 0;
+                        //appDelegate.user_type = 0;
                         appDelegate.customerInfo = nil;
                         appDelegate.contact_id = nil;
                         appDelegate.order_customer_id = nil;

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

@@ -180,7 +180,7 @@
             int modulus= [[bitem valueForKey:@"modulus"] intValue];
             citem+= modulus;
             double uprice= [[bitem valueForKey:@"unit_price"]doubleValue];
-            dprice+= uprice*modulus*count;
+            dprice+= uprice*modulus;
             
         }
         if(citem==1)
@@ -202,7 +202,7 @@
     
     
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    NSString* price = [NSString stringWithFormat:@"%.2f",self.unit_price* (1.0-self.discount/100.0)*count +dprice];
+    NSString* price = [NSString stringWithFormat:@"%.2f",(self.unit_price* (1.0-self.discount/100.0)+dprice)*count ];
     if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
     {
         

RedAnt ERP Mobile/common/Functions/category/CategorySearchFilterViewController.h

@@ -38,6 +38,8 @@
 @property (strong, nonatomic) IBOutlet UITextField *textModelDescription;
 
 
+@property (strong, nonatomic) NSMutableDictionary* default_filter;
+
 
 @property (strong,nonatomic)NSDictionary* categoryMenu;
 @end

RedAnt ERP Mobile/common/Functions/category/CategorySearchFilterViewController.m

@@ -9,6 +9,8 @@
 #import "CategorySearchFilterViewController.h"
 #import "AppDelegate.h"
 #import "DefaultAppearance.h"
+#import "RAUtils.h"
+
 
 @interface CategorySearchFilterViewController ()
 
@@ -16,60 +18,8 @@
 
 @implementation CategorySearchFilterViewController
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    
-    RATreeView *treeView = [[RATreeView alloc] initWithFrame:self.treeContainer.frame];
-    
-    treeView.delegate = self;
-    treeView.dataSource = self;
-    treeView.separatorStyle = RATreeViewCellSeparatorStyleSingleLine;
-    
-    [treeView reloadData];
-    //  [treeView expandRowForItem:phone withRowAnimation:RATreeViewRowAnimationLeft]; //expands Row
-    [treeView setBackgroundColor:UIColorFromRGB(0xF7F7F7)];
-    
-    self.treeView = treeView;
-    //    treeView.allowsSelection = true;
-    //    treeView.allowsMultipleSelection = true;
-    
-    /*
-     
-     UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 100.000001)];
-     
-     [line setBackgroundColor:[UIColor clearColor]];
-     self.treeView.treeHeaderView = line;
-     */
-    
-    
-    NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"frontcolor"];
-    
-    if(value==nil)
-        value=@"";
-    unsigned long frontcolor = strtoul([value UTF8String],0,16);
-    
-    UILabel *CategoryLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 5.5, self.view.frame.size.width, 33)];
-    CategoryLabel.textColor=UIColorFromRGB(frontcolor);
-    //    CategoryLabel.backgroundColor = [UIColor redColor];
-    CategoryLabel.text=NSLocalizedString(@" Category", nil);
-    //    [CategoryLabel sizeToFit];
-    
-    self.treeView.treeHeaderView = CategoryLabel;
-    
-    [self.treeContainer addSubview:treeView];
 
-//    self.treeView.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.treeView.bounds].CGPath;
-//    self.treeView.layer.masksToBounds = false;
-//    //添加四个边阴影
-//    
-//    self.treeView.layer.shadowColor = [UIColor blackColor].CGColor;
-//    self.treeView.layer.shadowOffset = CGSizeMake(0, 0);
-//    self.treeView.layer.shadowOpacity = 0.5;
-//    self.treeView.layer.shadowRadius = 2.0;
-    self.treeView.layer.borderColor=[UIColor lightGrayColor].CGColor;
-        self.treeView.layer.borderWidth = 0.5;
-//        self.treeView.layer.shadowRadius = 2.0;
+-(void) initUI{
     self.textModelName.text = self.modelname;
     
     self.textModelDescription.text = self.modeldescrip;
@@ -193,6 +143,64 @@
         if(bestseller.length>0)
             [self.buttonBestSeller setTitle:bestseller forState:UIControlStateNormal];
     }
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    
+    RATreeView *treeView = [[RATreeView alloc] initWithFrame:self.treeContainer.frame];
+    
+    treeView.delegate = self;
+    treeView.dataSource = self;
+    treeView.separatorStyle = RATreeViewCellSeparatorStyleSingleLine;
+    
+    [treeView reloadData];
+    //  [treeView expandRowForItem:phone withRowAnimation:RATreeViewRowAnimationLeft]; //expands Row
+    [treeView setBackgroundColor:UIColorFromRGB(0xF7F7F7)];
+    
+    self.treeView = treeView;
+    //    treeView.allowsSelection = true;
+    //    treeView.allowsMultipleSelection = true;
+    
+    /*
+     
+     UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 100.000001)];
+     
+     [line setBackgroundColor:[UIColor clearColor]];
+     self.treeView.treeHeaderView = line;
+     */
+    
+    
+    NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"frontcolor"];
+    
+    if(value==nil)
+        value=@"";
+    unsigned long frontcolor = strtoul([value UTF8String],0,16);
+    
+    UILabel *CategoryLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 5.5, self.view.frame.size.width, 33)];
+    CategoryLabel.textColor=UIColorFromRGB(frontcolor);
+    //    CategoryLabel.backgroundColor = [UIColor redColor];
+    CategoryLabel.text=NSLocalizedString(@" Category", nil);
+    //    [CategoryLabel sizeToFit];
+    
+    self.treeView.treeHeaderView = CategoryLabel;
+    
+    [self.treeContainer addSubview:treeView];
+
+//    self.treeView.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.treeView.bounds].CGPath;
+//    self.treeView.layer.masksToBounds = false;
+//    //添加四个边阴影
+//    
+//    self.treeView.layer.shadowColor = [UIColor blackColor].CGColor;
+//    self.treeView.layer.shadowOffset = CGSizeMake(0, 0);
+//    self.treeView.layer.shadowOpacity = 0.5;
+//    self.treeView.layer.shadowRadius = 2.0;
+    self.treeView.layer.borderColor=[UIColor lightGrayColor].CGColor;
+        self.treeView.layer.borderWidth = 0.5;
+//        self.treeView.layer.shadowRadius = 2.0;
+
+    [self initUI];
+
     // Do any additional setup after loading the view.
 }
 
@@ -210,11 +218,41 @@
  // Pass the selected object to the new view controller.
  }
  */
+-(NSMutableDictionary*) resetFilter:(NSMutableDictionary*)filter
+{
+    NSString* str= [RAUtils dict2string:filter];
+    str=[str stringByReplacingOccurrencesOfString:@"\"check\":1" withString:@"\"check\":0"];
+    str=[str stringByReplacingOccurrencesOfString:@"\"check\":\"1\"" withString:@"\"check\":\"0\""];
+    filter=[[RAUtils string2dict:str]mutableCopy];
+    filter[@"model_name"]=@"";
+    filter[@"model_description"]=@"";
+    filter[@"price"][@"val_0"][@"check"]=@"1";
+    filter[@"alert"][@"val_0"][@"check"]=@"1";
+    filter[@"qty"][@"val_0"][@"check"]=@"1";
+    filter[@"availability"][@"val_0"][@"check"]=@"1";
+    filter[@"best_seller"][@"val_1"][@"check"]=@"1";
+    return filter;
+}
 - (IBAction)onResetClick:(id)sender {
     
-    if(self.ResetClick)
-        self.ResetClick();
-    [self dismissViewControllerAnimated:true completion:nil];
+    self.default_filter= [self resetFilter:self.default_filter];
+    
+    
+    //  self.default_filter = [self.default_filter mutableCopy];
+    
+ //   self.categoryMenu = [self.default_filter objectForKey:@"category"];
+    self.alert_cadedate =[self.default_filter objectForKey:@"alert"];
+    self.modelname=[self.default_filter valueForKey:@"model_name"];
+    self.modeldescrip=[self.default_filter valueForKey:@"model_description"];
+    
+    
+    self.qty_cadedate=[self.default_filter objectForKey:@"qty"];
+    self.availability_cadedate=[self.default_filter objectForKey:@"availability"];
+    self.price_cadedate=[self.default_filter objectForKey:@"price"];
+    self.bestseller_cadedate=[self.default_filter objectForKey:@"best_seller"];
+    
+    
+    [self initUI];
 }
 - (IBAction)onCloseClick:(id)sender {
     [self dismissViewControllerAnimated:true completion:nil];

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -150,7 +150,8 @@
     CategorySearchFilterViewController * filterVC =[ self.storyboard instantiateViewControllerWithIdentifier:@"CategorySearchFilterViewController"];
     
     filterVC.categoryid = self.categoryid;
-    
+    filterVC.default_filter = [[self.category_data objectForKey:@"filter"] mutableCopy];
+
     //----------fake category filter----------------
 //    NSData* json =nil;
 //    json=[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"debug_category_filter" ofType:@"json" ]];

RedAnt ERP Mobile/common/Functions/contact/ContactListViewController.m

@@ -501,6 +501,8 @@ self.label_net_err.hidden=true;
 //                [self.navigationController popViewControllerAnimated:false];
                 
                 
+                [self.table reloadData];
+                
                 if(self.returnValue)
                     self.returnValue(data_init,self.from);
                 

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

@@ -10,6 +10,7 @@
 #import "CategoryCellSmall.h"
 #import "iSalesDB.h"
 #import "DetailViewController.h"
+#import "DefaultAppearance.h"
 
 
 @implementation DetailTopicCell
@@ -68,6 +69,17 @@
 }
 -(UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    
+    
+    NSString* value =[DefaultAppearance get_noneappearance_value:@"CategoryViewController" valuename:@"cell_border_color"];
+    
+    
+    
+    
+    
+    if(value==nil)
+        value=@"";
+    unsigned long color = strtoul([value UTF8String],0,16);
 
         static NSString * CellIdentifier = @"RelatedModelCell";
         CategoryCellSmall * cell = [collectionView dequeueReusableCellWithReuseIdentifier:CellIdentifier forIndexPath:indexPath];
@@ -114,6 +126,12 @@
             
             
         }
+    
+    
+    cell.layer.borderColor = UIColorFromRGB(color).CGColor;
+    cell.layer.borderWidth = 0.5;
+    //cell.layer.cornerRadius=15;
+    cell.layer.masksToBounds=true;
         return cell;
   
 }

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

@@ -574,7 +574,7 @@ self.isrefreshing=false;
     
 
     
-    NSString* value =[DefaultAppearance get_noneappearance_value:@"DetailTableHeaderView" valuename:@"title_text_color"];
+    NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultTableHeaderView" valuename:@"title_text_color"];
     
     if(value==nil)
         value=@"";
@@ -610,18 +610,18 @@ self.isrefreshing=false;
     {
     NSString* btntitle=@"Refresh" ;
 
-        NSString* value =[DefaultAppearance get_noneappearance_value:@"DetailTableHeaderView" valuename:@"refresh_button_color"];
-        
-        if(value==nil)
-        value=@"";
-        unsigned long color = strtoul([value UTF8String],0,16);
+//        NSString* value =[DefaultAppearance get_noneappearance_value:@"DetailTableHeaderView" valuename:@"refresh_button_color"];
+//        
+//        if(value==nil)
+//        value=@"";
+//        unsigned long color = strtoul([value UTF8String],0,16);
     
         
     
     UIButton * btn =[[UIButton alloc] initWithFrame:CGRectMake(tableView.bounds.size.width-100-15, 0, 100, 33)];
         
         
-        [btn setTitleColor:UIColorFromRGB(color) forState:UIControlStateNormal];
+      //  [btn setTitleColor:UIColorFromRGB(color) forState:UIControlStateNormal];
         btn.contentHorizontalAlignment=UIControlContentHorizontalAlignmentRight;
     btn.tag=section;
     [btn addTarget:self action:@selector(RefreshSection:) forControlEvents:UIControlEventTouchUpInside];

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -1286,7 +1286,7 @@
                     int modulus= [[bitem valueForKey:@"modulus"] intValue];
                     citem+= modulus;
                     double uprice= [[bitem valueForKey:@"unit_price"]doubleValue];
-                    dprice+= uprice*modulus*count;
+                    dprice+= uprice*modulus;
                     
                 }
                 if(citem==1)
@@ -1331,9 +1331,15 @@
                 subtotal=nil;
             }
             
+            float duprice = [unitprice floatValue];
+            float dsubtotal = (duprice+dprice)*[qty intValue];
+            
             cell.descriptionLabel.text=description;
-            cell.unitpriceLabel.text = unitprice;
-            cell.subtotalLabel.text = subtotal;
+            if(dprice>0)
+                cell.unitpriceLabel.text = [NSString stringWithFormat:@"%.2f+%.2f",duprice,dprice];//unitprice;
+            else
+                cell.unitpriceLabel.text = [NSString stringWithFormat:@"%.2f",duprice];//unitprice;
+            cell.subtotalLabel.text = [NSString stringWithFormat:@"%.2f",dsubtotal];//subtotal;
             cell.qtyLabel.text = qty;
             cell.statusLabel.text = status;
             

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -743,7 +743,7 @@ dispatch_async(self.loading_queue, ^{
     
     UILabel *pricelabel = [[UILabel alloc] initWithFrame:CGRectMake(/*492*/self.table_order.frame.size.width-276, 11, 100, 22)];
     pricelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
-    pricelabel.textColor=[UIColor whiteColor];
+    pricelabel.textColor=UIColorFromRGB(color);
     pricelabel.backgroundColor = [UIColor clearColor];
     pricelabel.text=NSLocalizedString(@"Order Total", nil);
     [pricelabel sizeToFit];
@@ -751,7 +751,7 @@ dispatch_async(self.loading_queue, ^{
     
     UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(self.table_order.frame.size.width-163/*605*/,11, 148, 22)];
     timelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
-    timelabel.textColor=[UIColor whiteColor];
+    timelabel.textColor=UIColorFromRGB(color);
     timelabel.backgroundColor = [UIColor clearColor];
     if(self.time_zone==nil)
         timelabel.text=@"Create time";

RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.m

@@ -317,7 +317,7 @@
     
     
     
-    UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(553,11, 148, 22)];
+    UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(self.table.frame.size.width-163,11, 148, 22)];
     timelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
     timelabel.textColor=UIColorFromRGB(color);
     timelabel.backgroundColor = [UIColor clearColor];

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioEditQTYViewController.h

@@ -34,5 +34,7 @@
 @property (strong, nonatomic) IBOutlet UILabel *labelpriceafter;
 
 @property (strong, nonatomic) IBOutlet UILabel *labelNewPrice;
+
+@property int ids_count;
 @end
 

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioEditQTYViewController.m

@@ -43,7 +43,7 @@
     self.labelNewPrice.text = [NSString stringWithFormat:@"%.2f",self.price* (1.0-self.discount/100)];
     if(self.arr_fashion_ids.count!=1)
     {
-        self.label_multiItems.text=[NSString stringWithFormat:@"%d items selected",self.arr_fashion_ids.count ];
+        self.label_multiItems.text=[NSString stringWithFormat:@"%d items selected",self.ids_count ];
         self.label_multiItems.hidden = false;
         self.editPrice.enabled = false;
         self.editPrice.text = nil;

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -19,7 +19,8 @@
 #import "PortfolioEditQTYViewController.h"
 
 #import "PDFViewController.h"
-
+#import "DefaultTableHeaderView.h"
+#import "DefaultAppearance.h"
 
 #define ALERT_DEL 1025
 @interface PortfolioViewController ()
@@ -32,6 +33,14 @@
 {
     self.content_data = nil;
 }
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
 
 -(void) reload_container_getdata:(bool) update_data
 {
@@ -449,6 +458,11 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    
+//    UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 0.000001)];
+//    [line setBackgroundColor:[UIColor clearColor]];
+//    self.itemListTable.tableHeaderView = line;
+//    
     UIRefreshControl *ref = [[UIRefreshControl alloc]init];
     ref.tag = 200 ;
     ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
@@ -457,7 +471,7 @@
     [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
     [self.itemListTable addSubview:ref];
     
-    [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
+ //   [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
     
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
     self.label_net_err.layer.borderWidth = 2.0;
@@ -471,23 +485,7 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     
-    
-    
-//    self.toolbar.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.toolbar.bounds].CGPath;
-//    self.toolbar.layer.masksToBounds = false;
-////    //添加四个边阴影
-//    
-//    self.toolbar.layer.shadowColor = [UIColor blackColor].CGColor;
-//    self.toolbar.layer.shadowOffset = CGSizeMake(0, 0);
-//    self.toolbar.layer.shadowOpacity = 0.5;
-//    self.toolbar.layer.shadowRadius = 2.0;
-    
-//    
-//     self.toolbar.layer.borderWidth = 1;
-//     self.toolbar.layer.borderColor = [[UIColor blackColor] CGColor];
-//    
-//   self.toolbar.clipsToBounds = YES;
-  //  [self reload_data];
+
     
 }
 
@@ -705,6 +703,7 @@
 //        NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]] mutableCopy];
         
         vc.arr_fashion_ids = nil;
+        vc.ids_count=checked.count;
         
         //        vc.fashionid =        [NSString stringWithFormat:@"%d",[[item_json valueForKey:@"fashion_id"] intValue]];
 //        vc.qty = [[item_json valueForKey:@"available_qty"] intValue];
@@ -825,10 +824,8 @@
 }
 -(void) viewWillAppear:(BOOL)animated
 {
-    [super viewWillAppear:animated];
     
-
-   
+    [super viewWillAppear:animated];
     
     [[self navigationController] setNavigationBarHidden:YES animated:NO];
 }
@@ -900,6 +897,18 @@
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
 }
+//-(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+//{
+//    
+//    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+//    
+//    
+//    
+//    [self.itemListTable reloadData];
+//    
+//    
+//    
+//}
 #pragma mark - Table view data source
 
 //- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
@@ -940,6 +949,43 @@
 //    else
 //        return @"detail section";
 //}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    
+    return 33;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    
+    
+    
+    NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultTableHeaderView" valuename:@"title_text_color"];
+    
+    if(value==nil)
+        value=@"";
+    unsigned long color = strtoul([value UTF8String],0,16);
+    
+    NSString *sectionTitle = @"Portfolio";
+    
+    DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, 33)];
+    
+    
+    UILabel *titlelabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 5.5, tableView.bounds.size.width, 22)];
+    titlelabel.textColor=UIColorFromRGB(color);
+    titlelabel.textAlignment=NSTextAlignmentCenter;
+    titlelabel.autoresizingMask=UIViewAutoresizingFlexibleWidth;
+    
+    titlelabel.text=sectionTitle;
+    titlelabel.center = myView.center;
+    
+    myView.autoresizesSubviews=true;
+    
+    [myView addSubview:titlelabel];
+    
+    
+    return myView;
+}
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     return 1;

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchFilterViewController.h

@@ -33,7 +33,7 @@
 @property (strong, nonatomic) NSDictionary* availability_cadedate;
 @property (strong, nonatomic) NSDictionary* price_cadedate;
 @property (strong, nonatomic) NSDictionary* bestseller_cadedate;
-
+@property (strong, nonatomic) NSMutableDictionary* default_filter;
 @property (strong, nonatomic) IBOutlet UILabel *labelPrice;
 
 

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchFilterViewController.m

@@ -12,6 +12,7 @@
 #import "EnumSelectViewController.h"
 #import "DefaultAppearance.h"
 #import "AppDelegate.h"
+#import "RAUtils.h"
 @interface ItemSearchFilterViewController ()
 
 @end
@@ -51,9 +52,30 @@
 
 
 - (IBAction)onResetClick:(id)sender {
-    if(self.ResetClick)
-        self.ResetClick();
-    [self dismissViewControllerAnimated:true completion:nil];
+//    if(self.ResetClick)
+//        self.ResetClick();
+//    [self dismissViewControllerAnimated:true completion:nil];
+    
+    
+    self.default_filter= [self resetFilter:self.default_filter];
+    
+    
+  //  self.default_filter = [self.default_filter mutableCopy];
+    
+    self.categoryMenu = [self.default_filter objectForKey:@"category"];
+    self.alert_cadedate =[self.default_filter objectForKey:@"alert"];
+    self.modelname=[self.default_filter valueForKey:@"model_name"];
+    self.modeldescrip=[self.default_filter valueForKey:@"model_description"];
+    
+    
+    self.qty_cadedate=[self.default_filter objectForKey:@"qty"];
+    self.availability_cadedate=[self.default_filter objectForKey:@"availability"];
+    self.price_cadedate=[self.default_filter objectForKey:@"price"];
+    self.bestseller_cadedate=[self.default_filter objectForKey:@"best_seller"];
+    
+    
+    [self initUI];
+    
 }
 
 - (IBAction)onSearchClick:(id)sender {
@@ -156,11 +178,7 @@
     
     
 }
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    
-    
-    
+-(void) initUI{
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     if(appDelegate.bLogin)
@@ -175,7 +193,7 @@
         self.buttonPrice.hidden=true;
     }
     
-
+    
     
     
     
@@ -183,12 +201,12 @@
                                                                     style:UIBarButtonItemStylePlain
                                                                    target:self
                                                                    action:@selector( onCloseClick:)];
-
+    
     
     self.navigationItem.rightBarButtonItem = closeButton;
-
     
-        self.edgesForExtendedLayout = UIRectEdgeNone;
+    
+    self.edgesForExtendedLayout = UIRectEdgeNone;
     
     RATreeView *treeView = [[RATreeView alloc] initWithFrame:self.treeContainer.frame];
     
@@ -201,16 +219,16 @@
     [treeView setBackgroundColor:UIColorFromRGB(0xF7F7F7)];
     
     self.treeView = treeView;
-//    treeView.allowsSelection = true;
-//    treeView.allowsMultipleSelection = true;
+    //    treeView.allowsSelection = true;
+    //    treeView.allowsMultipleSelection = true;
     
     /*
-    
-            UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 100.000001)];
-    
-            [line setBackgroundColor:[UIColor clearColor]];
-            self.treeView.treeHeaderView = line;
-    */
+     
+     UIView *line = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 0, 100.000001)];
+     
+     [line setBackgroundColor:[UIColor clearColor]];
+     self.treeView.treeHeaderView = line;
+     */
     
     
     NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultColor" valuename:@"frontcolor"];
@@ -220,10 +238,10 @@
     unsigned long frontcolor = strtoul([value UTF8String],0,16);
     
     UILabel *CategoryLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 5.5, self.view.frame.size.width, 33)];
-   CategoryLabel.textColor=UIColorFromRGB(frontcolor);
-//    CategoryLabel.backgroundColor = [UIColor redColor];
+    CategoryLabel.textColor=UIColorFromRGB(frontcolor);
+    //    CategoryLabel.backgroundColor = [UIColor redColor];
     CategoryLabel.text=NSLocalizedString(@" Category", nil);
-//    [CategoryLabel sizeToFit];
+    //    [CategoryLabel sizeToFit];
     
     self.treeView.treeHeaderView = CategoryLabel;
     
@@ -233,22 +251,22 @@
     
     self.textModelDescription.text = self.modeldescrip;
     
-//    NSString* alert =@"";
-//    int count = [[self.alert_cadedate valueForKey:@"count"] intValue];
-//    for(int i=0;i<count;i++)
-//    {
-//        NSDictionary* val_json =[self.alert_cadedate objectForKey:[NSString stringWithFormat:@"val_%d",i]];
-//        int check = [[val_json valueForKey:@"check"] intValue];
-//        if(check==1)
-//        {
-//            alert = [alert stringByAppendingString:[val_json valueForKey:@"value"]];
-//            break;
-//        }
-//    }
-//    
-//    if(alert.length>0)
-//    [self.buttonAlert setTitle:alert forState:UIControlStateNormal];
-
+    //    NSString* alert =@"";
+    //    int count = [[self.alert_cadedate valueForKey:@"count"] intValue];
+    //    for(int i=0;i<count;i++)
+    //    {
+    //        NSDictionary* val_json =[self.alert_cadedate objectForKey:[NSString stringWithFormat:@"val_%d",i]];
+    //        int check = [[val_json valueForKey:@"check"] intValue];
+    //        if(check==1)
+    //        {
+    //            alert = [alert stringByAppendingString:[val_json valueForKey:@"value"]];
+    //            break;
+    //        }
+    //    }
+    //
+    //    if(alert.length>0)
+    //    [self.buttonAlert setTitle:alert forState:UIControlStateNormal];
+    
     [treeView setBackgroundColor: [UIColor whiteColor]];
     
     
@@ -345,25 +363,49 @@
         if(bestseller.length>0)
             [self.buttonBestSeller setTitle:bestseller forState:UIControlStateNormal];
     }
-
+    
     self.treeView.layer.borderColor=[UIColor lightGrayColor].CGColor;
     self.treeView.layer.borderWidth = 0.5;
     
-//    self.treeView.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.treeView.bounds].CGPath;
-//    self.treeView.layer.masksToBounds = false;
-//    //添加四个边阴影
-//    
-//    self.treeView.layer.shadowColor = [UIColor blackColor].CGColor;
-//    self.treeView.layer.shadowOffset = CGSizeMake(0, 0);
-//    self.treeView.layer.shadowOpacity = 0.5;
-//    self.treeView.layer.shadowRadius = 2.0;
-
+    //    self.treeView.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.treeView.bounds].CGPath;
+    //    self.treeView.layer.masksToBounds = false;
+    //    //添加四个边阴影
+    //
+    //    self.treeView.layer.shadowColor = [UIColor blackColor].CGColor;
+    //    self.treeView.layer.shadowOffset = CGSizeMake(0, 0);
+    //    self.treeView.layer.shadowOpacity = 0.5;
+    //    self.treeView.layer.shadowRadius = 2.0;
+    
     // Do any additional setup after loading the view.
+
+    
 }
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self initUI];
+    
+ }
 - (IBAction)onCloseClick:(id)sender {
     [self dismissViewControllerAnimated:true completion:nil];
 }
 
+
+-(NSMutableDictionary*) resetFilter:(NSMutableDictionary*)filter
+{
+    NSString* str= [RAUtils dict2string:filter];
+    str=[str stringByReplacingOccurrencesOfString:@"\"check\":1" withString:@"\"check\":0"];
+    str=[str stringByReplacingOccurrencesOfString:@"\"check\":\"1\"" withString:@"\"check\":\"0\""];
+    filter=[[RAUtils string2dict:str]mutableCopy];
+    filter[@"model_name"]=@"";
+    filter[@"model_description"]=@"";
+    filter[@"price"][@"val_0"][@"check"]=@"1";
+    filter[@"alert"][@"val_0"][@"check"]=@"1";
+    filter[@"qty"][@"val_0"][@"check"]=@"1";
+    filter[@"availability"][@"val_0"][@"check"]=@"1";
+    filter[@"best_seller"][@"val_1"][@"check"]=@"1";
+    return filter;
+}
 - (IBAction)onAvailabilityClick:(id)sender {
     EnumSelectViewController* enumvc =[ self.storyboard instantiateViewControllerWithIdentifier:@"EnumSelectorViewController"];
     //  enumvc.delegate = self;

RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -301,11 +301,13 @@
     if(self.default_filter==nil)
         self.default_filter = [self.category_data objectForKey:@"filter"];
     
+    filterVC.default_filter = [self.default_filter mutableCopy];
+    
     filterVC.categoryMenu = [self.default_filter objectForKey:@"category"];
     filterVC.alert_cadedate =[self.default_filter objectForKey:@"alert"];
     filterVC.modelname=[self.default_filter valueForKey:@"model_name"];
     filterVC.modeldescrip=[self.default_filter valueForKey:@"model_description"];
-    
+   
     
     filterVC.qty_cadedate=[self.default_filter objectForKey:@"qty"];
     filterVC.availability_cadedate=[self.default_filter objectForKey:@"availability"];

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

@@ -16,6 +16,9 @@
 #import "TearSheetParamViewController.h"
 #import "EditModelPriceViewController.h"
 #import "ContactListViewController.h"
+#import "DefaultTableHeaderView.h"
+#import "DefaultAppearance.h"
+
 #define ALERT_DEL 1025
 //#import "PDFViewController.h"
 @interface WatchListViewController ()
@@ -386,6 +389,7 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
+    NSLog(@"%@",NSStringFromCGRect(self.itemListTable.frame));
     UIRefreshControl *ref = [[UIRefreshControl alloc]init];
     ref.tag = 200 ;
     ref.attributedTitle = [[NSAttributedString alloc]initWithString:@"Pull to refresh"];
@@ -393,8 +397,9 @@
     //    ref.hidden = true;
     [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
     [self.itemListTable addSubview:ref];
+    NSLog(@"%@",NSStringFromCGRect(self.itemListTable.frame));
     
-    [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
+  //  [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
     
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
     self.label_net_err.layer.borderWidth = 2.0;
@@ -588,6 +593,18 @@
 {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
+}
+-(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+
+    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    
+   
+    
+//    [self.itemListTable reloadData];
+  NSLog(@"%@",NSStringFromCGRect(self.itemListTable.frame));
+    
+    
 }
 #pragma mark - Table view data source
 
@@ -629,6 +646,43 @@
 //    else
 //        return @"detail section";
 //}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+
+        return 33;
+}
+
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    
+    
+    
+    NSString* value =[DefaultAppearance get_noneappearance_value:@"DefaultTableHeaderView" valuename:@"title_text_color"];
+    
+    if(value==nil)
+        value=@"";
+    unsigned long color = strtoul([value UTF8String],0,16);
+    
+    NSString *sectionTitle = @"Wish List";
+    
+    DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, 33)];
+
+    
+    UILabel *titlelabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 5.5, tableView.bounds.size.width, 22)];
+    titlelabel.textColor=UIColorFromRGB(color);
+    titlelabel.textAlignment=NSTextAlignmentCenter;
+    titlelabel.autoresizingMask=UIViewAutoresizingFlexibleWidth;
+    
+    titlelabel.text=sectionTitle;
+    titlelabel.center = myView.center;
+    
+    myView.autoresizesSubviews=true;
+    
+    [myView addSubview:titlelabel];
+    
+    
+    return myView;
+}
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     return 1;

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -63,7 +63,61 @@
         
         MainViewController * main_vc= (MainViewController*)self.main_vc;
         
+        //contact button
         
+        
+        
+        if(self.user==nil)
+        {
+            
+
+            [main_vc.btnContact setTitle:@"" forState:UIControlStateNormal];
+            
+            [main_vc.btnContact setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+            main_vc.btnContact.hidden = YES;
+            
+        }
+        else
+        {
+            
+
+                
+                NSString * contact =[self.customerInfo valueForKey:@"customer_contact"];
+                NSString * customer=[self.customerInfo valueForKey:@"customer_name"];
+                if(self.customerInfo==nil)
+                {
+                    //                contact=@"No Name";    if(customerinfo==nil)
+                    //                {
+                    contact=@"Select Contact";
+                    [main_vc.btnContact setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+                }
+                else
+                {
+                    
+                    if(contact==nil||contact.length==0)
+                    {
+                        contact=@"No Name";
+                        [main_vc.btnContact setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
+                    }
+                    else
+                    {
+                        [main_vc.btnContact setTitleColor:UIColorFromRGB(0x009900) forState:UIControlStateNormal];
+                    }
+                }
+                
+                NSMutableArray* arr_contact = [[NSMutableArray alloc] init];
+                if(contact.length>0)
+                    [arr_contact addObject:contact];
+                if(customer.length>0)
+                    [arr_contact addObject:customer];
+                
+                NSString *contact_string = [arr_contact componentsJoinedByString:@" @"];
+                
+                
+                [main_vc.btnContact setTitle:contact_string forState:UIControlStateNormal];
+                
+            
+        }
         //cart
         if(self.user==nil||self.cart_count==0)
         {

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

@@ -459,36 +459,10 @@
                 <viewController storyboardIdentifier="WatchListViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="dSV-Dg-id4" customClass="WatchListViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="l8z-x6-eMf">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="TEJ-4m-gTF">
-                                <rect key="frame" x="0.0" y="980" width="768" height="44"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <items>
-                                    <barButtonItem title="Select all" id="4ut-I6-lhS">
-                                        <connections>
-                                            <action selector="onSelectClick:" destination="dSV-Dg-id4" id="OW2-Fn-aja"/>
-                                        </connections>
-                                    </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="WGd-QY-X9M"/>
-                                    <barButtonItem title="Delete" id="1fK-gC-zJQ">
-                                        <connections>
-                                            <action selector="onDeleteClick:" destination="dSV-Dg-id4" id="1q5-N8-tEV"/>
-                                        </connections>
-                                    </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="ded-Mq-Wdh"/>
-                                    <barButtonItem title="Move to Cart" id="nkH-wk-LKl">
-                                        <connections>
-                                            <action selector="onAddtoCart:" destination="dSV-Dg-id4" id="3mi-fA-zV0"/>
-                                        </connections>
-                                    </barButtonItem>
-                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="GCT-Zy-PVt"/>
-                                </items>
-                                <color key="barTintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            </toolbar>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="22" sectionFooterHeight="22" id="Bod-ih-aFz">
-                                <rect key="frame" x="0.0" y="44" width="768" height="936"/>
+                                <rect key="frame" x="0.0" y="0.0" width="768" height="980"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
@@ -558,15 +532,32 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <color key="color" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             </activityIndicatorView>
-                            <navigationBar contentMode="scaleToFill" id="Wwz-yd-aV5">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="TEJ-4m-gTF">
+                                <rect key="frame" x="0.0" y="980" width="768" height="44"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <color key="barTintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <items>
-                                    <navigationItem title="Wish List" id="saF-j6-5P2"/>
+                                    <barButtonItem title="Select all" id="4ut-I6-lhS">
+                                        <connections>
+                                            <action selector="onSelectClick:" destination="dSV-Dg-id4" id="OW2-Fn-aja"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="WGd-QY-X9M"/>
+                                    <barButtonItem title="Delete" id="1fK-gC-zJQ">
+                                        <connections>
+                                            <action selector="onDeleteClick:" destination="dSV-Dg-id4" id="1q5-N8-tEV"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="ded-Mq-Wdh"/>
+                                    <barButtonItem title="Move to Cart" id="nkH-wk-LKl">
+                                        <connections>
+                                            <action selector="onAddtoCart:" destination="dSV-Dg-id4" id="3mi-fA-zV0"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="GCT-Zy-PVt"/>
                                 </items>
-                            </navigationBar>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            </toolbar>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
@@ -591,13 +582,13 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="22" sectionFooterHeight="22" id="kOF-xZ-ifb">
-                                <rect key="frame" x="0.0" y="44" width="768" height="936"/>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="28" sectionFooterHeight="28" id="kOF-xZ-ifb">
+                                <rect key="frame" x="0.0" y="0.0" width="768" height="980"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="WatchListItemCell" rowHeight="120" id="L9J-GT-Vuy" customClass="ModelItemCell">
-                                        <rect key="frame" x="0.0" y="22" width="768" height="120"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L9J-GT-Vuy" id="8jz-dG-ECN">
                                             <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
@@ -678,15 +669,6 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <color key="color" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             </activityIndicatorView>
-                            <navigationBar contentMode="scaleToFill" id="f8h-Ag-BEG">
-                                <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <color key="barTintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <items>
-                                    <navigationItem title="Portfolio" id="jxo-Qv-B6a"/>
-                                </items>
-                            </navigationBar>
                             <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="2mY-ma-k5g">
                                 <rect key="frame" x="0.0" y="980" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -933,17 +915,17 @@
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                             </button>
-                            <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="600" sectionHeaderHeight="10" sectionFooterHeight="10" id="fRO-Fc-0A3">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="600" sectionHeaderHeight="10" sectionFooterHeight="10" id="fRO-Fc-0A3">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <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" 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="49.5" width="768" height="550"/>
+                                        <rect key="frame" x="0.0" y="50" 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"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="550"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USD 123.45" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fD8-Km-IT3">
@@ -1046,7 +1028,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8bl-N2-vQ8" customClass="DefaultImageButton">
-                                                    <rect key="frame" x="450" y="503" width="133" height="39"/>
+                                                    <rect key="frame" x="458" y="487" width="124" height="39"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Add to portfolio" backgroundImage="btn_addtoportfolio">
                                                         <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1084,18 +1066,6 @@
                                                     <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="P9c-rP-A3n" customClass="DefaultImageButton">
-                                                    <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="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>
-                                                        <action selector="add_toCart:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="BVv-yh-dvO"/>
-                                                    </connections>
-                                                </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Model QTY in Cart" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="g3j-Vx-s9x">
                                                     <rect key="frame" x="450" y="356" width="262" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
@@ -1130,7 +1100,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AHJ-EJ-V5A" customClass="DefaultImageButton">
-                                                    <rect key="frame" x="600" y="503" width="133" height="39"/>
+                                                    <rect key="frame" x="590" y="487" width="124" 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">
@@ -1146,6 +1116,18 @@
                                                         <action selector="add_toWatchList:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="3NR-H3-EhB"/>
                                                     </connections>
                                                 </button>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="P9c-rP-A3n" customClass="DefaultImageButton">
+                                                    <rect key="frame" x="524" y="440" width="124" height="39"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                    <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>
+                                                        <action selector="add_toCart:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="BVv-yh-dvO"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -1177,10 +1159,10 @@
                                         </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"/>
+                                        <rect key="frame" x="0.0" y="600" 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"/>
+                                            <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">
@@ -1244,18 +1226,18 @@
                                         </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"/>
+                                        <rect key="frame" x="0.0" y="1200" 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="599.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="600"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailInfoCell" rowHeight="44" id="hYM-aE-rjR" customClass="DetailKVCell">
-                                        <rect key="frame" x="0.0" y="1799.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="1800" 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="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                             <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">
@@ -1861,7 +1843,21 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="qEq-Qg-SBo" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-318" y="-4325"/>
+            <point key="canvasLocation" x="-878" y="-4325"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="une-UD-PRu">
+            <objects>
+                <viewController id="ibd-dA-vXe" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="uVe-1K-Qq5">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Pok-6Z-Cze" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-44" y="-4325"/>
         </scene>
         <!--ScannerViewController-->
         <scene sceneID="tgY-Nq-Wd9">
@@ -2059,7 +2055,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="PJV-YE-GvQ">
-                                                    <rect key="frame" x="696" y="6" width="48" height="31"/>
+                                                    <rect key="frame" x="691" y="6" width="48" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <connections>
                                                         <action selector="cacheSwitchChanged:" destination="SCh-P5-b9w" eventType="valueChanged" id="Qx0-8P-8Gq"/>
@@ -2089,7 +2085,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="el1-Tc-PkB">
-                                                    <rect key="frame" x="488" y="11" width="256" height="21"/>
+                                                    <rect key="frame" x="483" y="11" width="256" 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"/>
@@ -2136,7 +2132,7 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FEW-hW-hPv" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="728" y="-4325"/>
+            <point key="canvasLocation" x="1200" y="-4313"/>
         </scene>
         <!--Setting-->
         <scene sceneID="4lC-Yf-AjG">
@@ -2417,7 +2413,7 @@
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Dkp-pb-PTw">
+                                                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Dkp-pb-PTw" customClass="BundleDetailButton">
                                                             <rect key="frame" x="639" y="86" width="56" height="25"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                             <state key="normal" title="Detail">
@@ -2533,10 +2529,12 @@
                                             <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"/>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="HXI-1Z-Yo5" customClass="DefaultImageButton">
+                                        <rect key="frame" x="550" y="83" width="30" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Cancel Order"/>
+                                        <state key="normal" title="Cancel Order" backgroundImage="btn_cancelorder">
+                                            <color key="titleColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                        </state>
                                         <connections>
                                             <action selector="OnCancelOrderClicked:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="DrG-rG-O9C"/>
                                         </connections>
@@ -5726,14 +5724,14 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yQq-ma-HdT" userLabel="unit price">
-                                                    <rect key="frame" x="530" y="42" width="104" height="21"/>
+                                                    <rect key="frame" x="507" y="42" width="127" 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="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eJp-xh-LUC" userLabel="sub total">
-                                                    <rect key="frame" x="522" y="100" width="112" height="21"/>
+                                                    <rect key="frame" x="507" y="100" width="127" 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"/>
@@ -5747,21 +5745,21 @@ Email: redantsupport@united-us.net</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="B9e-ud-vid">
-                                                    <rect key="frame" x="474" y="42" width="40" height="21"/>
+                                                    <rect key="frame" x="459" y="42" width="40" 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="QTY" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TmS-ni-EYJ">
-                                                    <rect key="frame" x="474" y="71" width="40" height="21"/>
+                                                    <rect key="frame" x="459" y="71" width="40" 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="Subtotal" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="upI-L7-lFy">
-                                                    <rect key="frame" x="442" y="100" width="72" height="21"/>
+                                                    <rect key="frame" x="427" y="100" width="72" 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"/>
@@ -5775,7 +5773,7 @@ Email: redantsupport@united-us.net</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Zvl-je-6gR" userLabel="description">
-                                                    <rect key="frame" x="114" y="13" width="320" height="108"/>
+                                                    <rect key="frame" x="114" y="13" width="305" height="108"/>
                                                     <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"/>
@@ -5797,14 +5795,14 @@ Email: redantsupport@united-us.net</string>
                                                     </connections>
                                                 </button>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dzI-A2-cDp" customClass="StrikethroughLabel">
-                                                    <rect key="frame" x="578" y="13" width="120" height="21"/>
+                                                    <rect key="frame" x="567" y="13" width="120" 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="10.00% off" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="jhV-zw-Osd">
-                                                    <rect key="frame" x="442" y="13" width="104" height="21"/>
+                                                    <rect key="frame" x="427" y="13" width="104" 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"/>
@@ -6150,8 +6148,8 @@ Email: redantsupport@united-us.net</string>
                                             <action selector="onMatchFullChanged:" destination="yq3-iF-ow0" eventType="valueChanged" id="ngR-Mb-hjH"/>
                                         </connections>
                                     </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"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Search by factory code" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yFN-y2-Ir3">
+                                        <rect key="frame" x="323" y="12" width="194" 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"/>
@@ -6166,7 +6164,7 @@ Email: redantsupport@united-us.net</string>
                                     </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"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <textInputTraits key="textInputTraits"/>
                                         <connections>
                                             <outlet property="delegate" destination="yq3-iF-ow0" id="Sj2-T9-hJ5"/>
@@ -8370,7 +8368,7 @@ Email: redantsupport@united-us.net</string>
                                 <rect key="frame" x="60" y="103" width="267" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <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" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="QTc-m9-3Z6">
@@ -8490,12 +8488,13 @@ Email: redantsupport@united-us.net</string>
         <image name="add_180" width="180" height="180"/>
         <image name="album" width="48" height="48"/>
         <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_addtocart_large" width="124" height="39"/>
+        <image name="btn_addtoportfolio" width="124" height="39"/>
+        <image name="btn_addtowish" width="124" height="39"/>
         <image name="btn_cancel" width="102" height="30"/>
+        <image name="btn_cancelorder" width="30" height="30"/>
         <image name="btn_ok" width="102" height="30"/>
-        <image name="btn_placeorder" width="126" height="30"/>
+        <image name="btn_placeorder" width="131" height="30"/>
         <image name="btn_reset" width="102" height="30"/>
         <image name="btn_retrieve" width="102" height="30"/>
         <image name="btn_save" width="102" height="30"/>

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -22,105 +22,105 @@
 
 
 //------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.111:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.111:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.111:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.116:8080/site/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.116:8080/site/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.116:8080/site/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.111:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.111:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.111:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.111:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.111:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.111:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.111:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.116:8080/site/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.116:8080/site/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.116:8080/site/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.116:8080/site/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.116:8080/site/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.116:8080/site/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.116:8080/site/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.111:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.111:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.111:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.111:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.111:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.111:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.111:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.111:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.111:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.111:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.111:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.111:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.116:8080/site/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.116:8080/site/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.116:8080/site/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.116:8080/site/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.116:8080/site/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.116:8080/site/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.116:8080/site/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.116:8080/site/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.116:8080/site/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.116:8080/site/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.116:8080/site/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.116:8080/site/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.111:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.111:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.116:8080/site/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.116:8080/site/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.116:8080/site/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.111:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.111:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.111:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.111:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.111:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.111:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.111:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.116:8080/site/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.116:8080/site/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.116:8080/site/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.116:8080/site/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.116:8080/site/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.116:8080/site/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.116:8080/site/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.116:8080/site/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.111:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.116:8080/site/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.111:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.111:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.116:8080/site/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.116:8080/site/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.116:8080/site/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.111:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.111:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.111:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.111:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.111:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.111:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.111:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.116:8080/site/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.116:8080/site/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.116:8080/site/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.116:8080/site/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.116:8080/site/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.116:8080/site/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.116:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.116:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.116:8080/site/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.116:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.116:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.116:8080/site/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.111:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.111:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.116:8080/site/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.116:8080/site/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.111:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.116:8080/site/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.116:8080/site/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.111:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.116:8080/site/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.116:8080/site/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.111:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.111:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.111:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.111:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.111:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.116:8080/site/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.116:8080/site/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.116:8080/site/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.116:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.116:8080/site/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.116:8080/site/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.116:8080/site/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.111:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.116:8080/site/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.111:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.116:8080/site/isales/uploadImg.htm"
 
-#define  URL_NPD_POLICY  @"http://192.168.0.111:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.116:8080/site/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.111/pj/offline/initDatas.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.116/pj/offline/initDatas.htm"
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.111/pj/offline/downloadDatas.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.116/pj/offline/downloadDatas.htm"
 
 //
 //

RedAnt ERP Mobile/iSales-NPD/default_appearance.json

@@ -1,6 +1,6 @@
 {
     "appearance": {
-        "count": 4,
+        "count": 6,
         "group_0": {
             "name": "global",
             "count": 11,
@@ -22,8 +22,8 @@
                 "note": "全局navigation barButton",
                 "control": "UIBarButtonItem",
                 "function": "TintColor",
-                "value": "0x996633",
-                "info": "NPD BROWN",
+                "value": "0x474747",
+                "info": "NPD GRAY",
                 "container1": {
                     "count": 1,
                     "item_0": "UINavigationBar"
@@ -55,8 +55,8 @@
                 "note": "全局toolbar barButton",
                 "control": "UIBarButtonItem",
                 "function": "TintColor",
-                "value": "0x996633",
-                "info": "NPD BROWN",
+                "value": "0x474747",
+                "info": "NPD GRAY",
                 "container": {
                     "count": 1,
                     "item_0": "UIToolbar"
@@ -102,8 +102,8 @@
                 "note": "全局section header 按钮",
                 "control": "UIButton",
                 "function": "setTitleColor.Normal",
-                "value": "0xffffff",
-                "info": "whiteColor",
+                "value": "0x007aff",
+                "info": "blueColor",
                 "container": {
                     "count": 1,
                     "item_0": "DefaultTableHeaderView"
@@ -177,18 +177,49 @@
                     "item_0": "ContactListTableViewCell"
                 }
             }
+        },
+        "group_4": {
+            "name": "order",
+            "count": 1,
+            "item_0": {
+                "note": "order list action 按钮",
+                "control": "UIButton",
+                "function": "setTitleColor.Normal",
+                "value": "0xffffff",
+                "info": "whiteColor",
+                "container": {
+                    "count": 1,
+                    "item_0": "OrderListTableViewCell"
+                }
+            }
+        },
+        "group_5": {
+            "name": "cart",
+            "count": 1,
+            "item_0": {
+                "note": "cart bundle item detail 按钮",
+                "control": "BundleDetailButton",
+                "function": "setTitleColor.Normal",
+                "value": "0x996633",
+                "info": "NPD BROWN",
+                "container": {
+                    "count": 1,
+                    "item_0": "ModelItemCell"
+                }
+            }
         }
+        
+        
     },
     "none_appearance": {
         "count": 3,
         "CategoryViewController": {
-            "cell_border_color": "0xffffff"
+            "cell_border_color": "0xbcbac1"
         },
         "DefaultTableHeaderView": {
-            "title_text_color": "0xffffff"
+            "title_text_color": "0x474747"
         },
         "DetailTableHeaderView": {
-            "title_text_color": "0x474747",
             "refresh_button_color": "0x007aff"
         }
         ,

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>160514</string>
+	<string>160615</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>