Ray Zhang пре 3 година
родитељ
комит
c2ffccbc25

+ 2 - 2
RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2563,7 +2563,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.34;
+				MARKETING_VERSION = 1.35;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2612,7 +2612,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.34;
+				MARKETING_VERSION = 1.35;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

+ 71 - 154
RedAnt ERP Mobile/HMLG Scan Order/CartViewController.m

@@ -1105,92 +1105,7 @@
     
 }
 - (IBAction)onOrderDiscount:(id)sender {
-    
-#ifdef BUILD_CONTRAST
-    
-    OrderDiscountViewController * vc =[[UIStoryboard storyboardWithName:@"ERP_Mobile_Cart" bundle:nil] instantiateViewControllerWithIdentifier:@"OrderDiscountViewController"];
-    
-    
-    
-    
-//    vc.discount=[[item_json valueForKey:@"discount"] floatValue];
-//    vc.price = [[item_json valueForKey:@"unit_price"] floatValue];
-//    vc.cart_id = [item_json valueForKey:@"cart_item_id"];//[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"cart_item_id"] intValue]];
-//    __block NSString* cartid=[item_json valueForKey:@"cart_item_id"];
-    //    vc.delegate = parentvc.self;
-    //    loginvc.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态,自己看看是哪种
-    vc.onSetValue = ^(double discount){
-        
-//        bool bmodify=false;
-//        if(discount>0)
-//            bmodify=true;
-        
-//        NSString* notes = [item_json valueForKey:@"note"];
-//        if(notes.length==0)
-//            notes=@"";
-//        if(bmodify)
-//        {
-//
-//
-//           // if([notes isEqualToString:@""])
-////                notes=[NSString stringWithFormat:@"Note: discount %d%% off.",(int)discount];
-////
-////            NSRange range;
-////            range = [notes rangeOfString:@"PRICE MODIFIED"];
-////            if (range.location != NSNotFound) {
-////
-////            }else{
-////               notes= [notes stringByAppendingString:@"\nPRICE MODIFIED"];
-////            }
-//        }
-//        else
-//
-//        {
-////            notes =@"";
-//        }
-        
-        __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Update Discount" completion:^{
-            
-            [RANetwork request_order_discount:discount completionHandler:^(NSMutableDictionary *result) {
-                [waitalert dismissViewControllerAnimated:YES completion:^{
-                    
-                    int iresult = [result[@"result"] intValue];
-                    if(iresult==RESULT_TRUE)
-                    {
-                        [self reload_data];
-                    }
-                    else
-                    {
-                        [RAUtils message_box:@"Set Order Discount" message:@"Can't set order discount, please contact administrator" completion:nil];
-                    }
-                                           }];
-            }];
 
-        }];
-   
-       
-    };
-    
-    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:vc] ;
-    
-    
-    
-    
-    
-    //    [self hackModalSheetSize:CGSizeMake(450, 200) ofVC:navi];
-    
-    navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态,自己看看是哪种
-    [self presentViewController:navi animated:YES completion:^{
-        
-        //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);
-        
-        DebugLog(@"EditModelPriceViewController present.........");
-        
-        //   self.btop = false;
-        //  <#code#>
-    }];
-    
-#endif
     
 }
 
@@ -2683,20 +2598,21 @@
 {
 #ifdef SCANNER_ORDER
     return 0;
-#endif
+#else
     
     if (self.back_order_flag) {
         return 50;
     } else {
         return 0;
     }
+#endif
 }
 - (UIView *) tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
     
 #ifdef SCANNER_ORDER
     return nil;
-#endif
+#else
     
     if (self.back_order_flag) {
 //        UIView *header = [tableView dequeueReusableCellWithIdentifier:@"section_header_cell"];
@@ -2717,84 +2633,85 @@
         return nil;
     }
     
