hmlg scan order 1.23, testflight

Change submit message handler

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/project.pbxproj

@@ -2717,7 +2717,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51457;
+				CURRENT_PROJECT_VERSION = 51487;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2734,7 +2734,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.20;
+				MARKETING_VERSION = 1.21;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2761,7 +2761,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51457;
+				CURRENT_PROJECT_VERSION = 51487;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2778,7 +2778,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.20;
+				MARKETING_VERSION = 1.21;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

RedAnt ERP Mobile/HMLG Scan Order.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>HMLG Scan Order.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/ScanListCell.m

@@ -203,7 +203,7 @@
     
  
     if([price0 isEqualToString:@"N/A"])
-        _labelPriceCTNR.text= price0;
+        _labelPriceCTNR.text= @"";//price0;
     else
         _labelPriceCTNR.text=[RAConvertor currencyNumber:[price0 floatValue]];
     
@@ -218,13 +218,13 @@
     if([_modelJson [@"special_price"] boolValue])
     {
         if([_modelJson[@"price2"] isEqualToString:@"N/A"])
-            _labelPriceSpecial.text=_modelJson[@"price2"];
+            _labelPriceSpecial.text=@"";//_modelJson[@"price2"];
         else
             _labelPriceSpecial.text=[RAConvertor currencyNumber:[_modelJson[@"price2"] floatValue]];
     }
     else
     {
-        _labelPriceSpecial.text=@"N/A";
+        _labelPriceSpecial.text=@"";//@"N/A";
     }
     
     
@@ -243,7 +243,7 @@
         
         if([_modelJson[@"price3"] isEqualToString:@"N/A"])
         {
-            _labelPriceNet.text=_modelJson[@"price3"];
+            _labelPriceNet.text=@"";//_modelJson[@"price3"];
 //            _labelPriceNCA.text=@"N/A";
         }
         else
@@ -255,13 +255,13 @@
     }
     else
     {
-        _labelPriceNet.text=@"N/A";
+        _labelPriceNet.text=@"";//@"N/A";
     }
     
     {
         if([_modelJson[@"price1"] isEqualToString:@"N/A"])
         {
-            _labelPriceNet.text=_modelJson[@"price1"];
+            _labelPriceNet.text=@"";//_modelJson[@"price1"];
 //            _labelPriceNCA.text=@"N/A";
         }
         else

RedAnt ERP Mobile/HMLG Scan Order/ScanModelListCell.m

@@ -100,7 +100,7 @@
     
     
     if([_modelJson[@"price0"] isEqualToString:@"N/A"])
-        _labelPriceCTNR.text=_modelJson[@"price0"];
+        _labelPriceCTNR.text=@"";//_modelJson[@"price0"];
     else
         _labelPriceCTNR.text=[RAConvertor currencyNumber:[_modelJson[@"price0"] floatValue]];
     
@@ -112,13 +112,13 @@
     if([_modelJson [@"special_price"] boolValue])
     {
         if([_modelJson[@"price2"] isEqualToString:@"N/A"])
-            _labelPriceSpecial.text=_modelJson[@"price2"];
+            _labelPriceSpecial.text=@"";//_modelJson[@"price2"];
         else
             _labelPriceSpecial.text=[RAConvertor currencyNumber:[_modelJson[@"price2"] floatValue]];
     }
     else
     {
-        _labelPriceSpecial.text=@"N/A";
+        _labelPriceSpecial.text=@"";//@"N/A";
     }
     
     
@@ -137,7 +137,7 @@
         
         if([_modelJson[@"price3"] isEqualToString:@"N/A"])
         {
-            _labelPriceNet.text=_modelJson[@"price3"];
+            _labelPriceNet.text=@"";//_modelJson[@"price3"];
 //            _labelPriceNCA.text=@"N/A";
         }
         else
@@ -149,7 +149,7 @@
     }
     else
     {
-        _labelPriceNet.text=@"N/A";
+        _labelPriceNet.text=@"";//@"N/A";
     }
         
 
@@ -168,7 +168,7 @@
     {
         if([_modelJson[@"price1"] isEqualToString:@"N/A"])
         {
-            _labelPriceNet.text=_modelJson[@"price1"];
+            _labelPriceNet.text=@"";//_modelJson[@"price1"];
 //            _labelPriceNCA.text=@"N/A";
         }
         else
@@ -183,7 +183,15 @@
 //        _labelPriceNCA.text=cell_price;//_modelJson[@"unit_price"];
 //    else
 //        _labelPriceNCA.text=[RAConvertor currencyNumber:[cell_price floatValue]];
-    _labelPrice25p.text=_modelJson[@"price2"];
+//    if([_modelJson[@"price1"] isEqualToString:@"N/A"])
+//    {
+//        _labelPrice25p.text=@"";//_modelJson[@"price2"];
+//    }
+//    else
+//    {
+//        _labelPrice25p.text=_modelJson[@"price2"];
+//    }
+//    
     _labelAvailable.text=_modelJson[@"available"];
         _editQTY.text=[_modelJson[@"count"] stringValue];
     

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -11331,7 +11331,7 @@
                                     @"aname" : @"Security Code",
                                     @"control" : @"edit",
                                     @"keyboard" : @"int",
-                                    @"length" : @"3",
+                                    @"length" : @"4",
                                     @"name" : @"credit_card_security_code",
                                     @"required" : @"true",
                                     @"value" : securityCode

RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m

@@ -3685,7 +3685,7 @@
                 
                 
             }
