UWA

撤销之前的部分版本特异性修改
增加UWA MODEL DETAIL CREATE HANG TAG 按钮
Uwa category， search ， item search 去掉 多选
修复一些小bug。
更换接口url

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

@@ -138,12 +138,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555925718.931403"
+            timestampString = "557721184.748302"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "476"
             endingLineNumber = "476"
-            landmarkName = "-onCreateTearSheet:"
+            landmarkName = "-createTearSheet"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -154,12 +154,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "555925718.931455"
+            timestampString = "557721184.7491421"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "881"
             endingLineNumber = "881"
-            landmarkName = "-onDeleteClick:"
+            landmarkName = "-onEditClick:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -202,7 +202,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4889179"
+            timestampString = "557721184.7499731"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1244"
@@ -218,7 +218,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.493077"
+            timestampString = "557721184.75026"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1231"
@@ -234,7 +234,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.493423"
+            timestampString = "557721184.750423"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1230"
@@ -266,7 +266,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4938461"
+            timestampString = "557721184.75059"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1487"
@@ -282,7 +282,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.494205"
+            timestampString = "557721184.750699"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1210"
@@ -458,11 +458,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.494666"
+            timestampString = "557721184.75177"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1933"
-            endingLineNumber = "1933"
+            startingLineNumber = "1934"
+            endingLineNumber = "1934"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -474,11 +474,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.494929"
+            timestampString = "557721184.75209"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1962"
-            endingLineNumber = "1962"
+            startingLineNumber = "1963"
+            endingLineNumber = "1963"
             landmarkName = "-collectionCell:setImageForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -522,11 +522,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.495231"
+            timestampString = "557721184.752527"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1915"
-            endingLineNumber = "1915"
+            startingLineNumber = "1916"
+            endingLineNumber = "1916"
             landmarkName = "-collectionView:cellForItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -538,7 +538,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.02991"
+            timestampString = "557721184.752695"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "444"
@@ -570,11 +570,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.495585"
+            timestampString = "557721184.752866"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2549"
-            endingLineNumber = "2549"
+            startingLineNumber = "2550"
+            endingLineNumber = "2550"
             landmarkName = "-alertView:clickedButtonAtIndex:"
             landmarkType = "7">
          </BreakpointContent>
@@ -730,7 +730,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.030545"
+            timestampString = "557721184.753513"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "190"
@@ -746,11 +746,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.030615"
+            timestampString = "557721184.753638"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2317"
-            endingLineNumber = "2317"
+            startingLineNumber = "2318"
+            endingLineNumber = "2318"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,7 +762,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.03067"
+            timestampString = "557721184.7537251"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "49"
@@ -810,7 +810,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.030833"
+            timestampString = "557721184.753897"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "141"
@@ -826,11 +826,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4961571"
+            timestampString = "557721184.753984"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2653"
-            endingLineNumber = "2653"
+            startingLineNumber = "2654"
+            endingLineNumber = "2654"
             landmarkName = "-reload_data"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,7 +842,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.496435"
+            timestampString = "557721184.754086"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1246"
@@ -858,7 +858,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4966871"
+            timestampString = "557721184.754179"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1232"
@@ -874,7 +874,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.030974"
+            timestampString = "557721184.754259"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "260"
@@ -890,7 +890,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.0310431"
+            timestampString = "557721184.754334"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "279"
@@ -986,7 +986,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.0314749"
+            timestampString = "557721184.754607"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "261"
@@ -1002,7 +1002,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.497085"
+            timestampString = "557721184.754716"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1513"
@@ -1018,7 +1018,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4973511"
+            timestampString = "557721184.754787"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1490"
@@ -1034,7 +1034,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.4976079"
+            timestampString = "557721184.7549241"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1467"
@@ -1066,7 +1066,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.031695"
+            timestampString = "557721184.75506"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "207"
@@ -1082,11 +1082,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.03175"
+            timestampString = "557721184.75516"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "364"
-            endingLineNumber = "364"
+            startingLineNumber = "365"
+            endingLineNumber = "365"
             landmarkName = "-viewWillLayoutSubviews"
             landmarkType = "7">
          </BreakpointContent>
@@ -1098,7 +1098,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.497925"
+            timestampString = "557721184.755259"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1350"
@@ -1114,11 +1114,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.031853"
+            timestampString = "557721184.75536"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1490"
-            endingLineNumber = "1490"
+            startingLineNumber = "1491"
+            endingLineNumber = "1491"
             landmarkName = "-willRotateToInterfaceOrientation:duration:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1130,7 +1130,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/search+itemsearch/SearchViewController.m"
-            timestampString = "556104318.0319149"
+            timestampString = "557721184.755458"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "196"
@@ -1146,7 +1146,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "556511557.498265"
+            timestampString = "557721184.755536"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1213"
@@ -1194,7 +1194,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.032128"
+            timestampString = "557721184.755749"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1484"
@@ -1242,7 +1242,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.032328"
+            timestampString = "557721184.756031"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1286"
@@ -1274,7 +1274,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.032743"
+            timestampString = "557721184.756166"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "531"
@@ -1290,7 +1290,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "556104318.032794"
+            timestampString = "557721184.7562439"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1378"

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1728,20 +1728,20 @@
 //        [map setValue:@"rect_contact_list" forKey:@"img"];
 //        [self.sideMenuItems addObject:map.copy];
         