-    
+#endif
 }
 #ifdef SCANNER_ORDER
 - (IBAction)onScanChangeCustomerType:(id)sender {
     
-    return;
-    NSString *orderdir =[OLDataProvider getScanPath];
-    
-    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Select Customer type" message:@"" preferredStyle:UIAlertControllerStyleAlert];
-    //block代码块取代了delegate
-    
-    
-    
-    UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Existing Customer" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
-        
-        NSMutableDictionary* dict = nil;
-        NSString* ordertemplate = nil;
-        if([RADataProvider getSiteHasERP])
-            ordertemplate =@"e_order.json";
-        else
-            ordertemplate =@"e_order_noerp.json";
-        
-        dict=[OLDataProvider loadScanTemplate:ordertemplate];
-        
-        NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
-        
-        
-        
-        [RAUtils dicttofile:orderPath dict:dict];
-        
-        
 
-        
+    return;
+//    NSString *orderdir =[OLDataProvider getScanPath];
 //
-//        NSString *contactpath = [orderdir stringByAppendingPathComponent:@"contact.json"];
+//    UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"Select Customer type" message:@"" preferredStyle:UIAlertControllerStyleAlert];
+//    //block代码块取代了delegate
 //
 //
 //
-//        [RAUtils dicttofile:contactpath dict:appDelegate.customerInfo];
+//    UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Existing Customer" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
 //
-//        [self scanPlaceOrder];
+//        NSMutableDictionary* dict = nil;
+//        NSString* ordertemplate = nil;
+//        if([RADataProvider getSiteHasERP])
+//            ordertemplate =@"e_order.json";
+//        else
+//            ordertemplate =@"e_order_noerp.json";
 //
-    }];
-    
-    UIAlertAction *alert2 = [UIAlertAction actionWithTitle:@"New customer" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-        NSMutableDictionary* dict = nil;
-        dict=[OLDataProvider loadScanTemplate:@"n_order.json"];
-        
-        NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
-        
-        
-        
-        [RAUtils dicttofile:orderPath dict:dict];
-        
-        
-
-//        
-//        
-//        NSString *contactpath = [orderdir stringByAppendingPathComponent:@"contact.json"];
-//        
-//        
-//        
-//        [RAUtils dicttofile:contactpath dict:appDelegate.customerInfo];
-//        [self scanPlaceOrder];
-    }];
-    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-        DebugLog(@"No");
-    }];
-    [alertControl addAction:actionOne];
-    [alertControl addAction:alert2];
-    [alertControl addAction:alertthree];
-    
-    //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
-    
-    
-    [self presentViewController:alertControl animated:YES completion:nil];
-    
-    DebugLog(@"%@",self.edit_select_arr);
+//        dict=[OLDataProvider loadScanTemplate:ordertemplate];
+//
+//        NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
+//
+//
+//
+//        [RAUtils dicttofile:orderPath dict:dict];
+//
+//
+//
+//
+////
+////        NSString *contactpath = [orderdir stringByAppendingPathComponent:@"contact.json"];
+////
+////
+////
+////        [RAUtils dicttofile:contactpath dict:appDelegate.customerInfo];
+////
+////        [self scanPlaceOrder];
+////
+//    }];
+//
+//    UIAlertAction *alert2 = [UIAlertAction actionWithTitle:@"New customer" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+//        NSMutableDictionary* dict = nil;
+//        dict=[OLDataProvider loadScanTemplate:@"n_order.json"];
+//
+//        NSString *orderPath = [orderdir stringByAppendingPathComponent:@"order.json"];
+//
+//
+//
+//        [RAUtils dicttofile:orderPath dict:dict];
+//
+//
+//
+////
+////
+////        NSString *contactpath = [orderdir stringByAppendingPathComponent:@"contact.json"];
+////
+////
+////
+////        [RAUtils dicttofile:contactpath dict:appDelegate.customerInfo];
+////        [self scanPlaceOrder];
+//    }];
+//    UIAlertAction *alertthree = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+//        DebugLog(@"No");
+//    }];
+//    [alertControl addAction:actionOne];
+//    [alertControl addAction:alert2];
+//    [alertControl addAction:alertthree];
+//
+//    //UIAlertControllerStyle类型为UIAlertControllerStyleAlert可以添加addTextFieldWithConfigurationHandler:^(UITextField *textField)
+//
+//
+//    [self presentViewController:alertControl animated:YES completion:nil];
+//
+//    DebugLog(@"%@",self.edit_select_arr);
 
     
 }

