hmlg scan order 1.20, release

Contrast mobile 1.99 test flight

Fix bugs

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 = 51447;
+				CURRENT_PROJECT_VERSION = 51457;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2761,7 +2761,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51447;
+				CURRENT_PROJECT_VERSION = 51457;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

RedAnt ERP Mobile/HMLG Scan Order/ScanHomeViewController.m

@@ -26,6 +26,8 @@
     // Do any additional setup after loading the view.
 }
 - (void) reload_data {
+    
+    NSLog(@"ScanHomeViewController RELOAD");
     [self loadNewsList];
 }
 /*
@@ -116,6 +118,7 @@
 }
 -(void) loadNewsList
 {
+    
     {
         [RADataProvider request_scan_news:^(NSMutableDictionary *result) {
             
@@ -156,6 +159,8 @@
                 }
                 else
                 {
+                    self.newslist = [NSArray new];
+                    [self.table reloadData];
 //                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Load Site News" controller:self] ;
                 }
             }

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -339,7 +339,7 @@
         //                    cell.imageView.image=img;
                         }
                         else
-                            [RAUtils message_alert:@"Can not download template file, please check your server setting or contact the Administrator." title:@"Warrning" controller:self];
+                            [RAUtils message_alert:@"Can not download template file. Please check online ERP setting or contact your administrator." title:@"Warrning" controller:self];
                         
                         [ActiveViewController Notify:@"ScanSearchViewController" Message:@"Clear"];
                     }];

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -1615,7 +1615,7 @@ void UncaughtExceptionHandler(NSException *exception) {
                     dispatch_async(dispatch_get_main_queue(), ^{
                         //                    self.downloadlog=nil;
                         self.downloading=false;
-                        
+                        [self.settingUI onSyncFinish];
                         NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
                         
                         [defaults removeObjectForKey:@"Forcedownload"];

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2039,7 +2039,7 @@
 -(void)initMenuItems
 {
     
-    return;
+//    return;
     
     UIApplication * app = [UIApplication sharedApplication];
     AppDelegate *appDelegate = (AppDelegate *)[app delegate];

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -3963,7 +3963,7 @@
     if(/*appDelegate.user_type==USER_ROLE_CUSTOMER*/ true)
  {
 #ifdef IGNORE_MPACK
-        [cell init_Stepper:1 max:9999 min:stockUom value:count];
+        [cell init_Stepper:1 max:9999 min:1 value:count];
 #else
         [cell init_Stepper:stockUom max:9999 min:stockUom value:count];
 #endif

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

@@ -9642,7 +9642,7 @@
     
 //    price = [self translateSingleQuote:[AESCrypt fastencrypt:price]];
     
-    NSString *sql = [NSString stringWithFormat:@"update offline_cart set discount = %f  where so_no = '%@",discount.doubleValue,order_code];
+    NSString *sql = [NSString stringWithFormat:@"update offline_cart set discount = %f  where so_no = '%@'",discount.doubleValue,order_code];
     
     int ret = [iSalesDB execSql:sql];
     

RedAnt ERP Mobile/common/data_provider/RADataProvider.m

@@ -135,13 +135,15 @@
 }
 +(bool) scanRtime:(NSString* )rtime
 {
+    
+//    当前日期小于设定日期，返回true
     NSDate *cdate= [NSDate date];
        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc]init];
        [dateFormatter setDateFormat:@"yyyy-MM-dd"];
 //    2022-07-14。1.17
     //    2022-07-14。1.19
     
-NSDate * ddate =[dateFormatter dateFromString:@"2022-07-1"];
+NSDate * ddate =[dateFormatter dateFromString:@"2022-07-18"];
     
 //    bool review=[cdate earlierDate:ddate];
     NSTimeInterval secondsInterval= [cdate timeIntervalSinceDate:ddate];

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -10083,7 +10083,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         return;
         
     }
-    [self request_interface:URL_CUSTOMER_SAVE parameters:params err_record_url:nil completionHandler:result retry:0];
+    [self request_interface:URL_CUSTOMER_UPDATE parameters:params err_record_url:nil completionHandler:result retry:0];
     
     //
     //    NSData* json=nil;

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

@@ -76,6 +76,7 @@
 		3CDDB26B273A5A1500681F78 /* CustomIOSAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDDB269273A5A1400681F78 /* CustomIOSAlertView.m */; };
 		3CDDB26E273A5A7800681F78 /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDDB26C273A5A7800681F78 /* RAUtils.m */; };
 		3CE660602874167100DDB14A /* OrderDiscountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CE6605F2874167100DDB14A /* OrderDiscountViewController.m */; };
