20160318

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/contents.xcworkspacedata

@@ -4,9 +4,6 @@
    <FileRef
       location = "group:iSales-NPD.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:iSales-DEMO.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:Pods/Pods.xcodeproj">
    </FileRef>

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -259,5 +259,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/cart/EditModelPriceViewController.m"
+            timestampString = "479975496.881973"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "67"
+            endingLineNumber = "67"
+            landmarkName = "-onSaveClicked:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -2237,7 +2237,7 @@
             layer.shadowOffset = CGSizeMake(0, 0);
             layer.shadowOpacity = 1;
         }
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         return cell;
     }else
         if([control isEqualToString:@"img"])
@@ -2440,7 +2440,7 @@
                 }
             }
             
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
         }else
@@ -2534,7 +2534,7 @@
                     layer.shadowOffset = CGSizeMake(0, 0);
                     layer.shadowOpacity = 1;
                 }
-                cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+                cell.backgroundColor = [UIColor whiteColor];
                 return cell;
             }
             else
@@ -2581,7 +2581,7 @@
                     cell.labelValue.text = value;
                     
                     
-                    cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+                    cell.backgroundColor = [UIColor whiteColor];
                     return cell;
                 }
                 else
@@ -2624,7 +2624,7 @@
                             layer.shadowOffset = CGSizeMake(0, 0);
                             layer.shadowOpacity = 1;
                         }
-                        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+                        cell.backgroundColor = [UIColor whiteColor];
                         return cell;
                     }
     if([control isEqualToString:@"multi_action"])
@@ -2698,7 +2698,7 @@
         //            layer.shadowOpacity = 1;
         //            layer.shadowRadius = 2.0;
         //        }
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         return cell;
     }
     else
@@ -2717,7 +2717,7 @@
             else
                 cell.switchCtrl.on = false;
             cell.accessoryType = UITableViewCellAccessoryNone;
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
         } else  if([control isEqualToString:@"enum"])
@@ -2792,7 +2792,7 @@
                 layer.shadowOffset = CGSizeMake(0, 0);
                 layer.shadowOpacity = 1;
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
         } else if([control isEqualToString:@"model"])
@@ -2958,7 +2958,7 @@
                 
                 
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
         }else if([control isEqualToString:@"datepicker"])
@@ -2999,7 +2999,7 @@
                 layer.shadowOffset = CGSizeMake(0, 0);
                 layer.shadowOpacity = 1;
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
         else if([control isEqualToString:@"monthpicker"])
@@ -3040,7 +3040,7 @@
                 layer.shadowOffset = CGSizeMake(0, 0);
                 layer.shadowOpacity = 1;
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
         else if([control isEqualToString:@"signature"])
@@ -3094,7 +3094,7 @@
                 });
                 
                 
-            }            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            }            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             // CommonEditorCellSignature* cell = (CommonEditorCellSignature*) [self.editorTable cellForRowAtIndexPath:indexPath];
             //cell.imageviewSignature.image = image;
@@ -3104,7 +3104,7 @@
             CellIdentifier = @"CommonEditorCellEdit";
             UITableViewCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
             cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
 }

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1498,7 +1498,7 @@
     
     if(appDelegate.user!=nil)
     {
-        [map setValue:@"Wishlist" forKey:@"title"];
+        [map setValue:@"Wish List" forKey:@"title"];
         [map setValue:@"rect_market_news" forKey:@"img"];
         [self.sideMenuItems addObject:map.copy];
         
@@ -1766,7 +1766,7 @@
     //    UIImageView* iv= [[UIImageView alloc] initWithImage:];
     cell.textLabel.text = title;
     cell.detailTextLabel.textColor =[UIColor redColor];
-    if([title isEqualToString:@"Wishlist"]&&appDelegate.wish_count>0)
+    if([title isEqualToString:@"Wish List"]&&appDelegate.wish_count>0)
         cell.detailTextLabel.text = [NSString stringWithFormat:@"%ld",appDelegate.wish_count];
     else if([title isEqualToString:@"Portfolio"]&&appDelegate.port_count>0)
         cell.detailTextLabel.text = [NSString stringWithFormat:@"%ld",appDelegate.port_count];
@@ -1916,7 +1916,7 @@
         }];
         
     }