-#ifdef BUILD_UWAVER
-        [map setValue:@"Hang Tag" forKey:@"title"];
-#else
+//#ifdef BUILD_UWAVER
+//        [map setValue:@"Hang Tag" forKey:@"title"];
+//#else
         [map setValue:@"Portfolio" forKey:@"title"];
-#endif
+//#endif
         
         [map setValue:@"rect_market_news" forKey:@"img"];
         [self.sideMenuItems addObject:map.copy];
         
-#ifdef BUILD_UWAVER
-        [map setValue:@"View Hang Tags" forKey:@"title"];
-#else
+//#ifdef BUILD_UWAVER
+//        [map setValue:@"View Hang Tags" forKey:@"title"];
+//#else
         [map setValue:@"View Portfolios" forKey:@"title"];
-#endif
+//#endif
         
         
         [map setValue:@"rect_pdf_list" forKey:@"img"];

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

@@ -63,6 +63,7 @@ typedef void (^add_to_cart_Handler)(void);
 @property int select_count;
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
 
+@property (weak, nonatomic) IBOutlet UIButton *btn_select;
 @property (strong,nonatomic) NSString* p_alert;
 @property (strong,nonatomic) NSString* p_available;
 @property (strong,nonatomic) NSString* p_QTY;

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

@@ -1548,7 +1548,8 @@
     self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Selece", @"Deselect", nil];
     
 #ifdef BUILD_UWAVER
-    self.addPortfolioBtn.title = @"Add to Hang Tag";
+//    self.addPortfolioBtn.title = @"Add to Hang Tag";
+    self.btn_select.hidden =true;
 #endif
     
     

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

@@ -70,6 +70,7 @@
 @property (strong, nonatomic) IBOutlet UIButton *btnNotifyMe;
 @property (nonatomic,copy) void(^notifyMeBlock)();
 
+@property (weak, nonatomic) IBOutlet UIButton *btn_hangtag;
 @property (strong, nonatomic) IBOutlet UILabel *eta_label;
 
 @property (strong, nonatomic) IBOutlet UILabel *incoming_stock_label;

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

@@ -40,6 +40,14 @@
 
 - (void)awakeFromNib
 {
+#ifdef BUILD_UWAVER
+    //    self.addPortfolioBtn.title = @"Add to Hang Tag";
+    self.btn_hangtag.hidden=false;
+#else
+    
+    self.btn_hangtag.hidden=true;
+#endif
+    
     
 //    self.selector_imageView.layer.borderColor = [UIColorFromRGB(0x996633) CGColor];
 //    self.selector_imageView.layer.borderWidth = 1;
@@ -85,6 +93,10 @@
     }
 
 }
+- (IBAction)create_HangTag:(id)sender {
+            UIViewController *vc= [RAUtils getViewController:self];
+    [RAUtils message_alert:@"" title:@"hang tag" controller:vc];
+}
 - (IBAction)add_toPortfolio:(id)sender {
     
     //    int count=[self.quantity_text.text intValue];

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

@@ -21,9 +21,10 @@
 @property bool ispush;
 @property bool use_model_name;
 @property (strong, nonatomic) IBOutlet UITableView *detailTable;
-@property (strong, nonatomic) IBOutlet UIButton *anchor_button;
+//@property (strong, nonatomic) IBOutlet UIButton *anchor_button;
 @property int quantity;
 @property int step;
+//@property (weak, nonatomic) IBOutlet UIButton *btn_hangtag;
 
 @property (strong,nonatomic) UIPopoverController *popover;
 

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

@@ -1416,7 +1416,7 @@ self.isrefreshing=false;
         }
         
         
-        self.anchor_button.frame=cell.selector_Button.frame;
+//        self.anchor_button.frame=cell.selector_Button.frame;
         cell.celldelegate=self;
         cell.quantity_text.text = [NSString stringWithFormat:@"%d",self.quantity];
         cell.step = self.step;

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

@@ -70,9 +70,9 @@
     [self.label_net_err addGestureRecognizer:tap];
     // Do any additional setup after loading the view.
     
