ERP Mobile compatible fix

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -72,7 +72,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "F14E477B-1EBC-4DA1-9A3B-1FB6F490BC5C"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/TFNavigationController.m"
@@ -676,5 +676,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0CBE80D8-3CC0-4812-BFC7-96426EFC2C0A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "93"
+            endingLineNumber = "93"
+            landmarkName = "+request_home:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "200B46DB-8F2D-4939-8792-7211EDA99427"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "790"
+            endingLineNumber = "790"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "200B46DB-8F2D-4939-8792-7211EDA99427 - f3213425cfb3c089"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__32-[RAHomeViewController loadData]_block_invoke"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/Home/RAHomeViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "790"
+                  endingLineNumber = "790"
+                  offsetFromSymbolStart = "85">
+               </Location>
+               <Location
+                  uuid = "200B46DB-8F2D-4939-8792-7211EDA99427 - f3213425cfb3c089"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__32-[RAHomeViewController loadData]_block_invoke"
+                  moduleName = "RA TradeFiling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ruizhang/Documents/CODE_IOS/ERPSuiteIOS/RA%20TradeFiling/RA%20TradeFiling/Home/RAHomeViewController.m"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "790"
+                  endingLineNumber = "790"
+                  offsetFromSymbolStart = "372">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -785,7 +785,7 @@
     __weak typeof(self) weakSelf = self;
     [RADataProvider LoadHome:^(NSMutableDictionary *result) {
         NSDictionary *json = result;
-        
+//        DebugLog(result);
         // dismiss progress
         [hud dismiss];
         if (weakSelf.refreshControl.isRefreshing) {

RA TradeFiling/RA TradeFiling/config.h

@@ -28,25 +28,25 @@
 // 接口定义
 
 
-#define URL_LOGIN         BASE_URL@"/loginMobile_v1.php"
-#define URL_CHANGE_PASS         BASE_URL@"/loginMobile_v1.php"
-#define URL_LOGOUT         BASE_URL@"/loginMobile_v1.php"
-#define URL_RETRIEVE_PASS       BASE_URL@"/loginMobile_v1.php"
+#define URL_LOGIN         BASE_URL@"/loginMobile.php"
+#define URL_CHANGE_PASS         BASE_URL@"/loginMobile.php"
+#define URL_LOGOUT         BASE_URL@"/loginMobile.php"
+#define URL_RETRIEVE_PASS       BASE_URL@"/loginMobile.php"
 
-#define URL_SIGNUP         BASE_URL@"/loginMobile_v1.php"
-#define URL_HOME                BASE_URL@"/mobileMain_v1.php"
-#define URL_SEARCH_RESULT       BASE_URL@"/resultMobile_v1.php"
+#define URL_SIGNUP         BASE_URL@"/loginMobile.php"
+#define URL_HOME                BASE_URL@"/mobileMain.php"
+#define URL_SEARCH_RESULT       BASE_URL@"/resultMobile.php"
 
 #define URL_PRIVACY             @"http://united-us.net/privacy.html"
 #define URL_ERR_LOG             @""
-#define URL_REQUEST_DETAIL      BASE_URL@"/resultMobile_v1.php"
+#define URL_REQUEST_DETAIL      BASE_URL@"/resultMobile.php"
 
 // commoneditor 图片上传url
 #define URL_UPLOAD_IMG          @""
-#define URL_SAVE_EDITOR         BASE_URL@"/editorMobile_v1.php"
+#define URL_SAVE_EDITOR         BASE_URL@"/editorMobile.php"
 
-#define URL_EDIT                BASE_URL@"/editorMobile_v1.php"
-#define URL_CADEDATE            BASE_URL@"/resultMobile_v1.php"
+#define URL_EDIT                BASE_URL@"/editorMobile.php"
+#define URL_CADEDATE            BASE_URL@"/resultMobile.php"
 
 //#define URL_SAVE_PANEL       BASE_URL@"/main_new_29.php"
 

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

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2016,7 +2016,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
@@ -2433,6 +2433,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2448,11 +2449,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include",
-					"$(PROJECT_DIR)/common/qrcode",
-					"$(PROJECT_DIR)/common/CommonEditor",
-				);
+				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				ONLY_ACTIVE_ARCH = YES;
@@ -2494,6 +2491,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2502,11 +2500,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include",
-					"$(PROJECT_DIR)/common/qrcode",
-					"$(PROJECT_DIR)/common/CommonEditor",
-				);
+				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				SDKROOT = iphoneos;
@@ -2523,7 +2517,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54382;
+				CURRENT_PROJECT_VERSION = 54393;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2536,10 +2530,6 @@
 				GCC_PREFIX_HEADER = "HMLG Scan Order/HMLG Scan Order-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/HMLG Scan Order/HMLG Scan Order-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
-					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
-				);
 				MARKETING_VERSION = 1.39;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -2573,7 +2563,7 @@
 				CODE_SIGN_ENTITLEMENTS = "HMLG Scan Order/HMLG Scan Order.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 54382;