-    else if([title isEqualToString:@"Wishlist"])
+    else if([title isEqualToString:@"Wish List"])
     {
         [self hideMenu];
         [self switchtowishlist];

RedAnt ERP Mobile/common/Functions/camscan/ScannerViewController.m

@@ -419,7 +419,10 @@
         case SCANNER_TARGET_CART:
         {
             
-            [self add_toCart];
+            
+            [RAUtils add_to_cart:self selector:@selector(addtocart)];
+//            return;
+//            [self add_toCart];
             //            DetailViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DetailViewController" ];
             //            //            dvc
             //

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

@@ -218,7 +218,7 @@
     cell.labelQTY.text=[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"modulus"] intValue]];
     
     cell.labelDescription.text = [item_json valueForKey:@"description"];
-     cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+     cell.backgroundColor = [UIColor whiteColor];
     return cell;
     //    }
     //    else

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

@@ -119,8 +119,8 @@
         
         
     }];
-    UIAlertAction *actionTwo = [UIAlertAction actionWithTitle:@"Add To Wishlist" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-        UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add To Wishlist"];
+    UIAlertAction *actionTwo = [UIAlertAction actionWithTitle:@"Add To Wish List" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+        UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add To Wish List"];
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             
             NSDictionary* cart_json = [iSalesNetwork move_cart2wish:ids];
@@ -137,7 +137,7 @@
                 }
                 else
                 {
-                    [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Add To Wishlist" controller:self] ;
+                    [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Add To Wish List" controller:self] ;
                 }
                 
                 
@@ -168,7 +168,7 @@
 - (IBAction)onEditAddWishClick:(id)sender {
     if(self.edit_select_arr.count==0)
     {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Move To Wishlist" controller:self] ;
+        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Move To Wish List" controller:self] ;
         return;
     }
     
@@ -180,7 +180,7 @@
     //
     //
     //    UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Move Models To Wishlist"];
+    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Move Models To Wish List"];
     
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -201,7 +201,7 @@
             }
             else
             {
-                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Move To Wishlist" controller:self] ;
+                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Move To Wish List" controller:self] ;
             }
             
             
@@ -869,8 +869,8 @@
             
             double totalprice =count*unitprice * (1.0-discount/100.0);
             
-            double cuft=count*[[item_json valueForKey:@"cuft"] doubleValue];
-            double weight=count*[[item_json valueForKey:@"weight"] doubleValue];
+            double cuft=[[item_json valueForKey:@"cuft"] doubleValue];
+            double weight=[[item_json valueForKey:@"weight"] doubleValue];
             int carton=/*count**/[[item_json valueForKey:@"carton"] intValue];
             
             int item_count=1;
@@ -1431,7 +1431,7 @@
         
         
     }
-    cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+    cell.backgroundColor = [UIColor whiteColor];
     
     
     if(self.itemListTable.editing)
@@ -1598,7 +1598,7 @@
     deleteRowAction.backgroundColor = UIColorFromRGB(0x336699);
     
     
-    UITableViewRowAction *addWatchAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Move To Wishlist" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
+    UITableViewRowAction *addWatchAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Move To Wish List" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
         
         NSLog(@"Wishlist click");
         
@@ -1650,7 +1650,7 @@
                 }
                 else
                 {
-                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Move To Wishlist" controller:self] ;
+                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Move To Wish List" controller:self] ;
                 }
                 
                 
@@ -1716,12 +1716,12 @@
                 }
             }
             
-            
+            UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Update Price"];
             
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             
                 
-                UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Update Price"];
+                
                 NSDictionary* cart_json = nil;
                 
                 cart_json = [iSalesNetwork cart_setPrice:[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"cart_item_id"] intValue]] price:price discount:discount notes:notes];

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

@@ -729,14 +729,14 @@
     
     if(checked.count==0)
     {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add To Wishlist." controller:self] ;
+        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add To Wish List." controller:self] ;
         return;
     }
     
     NSString * ids = [checked componentsJoinedByString:@","];
     self.addWishBtn.enabled =false;
     
-    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wishlist"];
+    UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
     
 
     
@@ -757,7 +757,7 @@
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 
                 [((MainViewController*)appDelegate.main_vc) reloadWish:true immediately:false];
-                [RAUtils message_alert:nil title:@" Multiple items added to Wishlist" controller:self] ;
+                [RAUtils message_alert:nil title:@" Multiple items added to Wish List" controller:self] ;
                 
                 
                 
@@ -766,7 +766,7 @@
             }
             else
             {
-                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wishlist" controller:self] ;
+                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wish List" controller:self] ;
             }
             
             