-#ifdef BUILD_UWAVER
-    self.navItem.title = @"View Hang Tags";
-#endif
+//#ifdef BUILD_UWAVER
+//    self.navItem.title = @"View Hang Tags";
+//#endif
 }
 
 - (void)didReceiveMemoryWarning {

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

@@ -75,11 +75,11 @@
     {
         
         
-#ifdef BUILD_UWAVER
-        self.btnCreatePort.title = @"Create Hang Tag";
-#else
+//#ifdef BUILD_UWAVER
+//        self.btnCreatePort.title = @"Create Hang Tag";
+//#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
-#endif
+//#endif
         self.btnCreatePort.enabled = true;
     }
     else
@@ -393,11 +393,11 @@
     if(checked.count==0)
     {
         NSString *title = @"Cannot Create Portfolio.";
-#ifdef BUILD_UWAVER
-        title = @"Cannot Create Hang Tag.";
-#else
-    title:@"Cannot Create Portfolio.";
-#endif
+//#ifdef BUILD_UWAVER
+//        title = @"Cannot Create Hang Tag.";
+//#else
+    title=@"Cannot Create Portfolio.";
+//#endif
         [RAUtils message_alert:@"You must select at least one model." title:title controller:self] ;
         return;
     }
@@ -521,11 +521,11 @@
     if(checked.count==0)
     {
         NSString *title = @"Cannot Create Portfolio.";
-#ifdef BUILD_UWAVER
-        title = @"Cannot Create Hang Tag.";
-#else
-    title:@"Cannot Create Portfolio.";
-#endif
+//#ifdef BUILD_UWAVER
+//        title = @"Cannot Create Hang Tag.";
+//#else
+    title=@"Cannot Create Portfolio.";
+//#endif
         [RAUtils message_alert:@"You must select at least one model." title:title controller:self] ;
         return;
     }
@@ -545,11 +545,11 @@
     
     if (catelog_name.length == 0) {
         NSString *msg = @"Portfolio name can not be empty";
-#ifdef BUILD_UWAVER
-        msg = @"hang tag name can not be empty";
-#else
+//#ifdef BUILD_UWAVER
+//        msg = @"hang tag name can not be empty";
+//#else
         msg = @"Portfolio name can not be empty";
-#endif
+//#endif
         [RAUtils message_alert:msg title:@"Warning" controller:self];
         return;
     }
@@ -726,11 +726,11 @@
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     [self.label_net_err addGestureRecognizer:tap];
     
-#ifdef BUILD_UWAVER
-    self.btnCreatePort.title = @"Create Hang Tag";
-    self.btnEdit.title = nil;
-    self.btnEdit.enabled = NO;
-#endif
+//#ifdef BUILD_UWAVER
+//    self.btnCreatePort.title = @"Create Hang Tag";
+//    self.btnEdit.title = nil;
+//    self.btnEdit.enabled = NO;
+//#endif
     
     [self initCheckedCount];
 }
@@ -1191,9 +1191,9 @@
     unsigned long color = strtoul([value UTF8String],0,16);
     
     NSString *sectionTitle = @"Portfolio";
-#ifdef BUILD_UWAVER
-    sectionTitle = @"Hang Tag";
-#endif
+//#ifdef BUILD_UWAVER
+//    sectionTitle = @"Hang Tag";
+//#endif
     
     DefaultTableHeaderView* myView = [[DefaultTableHeaderView alloc] initWithFrame:CGRectMake(0, 0, tableView.bounds.size.width, 33)];
     
@@ -1981,11 +1981,11 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     if(appDelegate.can_create_portfolio)
     {
         
-#ifdef BUILD_UWAVER
-        self.btnCreatePort.title = @"Create Hang Tag";
-#else
+//#ifdef BUILD_UWAVER
+//        self.btnCreatePort.title = @"Create Hang Tag";
+//#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
-#endif
+//#endif
         
         self.btnCreatePort.enabled = true;
     }
@@ -2062,11 +2062,11 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
     {
         
         
-#ifdef BUILD_UWAVER
-        self.btnCreatePort.title = @"Create Hang Tag";
-#else
+//#ifdef BUILD_UWAVER
+//        self.btnCreatePort.title = @"Create Hang Tag";
+//#else
         [self.btnCreatePort setTitle:@"Create Portfolio"];
-#endif
+//#endif
         self.btnCreatePort.enabled = true;
     }
     else

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

@@ -48,19 +48,19 @@
     
     
     
-#ifdef BUILD_UWAVER
-    
-    self.titleLabel.text = @"Create Hang Tag";
-    self.nameLabel.text = @"Hang Tag Name:";
-    self.noteLabel.text = @"Hang Tag Note:";
-    
-#else
+//#ifdef BUILD_UWAVER
+//
+//    self.titleLabel.text = @"Create Hang Tag";
+//    self.nameLabel.text = @"Hang Tag Name:";
+//    self.noteLabel.text = @"Hang Tag Note:";
+//
+//#else
     
     self.titleLabel.text = @"Create Portfolio";
     self.nameLabel.text = @"Portfolio Name:";
     self.noteLabel.text = @"Portfolio Note:";
     
-#endif
+//#endif
     
 }
 

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

@@ -17,6 +17,7 @@
 @property bool loadall;
 @property bool showalert;
 @property int categoryViewType;
+@property (weak, nonatomic) IBOutlet UIButton *btn_select;
 
 @property (strong, nonatomic) IBOutlet UIView *headerView;
 //@property (strong,nonatomic) NSString* keywords;

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