+				CURRENT_PROJECT_VERSION = 54393;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2586,10 +2576,6 @@
 				GCC_PREFIX_HEADER = "HMLG Scan Order/HMLG Scan Order-Prefix.pch";
 				INFOPLIST_FILE = "$(SRCROOT)/HMLG Scan Order/HMLG Scan Order-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
-					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
-				);
 				MARKETING_VERSION = 1.39;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

RedAnt ERP Mobile/common/Functions/modelDetail/ModelDescriptionController.m

@@ -20,9 +20,9 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
-    if (@available(iOS 11, *)) {
-        self.desc_tv.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    }
+//    if (@available(iOS 11, *)) {
+//        self.desc_tv.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+//    }
 //    else {
 //
 //
@@ -36,7 +36,7 @@
     self.navigationItem.rightBarButtonItem = exitBtn;
     
     self.desc_tv.editable = NO;
-    self.navigationController.navigationBar.translucent = NO;
+//    self.navigationController.navigationBar.translucent = NO;
 }
 
 - (void)viewWillAppear:(BOOL)animated {

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

@@ -15505,14 +15505,13 @@ if(stockUom==0)
                 sqlQuery = [NSString stringWithFormat:@"select name,description,product_id,color,legcolor,availability,incoming_stock,demension,seat_height,material,box_dim,volume,weight,model_set,load_ability,default_category,fabric_content,assembling,made_in,special_remarks,stockUom,product_group,selector_field,property_field,packaging,ETA,item_id,seat_dimension,product_content_writing from product where name='%@';",model_name]; // select name,description,product_id,color,legcolor,availability,incoming_stock,demension,seat_height,material,box_dim,volume,weight,model_set,load_ability,default_category,fabric_content,assembling,made_in,special_remarks,stockUom,product_group,selector_field,property_field,packaging from model where name='%@';
             }
         
-            else
+        else
                 
                 sqlQuery = [NSString stringWithFormat:@"select name,description,product_id,color,legcolor,availability,incoming_stock,demension,seat_height,material,box_dim,volume,weight,model_set,load_ability,default_category,fabric_content,assembling,made_in,special_remarks,stockUom,product_group,selector_field,property_field,packaging,ETA,item_id,seat_dimension,product_content_writing from product where product_id=%@;",product_id]; // select name,description,product_id,color,legcolor,availability,incoming_stock,demension,seat_height,material,box_dim,volume,weight,model_set,load_ability,default_category,fabric_content,assembling,made_in,special_remarks,stockUom,product_group,selector_field,property_field,packaging from model where product_id=%@;
         
         
         sqlite3_stmt * statement;
-        [ret setValue:@"2" forKey:@"result"];
-        [ret setValue:@"3" forKey:@"detail_section_count"];
+
         
         //    int count=0;
         if (sqlite3_prepare_v2(db, [sqlQuery UTF8String], -1, &statement, nil) == SQLITE_OK)
@@ -15522,7 +15521,8 @@ if(stockUom==0)
             if (sqlite3_step(statement) == SQLITE_ROW)
             {
                 //  NSMutableDictionary* item = [[NSMutableDictionary alloc] init];
-                
+                [ret setValue:@"2" forKey:@"result"];
+                [ret setValue:@"3" forKey:@"detail_section_count"];
                 
                 char *name = (char*)sqlite3_column_text(statement, 0);
                 if(name==nil)
@@ -15792,15 +15792,16 @@ if(stockUom==0)
                 [ret setObject:detail2_section forKey:@"detail_2"];
             }
             
-            
+            else
+            {
+                [ret setValue:@"8" forKey:@"result"];
+                [ret setValue:@"No such model." forKey:@"err_msg"];
+            }
             
             
             sqlite3_finalize(statement);
         }