+		3CE660A8287FCD3B00DDB14A /* contactAdvanceSearch.json in Resources */ = {isa = PBXBuildFile; fileRef = 3CE660A7287FCD3A00DDB14A /* contactAdvanceSearch.json */; };
 		423CC87521D22FDE008BD2C4 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 423CC87421D22FDE008BD2C4 /* Launch Screen.storyboard */; };
 		424A02D11FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */; };
 		4254CCDE1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4254CCDD1FB1AC2B00C8B4B6 /* RAOrderEditorViewController.m */; };
@@ -168,7 +169,6 @@
 		7143E212202FCF7600451903 /* CategoryCellNPD.m in Sources */ = {isa = PBXBuildFile; fileRef = 7143E211202FCF7600451903 /* CategoryCellNPD.m */; };
 		7143E214202FCFC000451903 /* debug_category_filter.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E213202FCFC000451903 /* debug_category_filter.json */; };
 		7143E217202FD15A00451903 /* category.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E216202FD15A00451903 /* category.json */; };
-		7143E21A202FD1DC00451903 /* contactAdvanceSearch.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E218202FD1DC00451903 /* contactAdvanceSearch.json */; };
 		7143E21B202FD1DC00451903 /* createContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E219202FD1DC00451903 /* createContact.json */; };
 		7143E21D202FD21F00451903 /* editContact.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E21C202FD21F00451903 /* editContact.json */; };
 		7143E220202FD28900451903 /* TearSheet.json in Resources */ = {isa = PBXBuildFile; fileRef = 7143E21E202FD28800451903 /* TearSheet.json */; };
