Просмотр исходного кода

修改Customer登录Customer Info设置。

Pen Li 9 лет назад
Родитель
Сommit
c1a0452f46

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


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

@@ -86,69 +86,5 @@
             stopOnStyle = "0">
             stopOnStyle = "0">
          </BreakpointContent>
          </BreakpointContent>
       </BreakpointProxy>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507022908.856778"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3417"
-            endingLineNumber = "3417"
-            landmarkName = "+search:limited:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507089093.724149"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10549"
-            endingLineNumber = "10549"
-            landmarkName = "+offline_placeorder:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507089093.724149"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10620"
-            endingLineNumber = "10620"
-            landmarkName = "+offline_placeorder:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507089093.724149"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10517"
-            endingLineNumber = "10517"
-            landmarkName = "+paymentInfoDic:db:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
    </Breakpoints>
 </Bucket>
 </Bucket>

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

@@ -7869,7 +7869,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             [arr_addr addObject:customer_zipcode];
             [arr_addr addObject:customer_zipcode];
             [arr_addr addObject:customer_country];
             [arr_addr addObject:customer_country];
             
             
-            NSString * customer_address = [RAUtils arr2string:arr_addr separator:@"<br>" trim:true];
+            NSString * customer_address = [RAUtils arr2string:arr_addr separator:@" " trim:true];
             
             
             
             
             char *logist = (char*)sqlite3_column_text(statement, 11);
             char *logist = (char*)sqlite3_column_text(statement, 11);

+ 3 - 1
RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -55,7 +55,9 @@
 
 
 -(void) setCustomerInfo:(NSMutableDictionary*)customerInfo
 -(void) setCustomerInfo:(NSMutableDictionary*)customerInfo
 {
 {
-
+    if (self.user_type == USER_ROLE_CUSTOMER && _customerInfo) {
+        return;
+    }
     _customerInfo=customerInfo;
     _customerInfo=customerInfo;
     
     
 //    DebugLog(@"%@",_customerInfo.class);
 //    DebugLog(@"%@",_customerInfo.class);