-        else
-        {
-            [ret setValue:@"8" forKey:@"result"];
-        }
+
         //    DebugLog(@"count:%d",count);
         
         

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

@@ -283,7 +283,7 @@
         NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
         
         NSString*  ver = [defaults stringForKey:@"OfflineVer"] ;
-        
+//        ver= nil;
        
         
         if(offline_user_iscurrent==0 && ver!=nil)

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>4</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment version="4864" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -44,7 +44,7 @@
                                                     <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="MmJ-aK-UGJ"/>
                                                 </connections>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1R3-At-QFU">
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1R3-At-QFU">
                                                 <rect key="frame" x="95" y="0.0" width="21" height="21"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -89,7 +89,7 @@
                                                     <action selector="switchToWishlist:" destination="BYZ-38-t0r" eventType="touchUpInside" id="gdE-vI-w3i"/>
                                                 </connections>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e64-zo-Edm">
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e64-zo-Edm">
                                                 <rect key="frame" x="408" y="0.0" width="21" height="21"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -133,7 +133,7 @@
                                                     <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4pZ-iU-9mA"/>
                                                 </connections>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x7d-bu-zNO">
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="x7d-bu-zNO">
                                                 <rect key="frame" x="95" y="0.0" width="21" height="21"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -170,7 +170,7 @@
                                                     <action selector="switchToWishlist:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bbq-OL-tIH"/>
                                                 </connections>
                                             </button>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULj-92-aZY">
+                                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULj-92-aZY">
                                                 <rect key="frame" x="329" y="0.0" width="21" height="21"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
                                                 <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1700,7 +1700,7 @@
             <objects>
                 <viewController storyboardIdentifier="AboutViewController" title="About us" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BJK-Xc-rOI" customClass="AboutViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Tg0-Yd-fvX">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
+                        <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cA7-od-VYw">
@@ -1819,7 +1819,7 @@ Email: redantsupport@united-us.net</string>
         </scene>
     </scenes>
     <resources>
-        <image name="about" width="72" height="72"/>
+        <image name="about" width="96" height="96"/>
         <image name="album" width="48" height="48"/>
         <image name="btn_cancel" width="102" height="30"/>
         <image name="btn_retrieve" width="102" height="30"/>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -201,14 +201,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="justified" translatesAutoresizingMaskIntoConstraints="NO" id="VRj-M1-sDm">
-                                <rect key="frame" x="3" y="0.0" width="759" height="983"/>
+                                <rect key="frame" x="16" y="10" width="736" height="958"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yLy-4Y-3J0">
-                                <rect key="frame" x="364.5" y="987" width="39" height="30"/>
+                                <rect key="frame" x="364.5" y="978" width="39" height="30"/>
                                 <state key="normal" title="Close">
                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -220,11 +220,11 @@
                         <viewLayoutGuide key="safeArea" id="Siy-AD-EVk"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="yLy-4Y-3J0" firstAttribute="top" secondItem="VRj-M1-sDm" secondAttribute="bottom" constant="4" id="2cu-u8-9P4"/>
-                            <constraint firstItem="VRj-M1-sDm" firstAttribute="top" secondItem="vB2-Se-iLa" secondAttribute="top" id="8s6-qr-d84"/>
-                            <constraint firstItem="VRj-M1-sDm" firstAttribute="leading" secondItem="Siy-AD-EVk" secondAttribute="leading" constant="3" id="AfV-vy-Iuz"/>
-                            <constraint firstItem="Siy-AD-EVk" firstAttribute="bottom" secondItem="yLy-4Y-3J0" secondAttribute="bottom" constant="7" id="Fuz-g4-JdW"/>
-                            <constraint firstItem="Siy-AD-EVk" firstAttribute="trailing" secondItem="VRj-M1-sDm" secondAttribute="trailing" constant="6" id="p4y-HK-xsD"/>
+                            <constraint firstItem="VRj-M1-sDm" firstAttribute="leading" secondItem="Siy-AD-EVk" secondAttribute="leading" constant="16" id="5E4-hh-ame"/>
+                            <constraint firstItem="Siy-AD-EVk" firstAttribute="bottom" secondItem="yLy-4Y-3J0" secondAttribute="bottom" constant="16" id="Fuz-g4-JdW"/>
+                            <constraint firstItem="Siy-AD-EVk" firstAttribute="trailing" secondItem="VRj-M1-sDm" secondAttribute="trailing" constant="16" id="OFd-GK-ecY"/>
+                            <constraint firstItem="yLy-4Y-3J0" firstAttribute="top" secondItem="VRj-M1-sDm" secondAttribute="bottom" constant="10" id="hXh-AT-zXE"/>
+                            <constraint firstItem="VRj-M1-sDm" firstAttribute="top" secondItem="vB2-Se-iLa" secondAttribute="top" constant="10" id="rn8-Xw-Vkh"/>
                             <constraint firstItem="yLy-4Y-3J0" firstAttribute="centerX" secondItem="vB2-Se-iLa" secondAttribute="centerX" id="six-Ui-ZTL"/>
                         </constraints>
                     </view>
