|
|
@@ -6528,18 +6528,31 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
|
|
|
countryCode = [dic valueForKey:@"country_code"];
|
|
|
if (!countryCode) {
|
|
|
- countryCode = @"US";
|
|
|
+// countryCode = @"US";
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ countryCode = [self countryCodeByid:code_id];
|
|
|
}
|
|
|
|
|
|
stateCode = [dic valueForKey:@"state_code"];
|
|
|
-
|
|
|
+ if (!stateCode.length) {
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ }
|
|
|
|
|
|
city = [dic valueForKey:@"city"];
|
|
|
+ if (!city.length) {
|
|
|
+ city = params[@"city"];
|
|
|
+ }
|
|
|
|
|
|
// zip code
|
|
|
NSMutableDictionary *zipDic = [[section_0 valueForKey:@"item_11"] mutableCopy];
|
|
|
[zipDic setValue:zipCode forKey:@"value"];
|
|
|
[section_0 setValue:zipDic forKey:@"item_11"];
|
|
|
+ } else {
|
|
|
+
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ countryCode = [self countryCodeByid:code_id];
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ city = params[@"city"];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -6936,15 +6949,31 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
NSDictionary *dic = [self offline_dealZipCode:zip_code];
|
|
|
|
|
|
countryCode = [dic valueForKey:@"country_code"];
|
|
|
+ if (!countryCode) {
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ countryCode = [self countryCodeByid:code_id];
|
|
|
+ }
|
|
|
|
|
|
stateCode = [dic valueForKey:@"state_code"];
|
|
|
+ if (!stateCode.length) {
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ }
|
|
|
|
|
|
city = [dic valueForKey:@"city"];
|
|
|
+ if (!city.length) {
|
|
|
+ city = params[@"city"];
|
|
|
+ }
|
|
|
|
|
|
// zip code
|
|
|
NSMutableDictionary *zipDic = [[section_0 valueForKey:@"item_8"] mutableCopy];
|
|
|
[zipDic setValue:zipcode forKey:@"value"];
|
|
|
[section_0 setValue:zipDic forKey:@"item_8"];
|
|
|
+ } else {
|
|
|
+
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ countryCode = [self countryCodeByid:code_id];
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ city = params[@"city"];
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -10617,18 +10646,31 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
|
|
|
country_code = [dic valueForKey:@"country_code"];
|
|
|
if (!country_code) {
|
|
|
- country_code = @"US";
|
|
|
+// country_code = @"US";
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ country_code = [self countryCodeByid:code_id];
|
|
|
}
|
|
|
|
|
|
stateCode = [dic valueForKey:@"state_code"];
|
|
|
-
|
|
|
+ if(!stateCode.length) {
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ }
|
|
|
|
|
|
city = [dic valueForKey:@"city"];
|
|
|
+ if (!city.length) {
|
|
|
+ city = params[@"city"];
|
|
|
+ }
|
|
|
|
|
|
// zip code
|
|
|
// NSMutableDictionary *zipDic = [[section_0 valueForKey:@"item_11"] mutableCopy];
|
|
|
// [zipDic setValue:zipCode forKey:@"value"];
|
|
|
// [section_0 setValue:zipDic forKey:@"item_11"];
|
|
|
+ } else {
|
|
|
+
|
|
|
+ NSString *code_id = params[@"country"];
|
|
|
+ country_code = [self countryCodeByid:code_id];
|
|
|
+ stateCode = params[@"state"];
|
|
|
+ city = params[@"city"];
|
|
|
}
|
|
|
}
|
|
|
|