Browse Source

修改离线New Ship To、Create Contact、Edit Contact,使Zipcode查不到时不刷新Country、State和City。

Pen Li 9 năm trước cách đây
mục cha
commit
e29ac9c5ee

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


+ 12 - 0
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,16 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

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

@@ -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"];
             }
         }
         

+ 4 - 2
RedAnt ERP Mobile/iSales-NPD/createContact.json

@@ -165,8 +165,10 @@
   "section_count" : 1,
   "title" : "New Contact",
   "up_params" : {
-    "count" : 2,
+    "count" : 4,
     "val_0" : "zipcode",
-    "val_1" : "country"
+    "val_1" : "country",
+    "val_2" : "state",
+    "val_3" : "city"
   }
 }

+ 5 - 3
RedAnt ERP Mobile/iSales-NPD/editContact.json

@@ -171,8 +171,10 @@
   "section_count" : 1,
   "title" : "Edit Customer",
   "up_params" : {
-    "count" : 2,
-    "val_0" : "zipcode",
-    "val_1" : "country"
+      "count" : 4,
+      "val_0" : "zipcode",
+      "val_1" : "country",
+      "val_2" : "state",
+      "val_3" : "city"
   }
 }