20160318

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

@@ -191,7 +191,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "293"
             endingLineNumber = "293"
-            landmarkName = "+add_to_cart:selector:"
+            landmarkName = "+add_to_cart:selectorholder:selector:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -207,7 +207,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "297"
             endingLineNumber = "297"
-            landmarkName = "+add_to_cart:selector:"
+            landmarkName = "+add_to_cart:selectorholder:selector:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -223,7 +223,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "412"
             endingLineNumber = "412"
-            landmarkName = "+add_to_cart:selector:"
+            landmarkName = "+add_to_cart:selectorholder:selector:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -239,7 +239,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "299"
             endingLineNumber = "299"
-            landmarkName = "+add_to_cart:selector:"
+            landmarkName = "+add_to_cart:selectorholder:selector:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -275,5 +275,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderDetailViewController.m"
+            timestampString = "479989194.500185"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1416"
+            endingLineNumber = "1416"
+            landmarkName = "-tableView:cellForRowAtIndexPath:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -2122,6 +2122,8 @@
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
+    if(section==0)
+        return 44;
     return 33;
 }
 //- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
@@ -3137,7 +3139,11 @@
     myView.layer.shadowOpacity = 0.5;
     myView.layer.shadowRadius = 2.0;
     
-    UIButton * btn =[[UIButton alloc] initWithFrame:CGRectMake(tableView.bounds.size.width-50-15, 0, 50, 33)];
+    int linespace=0;
+    if(section==0)
+        linespace=11;
+    
+    UIButton * btn =[[UIButton alloc] initWithFrame:CGRectMake(tableView.bounds.size.width-50-15, 0+linespace, 50, 33)];
     btn.tag=section;
     [btn addTarget:self action:@selector(HideSction:) forControlEvents:UIControlEventTouchUpInside];
     [btn setTitle:btntitle forState:UIControlStateNormal];
@@ -3148,7 +3154,7 @@
     myView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
     
     
-    UILabel *titlelabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 5.5, 200, 20)];
+    UILabel *titlelabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 5.5+linespace, 200, 20)];
     titlelabel.textColor=[UIColor whiteColor];
     titlelabel.backgroundColor = [UIColor clearColor];
     titlelabel.text=NSLocalizedString(labeltitle, nil);

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

@@ -24,7 +24,7 @@
 @property (strong,nonatomic) NSString* mail_content;
 @property (strong,nonatomic) NSArray* mail_to;
 @property (strong,nonatomic) NSString* save_name;
-
+@property (strong,nonatomic) NSString* save_note;
 
 @property (strong, nonatomic)  UIBarButtonItem *btnshare;
 @property (strong, nonatomic)  UIBarButtonItem *btnemail;

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

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

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

@@ -262,7 +262,7 @@
 //    
 //    
 //    
-    [RAUtils add_to_cart:self selector:@selector(addtocart)];
+    [RAUtils add_to_cart:self selectorholder:self selector:@selector(addtocart)];
     return;
     
     UIApplication * app = [UIApplication sharedApplication];
@@ -1325,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1430,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1513,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;

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

@@ -188,7 +188,7 @@
 - (IBAction)add_toCart:(id)sender {
     
     UIViewController *vc= [RAUtils getViewController:self];
-    [RAUtils add_to_cart:vc selector:@selector(addtocart)];
+    [RAUtils add_to_cart:vc selectorholder:self selector:@selector(addtocart)];
     return;
     
     

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

@@ -0,0 +1,13 @@
+//
+//  PortfolioEditQTYViewController.h
+//  iSales-NPD
+//
+//  Created by Ray on 3/18/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface PortfolioEditQTYViewController : UIViewController
+@property int qty;
+@end

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

@@ -0,0 +1,37 @@
+//
+//  PortfolioEditQTYViewController.m
+//  iSales-NPD
+//
+//  Created by Ray on 3/18/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import "PortfolioEditQTYViewController.h"
+
+@interface PortfolioEditQTYViewController ()
+
+@end
+
+@implementation PortfolioEditQTYViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

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

@@ -16,6 +16,8 @@
 #import "TearSheetParamViewController.h"
 #import "EditModelPriceViewController.h"
 #import "ContactListViewController.h"
+#import "PortfolioEditQTYViewController.h"
+
 #define ALERT_DEL 1025
 @interface PortfolioViewController ()
 
@@ -585,7 +587,7 @@
                 self.content_data = [cart_json mutableCopy];
                 [self.itemListTable reloadData];
                 
-                
+                [self.btnselect setTitle: @"Deselect all"];
                 UIApplication * app = [UIApplication sharedApplication];
                 AppDelegate *appDelegate = (AppDelegate *)[app delegate];
                 appDelegate.port_count =[[self.content_data valueForKey:@"count"] intValue];
@@ -598,7 +600,7 @@
                 }
             else
             {
-                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Watchlist" controller:self] ;
+                [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Loading Portfolio" controller:self] ;
             }
             
            self.isrefreshing=false;
@@ -937,8 +939,91 @@
     }];
     editRowAction.backgroundColor = UIColorFromRGB(0xff9933);
     
