161104

Fix:
force crash on customer info assign when login id is shop customer.
release order / reset contact will truncate shop login customer info

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1002,11 +1002,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "499750289.63805"
+            timestampString = "499920587.883901"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1760"
-            endingLineNumber = "1760"
+            startingLineNumber = "1770"
+            endingLineNumber = "1770"
             landmarkName = "-download_offline:checkdiskspace:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1034,11 +1034,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "499757986.854295"
+            timestampString = "499920587.883901"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1277"
-            endingLineNumber = "1277"
+            startingLineNumber = "1287"
+            endingLineNumber = "1287"
             landmarkName = "-download_offline:useInternalAddress:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1155,5 +1155,149 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499920216.427263"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "148"
+            endingLineNumber = "148"
+            landmarkName = "-onResetClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499920216.427263"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "168"
+            endingLineNumber = "168"
+            landmarkName = "-onResetClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499918666.201106"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "58"
+            endingLineNumber = "58"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499920216.427263"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "72"
+            endingLineNumber = "72"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499919984.795929"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "66"
+            endingLineNumber = "66"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499920216.427263"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "74"
+            endingLineNumber = "74"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/contact/CustomerInfoViewController.m"
+            timestampString = "499920216.427263"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "73"
+            endingLineNumber = "73"
+            landmarkName = "-onAssignClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/MainViewController.m"
+            timestampString = "499920587.883901"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "379"
+            endingLineNumber = "379"
+            landmarkName = "-onContactClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iSales-NPD/AppDelegate.m"
+            timestampString = "499920587.883901"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "59"
+            endingLineNumber = "59"
+            landmarkName = "-setCustomerInfo:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/contact/CustomerInfoViewController.m

@@ -61,11 +61,16 @@
         {
             NSDictionary * itemjson=[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j]];
             
-            NSString* name = [itemjson valueForKey:@"name"];
+            //NSObject* obj=[itemjson valueForKey:@"name"];
             
-            NSString* value = [itemjson valueForKey:@"value"];
+            NSString* name = itemjson[@"name"];//[[ valueForKey:@"name"] stringValue];
+//            NSLog(@"%@",name.class);
+//            NSLog(@"%@",self.data_init.class);
+//            NSLog(@"%@",NSDictionary.class);
+            NSString* value = itemjson[@"value"];//[[itemjson valueForKey:@""] stringValue];
             
-            [self.data_init setValue:value forKey:name];
+            //[self.data_init setValue:value forKey:name];
+            self.data_init[name]=value;
             
             
             
@@ -206,9 +211,11 @@
         
         UIAlertAction *actionOne = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
           
+            if(appDelegate.user_type!=USER_ROLE_CUSTOMER)
+            {
             appDelegate.contact_id=nil;
             appDelegate.customerInfo = nil;
-
+            }
             
             [self.navigationController popViewControllerAnimated:(false)];
 

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3568,7 +3568,7 @@ repeat:
         
         if(appDelegate.user_type==USER_ROLE_CUSTOMER)
         {
-            appDelegate.customerInfo = [objheader objectForKeyedSubscript:@"customerInfo"];
+            appDelegate.customerInfo = [[objheader objectForKeyedSubscript:@"customerInfo"] mutableCopy];
             appDelegate.contact_id = [objheader valueForKey:@"contact_id"];
 //            appDelegate.order_code =[objheader valueForKey:@"orderCode"];
 //            appDelegate.order_status =[[objheader valueForKey:@"orderStatus"] intValue];

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -54,7 +54,11 @@
 
 -(void) setCustomerInfo:(NSMutableDictionary*)customerInfo
 {
+
     _customerInfo=customerInfo;
+    
+//    NSLog(@"%@",_customerInfo.class);
+//    NSLog(@"%@",customerInfo.class);
     int count=customerInfo[@"count"];
     //assert(count==0);
     
@@ -238,8 +242,14 @@
 {
     self.order_code = nil;
     self.order_customer_id = nil;
-    self.customerInfo = nil;
-    self.contact_id = nil;
+    
+    
+    if(self.user_type!=USER_ROLE_CUSTOMER)
+    {
+        self.customerInfo = nil;
+        self.contact_id = nil;
+    }
+
     //   [self SetMode:nil];
     //   [self SetSo:nil];
     

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -11,11 +11,11 @@
 #define BUILD_NPD
 
 #define test_server
-#define exception_switch 0
+#define exception_switch 1
 
 
 
-#define PDF_DEBUG true
+#define PDF_DEBUG false
 
 //#define ENCRYPT_OFF