Prechádzať zdrojové kódy

HMLG scan order 1.35 release

fix message box completion execute issue
fix new install can not display stock issue
Ray Zhang 3 rokov pred
rodič
commit
42a783c0e1

+ 2 - 2
RA Image/RA Image.xcodeproj/project.pbxproj

@@ -1035,7 +1035,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52795;
+				CURRENT_PROJECT_VERSION = 53235;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA Image/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -1052,7 +1052,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52795;
+				CURRENT_PROJECT_VERSION = 53235;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				INFOPLIST_FILE = "RA Image/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;

+ 2 - 2
RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2546,7 +2546,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52890;
+				CURRENT_PROJECT_VERSION = 53288;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2595,7 +2595,7 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = NO;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52890;
+				CURRENT_PROJECT_VERSION = 53288;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 2 - 1
RedAnt ERP Mobile/HMLG Scan Order/config.h

@@ -75,6 +75,7 @@
 
 #else
 #define BASE_URL @"https://erp.homelegance.com/"
+#endif
 //
 //
 ////------------------- NPD server-----------------------
@@ -207,7 +208,7 @@
 //
 //#define  URL_BACK_ORDER_PREVIEW  @"https://central.united-us.com/usai_demo/shopping/isales/cartDeliveryBackOrderReview.htm"
 
-#endif
+
 
 //#define URL_AUTOCOMPLETE BASE_URL@"offlineorder_isales.php"
 

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

@@ -2139,6 +2139,19 @@
 //    NSString* user = RASingleton.sharedInstance.user;
     NSString* serverpath = [documents stringByAppendingPathComponent:servername];
 //    userpath = [userpath stringByAppendingPathComponent:user];
+    
+    
+    NSFileManager* fileManager = [NSFileManager defaultManager];
+    BOOL bdir=YES;
+    if(!  [fileManager fileExistsAtPath:serverpath isDirectory:&bdir])
+    {
+        
+        NSError *error = nil;
+        bool bsuccess=[fileManager createDirectoryAtPath:serverpath withIntermediateDirectories:YES attributes:nil error:&error];
+
+    }
+    
+    
     return serverpath;
 }
 +(NSString*) getUserPath
@@ -2154,6 +2167,18 @@
     NSString* user = RASingleton.sharedInstance.user;
     NSString* userpath = [documents stringByAppendingPathComponent:servername];
     userpath = [userpath stringByAppendingPathComponent:user];
+    
+    
+    
+    NSFileManager* fileManager = [NSFileManager defaultManager];
+    BOOL bdir=YES;
+    if(!  [fileManager fileExistsAtPath:userpath isDirectory:&bdir])
+    {
+        
+        NSError *error = nil;
+        bool bsuccess=[fileManager createDirectoryAtPath:userpath withIntermediateDirectories:YES attributes:nil error:&error];
+
+    }
     return userpath;
 }
 

+ 3 - 0
RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -5348,7 +5348,10 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
 #ifdef SCANNER_ORDER
     params[@"site_name"]=[RADataProvider getSiteName];
     params[@"_method"]=@"login";
+    
     url = [appDelegate.address stringByAppendingPathComponent:URL_UPDATE_AUTH];
+    
+    
     if([user.uppercaseString isEqualToString:@"GUEST"]&&[password.uppercaseString isEqualToString:@"GUEST"])
         scan_guest = true;
 #else

+ 2 - 2
common/RAUtils.m

@@ -597,7 +597,7 @@
 {
     
     
-    return [PopWaitAlert Show:title message:@"Please wait..." completion:nil];
+    return [PopWaitAlert Show:title message:@"Please wait..." completion:completion];
     
 //    return [self waiting_alert:parent message:@"Please wait..." title:title completion:completion];
 //    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title message:@"Please wait..." preferredStyle:UIAlertControllerStyleAlert];
@@ -611,7 +611,7 @@
 {
     
     
-    return [MessageBox Show:title message:message completion:nil];
+    return [MessageBox Show:title message:message completion:completion];
     
 //    return [self waiting_alert:parent message:@"Please wait..." title:title completion:completion];
 //    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title message:@"Please wait..." preferredStyle:UIAlertControllerStyleAlert];