HMLG scan order 1.29 with xcode 13

Fix order list display
Fix temp cart store

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

@@ -2519,7 +2519,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52034;
+				CURRENT_PROJECT_VERSION = 52038;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2536,7 +2536,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.28;
+				MARKETING_VERSION = 1.29;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2567,7 +2567,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 52034;
+				CURRENT_PROJECT_VERSION = 52038;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2584,7 +2584,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.28;
+				MARKETING_VERSION = 1.29;
 				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>2</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/MainViewController.m

@@ -1419,6 +1419,7 @@
 //            }
     float p =0;
     float s =0;
+    NSDictionary* price_group = [RADataProvider get_price_group:appDelegate.price_group];
     int order_qty=0;
     for(int j=0;j<[RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] intValue];j++)
     {
@@ -1431,11 +1432,11 @@
         {
             if([cartitem[@"special_price"] boolValue])
             {
-                msurcharge=([cartitem[@"price3"] doubleValue]-[cartitem[@"price2"] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
+                msurcharge=([cartitem[price_group[@"price_3"][@"name"]] doubleValue]-[cartitem[price_group[@"price_2"][@"name"]] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
             }
             else
             {
-                msurcharge=([cartitem[@"price3"] doubleValue]-[cartitem[@"price1"] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
+                msurcharge=([cartitem[price_group[@"price_3"][@"name"]] doubleValue]-[cartitem[price_group[@"price_1"][@"name"]] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
             }
         }
 

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -116,7 +116,7 @@
     [super viewDidLoad];
     
     NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
-    if([RADataProvider scanRtime:@""]&& addressDic!=nil)
+    if([RADataProvider scanRtime]&& addressDic!=nil)
     {
         _btnSetServer.hidden=true;
     }

RedAnt ERP Mobile/HMLG Scan Order/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/common/AppDelegateBase.m

@@ -2915,7 +2915,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 //    int sec =secondsInterval;
     
     
-    bool rtime = [RADataProvider scanRtime:@"2022-10-14"];
+    bool rtime = [RADataProvider scanRtime];
     NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
     if(rtime && !addressDic)
     {

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

@@ -2532,6 +2532,9 @@
     
 //    NSMutableDictionary* newlist  = [NSMutableDictionary new];
     
+//    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    
+    NSDictionary* price_group = [RADataProvider get_price_group:appDelegate.price_group];
     float p =0;
     float s =0;
     for(int j=0;j<[RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] intValue];j++)
@@ -2544,11 +2547,11 @@
         {
             if([cartitem[@"special_price"] boolValue])
             {
-                msurcharge=([cartitem[@"price3"] doubleValue]-[cartitem[@"price2"] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
+                msurcharge=([cartitem[price_group[@"price_3"][@"name"]] doubleValue]-[cartitem[price_group[@"price_2"][@"name"]] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
             }
             else
             {
-                msurcharge=([cartitem[@"price3"] doubleValue]-[cartitem[@"price1"] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
+                msurcharge=([cartitem[price_group[@"price_3"][@"name"]] doubleValue]-[cartitem[price_group[@"price_1"][@"name"]] doubleValue])*mcount*(1-[cartitem[@"discount"]doubleValue]/100.0);
             }
         }
 

RedAnt ERP Mobile/common/data_provider/RADataProvider.h

@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(NSArray*)request_scan_model_by_names:(NSString*)names;
 +(void) updateTemplate:(UIViewController*) vc;
 //+(void)encrypt_scan_models;
-+(bool) scanRtime:(NSString* )rtime;
++(bool) scanRtime;
 
 
 +(void)default_price_group;

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -133,7 +133,7 @@
     return models;
     
 }
-+(bool) scanRtime:(NSString* )rtime
++(bool) scanRtime
 {
     
 //    当前日期小于设定日期，返回true
@@ -143,7 +143,7 @@
 //    2022-07-14。1.17
     //    2022-07-14。1.19
     
-NSDate * ddate =[dateFormatter dateFromString:@"2022-10-14"];
+NSDate * ddate =[dateFormatter dateFromString:@"2022-10-15"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];

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>1</integer>
+			<integer>4</integer>
 		</dict>
 		<key>iSales-USAI.xcscheme_^#shared#^_</key>
 		<dict>