@@ -251,10 +251,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qll-0O-PAI">
-                                <rect key="frame" x="18" y="93" width="729" height="4"/>
+                                <rect key="frame" x="18" y="93" width="732" height="4"/>
                             </progressView>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jJD-lt-Uuj">
-                                <rect key="frame" x="18" y="132" width="729" height="4"/>
+                                <rect key="frame" x="18" y="132" width="732" height="4"/>
                             </progressView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Overall progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6P9-Se-W27">
                                 <rect key="frame" x="20" y="103" width="125" height="21"/>
@@ -262,25 +262,23 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sEa-AW-QiJ">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sEa-AW-QiJ">
                                 <rect key="frame" x="219" y="20" width="330" height="24"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0lX-Gd-bGG">
-                                <rect key="frame" x="639" y="972" width="108" height="30"/>
+                                <rect key="frame" x="686" y="972" width="61" height="30"/>
                                 <state key="normal" title="Send log"/>
                                 <connections>
                                     <action selector="onSendlogClick:" destination="Kn8-15-Yzp" eventType="touchUpInside" id="OYC-bp-Xth"/>
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="e3H-tp-xCS">
-                                <rect key="frame" x="18" y="149" width="729" height="816"/>
+                                <rect key="frame" x="18" y="149" width="732" height="816"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="816" id="9HB-QO-q3o"/>
-                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
@@ -288,28 +286,22 @@
                         <viewLayoutGuide key="safeArea" id="Mei-7N-AuH"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="sEa-AW-QiJ" firstAttribute="centerX" secondItem="3kg-RW-dkB" secondAttribute="centerX" id="1qQ-wL-YiJ"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="top" secondItem="sEa-AW-QiJ" secondAttribute="bottom" constant="49" id="2R3-Cr-zbm"/>