@@ -243,7 +243,8 @@
     [self.label_net_err addGestureRecognizer:tap];
     
 #ifdef BUILD_UWAVER
-    self.addPortfolioBtn.title = @"Add to Hang Tag";
+//    self.addPortfolioBtn.title = @"Add to Hang Tag";
+    self.btn_select.hidden = true;
 #endif
     
     

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

@@ -29,6 +29,7 @@
 @property bool showDetail;
 @property (strong, nonatomic) IBOutlet UIActivityIndicatorView *mum;
 
+@property (weak, nonatomic) IBOutlet UIButton *btn_select;
 @property bool loadmore_matchfull;
 @property bool isSelectionMode;
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *addCartBtn;

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

@@ -236,7 +236,8 @@
     self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Select", @"Deselect", nil];
     
 #ifdef BUILD_UWAVER
-    self.addPortfolioBtn.title = @"Add to Hang Tag";
+//    self.addPortfolioBtn.title = @"Add to Hang Tag";
+    self.btn_select.hidden = true;
 #endif
     
 #if defined(BUILD_HOMER) || defined(BUILD_GATIT)

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

@@ -930,13 +930,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="T9W-Tx-ngi">
-                                <rect key="frame" x="361" y="497" width="46" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Button">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </state>
-                            </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="600" sectionHeaderHeight="10" sectionFooterHeight="10" id="fRO-Fc-0A3">
                                 <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1130,8 +1123,8 @@
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <view contentMode="scaleToFill" id="HE5-zj-CRh" userLabel="Description RTLabel" customClass="RTLabel">
-                                                    <rect key="frame" x="35" y="39" width="695" height="54"/>
+                                                <view contentMode="scaleToFill" misplaced="YES" id="HE5-zj-CRh" userLabel="Description RTLabel" customClass="RTLabel">
+                                                    <rect key="frame" x="60" y="39" width="648" height="54"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </view>
@@ -1225,11 +1218,20 @@
                                                         <action selector="noLoginBtnClick:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="pev-0M-YaA"/>
                                                     </connections>
                                                 </button>
+                                                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="id3-5v-NO1">
+                                                    <rect key="frame" x="718" y="58" width="30" height="30"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                    <state key="normal" image="hangtag"/>
+                                                    <connections>
+                                                        <action selector="create_HangTag:" destination="PCZ-Ci-oQf" eventType="touchUpInside" id="Ra3-Tg-ISd"/>
+                                                    </connections>
+                                                </button>
                                             </subviews>
                                         </tableViewCellContentView>
                                         <inset key="separatorInset" minX="15" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         <connections>
                                             <outlet property="btnNotifyMe" destination="k7m-sd-nvE" id="Pwc-CF-WuT"/>
+                                            <outlet property="btn_hangtag" destination="id3-5v-NO1" id="eZa-eC-nxn"/>
                                             <outlet property="btnaddCart" destination="P9c-rP-A3n" id="Ne1-hV-blS"/>
                                             <outlet property="btnaddPortfolio" destination="8bl-N2-vQ8" id="OME-qi-bAh"/>
                                             <outlet property="btnaddWish" destination="AHJ-EJ-V5A" id="MWP-hv-a4g"/>
@@ -1384,7 +1386,6 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                     <connections>
-                        <outlet property="anchor_button" destination="T9W-Tx-ngi" id="Ofc-Om-fZg"/>
                         <outlet property="detailTable" destination="fRO-Fc-0A3" id="mtM-CG-aft"/>
                         <outlet property="label_net_err" destination="9F9-nh-erD" id="LMg-Fz-2zC"/>
                         <outlet property="mum" destination="anY-FA-ugi" id="3DW-o8-Uba"/>
@@ -1728,6 +1729,7 @@
                         <outlet property="addCartBtn" destination="lye-m8-iPD" id="1pe-VP-2iO"/>
                         <outlet property="addPortfolioBtn" destination="ult-1U-am5" id="Qgz-Qn-RIO"/>
                         <outlet property="addWishBtn" destination="Zcg-2a-cqw" id="MUf-Ms-LfL"/>
+                        <outlet property="btn_select" destination="KKK-3K-Sta" id="SLq-TI-SeV"/>
                         <outlet property="cagegoryLabel" destination="hnq-1q-3jz" id="1xO-Bs-qyM"/>
                         <outlet property="collectionview" destination="Dja-Oo-v5Y" id="qev-x9-g1K"/>
                         <outlet property="headerView" destination="M2M-p8-Hpm" id="WLL-SP-mR6"/>
@@ -6538,6 +6540,7 @@ Email: redantsupport@united-us.net</string>
                         <outlet property="addCartBtn" destination="gEd-lK-iv4" id="vGR-ea-IW5"/>
                         <outlet property="addPortfolioBtn" destination="NFT-r9-yyN" id="yXG-JL-ce4"/>
                         <outlet property="addWishBtn" destination="w2X-RD-AQL" id="GxL-eU-dWF"/>