+    // edit qty
     
-    
+    UITableViewRowAction *EditQTYAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDefault title:@"Edit QTY" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
+        
+        NSLog(@"edit click");
+        
+        
+        
+        UIViewController* parentvc=self;
+        
+        
+        
+        
+        PortfolioEditQTYViewController * vc =[ parentvc.storyboard instantiateViewControllerWithIdentifier:@"PortfolioEditQTYViewController"];
+        
+        
+        NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]] mutableCopy];
+        
+        
+        
+        vc.qty = [[item_json valueForKey:@"available_qty"] intValue];
+        //    vc.delegate = parentvc.self;
+        //    loginvc.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态，自己看看是哪种
+//        vc.onSetValue = ^(double price,double discount){
+//            
+//            
+//            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];
+//        };
+        
+        
+        UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:vc] ;
+        
+        
+        
+        
+        
+        //    [self hackModalSheetSize:CGSizeMake(450, 200) ofVC:navi];
+        
+        navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态，自己看看是哪种
+        [parentvc presentViewController:navi animated:YES completion:^{
+            
+            //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);
+            
+            NSLog(@"EditModelPriceViewController present.........");
+            
+            //   self.btop = false;
+            //  <#code#>
+        }];
+        
+        [tableView reloadRowsAtIndexPaths:@[indexPath]withRowAnimation:UITableViewRowAnimationMiddle];
+        
+        
+        
+        
+    }];
+    EditQTYAction.backgroundColor = UIColorFromRGB(0x336699);
     
     
     

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

@@ -212,6 +212,7 @@
     bool bremove=false;
     
     NSString* catelog_name= nil;
+        NSString* internal_note= nil;
     NSArray *keys= [upparams allKeys];
     //遍历keys
     for(int i=0;i<[keys count];i++)
@@ -232,6 +233,12 @@
             catelog_name=[upparams valueForKey:key];
             
         }
+        if([key isEqualToString:@"internal_note"])
+        {
+            internal_note=[upparams valueForKey:key];
+            
+        }
+        
         
         [pdf_url appendString:@"&"];
         
@@ -287,7 +294,7 @@
                 //                    ViewController.mail_content = [self.content_data valueForKey:@"email_content"];
                 
                 ViewController.save_name =catelog_name;
-                
+                ViewController.save_note =internal_note;
                 //ViewController.filename = catelog_name;
                 NSString* company=    [appDelegate.customerInfo valueForKey:@"customer_name"];
                 
@@ -349,7 +356,7 @@
                     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Saving..."];
                     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                         
-                        NSDictionary* json = [iSalesNetwork save_TearSheet:path name:name delete:del_ids];
+                        NSDictionary* json = [iSalesNetwork save_TearSheet:path name:name delete:del_ids note:internal_note];
                         
                         dispatch_async(dispatch_get_main_queue(), ^{
                             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -543,6 +550,7 @@
     bool bremove=false;
     
     NSString* catelog_name= nil;
+    NSString* internal_note = nil;
     NSArray *keys= [upparams allKeys];
     //遍历keys
     for(int i=0;i<[keys count];i++)
@@ -564,6 +572,12 @@
             
         }
         
+        if([key isEqualToString:@"internal_note"])
+        {
+            internal_note=[upparams valueForKey:key];
+            
+        }
+        
         [pdf_url appendString:@"&"];
         
         [pdf_url appendString:key];
@@ -587,6 +601,8 @@
     
     
     __block NSString* saveName = catelog_name;
+    
+     __block NSString* saveNote = internal_note;
     NSString* del_ids = nil;
     if(bremove)
         del_ids=[self.params valueForKey:@"item_ids"];
@@ -620,7 +636,7 @@
             UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Processing"];
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                 
-                NSDictionary* editor_json = [iSalesNetwork direct_save_TearSheet:pdf_url name:saveName delete:del_ids ];
+                NSDictionary* editor_json = [iSalesNetwork direct_save_TearSheet:pdf_url name:saveName delete:del_ids note:saveNote];
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];

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