-                            <constraint firstItem="k2H-8o-P97" firstAttribute="leading" secondItem="3kg-RW-dkB" secondAttribute="leadingMargin" id="59X-Q1-7cl"/>
-                            <constraint firstItem="Mei-7N-AuH" firstAttribute="bottom" secondItem="0lX-Gd-bGG" secondAttribute="bottom" constant="22" id="9Gc-iq-cAK"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="leading" secondItem="jJD-lt-Uuj" secondAttribute="leading" id="E4W-LQ-FIl"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="18" id="FyB-Ni-yGZ"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="trailing" secondItem="0lX-Gd-bGG" secondAttribute="trailing" id="GnS-kn-HRL"/>
-                            <constraint firstItem="sEa-AW-QiJ" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="219" id="Jk9-Sy-fXM"/>
-                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="k2H-8o-P97" secondAttribute="trailing" symbolic="YES" id="LZ2-00-57A"/>
-                            <constraint firstItem="e3H-tp-xCS" firstAttribute="top" secondItem="jJD-lt-Uuj" secondAttribute="bottom" constant="13" id="Lo3-p3-9oP"/>
-                            <constraint firstItem="k2H-8o-P97" firstAttribute="top" secondItem="Mei-7N-AuH" secondAttribute="top" constant="44" id="TYp-ej-wKg"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="top" secondItem="k2H-8o-P97" secondAttribute="bottom" constant="8" symbolic="YES" id="UR9-1P-reJ"/>
-                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="6P9-Se-W27" secondAttribute="trailing" symbolic="YES" id="VGU-Ez-MZv"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="trailing" secondItem="jJD-lt-Uuj" secondAttribute="trailing" id="Vtp-Pi-Va9"/>
-                            <constraint firstItem="sEa-AW-QiJ" firstAttribute="top" secondItem="Mei-7N-AuH" secondAttribute="top" id="Zru-2A-GRo"/>
-                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" secondItem="qll-0O-PAI" secondAttribute="trailing" constant="21" id="aMC-GE-Glh"/>
-                            <constraint firstItem="k2H-8o-P97" firstAttribute="leading" secondItem="6P9-Se-W27" secondAttribute="leading" id="bsW-qb-D5g"/>
-                            <constraint firstItem="0lX-Gd-bGG" firstAttribute="top" secondItem="e3H-tp-xCS" secondAttribute="bottom" constant="7" id="btN-0y-fTT"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="trailing" secondItem="e3H-tp-xCS" secondAttribute="trailing" id="d54-t9-VU0"/>
-                            <constraint firstItem="qll-0O-PAI" firstAttribute="leading" secondItem="e3H-tp-xCS" secondAttribute="leading" id="eFN-Cu-yoT"/>
-                            <constraint firstItem="0lX-Gd-bGG" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="639" id="gcb-LI-7SH"/>
-                            <constraint firstItem="6P9-Se-W27" firstAttribute="top" secondItem="qll-0O-PAI" secondAttribute="bottom" constant="6" id="q4U-gw-d5L"/>
+                            <constraint firstItem="k2H-8o-P97" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="20" id="5Yd-dB-sds"/>
+                            <constraint firstItem="e3H-tp-xCS" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="18" id="9gK-GJ-Rw1"/>
+                            <constraint firstItem="jJD-lt-Uuj" firstAttribute="top" secondItem="6P9-Se-W27" secondAttribute="bottom" constant="8" symbolic="YES" id="EIk-Dz-NXu"/>
+                            <constraint firstItem="e3H-tp-xCS" firstAttribute="top" secondItem="jJD-lt-Uuj" secondAttribute="bottom" constant="13" id="K5i-4r-bp4"/>
+                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" secondItem="0lX-Gd-bGG" secondAttribute="trailing" constant="21" id="ZpX-TX-f15"/>
+                            <constraint firstItem="qll-0O-PAI" firstAttribute="top" secondItem="k2H-8o-P97" secondAttribute="bottom" constant="8" symbolic="YES" id="b9o-Xe-aaj"/>
+                            <constraint firstItem="qll-0O-PAI" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="18" id="bDa-xC-0LB"/>
+                            <constraint firstItem="k2H-8o-P97" firstAttribute="top" secondItem="Mei-7N-AuH" secondAttribute="top" constant="44" id="eUa-EL-kaW"/>
+                            <constraint firstItem="0lX-Gd-bGG" firstAttribute="top" secondItem="e3H-tp-xCS" secondAttribute="bottom" constant="7" id="fQK-Zc-ipZ"/>
+                            <constraint firstItem="Mei-7N-AuH" firstAttribute="bottom" secondItem="0lX-Gd-bGG" secondAttribute="bottom" constant="22" id="g1U-6I-cNS"/>
+                            <constraint firstItem="jJD-lt-Uuj" firstAttribute="leading" secondItem="Mei-7N-AuH" secondAttribute="leading" constant="18" id="gXi-0f-TmX"/>
+                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" secondItem="jJD-lt-Uuj" secondAttribute="trailing" constant="18" id="jef-05-nGp"/>
+                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" secondItem="e3H-tp-xCS" secondAttribute="trailing" constant="18" id="qNL-PB-SKr"/>
+                            <constraint firstItem="6P9-Se-W27" firstAttribute="top" secondItem="qll-0O-PAI" secondAttribute="bottom" constant="6" id="vL6-3G-k4b"/>
+                            <constraint firstItem="Mei-7N-AuH" firstAttribute="trailing" secondItem="qll-0O-PAI" secondAttribute="trailing" constant="18" id="wpZ-Oh-Ysh"/>
+                            <constraint firstItem="6P9-Se-W27" firstAttribute="leading" secondItem="k2H-8o-P97" secondAttribute="leading" id="xxy-ig-3Ot"/>
                         </constraints>
                     </view>
                     <connections>
@@ -357,7 +349,7 @@
                                                         <constraint firstAttribute="width" constant="21" id="hbc-1I-70J"/>
                                                     </constraints>
                                                     <state key="normal" image="button:hrK-DY-RbO:image"/>
-                                                    <state key="selected" image="F17C886C-7962-461C-99C6-0B7F61677DD1"/>
+                                                    <state key="selected" image="C0ECEA11-F90E-455B-B29F-7674A15F20B3"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -1105,7 +1097,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="F17C886C-7962-461C-99C6-0B7F61677DD1" width="24" height="24">
+        <image name="C0ECEA11-F90E-455B-B29F-7674A15F20B3" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T