+                        <outlet property="btn_select" destination="6iP-k7-v7K" id="OLf-tU-3Nb"/>
                         <outlet property="collectionview" destination="C2R-Ga-XX8" id="l8W-KX-CWa"/>
                         <outlet property="headerView" destination="p4a-vP-6BH" id="1SW-GA-ouA"/>
                         <outlet property="labelTotal" destination="gK2-JX-k9J" id="jor-7j-1lH"/>
@@ -6576,7 +6579,7 @@ Email: redantsupport@united-us.net</string>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="KVd-zF-Tl0"/>
                                     <barButtonItem style="plain" id="joL-Py-zMr">
                                         <searchBar key="customView" contentMode="redraw" searchBarStyle="minimal" placeholder="Name, Address, Phone etc" id="37s-Zo-qJG">
-                                            <rect key="frame" x="297" y="0.0" width="364" height="44"/>
+                                            <rect key="frame" x="305" y="0.0" width="364" height="44"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                             <textInputTraits key="textInputTraits"/>
                                             <connections>
@@ -7651,6 +7654,7 @@ Email: redantsupport@united-us.net</string>
                         <outlet property="addCartBtn" destination="a9w-6Q-6fB" id="QLD-pr-s7e"/>
                         <outlet property="addPortfolioBtn" destination="GOL-aL-CNx" id="DwE-G4-AD3"/>
                         <outlet property="addWishBtn" destination="dZs-hS-NSR" id="k10-qQ-iDv"/>
+                        <outlet property="btn_select" destination="RUg-8h-2lT" id="UWi-Ae-ni9"/>
                         <outlet property="collectionview" destination="gVf-az-XzJ" id="niA-6w-zrt"/>
                         <outlet property="headerView" destination="hTt-eD-74U" id="y5p-ot-xnZ"/>
                         <outlet property="labelTotal" destination="EhH-is-sN0" id="Zq6-dX-MCz"/>
@@ -9816,7 +9820,7 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_search" width="102" height="30"/>
         <image name="btn_signin" width="100" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="72" height="72"/>
+        <image name="cart_empty" width="96" height="96"/>
         <image name="category" width="96" height="96"/>
         <image name="check_0_24" width="24" height="24"/>
         <image name="check_1_24" width="24" height="24"/>
@@ -9825,6 +9829,7 @@ Email: redantsupport@united-us.net</string>
         <image name="contact" width="72" height="72"/>
         <image name="continue" width="130" height="30"/>
         <image name="filter" width="32" height="32"/>
+        <image name="hangtag" width="30" height="30"/>
         <image name="layout_list" width="40" height="40"/>
         <image name="layout_small" width="40" height="40"/>
         <image name="laytou_large" width="40" height="40"/>
@@ -9834,7 +9839,7 @@ Email: redantsupport@united-us.net</string>
         <image name="mark_wish_32" width="32" height="32"/>
         <image name="menu_open" width="36" height="36"/>
         <image name="more_color_larger" width="32" height="32"/>
-        <image name="newcustomer" width="40" height="40"/>
+        <image name="newcustomer" width="32" height="32"/>
         <image name="neworder" width="40" height="40"/>
         <image name="notifyMe" width="124" height="39"/>
         <image name="npd_logo" width="110" height="13"/>

RedAnt ERP Mobile/iSales-UNITED WAVER.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>iSales-UWAVER.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/iSales-USAI.xcodeproj/xcuserdata/ray.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-USAI.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/iSales-UWAVER/Assets.xcassets/hangtag.imageset/Contents.json

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

RedAnt ERP Mobile/iSales-UWAVER/config.h

@@ -14,7 +14,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-//#define test_server
+#define test_server
 # endif
 
 #define exception_switch 1
@@ -27,7 +27,7 @@
 #import "Singleton.h"
 
 //离线模式开关
-#define OFFLINE_MODE
+//#define OFFLINE_MODE
 //google analytics 开关
 //#define GOOGLE_ANALYTICS
 //pdf 调试开关
@@ -52,234 +52,234 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.133:8080/site/isales/cartDeliveryBackOrderReview.htm"
-#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.133:8080/site/isales/moveToBackOrder.htm"
+#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.133:8080/site_uwa/isales_uwa/cartDeliveryBackOrderReview.htm"
+#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/moveToBackOrder.htm"
 
