|
@@ -199,13 +199,20 @@
|
|
|
// http://192.168.0.126:8080/site/isales/setSeeGivenPrice.htm
|
|
// http://192.168.0.126:8080/site/isales/setSeeGivenPrice.htm
|
|
|
|
|
|
|
|
NSString *discount = @"";
|
|
NSString *discount = @"";
|
|
|
|
|
+ BOOL rightDiscount = YES;
|
|
|
switch (self.changePrice) {
|
|
switch (self.changePrice) {
|
|
|
case Float:{
|
|
case Float:{
|
|
|
discount = self.floatTextField.text;
|
|
discount = self.floatTextField.text;
|
|
|
|
|
+ if (!discount || !discount.length) {
|
|
|
|
|
+ rightDiscount = NO;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case Percent:{
|
|
case Percent:{
|
|
|
discount = [self.percentageTextField.text stringByAppendingString:@"%"];
|
|
discount = [self.percentageTextField.text stringByAppendingString:@"%"];
|
|
|
|
|
+ if (!discount || discount.length <= 1) {
|
|
|
|
|
+ rightDiscount = NO;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
|
|
|
|
@@ -214,24 +221,32 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Set Price"];
|
|
|
|
|
-
|
|
|
|
|
- NSDictionary *dic = [iSalesNetwork set_npd_shop_givenPrice:@{@"base_price" : [NSString stringWithFormat:@"%d",self.priceType],@"discount" : discount,@"category_id" : @(self.categoryID)}.mutableCopy];
|
|
|
|
|
-
|
|
|
|
|
- [waitalert dismissWithClickedButtonIndex:0 animated:YES];
|
|
|
|
|
-
|
|
|
|
|
- if ([[dic objectForKey:@"result"] integerValue] == 2) {
|
|
|
|
|
|
|
+ if (rightDiscount) {
|
|
|
|
|
|
|
|
- [self.categoryPrice setObject:[NSString stringWithFormat:@"%d",self.priceType] forKey:@"base_price"];
|
|
|
|
|
- [self.categoryPrice setObject:discount forKey:@"price_discount"];
|
|
|
|
|
|
|
+ UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait" title:@"Set Price"];
|
|
|
|
|
+
|
|
|
|
|
+ NSDictionary *dic = [iSalesNetwork set_npd_shop_givenPrice:@{@"base_price" : [NSString stringWithFormat:@"%d",self.priceType],@"discount" : discount,@"category_id" : @(self.categoryID)}.mutableCopy];
|
|
|
|
|
+
|
|
|
|
|
+ [waitalert dismissWithClickedButtonIndex:0 animated:YES];
|
|
|
|
|
+
|
|
|
|
|
+ if ([[dic objectForKey:@"result"] integerValue] == 2) {
|
|
|
|
|
+
|
|
|
|
|
+ [self.categoryPrice setObject:[NSString stringWithFormat:@"%d",self.priceType] forKey:@"base_price"];
|
|
|
|
|
+ [self.categoryPrice setObject:discount forKey:@"price_discount"];
|
|
|
|
|
+
|
|
|
|
|
+ // 将数据返回
|
|
|
|
|
+ if (self.returnBlock)
|
|
|
|
|
+ self.returnBlock(self.categoryPrice);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ [self.navigationController popViewControllerAnimated:YES];
|
|
|
|
|
+
|
|
|
|
|
+ } else {
|
|
|
|
|
+
|
|
|
|
|
+ [RAUtils message_alert:@"Please write a correct value" title:@"Warning" controller:self];
|
|
|
|
|
|
|
|
- // 将数据返回
|
|
|
|
|
- if (self.returnBlock)
|
|
|
|
|
- self.returnBlock(self.categoryPrice);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- [self.navigationController popViewControllerAnimated:YES];
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
#pragma mark - text field delegate
|
|
#pragma mark - text field delegate
|