RedAnt ERP Mobile/iSales-NPD/NPD_Mobile.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="ipad10_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -12,16 +12,12 @@
         <scene sceneID="ARg-BH-4dH">
             <objects>
                 <viewController storyboardIdentifier="SimplifiedBuyingProgramViewController" title="Simplified Buying Program" useStoryboardIdentifierAsRestorationIdentifier="YES" id="BlP-LN-RiF" customClass="SimplifiedBuyingProgramViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Mp7-L4-AL0"/>
-                        <viewControllerLayoutGuide type="bottom" id="sMu-1b-6k3"/>
-                    </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="mnp-lB-78M">
                         <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kDK-60-oXV" customClass="DefaultImageButton">
-                                <rect key="frame" x="189" y="267" width="102" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kDK-60-oXV" customClass="DefaultImageButton">
+                                <rect key="frame" x="189" y="250" width="102" height="30"/>
                                 <state key="normal" title="OK" backgroundImage="btn_ok">
                                     <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
@@ -35,7 +31,7 @@
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" usesAttributedText="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z3C-WA-yT5">
-                                <rect key="frame" x="20" y="20" width="440" height="233"/>
+                                <rect key="frame" x="20" y="34" width="450" height="216"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <attributedString key="attributedText">
                                     <fragment>
@@ -49,16 +45,16 @@
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="gk1-bK-06P"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="z3C-WA-yT5" firstAttribute="top" secondItem="mnp-lB-78M" secondAttribute="top" constant="20" id="0Iz-WX-R5e"/>
-                            <constraint firstItem="5jb-0U-ahb" firstAttribute="trailing" secondItem="z3C-WA-yT5" secondAttribute="trailing" constant="20" id="DrF-qy-eJ6"/>
-                            <constraint firstItem="kDK-60-oXV" firstAttribute="top" secondItem="z3C-WA-yT5" secondAttribute="bottom" constant="14" id="GZc-ht-nRA"/>
-                            <constraint firstAttribute="bottom" secondItem="kDK-60-oXV" secondAttribute="bottom" constant="23" id="L6x-JQ-5U4"/>
-                            <constraint firstItem="z3C-WA-yT5" firstAttribute="leading" secondItem="5jb-0U-ahb" secondAttribute="leading" constant="20" id="XqM-rt-9kv"/>
-                            <constraint firstItem="kDK-60-oXV" firstAttribute="centerX" secondItem="mnp-lB-78M" secondAttribute="centerX" id="Z5O-67-jMH"/>
+                            <constraint firstItem="kDK-60-oXV" firstAttribute="centerX" secondItem="gk1-bK-06P" secondAttribute="centerX" id="IeV-fi-lAV"/>
+                            <constraint firstItem="gk1-bK-06P" firstAttribute="trailing" secondItem="z3C-WA-yT5" secondAttribute="trailing" constant="10" id="P1t-0v-GDA"/>
+                            <constraint firstItem="gk1-bK-06P" firstAttribute="bottom" secondItem="kDK-60-oXV" secondAttribute="bottom" constant="20" id="dxG-OJ-PjF"/>
+                            <constraint firstItem="z3C-WA-yT5" firstAttribute="leading" secondItem="gk1-bK-06P" secondAttribute="leading" constant="20" id="kJ3-qf-xLq"/>
+                            <constraint firstItem="z3C-WA-yT5" firstAttribute="top" secondItem="gk1-bK-06P" secondAttribute="top" constant="10" id="mx3-ms-YcO"/>
+                            <constraint firstItem="kDK-60-oXV" firstAttribute="top" secondItem="z3C-WA-yT5" secondAttribute="bottom" id="v85-sD-FcY"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="5jb-0U-ahb"/>
                     </view>
                     <value key="contentSizeForViewInPopover" type="size" width="480" height="320"/>
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -69,7 +65,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="pXs-Bt-20T" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4019.53125" y="-592.96875"/>
+            <point key="canvasLocation" x="4019.2682926829266" y="-593.38983050847457"/>
         </scene>
     </scenes>
     <resources>