@@ -1325,6 +1325,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1334,6 +1335,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
@@ -1425,6 +1430,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1434,6 +1440,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         if(!checked)
         {
@@ -1503,6 +1513,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1512,6 +1523,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
@@ -1526,7 +1541,7 @@
         {
             
             cell.checkImageView.hidden = true;
-            [cell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+            [cell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {
@@ -1803,7 +1818,7 @@
             if(self.categoryViewType != CATEGORY_VIEWTYPE_LIST)
                 [currentSelecteCell setBackgroundColor: UIColorFromRGB(0x996633)];
             else
-                [currentSelecteCell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+                [currentSelecteCell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {

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

@@ -597,7 +597,7 @@ self.label_net_err.hidden=true;
         moreDataLabel.frame=CGRectMake(0, 10, self.table.bounds.size.width, 20);
         [moreDataLabel setBackgroundColor:[UIColor clearColor]];
         //        [moreDataLabel addTarget:self action:@selector(changeCell) forControlEvents:UIControlEventValueChanged];
-        moreCell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        moreCell.backgroundColor = [UIColor whiteColor];
         [moreCell.contentView addSubview:moreDataLabel];
         if([self.load_more_hint isEqualToString:@"Load more..."])
             [self performSelector:@selector(loadmore) withObject:nil afterDelay:1];
@@ -625,7 +625,7 @@ self.label_net_err.hidden=true;
         
         //cell.sep
 //        [UIColor rg]*/
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
 //        cell.separator.backgroundColor = [UIColor grayColor];
         return cell;
     }

RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -493,7 +493,7 @@
         NSString * topictitle =[view_json valueForKey:@"title"];
         cell.label_title.text =topictitle;
         
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         return cell;
         
     }
@@ -538,7 +538,7 @@
             
             
         }
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         
         
   
@@ -551,7 +551,7 @@
         //        CellIdentifier = @"CommonEditorCellEdit";
         //        UITableViewCell * cell= [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
         //        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-        //        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        //        cell.backgroundColor = [UIColor whiteColor];
         //        return cell;
         
         int cell_width = [[view_json valueForKey:@"width"]intValue];
@@ -628,7 +628,7 @@
             
             
         }
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         
         
         //        // NSDictionary * topicview_json =[topicjson objectForKey:[NSString stringWithFormat:@"topicview_%d",i] ];

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

@@ -110,7 +110,7 @@
                         }
                         else
                         {
-                            [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add Wishlist" controller:vc] ;
+                            [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add Wish List" controller:vc] ;
                         }
                         
                         
@@ -175,7 +175,7 @@
                 else
                 {
                     UIViewController *vc= [RAUtils getViewController:self];
-                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add Wishlist" controller:vc] ;
+                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add Wish List" controller:vc] ;
                 }
                 
                 
@@ -187,6 +187,10 @@
 
 - (IBAction)add_toCart:(id)sender {
     
+    UIViewController *vc= [RAUtils getViewController:self];
+    [RAUtils add_to_cart:vc selector:@selector(addtocart)];
+    return;
+    
     
     int count=[self.quantity_text.text intValue];
     
@@ -368,7 +372,12 @@
     
     
 }
-
+-(void) addtocart
+{
+    int count=[self.quantity_text.text intValue];
+    
+    [self addtocart:count];
+}
 -(void) addtocart:(int) count
 {
     AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate];

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

@@ -1124,7 +1124,7 @@ self.isrefreshing=false;
 
             
         });
-       // cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+       // cell.backgroundColor = [UIColor whiteColor];
         
         
         cell.shopCartBlock = ^(UIImageView *imageView){
@@ -1263,7 +1263,7 @@ self.isrefreshing=false;
             [cell.contentView addSubview:lineview];// cell.contentView是个readonly属性,所以别想着替换contentView了.
             
             
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
         else if ([type isEqualToString:@"img"])
@@ -1324,7 +1324,7 @@ self.isrefreshing=false;
                 
                 
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
         else if ([type isEqualToString:@"content"])
@@ -1340,7 +1340,7 @@ self.isrefreshing=false;
                 cell.related_data = section_json;
             [cell.topicCollectionView reloadData];
             
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
                 return cell;
                 
             

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

@@ -1116,7 +1116,7 @@
                 
                 [cell.webview loadHTMLString:[self.content_data valueForKey:@"order_info"] baseURL:nil];
                 
-                cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+                cell.backgroundColor = [UIColor whiteColor];
                 return cell;
             }
             else
@@ -1163,7 +1163,7 @@
                     
                     
                 }
-                cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+                cell.backgroundColor = [UIColor whiteColor];
                 return cell;
                 
                 
@@ -1191,7 +1191,7 @@
             
             [cell.webview loadHTMLString:[self.content_data valueForKey:@"more_order_info"] baseURL:nil];
             
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
             
@@ -1232,7 +1232,7 @@
             //
             //
             //
-            //            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            //            cell.backgroundColor = [UIColor whiteColor];
             //            return cell;
         }
             break;
@@ -1380,7 +1380,7 @@
                 
                 
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
             
         }