@@ -579,7 +579,7 @@
 }
 - (IBAction)onAddCartClick:(id)sender {
     
-    [RAUtils add_to_cart:self selector:@selector(addtocart)];
+    [RAUtils add_to_cart:self selectorholder:self selector:@selector(addtocart)];
     return;
     
     UIApplication * app = [UIApplication sharedApplication];
@@ -1173,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1271,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1356,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;

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

@@ -504,7 +504,7 @@
     // Dispose of any resources that can be recreated.
 }
 - (IBAction)onAddCartClick:(id)sender {
-    [RAUtils add_to_cart:self selector:@selector(addtocart)];
+    [RAUtils add_to_cart:self selectorholder:self selector:@selector(addtocart)];
     return;
     
     UIApplication * app = [UIApplication sharedApplication];
@@ -1240,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1338,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1430,7 +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];
+        bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
         
         if(wish_exist)
             cell.mark_wish.hidden=false;

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

@@ -48,7 +48,7 @@
         [self.itemListTable reloadData];
 }
 - (IBAction)onAddtoCart:(id)sender {
-    [RAUtils add_to_cart:self selector:@selector(addtocart)];
+    [RAUtils add_to_cart:self selectorholder:self selector:@selector(addtocart)];
     return;
     
     UIApplication * app = [UIApplication sharedApplication];

RedAnt ERP Mobile/common/RAUtils.h

@@ -43,5 +43,5 @@ typedef void (^add_to_cart_Handler)(void);
 +(NSMutableArray*)dictionary2array:(NSDictionary*)json count_fields:(NSString*) count_fields item_mark:(NSString*) item_mark items_mark:(NSString* )items_mark;
 
 +(NSArray*) string2arr:(NSString*) string separator:(NSString*)separator;
-+(void) add_to_cart:(UIViewController*) vc selector:(SEL)aSelector;
++(void) add_to_cart:(UIViewController*) vc selectorholder:(id)holder selector:(SEL)addtocart;
 @end

RedAnt ERP Mobile/common/RAUtils.m

@@ -222,7 +222,7 @@
 
 }
 
-+(void) neworder:(UIViewController*) vc selector:(SEL)addtocart
++(void) neworder:(UIViewController*) vc selectorholder:(id)holder selector:(SEL)addtocart
 {
     
     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Create Order"];
@@ -246,7 +246,7 @@
                     appDelegate.order_code = order_code;
                     
                     
-                    [vc performSelector:addtocart];
+                    [holder performSelector:addtocart];
                     
                     
                     //    [self ReloadData];
@@ -279,7 +279,7 @@
     });
 }
 
-+(void) add_to_cart:(UIViewController*) vc selector:(SEL)addtocart
++(void) add_to_cart:(UIViewController*) vc selectorholder:(id)holder selector:(SEL)addtocart
 {
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];
@@ -324,7 +324,7 @@
                         //ovc.customer_id = appDelegate.contact_id;
                         ovc.selectOrder = ^(NSMutableDictionary* order_detail){
                             
-                            [vc performSelector:addtocart];
+                            [holder performSelector:addtocart];
                             
                             
                         };
@@ -364,7 +364,7 @@
                                     
                                     
                                     if(appDelegate.order_code==nil)
-                                        [self neworder:vc selector:addtocart];
+                                        [self neworder:vc selectorholder:vc selector:addtocart];
                                     //                                                            neworder();
                                     
                                     //    [main_vc checklogin:true];
@@ -390,7 +390,7 @@
                             }
                             else
                             {
-                                [self neworder:vc selector:addtocart];
+                                [self neworder:vc selectorholder:vc selector:addtocart];
                             }
                             
                         }
@@ -425,7 +425,7 @@
                     //customer login;
                     [main_vc checklogin:false];
                     //[self addtocart];
-                    [vc performSelector:addtocart];
+                    [holder performSelector:addtocart];
                 }
             }
             
@@ -477,7 +477,7 @@
                     //ovc.customer_id = appDelegate.contact_id;
                     ovc.selectOrder = ^(NSMutableDictionary* order_detail){
                         
-                        [vc performSelector:addtocart];
+                        [holder performSelector:addtocart];
                         
                         
                     };