RedAnt ERP Mobile/iSales-UNITED WAVER.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2036,7 +2036,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
@@ -2423,6 +2423,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2438,13 +2439,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include",
-					"$(PROJECT_DIR)/common/qrcode",
-					"$(PROJECT_DIR)/common/CommonEditor",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
@@ -2484,6 +2479,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2492,13 +2488,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/include",
-					"$(PROJECT_DIR)/common/qrcode",
-					"$(PROJECT_DIR)/common/CommonEditor",
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
 				VALIDATE_PRODUCT = YES;
@@ -2526,10 +2516,6 @@
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-UWAVER/iSales-UWAVER-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
-					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2572,10 +2558,6 @@
 				GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/iSales-UWAVER/iSales-UWAVER-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				LIBRARY_SEARCH_PATHS = (
-					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
-					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
-				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -3,11 +3,14 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		3CB70DB82531B28A00930FFC /* RAUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CB70DB72531B28A00930FFC /* RAUtils.m */; };
+		3CD691902ABD620E004D8A1D /* PopWaitAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD6918D2ABD620D004D8A1D /* PopWaitAlert.m */; };
+		3CD691912ABD620E004D8A1D /* MessageBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD6918E2ABD620D004D8A1D /* MessageBox.m */; };
+		3CD691922ABD620E004D8A1D /* RAPopviewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD6918F2ABD620D004D8A1D /* RAPopviewContainer.m */; };
 		4205FD4820C0F33500DB42B4 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4720C0F33500DB42B4 /* LoginViewController.m */; };
 		4205FD4B20C0F4C400DB42B4 /* RetrievePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4A20C0F4C300DB42B4 /* RetrievePasswordViewController.m */; };
 		4205FD5320C0F50C00DB42B4 /* JLCustomerAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4E20C0F50C00DB42B4 /* JLCustomerAlertController.m */; };
@@ -198,14 +201,14 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		42ED62E120F85ADB00E08CCB /* Embed App Extensions */ = {
+		42ED62E120F85ADB00E08CCB /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
 			);
