Pen Li 9 жил өмнө
parent
commit
072abe8ccd

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 3
RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3663,9 +3663,7 @@ repeat:
 //}
 
 + (NSDictionary *)set_npd_shop_price_type:(NSInteger)priceType {
-    
-//    NSString *url = @"http://192.168.0.126:8080/site/isales/setSeePriceType.htm";
-    
+        
     NSData *data = [iSalesNetwork get_json:URL_SET_PRICE_TYPE parameters:@{@"price_type" : [NSString stringWithFormat:@"%d",priceType]}.mutableCopy];
     
     NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/PriceSettingViewController.m

@@ -111,7 +111,7 @@
 - (IBAction)calculatePriceButtonClick:(UIButton *)sender {
     
     
-    NSString *url = @"http://192.168.0.126:8080/site/isales/getSeeGivenPrice.htm";
+    NSString *url = URL_GET_CIVEN_PRICE;
     NSData *data = [iSalesNetwork get_json:url parameters:@{}.mutableCopy];
     
     NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil];

+ 1 - 1
RedAnt ERP Mobile/iSales-NPD/SetCategoryPriceController.m

@@ -211,7 +211,7 @@
             break;
     }
     
-    NSString *url = @"http://192.168.0.126:8080/site/isales/setSeeGivenPrice.htm";
+    NSString *url = URL_SET_GIVEN_PRICE;
     
     NSData *data = [iSalesNetwork get_json:url parameters:@{@"base_price" : [NSString stringWithFormat:@"%d",self.priceType],@"discount" : discount,@"category_id" : @(self.categoryID)}.mutableCopy];
     

+ 8 - 0
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -141,6 +141,10 @@
 
 #define URL_SET_PRICE_TYPE @"http://192.168.0.112:8080/site/isales/setSeePriceType.htm"
 
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.112:8080/site/isales/getSeeGivenPrice.htm"
+
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.112:8080/site/isales/setSeeGivenPrice.htm"
+
 #else
 
 
@@ -252,6 +256,10 @@
 
 #define URL_SET_PRICE_TYPE @"https://www.newpacificdirect.com/isales/setSeePriceType.htm"
 
+#define URL_GET_CIVEN_PRICE @"https://www.newpacificdirect.com/isales/getSeeGivenPrice.htm"
+
+#define URL_SET_GIVEN_PRICE @"https://www.newpacificdirect.com/isales/setSeeGivenPrice.htm"
+
 #endif
 
 #endif