-#define  URL_UPDATE_AUTH  @"http://192.168.0.133:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.133:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.133:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.133:8080/site_uwa/isales_uwa/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.133:8080/site_uwa/isales_uwa/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.133:8080/site_uwa/isales_uwa/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.133:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.133:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.133:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.133:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.133:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.133:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.133:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.133:8080/site_uwa/isales_uwa/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.133:8080/site_uwa/isales_uwa/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.133:8080/site_uwa/isales_uwa/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.133:8080/site_uwa/isales_uwa/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.133:8080/site_uwa/isales_uwa/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.133:8080/site_uwa/isales_uwa/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.133:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.133:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.133:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.133:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.133:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.133:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.133:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.133:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.133:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.133:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.133:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.133:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.133:8080/site_uwa/isales_uwa/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.133:8080/site_uwa/isales_uwa/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.133:8080/site_uwa/isales_uwa/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.133:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.133:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.133:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.133:8080/site_uwa/isales_uwa/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.133:8080/site_uwa/isales_uwa/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.133:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.133:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.133:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.133:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.133:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.133:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.133:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.133:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.133:8080/site_uwa/isales_uwa/increment.htm"
+#define  URL_CART  @"http://192.168.0.133:8080/site_uwa/isales_uwa/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.133:8080/site_uwa/isales_uwa/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.133:8080/site_uwa/isales_uwa/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.133:8080/site_uwa/isales_uwa/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.133:8080/site_uwa/isales_uwa/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.133:8080/site_uwa/isales_uwa/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.133:8080/site/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.133:8080/site/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.133:8080/site/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.0.133:8080/site_uwa/isales_uwa/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.0.133:8080/site_uwa/isales_uwa/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.0.133:8080/site_uwa/isales_uwa/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.133:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.133:8080/site_uwa/isales_uwa/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.133:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.133:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.133:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.133:8080/site_uwa/isales_uwa/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.133:8080/site_uwa/isales_uwa/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.133:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.133:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.133:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.133:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.133:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.133:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.133:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.133:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.133:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.133:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.133:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.133:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.133:8080/site_uwa/isales_uwa/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.133:8080/site_uwa/isales_uwa/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.133:8080/site_uwa/isales_uwa/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.133:8080/site_uwa/isales_uwa/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.133:8080/site_uwa/isales_uwa/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.133:8080/site_uwa/isales_uwa/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.133:8080/site_uwa/isales_uwa/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.133:8080/site_uwa/isales_uwa/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.133:8080/site_uwa/isales_uwa/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.133:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.133:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.133:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.133:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.133:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.133:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.133:8080/site_uwa/isales_uwa/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.133:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.133:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.133:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.133:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.133:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.133:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.133:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.133:8080/site_uwa/isales_uwa/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.133:8080/site_uwa/isales_uwa/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.133:8080/site_uwa/isales_uwa/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.133:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.133:8080/site_uwa/isales_uwa/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.133:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.133:8080/site_uwa/isales_uwa/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.133:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.133:8080/site_uwa/isales_uwa/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.133:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.133:8080/site_uwa/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.133:8080/site_uwa/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site_uwa/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.133:8080/site_uwa/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.133:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.133:8080/site_uwa/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.133:8080/site/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.133:8080/site_uwa/isales_uwa/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.133:8080/site/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.133:8080/site_uwa/isales_uwa/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.133:8080/site/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.133:8080/site_uwa/isales_uwa/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.133:8080/site/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.133:8080/site_uwa/isales_uwa/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.133:8080/site/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.133:8080/site_uwa/isales_uwa/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.133:8080/site/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.133:8080/site_uwa/isales_uwa/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.133:8080/site/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.133:8080/site_uwa/isales_uwa/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"http://192.168.0.133:8080/site/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"http://192.168.0.133:8080/site_uwa/isales_uwa/sendWishListEmail.htm"
 
-#define URL_BLOG @"http://192.168.0.133:8080/site/blog"
+#define URL_BLOG @"http://192.168.0.133:8080/site_uwa/blog"
 
 #else
 
 