@@ -1437,7 +1437,7 @@
                 default:
                     break;
             }
-            cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+            cell.backgroundColor = [UIColor whiteColor];
             return cell;
         }
     }

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

@@ -793,7 +793,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
         if([self.load_more_hint isEqualToString:@"Load more..."])
           [self performSelector:@selector(loadmore) withObject:nil afterDelay:1];  
 //        NSLog(@"更多...");
-        moreCell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        moreCell.backgroundColor = [UIColor whiteColor];
         return moreCell;
     }
     else
@@ -829,7 +829,7 @@ dispatch_async(dispatch_get_main_queue(), ^{
         cell.label_creator.text = creator;
         
         cell.label_status.text=status;
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         return cell;
     }
 //    NSDictionary * item_json = [self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];

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

@@ -13,4 +13,5 @@
 @property (strong, nonatomic) IBOutlet UILabel *labelName;
 @property (strong, nonatomic) IBOutlet UILabel *labelTime;
 
+@property (strong, nonatomic) IBOutlet UILabel *labelNote;
 @end

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

@@ -284,12 +284,12 @@
     myView.layer.shadowRadius = 2.0;
     
     
-    UILabel *statuslabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 11, 75, 22)];
-    statuslabel.textColor=[UIColor whiteColor];
-    statuslabel.backgroundColor = [UIColor clearColor];
-    statuslabel.text=NSLocalizedString(@"Name", nil);
-    [statuslabel sizeToFit];
-    [myView addSubview:statuslabel];
+    UILabel *namelabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 11, 75, 22)];
+    namelabel.textColor=[UIColor whiteColor];
+    namelabel.backgroundColor = [UIColor clearColor];
+    namelabel.text=NSLocalizedString(@"Name", nil);
+    [namelabel sizeToFit];
+    [myView addSubview:namelabel];
     
 //    UILabel *solabel = [[UILabel alloc] initWithFrame:CGRectMake(173, 5.5, 130, 22)];
 //    solabel.textColor=[UIColor whiteColor];
@@ -298,11 +298,17 @@
 //    [solabel sizeToFit];
 //    [myView addSubview:solabel];
     
-
+    UILabel *notelabel = [[UILabel alloc] initWithFrame:CGRectMake(250, 11, 75, 22)];
+    notelabel.textColor=[UIColor whiteColor];
+    notelabel.backgroundColor = [UIColor clearColor];
+    notelabel.text=NSLocalizedString(@"Notes", nil);
+    [notelabel sizeToFit];
+    [myView addSubview:notelabel];
     
     
     
     UILabel *timelabel = [[UILabel alloc] initWithFrame:CGRectMake(553,11, 148, 22)];
+    timelabel.autoresizingMask=UIViewAutoresizingFlexibleLeftMargin;
     timelabel.textColor=[UIColor whiteColor];
     timelabel.backgroundColor = [UIColor clearColor];
 
@@ -313,9 +319,19 @@
     
     
     
+    myView.autoresizesSubviews=true;
+    // [myView setAutoresizingMask:UIViewAutoresizingFlexibleWidth  | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin];
+    
+    
+    
     
+    //    modellabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+    //    pricelabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+    //    timelabel.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
+    myView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     //
     return myView;
+
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
@@ -369,7 +385,7 @@
         if([self.load_more_hint isEqualToString:@"Load more..."])
             [self performSelector:@selector(loadmore) withObject:nil afterDelay:1];
         //        NSLog(@"更多...");
-        moreCell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        moreCell.backgroundColor = [UIColor whiteColor];
         return moreCell;
     }
     else
@@ -379,20 +395,22 @@
         
        // int _id= [[self.content_data[indexPath.row] valueForKey:@"_id"] intValue];
         NSString* name= [self.content_data[indexPath.row] valueForKey:@"tear_name"];
+        NSString* note= [self.content_data[indexPath.row] valueForKey:@"tear_note"];
         NSString* create_time= [self.content_data[indexPath.row] valueForKey:@"create_time"];
-        NSString* type = [self.content_data[indexPath.row] valueForKey:@"type"] ;
+      //  NSString* type = [self.content_data[indexPath.row] valueForKey:@"type"] ;
       //  NSString* file_name = [self.content_data[indexPath.row] valueForKey:@"file_name"];
 
         cell.labelName.text = name;
         cell.labelTime.text = create_time;