-			name = "Embed App Extensions";
+			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -213,6 +216,12 @@
 /* Begin PBXFileReference section */
 		3CB70DB62531B28A00930FFC /* RAUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAUtils.h; path = ../../common/RAUtils.h; sourceTree = "<group>"; };
 		3CB70DB72531B28A00930FFC /* RAUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAUtils.m; path = ../../common/RAUtils.m; sourceTree = "<group>"; };
+		3CD6918A2ABD620D004D8A1D /* MessageBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageBox.h; sourceTree = "<group>"; };
+		3CD6918B2ABD620D004D8A1D /* PopWaitAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PopWaitAlert.h; sourceTree = "<group>"; };
+		3CD6918C2ABD620D004D8A1D /* RAPopviewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPopviewContainer.h; sourceTree = "<group>"; };
+		3CD6918D2ABD620D004D8A1D /* PopWaitAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PopWaitAlert.m; sourceTree = "<group>"; };
+		3CD6918E2ABD620D004D8A1D /* MessageBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageBox.m; sourceTree = "<group>"; };
+		3CD6918F2ABD620D004D8A1D /* RAPopviewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAPopviewContainer.m; sourceTree = "<group>"; };
 		4205FD4620C0F33500DB42B4 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
 		4205FD4720C0F33500DB42B4 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		4205FD4920C0F4C300DB42B4 /* RetrievePasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetrievePasswordViewController.h; sourceTree = "<group>"; };
@@ -603,6 +612,20 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3CD691892ABD620D004D8A1D /* MessageBox */ = {
+			isa = PBXGroup;
+			children = (
+				3CD6918A2ABD620D004D8A1D /* MessageBox.h */,
+				3CD6918B2ABD620D004D8A1D /* PopWaitAlert.h */,
+				3CD6918C2ABD620D004D8A1D /* RAPopviewContainer.h */,
+				3CD6918D2ABD620D004D8A1D /* PopWaitAlert.m */,
+				3CD6918E2ABD620D004D8A1D /* MessageBox.m */,
+				3CD6918F2ABD620D004D8A1D /* RAPopviewContainer.m */,
+			);
+			name = MessageBox;
+			path = ../../common/MessageBox;
+			sourceTree = "<group>";
+		};
 		4205FD4520C0F33500DB42B4 /* Login */ = {
 			isa = PBXGroup;
 			children = (
@@ -1397,6 +1420,7 @@
 		71EAA33020B9571B002F003C /* Apex And Drivers */ = {
 			isa = PBXGroup;
 			children = (
+				3CD691892ABD620D004D8A1D /* MessageBox */,
 				42529D2620C0E98A000C0F4D /* Config */,
 				42DCCC4821818CF90027A5BB /* DatePicker */,
 				42C6074921536E59003E5379 /* ExceptionHandler */,
@@ -1450,7 +1474,7 @@
 				71EAA32A20B9571B002F003C /* Sources */,
 				71EAA32B20B9571B002F003C /* Frameworks */,
 				71EAA32C20B9571B002F003C /* Resources */,
-				42ED62E120F85ADB00E08CCB /* Embed App Extensions */,
+				42ED62E120F85ADB00E08CCB /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
@@ -1467,7 +1491,8 @@
 		71EAA32620B9571B002F003C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = USAI;
 				TargetAttributes = {
 					71EAA32D20B9571B002F003C = {
@@ -1572,6 +1597,7 @@
 				4255EC7120C4E2EC00E5DA24 /* RADetailActionSelectionModel.m in Sources */,
 				4259597A2148F38000F7DD41 /* RASettingSwitchModel.m in Sources */,
 				420D11092133EE5D00149B37 /* RAOrderFilterSectionModel.m in Sources */,
+				3CD691912ABD620E004D8A1D /* MessageBox.m in Sources */,
 				42D7B0762147945C0046FE89 /* RASettingViewController.m in Sources */,
 				42D8B8DE20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.m in Sources */,
 				425B97E520C7BD3800B35713 /* UIView+Toast.m in Sources */,
@@ -1638,6 +1664,7 @@
 				429A0AD7216CA666004DEF7A /* RASettingLinkCell.m in Sources */,
 				4205FD5C20C1316200DB42B4 /* RABaseViewController.m in Sources */,
 				425959802148F82600F7DD41 /* RASettingBaseCell.m in Sources */,
+				3CD691902ABD620E004D8A1D /* PopWaitAlert.m in Sources */,
 				425F1B6C2138F0470031B2C7 /* RANavigationController.m in Sources */,
 				425B97E220C7BC4A00B35713 /* RAUploadListViewController.m in Sources */,
 				4235FABB213E644A000B6672 /* RADetailSignatureCell.m in Sources */,
@@ -1692,6 +1719,7 @@
 				42D8B8BB20C2486C001C125F /* RADetailActionSubCell.m in Sources */,
 				71EAA33320B9571B002F003C /* AppDelegate.m in Sources */,
 				4259598C2148FD8200F7DD41 /* RASettingViewController+TableDataSource.m in Sources */,
+				3CD691922ABD620E004D8A1D /* RAPopviewContainer.m in Sources */,
 				42D187802140BACC00C822C0 /* RAEditRequiredAlert.m in Sources */,
 				425959862148F85100F7DD41 /* RASettingSwitchCell.m in Sources */,
 				4205FD6F20C13E2700DB42B4 /* RAHomeViewController+HomeTableDataSource.m in Sources */,
@@ -1893,6 +1921,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1953,6 +1982,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

Redant Drivers/Apex And Drivers/RADataProvider.m

@@ -198,7 +198,7 @@
     
    
     
-    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    NSMutableDictionary* ret= ((NSDictionary*)[RAConvertor data2dict:json]).mutableCopy;
     
     
     NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_orderList.json",RASingleton.sharedInstance.user]];
@@ -240,7 +240,7 @@
     
     NSData* json=[self get_json:URL_MORE_ORDER parameters:params  file:nil];
     
-    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    NSMutableDictionary* ret= ((NSDictionary*)[RAConvertor data2dict:json]).mutableCopy;
     
     
     NSString* path = [[RAUtils appCacheDirectory] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_moreorder%@.json",RASingleton.sharedInstance.user,@(orderType)]];
@@ -294,7 +294,7 @@
     
     NSData* json=[self get_json:URL_DETAIL parameters:params  file:nil];
     
-    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    NSMutableDictionary* ret= ((NSDictionary*)[RAConvertor data2dict:json]).mutableCopy;
     
     
  
@@ -352,7 +352,7 @@
     
     NSData* json=[self get_json:URL_UPDATE parameters:params  file:nil];
     
-    NSMutableDictionary* ret= [RAConvertor data2dict:json].mutableCopy;
+    NSMutableDictionary* ret= ((NSDictionary*)[RAConvertor data2dict:json]).mutableCopy;