-//------------------- NPD server-----------------------
-#define  URL_UPDATE_AUTH  @"https://central.united-us.com/demo/shopping/isales/login.htm"
-#define  URL_LOGOUT  @"https://central.united-us.com/demo/shopping/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"https://central.united-us.com/demo/shopping/isales/forgotPassword.htm"
+//------------------- UWA server-----------------------
+#define  URL_UPDATE_AUTH  @"https://central.united-us.com/demo/shopping/isales_uwa/login.htm"
+#define  URL_LOGOUT  @"https://central.united-us.com/demo/shopping/isales_uwa/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"https://central.united-us.com/demo/shopping/isales_uwa/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"https://central.united-us.com/demo/shopping/isales/menu.htm"
-#define  URL_LOAD_HOME  @"https://central.united-us.com/demo/shopping/isales/homePage.htm"
-#define  URL_CATEGORY @"https://central.united-us.com/demo/shopping/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"https://central.united-us.com/demo/shopping/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"https://central.united-us.com/demo/shopping/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"https://central.united-us.com/demo/shopping/isales/categoryMore.htm"
+#define  URL_REQUEST_CATMENU  @"https://central.united-us.com/demo/shopping/isales_uwa/menu.htm"
+#define  URL_LOAD_HOME  @"https://central.united-us.com/demo/shopping/isales_uwa/homePage.htm"
+#define  URL_CATEGORY @"https://central.united-us.com/demo/shopping/isales_uwa/distinctCategory.htm"
+#define  URL_SEARCH  @"https://central.united-us.com/demo/shopping/isales_uwa/search.htm"
+#define  URL_ITEM_SEARCH  @"https://central.united-us.com/demo/shopping/isales_uwa/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"https://central.united-us.com/demo/shopping/isales_uwa/categoryMore.htm"
 
 
-#define  URL_ORDER_LIST  @"https://central.united-us.com/demo/shopping/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"https://central.united-us.com/demo/shopping/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"https://central.united-us.com/demo/shopping/isales/createOrder.htm"
-#define URL_SAVE_ORDER @"https://central.united-us.com/demo/shopping/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"https://central.united-us.com/demo/shopping/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"https://central.united-us.com/demo/shopping/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"https://central.united-us.com/demo/shopping/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"https://central.united-us.com/demo/shopping/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"https://central.united-us.com/demo/shopping/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"https://central.united-us.com/demo/shopping/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"https://central.united-us.com/demo/shopping/isales_uwa/orderList.htm"
+#define  URL_ORDER_DETAIL  @"https://central.united-us.com/demo/shopping/isales_uwa/orderDetail.htm"
+#define URL_COMMIT_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/createOrder.htm"
+#define URL_SAVE_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"https://central.united-us.com/demo/shopping/isales_uwa/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales/setPrice.htm"
-#define  URL_CART_INCRESEMENT  @"https://central.united-us.com/demo/shopping/isales/increment.htm"
-#define  URL_CART  @"https://central.united-us.com/demo/shopping/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"https://central.united-us.com/demo/shopping/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"https://central.united-us.com/demo/shopping/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"https://central.united-us.com/demo/shopping/isales/checkCartItem.htm"
+#define  URL_CART_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales_uwa/setPrice.htm"
+#define  URL_CART_INCRESEMENT  @"https://central.united-us.com/demo/shopping/isales_uwa/increment.htm"
+#define  URL_CART  @"https://central.united-us.com/demo/shopping/isales_uwa/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"https://central.united-us.com/demo/shopping/isales_uwa/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"https://central.united-us.com/demo/shopping/isales_uwa/addToCart.htm"
+#define  URL_CART_REMOVE  @"https://central.united-us.com/demo/shopping/isales_uwa/deleteToCart.htm"
+#define  URL_CART_CHECK  @"https://central.united-us.com/demo/shopping/isales_uwa/checkCartItem.htm"
 
-#define  URL_CART2WISH  @"https://central.united-us.com/demo/shopping/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"https://central.united-us.com/demo/shopping/isales/wishlistRemoveToCart.htm"
+#define  URL_CART2WISH  @"https://central.united-us.com/demo/shopping/isales_uwa/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"https://central.united-us.com/demo/shopping/isales_uwa/wishlistRemoveToCart.htm"
 
-#define  URL_ITEM_DETAIL  @"https://central.united-us.com/demo/shopping/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"https://central.united-us.com/demo/shopping/isales_uwa/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales_uwa/addToWishList.htm"
+#define  URL_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales_uwa/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales_uwa/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"https://central.united-us.com/demo/shopping/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIO  @"https://central.united-us.com/demo/shopping/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"https://central.united-us.com/demo/shopping/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"https://central.united-us.com/demo/shopping/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"https://central.united-us.com/demo/shopping/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"https://central.united-us.com/demo/shopping/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"https://central.united-us.com/demo/shopping/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"https://central.united-us.com/demo/shopping/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"https://central.united-us.com/demo/shopping/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"https://central.united-us.com/demo/shopping/isales_uwa/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"https://central.united-us.com/demo/shopping/isales_uwa/deleteToPortfolio.htm"
+#define  URL_PORTFOLIO  @"https://central.united-us.com/demo/shopping/isales_uwa/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales_uwa/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"https://central.united-us.com/demo/shopping/isales_uwa/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"https://central.united-us.com/demo/shopping/isales_uwa/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"https://central.united-us.com/demo/shopping/isales_uwa/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"https://central.united-us.com/demo/shopping/isales_uwa/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"https://central.united-us.com/demo/shopping/isales_uwa/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"https://central.united-us.com/demo/shopping/isales_uwa/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"https://central.united-us.com/demo/shopping/isales_uwa/getTearSheetAvailableQty.htm"
 
 
-#define  URL_CONTACT_LIST  @"https://central.united-us.com/demo/shopping/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"https://central.united-us.com/demo/shopping/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"https://central.united-us.com/demo/shopping/isales_uwa/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"https://central.united-us.com/demo/shopping/isales_uwa/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"https://central.united-us.com/demo/shopping/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"https://central.united-us.com/demo/shopping/isales_uwa/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"https://central.united-us.com/demo/shopping/isales_uwa/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"https://central.united-us.com/demo/shopping/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"https://central.united-us.com/demo/shopping/isales_uwa/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"https://central.united-us.com/demo/shopping/isales_uwa/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"https://central.united-us.com/demo/shopping/isales/getCustomerInfoByContact.htm"
-#define  URL_NEW_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales/getAddCustomer.htm"
-#define  URL_CUSTOMER_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"https://central.united-us.com/demo/shopping/isales/updateCustomerBusiCard.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"https://central.united-us.com/demo/shopping/isales/getContactAdvance.htm"
+#define  URL_CUSTOMER_INFO  @"https://central.united-us.com/demo/shopping/isales_uwa/getCustomerInfoByContact.htm"
+#define  URL_NEW_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales_uwa/getAddCustomer.htm"
+#define  URL_CUSTOMER_SAVE  @"https://central.united-us.com/demo/shopping/isales_uwa/saveCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"https://central.united-us.com/demo/shopping/isales_uwa/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"https://central.united-us.com/demo/shopping/isales_uwa/getContactAdvance.htm"
 
 
 
 
 