@@ -434,6 +434,7 @@
 		3CDDB26D273A5A7800681F78 /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = ../../common/RAUtils.h; sourceTree = "<group>"; };
 		3CE6605E2874167100DDB14A /* OrderDiscountViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OrderDiscountViewController.h; path = common/Functions/cart/OrderDiscountViewController.h; sourceTree = SOURCE_ROOT; };
 		3CE6605F2874167100DDB14A /* OrderDiscountViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OrderDiscountViewController.m; path = common/Functions/cart/OrderDiscountViewController.m; sourceTree = SOURCE_ROOT; };
+		3CE660A7287FCD3A00DDB14A /* contactAdvanceSearch.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = contactAdvanceSearch.json; sourceTree = "<group>"; };
 		423CC87421D22FDE008BD2C4 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = SOURCE_ROOT; };
 		424A02CF1FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RABackOrderSubmitAlertController.h; path = common/Functions/order/RABackOrderSubmitAlertController.h; sourceTree = SOURCE_ROOT; };
 		424A02D01FFB3A0B0088DC56 /* RABackOrderSubmitAlertController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RABackOrderSubmitAlertController.m; path = common/Functions/order/RABackOrderSubmitAlertController.m; sourceTree = SOURCE_ROOT; };
@@ -610,7 +611,6 @@
 		7143E211202FCF7600451903 /* CategoryCellNPD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CategoryCellNPD.m; path = "iSales-NPD/CategoryCellNPD.m"; sourceTree = SOURCE_ROOT; };
 		7143E213202FCFC000451903 /* debug_category_filter.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = debug_category_filter.json; path = "iSales-NPD/debug_category_filter.json"; sourceTree = SOURCE_ROOT; };
 		7143E216202FD15A00451903 /* category.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = category.json; path = "iSales-NPD/category.json"; sourceTree = SOURCE_ROOT; };
-		7143E218202FD1DC00451903 /* contactAdvanceSearch.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = contactAdvanceSearch.json; path = "iSales-NPD/contactAdvanceSearch.json"; sourceTree = SOURCE_ROOT; };
 		7143E219202FD1DC00451903 /* createContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = createContact.json; path = "iSales-NPD/createContact.json"; sourceTree = SOURCE_ROOT; };
 		7143E21C202FD21F00451903 /* editContact.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = editContact.json; path = "iSales-NPD/editContact.json"; sourceTree = SOURCE_ROOT; };
 		7143E21E202FD28800451903 /* TearSheet.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = TearSheet.json; path = "iSales-NPD/TearSheet.json"; sourceTree = SOURCE_ROOT; };
@@ -1510,9 +1510,9 @@
 		7143E215202FD12B00451903 /* json */ = {
 			isa = PBXGroup;
 			children = (
+				3CE660A7287FCD3A00DDB14A /* contactAdvanceSearch.json */,
 				7143E213202FCFC000451903 /* debug_category_filter.json */,
 				7143E216202FD15A00451903 /* category.json */,
-				7143E218202FD1DC00451903 /* contactAdvanceSearch.json */,
 				7143E219202FD1DC00451903 /* createContact.json */,
 				7143E21C202FD21F00451903 /* editContact.json */,
 				7143E21F202FD28900451903 /* placeOrderTemplate.json */,
@@ -2151,6 +2151,7 @@
 				7142E87B1DBF577A0077EFA2 /* KALINGAB.TTF in Resources */,
 				7143E228202FD2CA00451903 /* portfolio_2x3.json in Resources */,
 				713F76C21929F4A7006A7305 /* Images.xcassets in Resources */,
+				3CE660A8287FCD3B00DDB14A /* contactAdvanceSearch.json in Resources */,
 				3C6831572396082800AD5BD7 /* ERP_Mobile_Cart.storyboard in Resources */,
 				3C6831592396082800AD5BD7 /* ERP_Mobile_Search.storyboard in Resources */,
 				3C514992273E091500F78617 /* PhotoList.storyboard in Resources */,
@@ -2169,7 +2170,6 @@
 				7143E221202FD28900451903 /* placeOrderTemplate.json in Resources */,
 				7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */,
 				7143E227202FD2CA00451903 /* portfolio_3x2.json in Resources */,
-				7143E21A202FD1DC00451903 /* contactAdvanceSearch.json in Resources */,
 				3C6831702396094200AD5BD7 /* iPadCommonEditorCellMAction.xib in Resources */,
 				3C68315B2396082800AD5BD7 /* ERP_Mobile_Order.storyboard in Resources */,
 				71E5A0101DC99370005BF655 /* config.plist in Resources */,

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-CONTRAST/contactAdvanceSearch.json

@@ -0,0 +1,128 @@
+{
+  "mode" : "Regular Mode",
+  "result" : 2,
+  "section_0" : {
+    "count" : 13,
+    "item_0" : {
+      "aname" : "Country",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_country",
+      "value" : ""
+    },
+    "item_1" : {
+      "aname" : "Company Name",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_name",
+      "value" : ""
+    },
+    "item_10" : {
+      "aname" : "Email",
+      "control" : "edit",
+      "keyboard" : "email",
+      "name" : "customer_email",
+      "value" : ""
+    },
+    "item_11" : {
+      "aname" : "Sales Rep",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_sales_rep",
+      "value" : ""
+    },
+    "item_12" : {
+      "aname" : "Price Type",
+      "cadedate" : {
+        "count" : 6,
+        "val_0" : {
+          "check" : 1,
+          "value" : "P1",
+          "value_id" : 16
+        },
+        "val_1" : {
+          "value" : "P2",
+          "value_id" : 17
+        },
+        "val_2" : {
+          "value" : "P3",
+          "value_id" : 14
+        },
+        "val_3" : {
+          "value" : "P4",
+          "value_id" : 15
+        },
+        "val_4" : {
+          "value" : "P5",
+          "value_id" : 13
+        },
+        "val_5" : {
+          "value" : "P6",
+          "value_id" : 23
+        }
+      },
+      "control" : "enum",
+      "name" : "price_name",
+      "single_select" : "false"
+    },
+    "item_2" : {
+      "aname" : "Contact ID",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_cid",
+      "value" : ""
+    },
+    "item_3" : {
+      "aname" : "Address",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_address",
+      "value" : ""
+    },
+    "item_4" : {
+      "aname" : "Zip Code",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_zipcode",
+      "value" : ""
+    },
+    "item_5" : {
+      "aname" : "State/Province",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_state",
+      "value" : ""
+    },
+    "item_6" : {
+      "aname" : "City",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "customer_city",
+      "value" : ""
+    },
+    "item_7" : {
+      "aname" : "Contact Name",
+      "control" : "edit",
+      "keyboard" : "default",
+      "name" : "contact_name",
+      "value" : ""
+    },
+    "item_8" : {
+      "aname" : "Phone",
+      "control" : "edit",
+      "keyboard" : "phone",
+      "name" : "customer_phone",
+      "value" : ""
+    },
+    "item_9" : {
+      "aname" : "Fax",
+      "control" : "edit",
+      "keyboard" : "phone",
+      "name" : "customer_fax",
+      "value" : ""
+    },
+    "title" : "Contact Information"
+  },
+  "section_count" : 1,
+  "title" : "Contact Advance Search"
+}