-            else if([result[@"result"] intValue]==-4||[result[@"result"] intValue]==4-3)
+            else if([result[@"result"] intValue]==-4||[result[@"result"] intValue]==-3)
             {
                 self.fail_submit = true;
                 self.realuser = nil;
@@ -3702,6 +3702,14 @@
 //              }
                 return;
                 
+            }
+            else if(iresult==9)
+            {
+                self.fail_submit = true;
+                self.realuser = nil;
+                self.realpassword = nil;
+                [RAUtils message_alert:result[@"err_msg"] title:@"Submit Order" controller:self];
+
             }
             else
             {

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -143,7 +143,7 @@
 //    2022-07-14。1.17
     //    2022-07-14。1.19
     
-NSDate * ddate =[dateFormatter dateFromString:@"2022-07-18"];
+NSDate * ddate =[dateFormatter dateFromString:@"2022-07-1"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/project.pbxproj

@@ -2587,7 +2587,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 211231;
+				CURRENT_PROJECT_VERSION = 220718;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2631,7 +2631,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 211231;
+				CURRENT_PROJECT_VERSION = 220718;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/iSales-CONTRAST.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iSales-CONTRAST.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>iSales-USAI.xcscheme_^#shared#^_</key>
 		<dict>

RedAnt ERP Mobile/iSales-CONTRAST/config.h

@@ -17,7 +17,7 @@
 #define RA_NOTIFICATION
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

RedAnt ERP Mobile/iSales-NPD/Base.lproj/OLM.storyboard

@@ -301,7 +301,7 @@
                                                     <rect key="frame" x="10" y="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" image="button:hrK-DY-RbO:image"/>
-                                                    <state key="selected" image="2F089CCB-7010-4AA9-9A8E-125DB4F12EBD"/>
+                                                    <state key="selected" image="1EF24CC2-21BA-4F23-9223-180D96119692"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -1091,7 +1091,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="2F089CCB-7010-4AA9-9A8E-125DB4F12EBD" width="24" height="24">
+        <image name="1EF24CC2-21BA-4F23-9223-180D96119692" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T

common/NetworkUtils.m

@@ -1123,7 +1123,7 @@ repeat:
 +(void)request_upload_fast :(NSData *)filedata   FileName:(NSString*) filename server:(NSString*) urlString parameters:(NSMutableDictionary *) params completionHandler:(resultHandler)result
 {
     //    NSString *fileName = [filePath lastPathComponent];
-    
+    DebugLog(urlString);
     NSMutableData *dataM = [NSMutableData data];
     
     NSMutableString *stringM = [NSMutableString string];
@@ -1230,7 +1230,7 @@ repeat:
         NSHTTPURLResponse* urlResponse =(NSHTTPURLResponse*)response;
         if (responseData==nil) {
             
-            //            DebugLog(@"response error:%@", [error localizedDescription]);
+            DebugLog(@"request_upload_fast error:%@", [error localizedDescription]);
             
             
             NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
@@ -1291,12 +1291,32 @@ repeat:
         }
         else
         {
-     
+            NSString *str = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
+            DebugLog(@"request_upload_fast result:%@", str);
             NSMutableDictionary* dict =[[RAConvertor data2dict:responseData] mutableCopy];
             if([dict[@"result"] intValue]==RESULT_USERAUTH_ERROR)
             {
                 dict[@"err_msg"]=@"Authorization failed.";
             }
+            
+            // 兼容不同后台的错误消息反馈
+            if([dict[@"result"] intValue]!=RESULT_TRUE&&dict[@"msg"]!=nil && dict[@"err_msg"]==nil)
+            {
+            
+                dict[@"err_msg"]=dict[@"msg"];
+            }
+            
+            if([dict[@"result"] intValue]!=RESULT_TRUE&&dict[@"message"]!=nil && dict[@"err_msg"]==nil)
+            {
+                dict[@"err_msg"]=dict[@"message"];
+            }
+            if(dict==nil)
+            {
+                dict= [NSMutableDictionary new];
+                dict[@"result"]=@9;
+                dict[@"err_msg"]=@"Sorry, can not access server, please contact support.";
+            }
+            
             //                            if([dict[@"result"] intValue]==RESULT_ERROR)
             //                            {
             ////                                RESULT_ERROR