-#define  URL_ERR_LOG  @"https://central.united-us.com/demo/shopping/isales/er_log.htm"
+#define  URL_ERR_LOG  @"https://central.united-us.com/demo/shopping/isales_uwa/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"https://central.united-us.com/demo/shopping/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"https://central.united-us.com/demo/shopping/isales_uwa/uploadImg.htm"
 
-#define URL_COPY_ORDER @"https://central.united-us.com/demo/shopping/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"https://central.united-us.com/demo/shopping/isales/updateOrderSign.htm"
-#define  URL_CUSTOMER_UPDATE  @"https://central.united-us.com/demo/shopping/isales/updateCustomer.htm"
-#define  URL_CART_GENERAL_NOTES  @"https://central.united-us.com/demo/shopping/isales/updateGeneralNote.htm"
-#define  URL_CART_ITEM_NOTES  @"https://central.united-us.com/demo/shopping/isales/setItemNotes.htm"
-#define  URL_EDIT_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"https://central.united-us.com/demo/shopping/isales/hasPendingOrderByContact.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteTearSheetPdf.htm"
-#define  URL_NPD_POLICY   @"https://central.united-us.com/demo/shopping/isales/generalPolicy.htm"
+#define URL_COPY_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/copyOrder.htm"
+#define URL_SIGN_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/updateOrderSign.htm"
+#define  URL_CUSTOMER_UPDATE  @"https://central.united-us.com/demo/shopping/isales_uwa/updateCustomer.htm"
+#define  URL_CART_GENERAL_NOTES  @"https://central.united-us.com/demo/shopping/isales_uwa/updateGeneralNote.htm"
+#define  URL_CART_ITEM_NOTES  @"https://central.united-us.com/demo/shopping/isales_uwa/setItemNotes.htm"
+#define  URL_EDIT_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales_uwa/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"https://central.united-us.com/demo/shopping/isales_uwa/hasPendingOrderByContact.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales_uwa/deleteTearSheetPdf.htm"
+#define  URL_NPD_POLICY   @"https://central.united-us.com/demo/shopping/isales_uwa/generalPolicy.htm"
 
 
 
@@ -290,31 +290,31 @@
 #define  URL_FINISH_DOWNLOAD_OFFLINE  @"https://central.united-us.com/demo/shopping/offline/confirmVersion.htm"
 #define  URL_UPLOAD_OFFLINE  @"https://central.united-us.com/demo/shopping/offline/uploadOfflineData.htm"
 
-#define  URL_CATEGORYADDALL  @"https://central.united-us.com/demo/shopping/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"https://central.united-us.com/demo/shopping/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"https://central.united-us.com/demo/shopping/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"https://central.united-us.com/demo/shopping/isales_uwa/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"https://central.united-us.com/demo/shopping/isales_uwa/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"https://central.united-us.com/demo/shopping/isales_uwa/itemSearchAddAllTo.htm"
 
-#define URL_SET_PRICE_TYPE @"https://central.united-us.com/demo/shopping/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"https://central.united-us.com/demo/shopping/isales_uwa/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales_uwa/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales_uwa/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"https://central.united-us.com/demo/shopping/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"https://central.united-us.com/demo/shopping/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"https://central.united-us.com/demo/shopping/isales_uwa/requestLogin.htm"
 
-#define URL_EMAIL_CART @"https://central.united-us.com/demo/shopping/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"https://central.united-us.com/demo/shopping/isales_uwa/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"https://central.united-us.com/demo/shopping/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"https://central.united-us.com/demo/shopping/isales_uwa/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"https://central.united-us.com/demo/shopping/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"https://central.united-us.com/demo/shopping/isales_uwa/sendWishListEmail.htm"
 
 #define URL_BLOG @"https://central.united-us.com/demo/shopping/blog"
 
-#define  URL_MOVE_TO_BACK_ORDER @"https://central.united-us.com/demo/shopping/isales/moveToBackOrder.htm"
+#define  URL_MOVE_TO_BACK_ORDER @"https://central.united-us.com/demo/shopping/isales_uwa/moveToBackOrder.htm"
 
-#define  URL_BACK_ORDER_PREVIEW  @"https://central.united-us.com/demo/shopping/isales/cartDeliveryBackOrderReview.htm"
+#define  URL_BACK_ORDER_PREVIEW  @"https://central.united-us.com/demo/shopping/isales_uwa/cartDeliveryBackOrderReview.htm"
 
 #endif