@@ -517,7 +517,7 @@
                                 
                                 
                                 if(appDelegate.order_code==nil)
-                                    [self neworder:vc selector:addtocart];
+                                    [self neworder:vc selectorholder:vc selector:addtocart];
                                 //                                                            neworder();
                                 
                                 //    [main_vc checklogin:true];
@@ -543,7 +543,7 @@
                         }
                         else
                         {
-                            [self neworder:vc selector:addtocart];
+                            [self neworder:vc selectorholder:vc selector:addtocart];
                         }
                         
                     }
@@ -619,7 +619,7 @@
                                     ovc.customer_id = appDelegate.contact_id;
                                     ovc.selectOrder = ^(NSMutableDictionary* order_detail){
                                         
-                                        [vc performSelector:addtocart];
+                                        [holder performSelector:addtocart];
                                         
                                         
                                     };
@@ -659,7 +659,7 @@
                                                 
                                                 
                                                 if(appDelegate.order_code==nil)
-                                                    [self neworder:vc selector:addtocart];
+                                                    [self neworder:vc selectorholder:vc selector:addtocart];
                                                 //                                                            neworder();
                                                 
                                                 //    [main_vc checklogin:true];
@@ -685,7 +685,7 @@
                                         }
                                         else
                                         {
-                                            [self neworder:vc selector:addtocart];
+                                            [self neworder:vc selectorholder:vc selector:addtocart];
                                         }
                                         
                                     }
@@ -737,7 +737,7 @@
                                         ovc.customer_id = appDelegate.contact_id;
                                         ovc.selectOrder = ^(NSMutableDictionary* order_detail){
                                             
-                                            [vc performSelector:addtocart];
+                                            [holder performSelector:addtocart];
                                             
                                             
                                         };
@@ -814,7 +814,7 @@
                                                     
                                                     
                                                     if(appDelegate.order_code==nil)
-                                                        [self neworder:vc selector:addtocart];
+                                                        [self neworder:vc selectorholder:vc selector:addtocart];
                                                     //                                                            neworder();
                                                     
                                                     //    [main_vc checklogin:true];
@@ -840,7 +840,7 @@
                                             }
                                             else
                                             {
-                                                [self neworder:vc selector:addtocart];
+                                                [self neworder:vc selectorholder:vc selector:addtocart];
                                             }
                                             
                                         }
@@ -919,7 +919,7 @@
 //            if(appDelegate.order_code==nil)
 //                [ self neworder];
 //            else
-                [vc performSelector:addtocart];
+                [holder performSelector:addtocart];
             
             
             

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.h

@@ -100,8 +100,8 @@
 
 +(NSDictionary*)request_PDFList:(int ) offset limit:(int)limit keywords:(NSString* ) keywords;
 +(NSDictionary*)request_TearSheet:(NSString*) request_url ;
-+(NSDictionary*)save_TearSheet:(NSString*) path name:(NSString*)name delete:(NSString* )ids;
-+(NSDictionary*)direct_save_TearSheet:(NSString*) request_url name:(NSString*)name delete:(NSString* )ids;
++(NSDictionary*)save_TearSheet:(NSString*) path name:(NSString*)name delete:(NSString* )ids note:(NSString* )note;
++(NSDictionary*)direct_save_TearSheet:(NSString*) request_url name:(NSString*)name delete:(NSString* )ids note:(NSString* )saveNote;
 
 
 //+(NSDictionary*)category_LoadMore: (NSString*) category customid:(int) customid price_template:(int) price_template sort:(int) sort_by filter:(NSString*) filter keyword:(NSString*) keyword offset:(int)offset;

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -1162,7 +1162,7 @@ repeat:{
     return jsobj;
     
 }