-        cell.labelType.text = type;
+        cell.labelNote.text = note;
+   //     cell.labelType.text = type;
 //        cell.labelprice.text=price;
 //        cell.label_date.text=purchase_time;
 //        cell.label_contact.text=customer_name;
 //        cell.label_model.text = model_count;
 //        
 //        cell.label_status.text=status;
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
         return cell;
     }
     //    NSDictionary * item_json = [self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]];
@@ -525,5 +543,106 @@
     }
     else
         self.reset = false;
+}
+
+#pragma mark 在滑动手势删除某一行的时候，显示出更多的按钮
+
+- (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath
+
+{
+    
+    NSString* listid= [self.content_data[indexPath.row] valueForKey:@"tearsheets_id"];
+    
+    UITableViewRowAction *deleteRowAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Delete" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
+        
+        NSLog(@"delete click");
+        
+        
+        
+//        UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Delete confirm", nil) message:NSLocalizedString(@"Are you sure to remove portfolio?", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"NO", nil) otherButtonTitles:NSLocalizedString(@"YES", nil), nil];
+//    //    alert.tag = ALERT_DEL;
+//        // alert.
+//        [alert show];
+//        
+        
+
+        
+            UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Are you sure to remove portfolio?" message:nil preferredStyle:UIAlertControllerStyleAlert];
+            //block代码块取代了delegate
+            
+            
+            
+            UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+                UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Remove Portfilio"];
+                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                    
+                    NSDictionary* cart_json = [iSalesNetwork delete_portfoliolist:listid];
+                    
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        
+                        [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+                        
+                        if([[cart_json valueForKey:@"result"] intValue]==2)
+                        {
+                            
+                            [self ReloadData];
+                        }
+                        else
+                        {
+                            [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Delete Portfolio" controller:self] ;
+                        }
+                        
+                        
+                        
+                    });
+                });
+                
+                
+            }];
+            
+            UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+                NSLog(@"No");
+            }];
+            [alertControl addAction:actionOne];
+            
+            [alertControl addAction:alertthree];
+            
+            //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
+            
+            
+            [self presentViewController:alertControl animated:YES completion:nil];
+            
+
+            
+            
+        
+        
+        
+        
+        
+        
+    }];
+    deleteRowAction.backgroundColor = UIColorFromRGB(0x336699);
+    
+    
+    
+    NSString* create_user= [self.content_data[indexPath.row] valueForKey:@"create_user"];
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    if([create_user isEqualToString:appDelegate.user])
+    {
+         return @[deleteRowAction];
+    }
+    return nil;
+
+    
+    
+}
+
+
+- (void)tableView:(UITableView *)tableView
+commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    
+    
 }
 @end

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

@@ -402,7 +402,7 @@
     [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
     [self.itemListTable addSubview:ref];
     
-    [[UIToolbar appearance] setBackgroundColor:UIColorFromRGB(0xF2EEEA)];
+    [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
     
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
     self.label_net_err.layer.borderWidth = 2.0;
@@ -769,7 +769,7 @@
         
         
     }
-    cell.backgroundColor = [UIColor whiteColor];//UIColorFromRGB(0xF2EEEA);
+    cell.backgroundColor = [UIColor whiteColor];// [UIColor whiteColor];;
     return cell;
     
 }
@@ -806,35 +806,6 @@
     return UITableViewCellEditingStyleDelete;
 }
 
-//- (void)tableView:(UITableView *)tableView
-//commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:(NSIndexPath *)indexPath {
-//
-//
-//    NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]] mutableCopy];
-//
-//    NSString *ids=[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"item_id"] intValue]];
-//
-//
-//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//
-//        NSDictionary* cart_json = [iSalesNetwork watchlist_remove:ids];
-//
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//
-//            if([[cart_json valueForKey:@"result"] intValue]==2)
-//            {
-//                [self reload_data];
-//            }
-//            else
-//            {
-//                [RAUtils error_alert:[cart_json valueForKey:@"err_msg"] title:@"Failed to remove model from wishlist."] ;
-//            }
-//
-//
-//
-//        });
-//    });
-//}
 
 //#pragma mark - UIAlertViewDelegate
 //// Called when a button is clicked. The view will be automatically dismissed after this call returns