+ 6 - 1
RedAnt ERP Mobile/common/AppDelegateBase.h

@@ -31,9 +31,14 @@ typedef enum {
     CustomerTypeStore     = 0,
     CustomerTypeCustomer  = 1
 } CustomerType;
-
+#ifdef USE_BLE_SCANNER
 @interface AppDelegateBase : UIResponder<UIApplicationDelegate , NSURLConnectionDataDelegate
 ,ScanApiHelperDelegate,CBCentralManagerDelegate, CBPeripheralDelegate>
+#else
+@interface AppDelegateBase : UIResponder<UIApplicationDelegate , NSURLConnectionDataDelegate
+,ScanApiHelperDelegate>
+
+#endif
 //{
 //        id<ScannerEventsFeedback> _eventsFeedback;
 //}

+ 11 - 4
RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -613,7 +613,7 @@ void UncaughtExceptionHandler(NSException *exception) {
     
 #ifdef SCANNER_ORDER
     return;
-#endif
+#else
     __block NSMutableArray *err_array = [NSMutableArray array];
     [iSalesDB jk_query:@"select errmsg,params,create_time from errlog;" completion:^(sqlite3_stmt *stmt, NSMutableDictionary *container, long *count) {
         
@@ -682,7 +682,7 @@ void UncaughtExceptionHandler(NSException *exception) {
         
     }
     
-    
+#endif
 }
 
 - (void)dealWithUrgencyFile {
@@ -805,7 +805,7 @@ void UncaughtExceptionHandler(NSException *exception) {
                         }
                         else
                         {
-                            MainViewController *mainVC = [self.window.rootViewController.childViewControllers lastObject];
+//                            MainViewController *mainVC = [self.window.rootViewController.childViewControllers lastObject];
                             
                             [RAUtils message_box:@"Open Order" message:[order_json valueForKey:@"err_msg"]  completion:nil];
                         }
@@ -1785,7 +1785,7 @@ void UncaughtExceptionHandler(NSException *exception) {
         SyncControlPanelViewController * syncVC =[ [UIStoryboard storyboardWithName:@"OLM" bundle:nil] instantiateViewControllerWithIdentifier:@"SyncControlPanelViewController"];
         syncVC.action_string=@"Download";
         UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:syncVC] ;
-        navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态,自己看看是哪种
+        navi.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态,自己看看是哪种
         [parent presentViewController:navi animated:YES completion:^{
             
             //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);
@@ -3807,6 +3807,8 @@ void UncaughtExceptionHandler(NSException *exception) {
     
 }
 //检查蓝牙状态
+
+
 - (void)centralManagerDidUpdateState:(nonnull CBCentralManager *)central {
     switch (central.state) {
         case CBManagerStatePoweredOn:
@@ -4150,4 +4152,9 @@ void UncaughtExceptionHandler(NSException *exception) {
 //        [_manager connectPeripheral:_peripheral options:nil];
 //}
 
+
+
+
+
+
 @end

+ 1 - 1
RedAnt ERP Mobile/common/CartUtils.m

@@ -240,7 +240,7 @@
 
         //    [self hackModalSheetSize:CGSizeMake(450, 200) ofVC:navi];
 
-        navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态,自己看看是哪种
+        navi.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态,自己看看是哪种
         [vc presentViewController:navi animated:YES completion:^{
 
             //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);

+ 5 - 1
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -765,7 +765,7 @@
                             
 #ifdef BUILD_CONTRAST
 
-                            weakself.orderdiscount = [cart_json[@"order_discount"] doubleValue];
+                            weakself.orderdiscount = [cart_json[@"orderDiscount"] doubleValue];
 #endif
       
                             
@@ -1324,6 +1324,10 @@
                     {
                         [self reload_data];
                     }
+                else if(iresult==RESULT_NET_ERROR)
+                {
+                    [RAUtils message_box:@"Set Order Discount" message:@"Can't connect to the server, please try again." completion:nil];
+                }
                     else
                     {
                         [RAUtils message_box:@"Set Order Discount" message:@"Can't set order discount, please contact administrator" completion:nil];

+ 1 - 1
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -17087,7 +17087,7 @@ if(stockUom==0)
         
         
         if(orderdiscount>0)
-            ret[@"order_discount"]=@(orderdiscount);
+            ret[@"orderDiscount"]=@(orderdiscount);
         ret[@"mode"]=@"Regular Mode";
         
         [iSalesDB close_db:db];

+ 1 - 1
RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -119,7 +119,7 @@
 //    2022-07-14。1.17
     //    2022-07-14。1.19
     
-NSDate * ddate =[dateFormatter dateFromString:@"2023-1-21"];
+NSDate * ddate =[dateFormatter dateFromString:@"2023-4-18"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];

+ 1 - 1
RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-CONTRAST.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>4</integer>
 		</dict>
 		<key>iSales-USAI.xcscheme_^#shared#^_</key>
 		<dict>

+ 86 - 86
RedAnt ERP Mobile/iSales-CONTRAST/config.h

@@ -53,143 +53,143 @@
 #define LOCAL_URL_CUSTOMER_INFO_EDITOR @"customer_info_template"
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"
 
-// http://192.168.0.133:8080/site
+// http://192.168.0.161:8080/site
 // http://12.196.120.217
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.133:80/pjHmlg/isales/cartDeliveryBackOrderReview.htm"
-#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.133:80/pjHmlg/isales/moveToBackOrder.htm"
+#define  URL_BACK_ORDER_PREVIEW  @"http://192.168.0.161:80/pjHmlg/isales/cartDeliveryBackOrderReview.htm"
+#define  URL_MOVE_TO_BACK_ORDER @"http://192.168.0.161:80/pjHmlg/isales/moveToBackOrder.htm"
 #define URL_PRIVACY @"https://uwa.united-us.net/site/isales_uwa/privacyPolicy.htm"
 
-#define  URL_UPDATE_AUTH  @"http://192.168.0.133:80/pjHmlg/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.133:80/pjHmlg/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.133:80/pjHmlg/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.161:80/pjHmlg/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.161:80/pjHmlg/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.161:80/pjHmlg/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.133:80/pjHmlg/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.133:80/pjHmlg/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.133:80/pjHmlg/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.133:80/pjHmlg/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.133:80/pjHmlg/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.133:80/pjHmlg/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.133:80/pjHmlg/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.161:80/pjHmlg/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.161:80/pjHmlg/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.161:80/pjHmlg/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.161:80/pjHmlg/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.161:80/pjHmlg/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.161:80/pjHmlg/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.161:80/pjHmlg/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.133:80/pjHmlg/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.133:80/pjHmlg/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.133:80/pjHmlg/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.133:80/pjHmlg/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.133:80/pjHmlg/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.133:80/pjHmlg/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.133:80/pjHmlg/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.133:80/pjHmlg/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.133:80/pjHmlg/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.133:80/pjHmlg/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.133:80/pjHmlg/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.133:80/pjHmlg/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.161:80/pjHmlg/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.161:80/pjHmlg/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.161:80/pjHmlg/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.161:80/pjHmlg/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.161:80/pjHmlg/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.161:80/pjHmlg/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.161:80/pjHmlg/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.161:80/pjHmlg/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.161:80/pjHmlg/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.161:80/pjHmlg/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.161:80/pjHmlg/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.161:80/pjHmlg/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.133:80/pjHmlg/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.133:80/pjHmlg/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.133:80/pjHmlg/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.161:80/pjHmlg/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.161:80/pjHmlg/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.161:80/pjHmlg/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.133:80/pjHmlg/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.133:80/pjHmlg/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.133:80/pjHmlg/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.133:80/pjHmlg/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.133:80/pjHmlg/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.133:80/pjHmlg/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.133:80/pjHmlg/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.133:80/pjHmlg/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.161:80/pjHmlg/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.161:80/pjHmlg/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.161:80/pjHmlg/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.161:80/pjHmlg/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.161:80/pjHmlg/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.161:80/pjHmlg/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.161:80/pjHmlg/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.161:80/pjHmlg/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.133:80/pjHmlg/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.133:80/pjHmlg/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.133:80/pjHmlg/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.0.161:80/pjHmlg/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.0.161:80/pjHmlg/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.0.161:80/pjHmlg/isales/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.133:80/pjHmlg/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.161:80/pjHmlg/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.133:80/pjHmlg/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.133:80/pjHmlg/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.133:80/pjHmlg/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.161:80/pjHmlg/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.161:80/pjHmlg/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.161:80/pjHmlg/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.133:80/pjHmlg/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.133:80/pjHmlg/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.133:80/pjHmlg/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.133:80/pjHmlg/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.133:80/pjHmlg/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.133:80/pjHmlg/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.133:80/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.133:80/pjHmlg/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.133:80/pjHmlg/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.133:80/pjHmlg/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.133:80/pjHmlg/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.133:80/pjHmlg/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.161:80/pjHmlg/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.161:80/pjHmlg/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.161:80/pjHmlg/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.161:80/pjHmlg/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.161:80/pjHmlg/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.161:80/pjHmlg/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.161:80/pjHmlg/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.161:80/pjHmlg/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.161:80/pjHmlg/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.161:80/pjHmlg/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.161:80/pjHmlg/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.161:80/pjHmlg/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.133:80/pjHmlg/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.133:80/pjHmlg/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.161:80/pjHmlg/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.161:80/pjHmlg/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.133:80/pjHmlg/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.133:80/pjHmlg/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.161:80/pjHmlg/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.161:80/pjHmlg/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.133:80/pjHmlg/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.133:80/pjHmlg/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.161:80/pjHmlg/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.161:80/pjHmlg/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.133:80/pjHmlg/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.133:80/pjHmlg/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.133:80/pjHmlg/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.133:80/pjHmlg/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.133:80/pjHmlg/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.133:80/pjHmlg/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.133:80/pjHmlg/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.161:80/pjHmlg/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.161:80/pjHmlg/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.161:80/pjHmlg/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.161:80/pjHmlg/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.161:80/pjHmlg/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.161:80/pjHmlg/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.161:80/pjHmlg/isales/updateCustomerBusiCard.htm"
 
 #define URL_CHANGE_PASSWORD @""
 #define URL_SIGN_UP @""
 
-//#define  URL_ORDER_DISCOUNT  @"http://192.168.0.133:80/pjHmlg/isales/setOrderItemDiscount.htm"
-#define  URL_ORDER_DISCOUNT  @"http://192.168.0.133:80/pjHmlg/isales/setOrderDiscount.htm"
+//#define  URL_ORDER_DISCOUNT  @"http://192.168.0.161:80/pjHmlg/isales/setOrderItemDiscount.htm"
+#define  URL_ORDER_DISCOUNT  @"http://192.168.0.161:80/pjHmlg/isales/setOrderDiscount.htm"
 
-#define  URL_ERR_LOG  @"http://192.168.0.133:80/pjHmlg/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.161:80/pjHmlg/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.133:80/pjHmlg/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.161:80/pjHmlg/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.133:80/pjHmlg/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.161:80/pjHmlg/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.133:80/pjHmlg/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.133:80/pjHmlg/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.161:80/pjHmlg/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.161:80/pjHmlg/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.133:80/pjHmlg/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.133:80/pjHmlg/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.161:80/pjHmlg/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.161:80/pjHmlg/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.133:80/pjHmlg/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.161:80/pjHmlg/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.133:80/pjHmlg/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.161:80/pjHmlg/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.133:80/pjHmlg/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.161:80/pjHmlg/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.133:80/pjHmlg/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.161:80/pjHmlg/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.133:80/pjHmlg/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.161:80/pjHmlg/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.133:80/pjHmlg/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.161:80/pjHmlg/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.133:80/pjHmlg/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.161:80/pjHmlg/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.133:80/pjHmlg/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.161:80/pjHmlg/isales/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"http://192.168.0.133:80/pjHmlg/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"http://192.168.0.161:80/pjHmlg/isales/sendWishListEmail.htm"
 
 #define URL_BLOG @"http://12.196.120.217/blog"
 #define  URL_DELETE_ACCOUNT @""