-+(NSDictionary*)direct_save_TearSheet:(NSString*) request_url name:(NSString*)name delete:(NSString* )ids
++(NSDictionary*)direct_save_TearSheet:(NSString*) request_url name:(NSString*)name delete:(NSString* )ids note:(NSString* )saveNote
 {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
@@ -1178,6 +1178,8 @@ repeat:{
     [params setValue:request_url forKey:@"pdfUrl"];
     [params setValue:name forKey:@"pdfName"];
     [params setValue:ids forKey:@"itemIds"];
+    [params setValue:saveNote forKey:@"pdfNote"];
+    
     
     NSData* json=[self get_json:URL_REQUEST_DM parameters:params];
     if(json==nil)
@@ -1209,7 +1211,7 @@ repeat:{
     NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
     return jsobj;
 }
-+(NSDictionary*)save_TearSheet:(NSString*) path name:(NSString*)name delete:(NSString* )ids
++(NSDictionary*)save_TearSheet:(NSString*) path name:(NSString*)name delete:(NSString* )ids note:(NSString*)note
 {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
@@ -1224,6 +1226,7 @@ repeat:{
     
     [params setValue:path forKey:@"pdfPath"];
     [params setValue:name forKey:@"pdfName"];
+    [params setValue:note forKey:@"pdfNote"];
     [params setValue:ids forKey:@"itemIds"];
     
     NSData* json=[self get_json:URL_SAVE_DM parameters:params];

RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -123,6 +123,7 @@
 		718716291C433DA400F25860 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716281C433DA400F25860 /* AVFoundation.framework */; };
 		7187162C1C43428100F25860 /* libScanApiCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716221C433D5000F25860 /* libScanApiCore.a */; };
 		718B91831C75638100265FFF /* TouchImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 718B91821C75638100265FFF /* TouchImageView.m */; };
+		71D0344F1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D0344E1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m */; };
 		71DEE874192DE003003F645F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71DEE873192DE003003F645F /* QuartzCore.framework */; };
 		71DEE876192DE00E003F645F /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71DEE875192DE00E003F645F /* Accelerate.framework */; };
 		71DF742B1C57560600F2789C /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 71DF742A1C57560600F2789C /* Reachability.m */; };
@@ -388,6 +389,8 @@
 		7187162A1C43406300F25860 /* libScanApiCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libScanApiCore.a; path = "../../../ios_samples/ScanApiSDK-10.2.227/lib/libScanApiCore.a"; sourceTree = "<group>"; };
 		718B91811C75638100265FFF /* TouchImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchImageView.h; path = common/customUI/TouchImageView.h; sourceTree = SOURCE_ROOT; };
 		718B91821C75638100265FFF /* TouchImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TouchImageView.m; path = common/customUI/TouchImageView.m; sourceTree = SOURCE_ROOT; };
+		71D0344D1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioEditQTYViewController.h; path = common/Functions/portfolio/PortfolioEditQTYViewController.h; sourceTree = SOURCE_ROOT; };
+		71D0344E1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioEditQTYViewController.m; path = common/Functions/portfolio/PortfolioEditQTYViewController.m; sourceTree = SOURCE_ROOT; };
 		71DEE873192DE003003F645F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		71DEE875192DE00E003F645F /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
 		71DF74291C57560600F2789C /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Reachability.h; path = common/Reachability.h; sourceTree = SOURCE_ROOT; };
@@ -512,6 +515,8 @@
 				7162A5A71C58735900AB630E /* PortfolioViewController.m */,
 				7162A5A81C58735900AB630E /* TearSheetParamViewController.h */,
 				7162A5A91C58735900AB630E /* TearSheetParamViewController.m */,
+				71D0344D1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.h */,
+				71D0344E1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m */,
 			);
 			name = portfolio;
 			sourceTree = "<group>";
@@ -1250,6 +1255,7 @@
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,
 				71DF74691C575E7900F2789C /* MonthPickerViewController.m in Sources */,
 				71DF74371C575D6600F2789C /* CommonGridViewController.m in Sources */,
+				71D0344F1C9BF3C400E0F7AD /* PortfolioEditQTYViewController.m in Sources */,
 				7162A5B51C58738600AB630E /* ScannerViewController.m in Sources */,
 				713F76BA1929F4A7006A7305 /* AppDelegate.m in Sources */,
 				7162A59B1C58733400AB630E /* OrderDetailModelCell.m in Sources */,

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -16,194 +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"
 
-//------------------- 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  @"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_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  @"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_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_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 @"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_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  @"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_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  @"https://www.newpacificdirect.com/isales/creditCard.htm"
-#define  URL_CREDITCARD_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_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_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  @"https://www.newpacificdirect.com/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"https://www.newpacificdirect.com/isales/uploadImg.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.119:8080/site/isales/er_log.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"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.119:8080/site/isales/uploadImg.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"
+//#define  URL_PORTFOLIOLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteTearSheetPdf.htm"
+//
+
 #endif