@@ -906,7 +877,38 @@
         //    vc.delegate = parentvc.self;
         //    loginvc.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态，自己看看是哪种
         vc.onSetValue = ^(double price,double discount){
-            [self reload_data];//[main_vc checklogin:true];
+            
+
+            UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Update Price"];
+            
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                
+                NSDictionary* cart_json = nil;
+                
+                cart_json= [iSalesNetwork portfolio_setPrice:[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"item_id"] intValue]] price:price discount:discount];
+                
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
+                    
+                    
+                    if([[cart_json valueForKey:@"result"] intValue]==2)
+                    {
+                        [self reload_data];
+                    }
+                    else
+                    {
+                        [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Edit Price" controller:self] ;
+                    }
+                    
+                    
+                    
+                    
+                });
+            });
+            
+            
+            
+            //  [self reload_data];//[main_vc checklogin:true];
         };
         
         

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

@@ -374,49 +374,7 @@
                         });
                     });
                     
-                    
-                    //
-                    //                        if(bremove)
-                    //                        {
-                    //                            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    //
-                    //                                NSDictionary* json = [iSalesNetwork watchlist_remove:[self.params valueForKey:@"product_ids"]];
-                    //
-                    //                                dispatch_async(dispatch_get_main_queue(), ^{
-                    //
-                    //
-                    //
-                    //                                    if([[json valueForKey:@"result"] intValue]==2)
-                    //                                    {
-                    //
-                    //                                        [self.navigationController dismissViewControllerAnimated:true completion:^{
-                    ////                                            if(self.onDismiss)
-                    ////                                                self.onDismiss(catelog_name);
-                    //                                        }];
-                    //                                    }
-                    //                                    else
-                    //                                    {
-                    //                                        [RAUtils error_alert:[json valueForKey:@"err_msg"] title:@"Failed to remove model from wishlist."] ;
-                    //                                    }
-                    //
-                    //                                });
-                    //                            });
-                    //                        }
-                    
-                    //                        NSString* cid=    [appDelegate.customerInfo valueForKey:@"customer_cid"];
-                    //                        if(cid==nil)
-                    //                            cid=@"";
-                    //
-                    //                        NSString *path = NSTemporaryDirectory();
-                    //                        NSString *temp_path = [path stringByAppendingPathComponent:file];
-                    //
-                    //                        [iSalesDB save_pdf:temp_path filename:file];
-                    ////                        NSString* str_sendto=[send_to componentsJoinedByString:@";"];
-                    //                        NSString *sql = [NSString stringWithFormat:
-                    //                                         @"INSERT INTO pdf_cache (name,file_name,c_id,c_name,o_id,pdf_type,send_to) VALUES ('%@', '%@', '%@', '%@', '%@', '%@', '%@')",
-                    //                                         name, file,cid, company, @"", @"Tear Sheet",str_sendto];
-                    //
-                    //                        [iSalesDB execSql:sql];
+                  
                     
                 };
                 

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

@@ -195,7 +195,7 @@
     if(alert.length>0)
     [self.buttonAlert setTitle:alert forState:UIControlStateNormal];
 
-    [treeView setBackgroundColor:UIColorFromRGB(0xF2EEEA)];
+    [treeView setBackgroundColor: [UIColor whiteColor]];
 
     
     self.treeView.layer.shadowPath =[UIBezierPath bezierPathWithRect:self.treeView.bounds].CGPath;
@@ -330,7 +330,7 @@
 - (void)treeView:(RATreeView *)treeView willDisplayCell:(UITableViewCell *)cell forItem:(id)item treeNodeInfo:(RATreeNodeInfo *)treeNodeInfo
 {
     if (treeNodeInfo.treeDepthLevel == 0) {
-        cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+        cell.backgroundColor = [UIColor whiteColor];
     } else if (treeNodeInfo.treeDepthLevel == 1) {
         cell.backgroundColor = UIColorFromRGB(0xD1EEFC);
     } else if (treeNodeInfo.treeDepthLevel == 2) {

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

@@ -1033,7 +1033,7 @@
     
     if(checked.count==0)
     {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add to wishlist." controller:self] ;
+        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add To Wish List." controller:self] ;
         return;
     }
     
@@ -1041,7 +1041,7 @@
     self.addWishBtn.enabled =false;
     
     
-     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wishlist"];
+     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         NSDictionary* return_json = [iSalesNetwork add_toWatchList:ids ];
@@ -1058,7 +1058,7 @@
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 
                 [((MainViewController*)appDelegate.main_vc) reloadWish:true immediately:false];
-                    [RAUtils message_alert:nil title:@" Multiple items added to Wishlist" controller:self] ;
+                    [RAUtils message_alert:nil title:@" Multiple items added to Wish List" controller:self] ;
                     
                     
                 [self end_select:1];
@@ -1066,7 +1066,7 @@
             }
             else
             {
-                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wishlist" controller:self] ;
+                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wish List" controller:self] ;
             }
             
             
@@ -1173,6 +1173,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1182,6 +1183,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
@@ -1266,6 +1271,7 @@
         bool checked =[[item_json valueForKey:@"checked"] boolValue];
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1275,6 +1281,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         if(!checked)
         {
@@ -1346,6 +1356,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1355,6 +1366,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
@@ -1369,7 +1384,7 @@
         {
             
             cell.checkImageView.hidden = true;
-            [cell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+            [cell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {
@@ -1604,7 +1619,7 @@
             if(self.categoryViewType != CATEGORY_VIEWTYPE_LIST)
                 [currentSelecteCell setBackgroundColor: UIColorFromRGB(0x996633)];
             else
-                [currentSelecteCell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+                [currentSelecteCell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {

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

@@ -959,14 +959,14 @@
     
     if(checked.count==0)
     {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add to wishlist." controller:self] ;
+        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Add To Wish List." controller:self] ;
         return;
     }
     
     NSString * ids = [checked componentsJoinedByString:@","];
     self.addWishBtn.enabled =false;
     
-     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wishlist"];
+     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         NSDictionary* return_json = [iSalesNetwork add_toWatchList:ids ];
@@ -984,7 +984,7 @@
                     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
  
                 [((MainViewController*)appDelegate.main_vc) reloadWish:true immediately:false];
-                    [RAUtils message_alert:nil title:@" Multiple items added to Wishlist" controller:self] ;
+                    [RAUtils message_alert:nil title:@" Multiple items added to Wish List" controller:self] ;
                     
                     
                 [self end_select:1];
@@ -992,7 +992,7 @@
             }
             else
             {
-                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wishlist" controller:self] ;
+                [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Add To Wish List" controller:self] ;
             }
             
             
@@ -1240,6 +1240,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1249,6 +1250,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
         
@@ -1333,6 +1338,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1342,6 +1348,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
         
@@ -1420,6 +1430,7 @@
         
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
+        bool closeout = [[item_json valueForKey:@"closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1429,6 +1440,10 @@
             cell.mark_order.hidden=false;
         else
             cell.mark_order.hidden=true;
+        if(closeout)
+            cell.mark_closeout.hidden=false;
+        else
+            cell.mark_closeout.hidden=true;
         //    NSString* old_price =[item_json valueForKey:@"old_price"];
         //    NSString* price =[item_json valueForKey:@"price"];
         
@@ -1442,7 +1457,7 @@
         {
             
             cell.checkImageView.hidden = true;
-            [cell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+            [cell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {
@@ -1680,7 +1695,7 @@
             if(self.categoryViewType != CATEGORY_VIEWTYPE_LIST)
             [currentSelecteCell setBackgroundColor: UIColorFromRGB(0x996633)];
             else
-               [currentSelecteCell setBackgroundColor: UIColorFromRGB(0xF2EEEA)];
+               [currentSelecteCell setBackgroundColor:  [UIColor whiteColor]];
         }
         else
         {

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

@@ -394,7 +394,7 @@
     [ref addTarget:self action:@selector(manually_refresh) forControlEvents:UIControlEventValueChanged];
     [self.itemListTable addSubview:ref];
     
-    [[UIToolbar appearance] setBackgroundColor:UIColorFromRGB(0xF2EEEA)];
+    [[UIToolbar appearance] setBackgroundColor: [UIColor whiteColor]];
     
     self.label_net_err.layer.borderColor = [UIColor darkGrayColor].CGColor;
     self.label_net_err.layer.borderWidth = 2.0;
@@ -506,7 +506,7 @@
             }
             else
             {
-                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Remove Model From Wishlist" controller:self] ;
+                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Remove Model From Wish List" controller:self] ;
             }
             
         });
@@ -729,7 +729,7 @@
         
         
     }
-    cell.backgroundColor = [UIColor whiteColor];//UIColorFromRGB(0xF2EEEA);
+    cell.backgroundColor = [UIColor whiteColor];// [UIColor whiteColor];;
     return cell;
     
 }
@@ -766,35 +766,7 @@
     return UITableViewCellEditingStyleDelete;
 }
 
-//- (void)tableView:(UITableView *)tableView
-//commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:(NSIndexPath *)indexPath {
-//    
-//    
-//    NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]] mutableCopy];
-//    
-//    NSString *ids=[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"item_id"] intValue]];
-//    
-//    
-//    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-//        
-//        NSDictionary* cart_json = [iSalesNetwork watchlist_remove:ids];
-//        
-//        dispatch_async(dispatch_get_main_queue(), ^{
-//            
-//            if([[cart_json valueForKey:@"result"] intValue]==2)
-//            {
-//                [self reload_data];
-//            }
-//            else
-//            {
-//                [RAUtils error_alert:[cart_json valueForKey:@"err_msg"] title:@"Failed to remove model from wishlist."] ;
-//            }
-//            
-//            
-//            
-//        });
-//    });
-//}
+
 
 //#pragma mark - UIAlertViewDelegate
 //// Called when a button is clicked. The view will be automatically dismissed after this call returns

RedAnt ERP Mobile/common/categoryMenu_RATree/RAViewController.m

@@ -158,7 +158,7 @@
   
   [treeView reloadData];
 //  [treeView expandRowForItem:phone withRowAnimation:RATreeViewRowAnimationLeft]; //expands Row
-  [treeView setBackgroundColor:UIColorFromRGB(0xF2EEEA)];
+  [treeView setBackgroundColor: [UIColor whiteColor]];
   
   self.treeView = treeView;
   [self.treeContainer addSubview:treeView];
@@ -266,7 +266,7 @@
 - (void)treeView:(RATreeView *)treeView willDisplayCell:(UITableViewCell *)cell forItem:(id)item treeNodeInfo:(RATreeNodeInfo *)treeNodeInfo
 {
   if (treeNodeInfo.treeDepthLevel == 0) {
-    cell.backgroundColor = UIColorFromRGB(0xF2EEEA);
+    cell.backgroundColor = [UIColor whiteColor];
   } else if (treeNodeInfo.treeDepthLevel == 1) {
     cell.backgroundColor = UIColorFromRGB(0xD1EEFC);
   } else if (treeNodeInfo.treeDepthLevel == 2) {

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.h

@@ -18,6 +18,8 @@
 +(NSDictionary*) portfolio_remove:(NSString* ) item_ids;
 +(NSDictionary*)request_Portfolio;
 
++(NSDictionary*) delete_portfoliolist:(NSString* ) listid;
+
 +(NSDictionary*) add_toPortfolio:(NSString* ) item_id;
 +(NSData*)get_json : (NSString*) url parameters:(NSMutableDictionary *) params;
 +(int)Authorize : (NSString*) user password:(NSString*) password ;

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -354,6 +354,34 @@ repeat:{
 //{
 //    
 //}
+
++(NSDictionary*) delete_portfoliolist:(NSString* ) listid
+{
+    if(![self IsNetworkAvailable])
+        return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
+    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    if(appDelegate.user!=nil)
+        [params setValue:appDelegate.user forKey:@"user"];
+    if(appDelegate.contact_id!=nil)
+        [params setValue:appDelegate.contact_id forKey:@"contactId"];
+    if(appDelegate.password!=nil)
+        [params setValue:appDelegate.password forKey:@"password"];
+    [params setValue:listid forKey:@"tearsheetsId"];
+    //    [params setValue:editor forKey:@"editor"];
+    NSData* json=[self get_json:URL_PORTFOLIOLIST_REMOVE parameters:params];
+    if(json!=nil)
+    {
+        NSError *error=nil;
+        NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
+        
+        
+
+        return jsobj;
+    }
+    else
+        return nil;
+}
 +(NSDictionary*) portfolio_remove:(NSString* ) item_ids
 {
     if(![self IsNetworkAvailable])

RedAnt ERP Mobile/iSales-NPD/CategoryCellNPD.h

@@ -14,6 +14,7 @@
 @property (strong, nonatomic) IBOutlet UILabel *modelNoLabel;
 @property (strong, nonatomic) IBOutlet UIImageView *checkImageView;
 @property (strong, nonatomic) IBOutlet UIImageView *mark_order;
+@property (strong, nonatomic) IBOutlet UIImageView *mark_closeout;
 
 @property (strong, nonatomic) IBOutlet UIImageView *mark_wish;
 @end

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/filter.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "filter.png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "filter@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "filter@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/mark_closeout_16.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "book(1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/mark_closeout_24.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "book(1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/mark_closeout_32.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "book(1).png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "book(1)@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/mark_wish_24.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "wujiaox.png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wujiaox@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wujiaox@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/mark_wish_32.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "wujiaox.png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wujiaox@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wujiaox@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/place_order.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "PLACE-ORDER(1).png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "PLACE-ORDER(1)@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "PLACE-ORDER(1)@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/wishlist.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "wilish.png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wilish@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "wilish@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/config.h

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