HMLG scan order 1.25

bug fix
net price can be empty

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

@@ -55,6 +55,7 @@
 		3C51E7CD27B261EC00E61163 /* RAUploadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7C827B261EC00E61163 /* RAUploadManager.m */; };
 		3C51E7D027B2623700E61163 /* UploadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7CF27B2623700E61163 /* UploadCell.m */; };
 		3C51E7D327B2628900E61163 /* UIView+Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C51E7D227B2628900E61163 /* UIView+Toast.m */; };
+		3C57678928D9B2DC00D1B5BF /* CommonEditorWebCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C57678728D9B2DC00D1B5BF /* CommonEditorWebCell.m */; };
 		3C68314D239607B500AD5BD7 /* ytplayer.html in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314A239607B500AD5BD7 /* ytplayer.html */; };
 		3C68314E239607B500AD5BD7 /* RAYTPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C68314B239607B500AD5BD7 /* RAYTPlayer.m */; };
 		3C6831562396082800AD5BD7 /* ERP_Mobile_Discard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C68314F2396082700AD5BD7 /* ERP_Mobile_Discard.storyboard */; };
@@ -427,6 +428,8 @@
 		3C51E7CF27B2623700E61163 /* UploadCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadCell.m; sourceTree = "<group>"; };
 		3C51E7D127B2628900E61163 /* UIView+Toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+Toast.h"; path = "../../common/customUI/UIView+Toast.h"; sourceTree = "<group>"; };
 		3C51E7D227B2628900E61163 /* UIView+Toast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIView+Toast.m"; path = "../../common/customUI/UIView+Toast.m"; sourceTree = "<group>"; };
+		3C57678728D9B2DC00D1B5BF /* CommonEditorWebCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonEditorWebCell.m; path = ../../common/customUI/commoneditor/CommonEditorWebCell.m; sourceTree = "<group>"; };
+		3C57678828D9B2DC00D1B5BF /* CommonEditorWebCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommonEditorWebCell.h; path = ../../common/customUI/commoneditor/CommonEditorWebCell.h; sourceTree = "<group>"; };
 		3C68314A239607B500AD5BD7 /* ytplayer.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ytplayer.html; path = ../../common/Youtube/ytplayer.html; sourceTree = "<group>"; };
 		3C68314B239607B500AD5BD7 /* RAYTPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAYTPlayer.m; path = ../../common/Youtube/RAYTPlayer.m; sourceTree = "<group>"; };
 		3C68314C239607B500AD5BD7 /* RAYTPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAYTPlayer.h; path = ../../common/Youtube/RAYTPlayer.h; sourceTree = "<group>"; };
@@ -1933,6 +1936,8 @@
 				3C514934273D095800F78617 /* CommonEditorCellSwitch.m */,
 				3C514946273D095900F78617 /* CommonEditorCellTextView.h */,
 				3C514935273D095800F78617 /* CommonEditorCellTextView.m */,
+				3C57678828D9B2DC00D1B5BF /* CommonEditorWebCell.h */,
+				3C57678728D9B2DC00D1B5BF /* CommonEditorWebCell.m */,
 				3C514952273D096A00F78617 /* CommonEditorViewController.h */,
 				3C514951273D096A00F78617 /* CommonEditorViewController.m */,
 				3C514954273D097E00F78617 /* CommonEditorTableContainerView.h */,
@@ -2330,6 +2335,7 @@
 				71BF06FE1D2F3CBA00981938 /* OfflineSettingViewController.m in Sources */,
 				71DF74341C5757DA00F2789C /* ActiveViewController.m in Sources */,
 				7162A5431C58719D00AB630E /* RATreeNodeInfo.m in Sources */,
+				3C57678928D9B2DC00D1B5BF /* CommonEditorWebCell.m in Sources */,
 				3C51494B273D095900F78617 /* CommonEditorCellLabel.m in Sources */,
 				71FFBBE91C60894900D91DC2 /* iSalesDB.m in Sources */,
 				7162A55B1C58724700AB630E /* ContactAdvanceSearchViewController.m in Sources */,
@@ -2513,7 +2519,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51537;
+				CURRENT_PROJECT_VERSION = 51890;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2530,7 +2536,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.23;
+				MARKETING_VERSION = 1.25;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2557,7 +2563,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 51537;
+				CURRENT_PROJECT_VERSION = 51890;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2574,7 +2580,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.23;
+				MARKETING_VERSION = 1.25;
 				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>4</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/SO.storyboard

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="ipad7_9" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -22,7 +23,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cgR-Wk-NQr">
-                                <rect key="frame" x="384.5" y="249" width="71.5" height="31"/>
+                                <rect key="frame" x="376" y="245.5" width="80" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Update"/>
                                 <connections>
@@ -30,7 +31,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mGr-dd-c4r">
-                                <rect key="frame" x="24" y="249" width="44" height="31"/>
+                                <rect key="frame" x="24" y="245.5" width="47.5" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="OK"/>
                                 <connections>
@@ -154,7 +155,7 @@
                                 <rect key="frame" x="10" y="54.5" width="546" height="476.5"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="StockTableViewCell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="StockTableViewCell" id="cCT-oh-Vaw" customClass="StockTableViewCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="546" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="546" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="cCT-oh-Vaw" id="H4K-HT-ycL">
                                             <rect key="frame" x="0.0" y="0.0" width="546" height="43.5"/>
@@ -185,7 +186,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bzB-Zs-Ggl">
-                                                    <rect key="frame" x="385" y="6.5" width="145" height="31"/>
+                                                    <rect key="frame" x="385" y="4.5" width="145" height="34.5"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="145" id="XtK-g7-iX0"/>
                                                     </constraints>
@@ -222,7 +223,7 @@
                                 </connections>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mWZ-UV-2uq">
-                                <rect key="frame" x="417" y="539" width="70" height="31"/>
+                                <rect key="frame" x="409" y="535.5" width="78" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Submit"/>
                                 <connections>
@@ -256,7 +257,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GSH-xU-ZC2">
-                                <rect key="frame" x="79" y="539" width="68.5" height="31"/>
+                                <rect key="frame" x="79" y="535.5" width="76.5" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Cancel"/>
                                 <connections>
@@ -310,7 +311,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yd7-ed-ROM">
-                                <rect key="frame" x="321" y="209" width="69" height="31"/>
+                                <rect key="frame" x="313.5" y="205.5" width="76.5" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Cancel"/>
                                 <connections>
@@ -318,7 +319,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c2l-a1-1N7">
-                                <rect key="frame" x="90" y="209" width="72" height="31"/>
+                                <rect key="frame" x="90" y="205.5" width="80" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Update"/>
                                 <connections>
@@ -326,7 +327,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rGb-d5-ylx">
-                                <rect key="frame" x="116" y="126" width="75" height="31"/>
+                                <rect key="frame" x="116" y="126" width="75" height="34.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="75" id="EOy-tz-SaQ"/>
                                 </constraints>
@@ -338,7 +339,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j4k-ge-lGR">
-                                <rect key="frame" x="30" y="126" width="75" height="31"/>
+                                <rect key="frame" x="30" y="126" width="75" height="34.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="75" id="7yC-hg-CCg"/>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="75" id="shA-L7-Hr8"/>
@@ -351,7 +352,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XyX-ZJ-w5O">
-                                <rect key="frame" x="288" y="126" width="75" height="31"/>
+                                <rect key="frame" x="288" y="126" width="75" height="34.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="75" id="rWX-pU-Bpc"/>
                                 </constraints>
@@ -363,7 +364,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TM5-qF-w8m">
-                                <rect key="frame" x="375" y="126" width="75" height="31"/>
+                                <rect key="frame" x="375" y="126" width="75" height="34.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="75" id="0JP-zW-FX3"/>
                                 </constraints>
@@ -375,7 +376,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C8q-nA-CQp">
-                                <rect key="frame" x="202" y="126" width="75" height="31"/>
+                                <rect key="frame" x="202" y="126" width="75" height="34.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="75" id="Vbq-K9-ykh"/>
                                 </constraints>
@@ -441,7 +442,7 @@
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ScanListCell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ScanListCell" rowHeight="136" id="YfV-Cl-5Tu" customClass="ScanListCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="714" height="136"/>
+                                        <rect key="frame" x="0.0" y="50" width="714" height="136"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YfV-Cl-5Tu" id="exp-Hy-y0g">
                                             <rect key="frame" x="0.0" y="0.0" width="714" height="136"/>
@@ -698,7 +699,7 @@
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qoy-vW-xRS">
-                                                    <rect key="frame" x="603" y="3" width="96" height="41"/>
+                                                    <rect key="frame" x="590.5" y="3" width="108.5" height="41"/>
                                                     <state key="normal" title="Button"/>
                                                     <buttonConfiguration key="configuration" style="plain" title="Add to cart"/>
                                                     <connections>
@@ -865,11 +866,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="bW9-lh-e8E">
-                                <rect key="frame" x="15" y="44" width="714" height="978"/>
+                                <rect key="frame" x="15" y="44" width="714" height="974.5"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ScanModelListCell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ScanModelListCell" rowHeight="136" id="di6-XI-avZ" customClass="ScanModelListCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="714" height="136"/>
+                                        <rect key="frame" x="0.0" y="50" width="714" height="136"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="di6-XI-avZ" id="Ajw-zF-nXf">
                                             <rect key="frame" x="0.0" y="0.0" width="714" height="136"/>
@@ -1276,7 +1277,7 @@
                                 </connections>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N1G-LR-2o5">
-                                <rect key="frame" x="608" y="1042" width="96" height="31"/>
+                                <rect key="frame" x="595.5" y="1038.5" width="108.5" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Add to cart"/>
                                 <connections>
@@ -1284,7 +1285,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zM0-LF-q8I">
-                                <rect key="frame" x="480" y="1042" width="88" height="31"/>
+                                <rect key="frame" x="456.5" y="1038.5" width="99" height="34.5"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Scan next"/>
                                 <connections>
@@ -1336,7 +1337,7 @@
                                         <color key="sectionIndexBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="CartItemCell" rowHeight="146" id="fdn-6O-9Xe" customClass="ModelItemCell">
-                                                <rect key="frame" x="0.0" y="44.5" width="744" height="146"/>
+                                                <rect key="frame" x="0.0" y="50" width="744" height="146"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fdn-6O-9Xe" id="dsP-tF-cWg">
                                                     <rect key="frame" x="0.0" y="0.0" width="744" height="146"/>
@@ -1553,7 +1554,7 @@ Stock</string>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ScanCartItemCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ScanCartItemCell" rowHeight="120" id="Bb2-X4-qir" customClass="ScanCartItemCell">
-                                                <rect key="frame" x="0.0" y="190.5" width="744" height="120"/>
+                                                <rect key="frame" x="0.0" y="196" width="744" height="120"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Bb2-X4-qir" id="6UY-HP-ApY">
                                                     <rect key="frame" x="0.0" y="0.0" width="744" height="120"/>
@@ -1633,7 +1634,7 @@ Stock</string>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ATy-eu-2mi">
-                                                            <rect key="frame" x="425" y="78" width="169" height="31"/>
+                                                            <rect key="frame" x="425" y="74.5" width="169" height="34.5"/>
                                                             <state key="normal" title="Button"/>
                                                             <buttonConfiguration key="configuration" style="plain" title="Discount"/>
                                                             <connections>
@@ -1692,7 +1693,7 @@ Stock</string>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="section_header_cell" rowHeight="50" id="PUX-MI-ptL">
-                                                <rect key="frame" x="0.0" y="310.5" width="744" height="50"/>
+                                                <rect key="frame" x="0.0" y="316" width="744" height="50"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="PUX-MI-ptL" id="eIK-df-kd8">
                                                     <rect key="frame" x="0.0" y="0.0" width="744" height="50"/>
@@ -1958,7 +1959,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MkS-tT-MEd">
-                                        <rect key="frame" x="456.5" y="84" width="122.5" height="31"/>
+                                        <rect key="frame" x="438.5" y="80.5" width="140.5" height="34.5"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="tinted" title="Customer Type"/>
                                         <connections>
@@ -2149,7 +2150,7 @@ Stock</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ScanListCell" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ScanListCell" rowHeight="136" id="RBD-TT-DqV" customClass="ScanListCell">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="136"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="136"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="RBD-TT-DqV" id="h6v-P5-Y6J">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="136"/>
@@ -2412,7 +2413,7 @@ Stock</string>
                                                     </userDefinedRuntimeAttributes>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LEh-OL-gzO">
-                                                    <rect key="frame" x="633" y="3" width="96" height="41"/>
+                                                    <rect key="frame" x="620.5" y="3" width="108.5" height="41"/>
                                                     <state key="normal" title="Button"/>
                                                     <buttonConfiguration key="configuration" style="plain" title="Add to cart"/>
                                                     <connections>
@@ -2581,7 +2582,7 @@ Stock</string>
                                 <rect key="frame" x="0.0" y="0.0" width="744" height="1133"/>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c9q-te-KHg">
-                                <rect key="frame" x="182" y="436.5" width="380" height="260"/>
+                                <rect key="frame" x="182" y="433" width="380" height="260"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Homelegance Warehouse Location:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Vv-Np-lYi">
                                         <rect key="frame" x="24" y="16" width="332" height="24"/>
@@ -2590,7 +2591,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pIX-gE-l1R">
-                                        <rect key="frame" x="130" y="56" width="120.5" height="31"/>
+                                        <rect key="frame" x="121.5" y="56" width="137.5" height="34.5"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="Select a server"/>
                                         <connections>
@@ -2598,12 +2599,12 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="AcX-Su-5k5">
-                                        <rect key="frame" x="24" y="103" width="332" height="34"/>
+                                        <rect key="frame" x="24" y="106.5" width="332" height="34"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
                                     </textField>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cO1-GO-FNL">
-                                        <rect key="frame" x="300.5" y="153" width="55.5" height="31"/>
+                                        <rect key="frame" x="295" y="156.5" width="61" height="34.5"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="Save"/>
                                         <connections>
@@ -2611,7 +2612,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ogl-HO-s1X">
-                                        <rect key="frame" x="287" y="216" width="69" height="31"/>
+                                        <rect key="frame" x="279.5" y="223" width="76.5" height="34.5"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="Cancel"/>
                                         <connections>
@@ -2619,7 +2620,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j4q-WP-XaC">
-                                        <rect key="frame" x="24" y="153" width="101" height="31"/>
+                                        <rect key="frame" x="24" y="156.5" width="114.5" height="34.5"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="Refresh List"/>
                                         <connections>
@@ -2630,6 +2631,7 @@ Stock</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstItem="5Vv-Np-lYi" firstAttribute="top" secondItem="c9q-te-KHg" secondAttribute="top" constant="16" id="ARj-my-hwI"/>
+                                    <constraint firstAttribute="height" constant="260" id="BJ3-kB-3bf"/>
                                     <constraint firstItem="cO1-GO-FNL" firstAttribute="top" secondItem="AcX-Su-5k5" secondAttribute="bottom" constant="16" id="Oh4-1c-KcK"/>
                                     <constraint firstItem="5Vv-Np-lYi" firstAttribute="centerX" secondItem="c9q-te-KHg" secondAttribute="centerX" id="R1y-Bw-fin"/>
                                     <constraint firstItem="AcX-Su-5k5" firstAttribute="width" secondItem="5Vv-Np-lYi" secondAttribute="width" id="SC5-oR-IPR"/>
@@ -2643,7 +2645,6 @@ Stock</string>
                                     <constraint firstAttribute="width" constant="380" id="lEF-5e-SdY"/>
                                     <constraint firstItem="AcX-Su-5k5" firstAttribute="centerX" secondItem="c9q-te-KHg" secondAttribute="centerX" id="pZ7-1p-8Yu"/>
                                     <constraint firstItem="pIX-gE-l1R" firstAttribute="centerX" secondItem="c9q-te-KHg" secondAttribute="centerX" id="qrH-gh-mnJ"/>
-                                    <constraint firstAttribute="height" constant="260" id="xjv-g5-hMd"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -2652,8 +2653,9 @@ Stock</string>
                         <constraints>
                             <constraint firstItem="c9q-te-KHg" firstAttribute="centerX" secondItem="uQc-Lh-Rs6" secondAttribute="centerX" id="5py-rA-UQR"/>
                             <constraint firstItem="Fch-tn-bXo" firstAttribute="top" secondItem="uQc-Lh-Rs6" secondAttribute="top" id="SfD-fe-Ur7"/>
-                            <constraint firstItem="c9q-te-KHg" firstAttribute="centerY" secondItem="uQc-Lh-Rs6" secondAttribute="centerY" id="dWN-tt-I2P"/>
+                            <constraint firstItem="c9q-te-KHg" firstAttribute="centerY" secondItem="uQc-Lh-Rs6" secondAttribute="centerY" priority="750" id="dWN-tt-I2P"/>
                             <constraint firstItem="Fch-tn-bXo" firstAttribute="leading" secondItem="XV0-bs-Lf0" secondAttribute="leading" id="ecu-14-4j6"/>
+                            <constraint firstItem="XV0-bs-Lf0" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="c9q-te-KHg" secondAttribute="bottom" constant="420" id="qJH-sf-KLA"/>
                             <constraint firstAttribute="bottom" secondItem="Fch-tn-bXo" secondAttribute="bottom" id="rSE-qk-tFf"/>
                             <constraint firstAttribute="trailing" secondItem="Fch-tn-bXo" secondAttribute="trailing" id="xc6-v5-vy7"/>
                         </constraints>
@@ -2681,7 +2683,7 @@ Stock</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="hO3-NR-b05">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hO3-NR-b05" id="jg4-JD-jFQ">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="43.5"/>
@@ -2722,7 +2724,7 @@ Stock</string>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="k1t-dv-O2g">
-                                        <rect key="frame" x="0.0" y="44.5" width="744" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="50" width="744" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="k1t-dv-O2g" id="JR5-7G-JCb">
                                             <rect key="frame" x="0.0" y="0.0" width="744" height="43.5"/>

RedAnt ERP Mobile/HMLG Scan Order/ScanListCell.m

@@ -206,7 +206,7 @@
         price3 = [NSString stringWithFormat:@"%.2f",[_modelJson[price_group[@"price_3"][@"name"]] doubleValue]];
 
 //    if(![_modelJson [@"special_price"] boolValue]&& ![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])
-    if((![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqual:price3]))
+    if((![price1 isEqualToString: @"N/A"] && [price1 isEqualToString:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqualToString:price3]))
     {
 //        if(RASingleton.sharedInstance.price_type==1)
             _modelJson [@"net_price"] = @true;

RedAnt ERP Mobile/HMLG Scan Order/ScanModelListCell.m

@@ -112,7 +112,7 @@
         price3 = [NSString stringWithFormat:@"%.2f",[_modelJson[price_group[@"price_3"][@"name"]] doubleValue]];
 
 //    if(![_modelJson [@"special_price"] boolValue]&& ![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])
-    if((![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqual:price3]))
+    if((![price1 isEqualToString: @"N/A"] && [price1 isEqualToString:price3])||(![price2 isEqualToString: @"N/A"] && [price2 isEqualToString:price3]))
     {
 //        if(RASingleton.sharedInstance.price_type==1)
             _modelJson [@"net_price"] = @true;

RedAnt ERP Mobile/HMLG Scan Order/ScanOrderModelListViewController.m

@@ -13,6 +13,7 @@
 #import "ActiveViewController.h"
 #import "RAUtils.h"
 #import "RAConvertor.h"
+#import "RADataProvider.h"
 @interface ScanOrderModelListViewController ()
 
 @end
@@ -45,7 +46,8 @@
 {
     [super setScan_val:scan_val];
     
-    
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    NSDictionary* price_group = [RADataProvider get_price_group:appDelegate.price_group];
     self.modellist = [NSMutableArray new];
     
     NSArray* arr = (NSArray*) self.scan_val;
@@ -85,10 +87,10 @@
             unit_cuft = [NSString stringWithFormat:@"%.2f", [jitem[@"unit_cuft"] doubleValue]];
         }
         
-        NSString* price0=jitem[@"price0"]; //DDP
-        NSString* price1=jitem[@"price1"]; //WHSE
-        NSString* price2=jitem[@"price2"]; //SHOW
-        NSString* price3=jitem[@"price3"]; //%25
+        NSString* price0=jitem[price_group[@"price_0"][@"name"]]; //DDP
+        NSString* price1=jitem[price_group[@"price_1"][@"name"]]; //WHSE
+        NSString* price2=jitem[price_group[@"price_2"][@"name"]]; //SHOW
+        NSString* price3=jitem[price_group[@"price_3"][@"name"]]; //%25
         NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
         if (addressDic) {
             
@@ -102,16 +104,16 @@
 
         
         if(![price0 isEqualToString: @"N/A"])
-            price0 = [NSString stringWithFormat:@"%.2f",[jitem[@"price0"] doubleValue]];
+            price0 = [NSString stringWithFormat:@"%.2f",[jitem[price_group[@"price_0"][@"name"]] doubleValue]];
         if(![price1 isEqualToString: @"N/A"])
-            price1 = [NSString stringWithFormat:@"%.2f",[jitem[@"price1"] doubleValue]];
+            price1 = [NSString stringWithFormat:@"%.2f",[jitem[price_group[@"price_1"][@"name"]] doubleValue]];
         if(![price2 isEqualToString: @"N/A"])
         {
-            price2 = [NSString stringWithFormat:@"%.2f",[jitem[@"price2"] doubleValue]];
+            price2 = [NSString stringWithFormat:@"%.2f",[jitem[price_group[@"price_2"][@"name"]] doubleValue]];
             jitem [@"special_price"] = @true;
         }
         if(![price3 isEqualToString: @"N/A"])
-            price3 = [NSString stringWithFormat:@"%.2f",[jitem[@"price3"] doubleValue]];
+            price3 = [NSString stringWithFormat:@"%.2f",[jitem[price_group[@"price_3"][@"name"]] doubleValue]];
 
         if(![jitem [@"special_price"] boolValue]&& ![price1 isEqualToString: @"N/A"] && [price1 isEqual:price3])
         {
@@ -140,7 +142,7 @@
         if(RASingleton.sharedInstance.price_type==1)
         {
     //        if(_modelJson [@"net_price"])
-                cell_price=jitem[@"price3"];
+                cell_price=jitem[price_group[@"price_3"][@"name"]];
 //            jitem[@"unit_price"] =jitem[@"price3"];
 //            jitem[@"erp_unit_price"] =jitem[@"price3"];
     //        else if(_modelJson [@"special_price"])
@@ -154,23 +156,23 @@
         }
         else
         {
-            cell_price=jitem[@"price0"];
+            cell_price=jitem[price_group[@"price_0"][@"name"]];
 //            jitem[@"unit_price"] =jitem[@"price0"];
 //            jitem[@"erp_unit_price"] =jitem[@"price0"];
         }
         
         NSString * unit_price;
         if(RASingleton.sharedInstance.price_type==0)
-            unit_price=jitem[@"price0"];
+            unit_price=jitem[price_group[@"price_0"][@"name"]];
         else if(jitem [@"special_price"])
         {
-            unit_price= jitem[@"price2"];
+            unit_price= jitem[price_group[@"price_2"][@"name"]];
         }
         else if(jitem [@"net_price"])
-            unit_price=jitem[@"price3"];
+            unit_price=jitem[price_group[@"price_3"][@"name"]];
         else
         {
-            unit_price= jitem[@"price1"];
+            unit_price= jitem[price_group[@"price_1"][@"name"]];
         }
 
         if([unit_price isEqualToString:@"N/A"])

RedAnt ERP Mobile/common/AppDelegateBase.m

@@ -14,7 +14,7 @@
 #import "ZipArchive.h"
 #import "DefaultAppearance.h"
 #import "OLDataProvider.h"
-//#import "AFHTTPSessionManager.h"
+
 #import "SelectUploadOrderViewController.h"
 #import "iSalesDB.h"
 #import "RANetwork.h"

RedAnt ERP Mobile/common/Functions/camscan/ScannerViewController.m

@@ -243,7 +243,7 @@
     {
 //        self.scan_val = @"[[\"1111\",\"name0\",\"description\",\"10.1 X 20.2 X 30.3\",\"2\",\"12.34\",\"VIET\",\"VCSF\",\"May\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\"],[\"2222\",\"name1\",\"description\",\"10.1 X 20.2 X 30.3\",\"2\",\"12.34\",\"VIET\",\"VCSF\",\"May\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\",\"123.45\",\"234.56\"]]";
         
-        self.scan_val =@"[\"MT-USH08Q\",\"1438-4\",\"1000A70WH\",\"1002A70BK\"]";// @"[\"1002A70BK\"]";// 
+        self.scan_val =@"[\"1430K-1CK*\",\"1430K-1EK*\",\"1000A70WH\",\"1002A70BK\"]";// @"[\"1002A70BK\"]";// 
         [self addtocart];
     }
 
@@ -901,7 +901,7 @@
 //
 //        jitem[@"check"]=@(true);
 //
-        
+         
         self.resultvc.scan_val = item;
         self.resultvc.modalPresentationStyle = UIModalPresentationFullScreen;//有三种状态，自己看看是哪种
         __weak typeof(self) weakself = self;

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

@@ -1231,12 +1231,15 @@
     self.label_net_err.layer.masksToBounds=true;
     
     
-    #ifndef RA_NOTIFICATION
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(priceTypeChanged:) name:Change_Price_Type_Notification object:nil];
     
 #ifdef SCANNER_ORDER
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cartrefresh:) name:@"RA_NOTIFICATION_CART_REFRESH" object:nil];
 #endif
+    
+    #ifndef RA_NOTIFICATION
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(priceTypeChanged:) name:Change_Price_Type_Notification object:nil];
+    
+
 #endif
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];
@@ -1282,6 +1285,9 @@
 -(void) cartrefresh: (NSNotification *)notification
 {
     [OLDataProvider scanRefreshCart];
+    [ActiveViewController Notify:@"CartViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+//    [self refresh_total];
+//    [self refresh_ui];
 }
 //-(void)SelectOrder:(NSString *)orderid
 //{
@@ -3026,11 +3032,17 @@
             {
                 if([item_json[@"special_price"] boolValue])
                 {
-                    msurcharge=([item_json[@"price3"] doubleValue]-[item_json[@"price2"] doubleValue])*count*(1-discount/100.0);
+                    msurcharge=([item_json[price_group[@"price_3"][@"name"]] doubleValue]-[item_json[price_group[@"price_2"][@"name"]] doubleValue])*count*(1-discount/100.0);
+                    if(msurcharge<0)
+                        msurcharge = 0;
                 }
                 else
                 {
-                    msurcharge=([item_json[@"price3"] doubleValue]-[item_json[@"price1"] doubleValue])*count*(1-discount/100.0);
+                    msurcharge=([item_json[price_group[@"price_3"][@"name"]] doubleValue]-[item_json[price_group[@"price_1"][@"name"]] doubleValue])*count*(1-discount/100.0);
+                    if(msurcharge<0)
+                        msurcharge = 0;
+
+                    
                 }
             }
 

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

@@ -12,8 +12,8 @@
 #import "AESCrypt.h"
 //#import "AppDelegate.h"
 #import "ZipArchive.h"
-//#import "UIProgressView+AFNetworking.h"
-//#import "AFHTTPSessionManager.h"
+
+
 #import "AppDelegate.h"
 #import "pdfCreator.h"
 #import "RASingleton.h"
@@ -2705,6 +2705,9 @@
         newsection[[NSString stringWithFormat:@"item_%d",newcount]]=cartitem;
         newcount++;
     }
+    newsection[@"count"]=@(newcount);
+    newsection[@"available"] = @(1);
+    newsection[@"title"] = @"Available List";
     RASingleton.sharedInstance.scan_cart[@"section_0"]=newsection;
 }
 

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

@@ -22,7 +22,7 @@
 #import "RAPDFViewController.h"
 #import "SignatureViewController.h"
 #import "MainViewController.h"
-//#import "AFHTTPSessionManager.h"
+
 #import "DefaultAppearance.h"
 #import "DefaultTableHeaderView.h"
 #import "OLDataProvider.h"

RedAnt ERP Mobile/common/customUI/ImageUploadViewController.m

@@ -8,8 +8,6 @@
 
 #import "ImageUploadViewController.h"
 
-//#import "UIProgressView+AFNetworking.h"
-//#import "AFHTTPSessionManager.h"
 
 #import "config.h"
 #import "RAUtils.h"
@@ -24,7 +22,6 @@
 #import "NetworkUtils.h"
 #import "OLDataProvider.h"
 
-//#import "UIAlertView+AFNetworking.h"
 
 #define TEST_URL @"http://192.168.1.3:8080/ios_server/ul.jsp"
 @interface ImageUploadViewController ()

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

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

@@ -199,7 +199,6 @@
 		716961B519594E1000B19FB4 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 716961B419594E1000B19FB4 /* libsqlite3.dylib */; };
 		716AF8E11D7AA0E0001188E0 /* SelectUploadOrderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 716AF8E01D7AA0E0001188E0 /* SelectUploadOrderViewController.m */; };
 		716AF8E71D7AA398001188E0 /* SelectOrderTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 716AF8E51D7AA398001188E0 /* SelectOrderTableViewCell.m */; };
-		7174D02420033C4900C8C7E6 /* CommonEditorWebCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7174D02320033C4900C8C7E6 /* CommonEditorWebCell.m */; };
 		7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7186C25C1C97A6EE00CB43F4 /* FunctionTestViewController.m */; };
 		718716251C433D8B00F25860 /* ExternalAccessory.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716241C433D8B00F25860 /* ExternalAccessory.framework */; };
 		718716271C433D9700F25860 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 718716261C433D9700F25860 /* AudioToolbox.framework */; };
@@ -218,8 +217,6 @@
 		71BF06FE1D2F3CBA00981938 /* OfflineSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF06FD1D2F3CBA00981938 /* OfflineSettingViewController.m */; };
 		71BF07081D2F3D2800981938 /* SyncControlPanelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF07071D2F3D2800981938 /* SyncControlPanelViewController.m */; };
 		71BF33011EFA1D6100842CB4 /* Assets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 71BF32FB1EFA1D6100842CB4 /* Assets.bundle */; };
-		71BF33021EFA1D6100842CB4 /* YTPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */; };
-		71BF33031EFA1D6100842CB4 /* YTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BF33001EFA1D6100842CB4 /* YTViewController.m */; };
 		71C014D71F46958F00DEB153 /* OLM.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71C014D51F46958F00DEB153 /* OLM.storyboard */; };
 		71C1D8311F456A9100CEA1C9 /* CUL.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71C1D8301F456A9100CEA1C9 /* CUL.storyboard */; };
 		71C1D83D1F456BE800CEA1C9 /* more_info.html in Resources */ = {isa = PBXBuildFile; fileRef = 71C1D8361F456BE800CEA1C9 /* more_info.html */; };
@@ -649,8 +646,6 @@
 		716AF8E01D7AA0E0001188E0 /* SelectUploadOrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectUploadOrderViewController.m; path = common/Functions/offline/SelectUploadOrderViewController.m; sourceTree = SOURCE_ROOT; };
 		716AF8E51D7AA398001188E0 /* SelectOrderTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectOrderTableViewCell.m; path = common/Functions/offline/SelectOrderTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		716AF8E61D7AA398001188E0 /* SelectOrderTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectOrderTableViewCell.h; path = common/Functions/offline/SelectOrderTableViewCell.h; sourceTree = SOURCE_ROOT; };
-		7174D02220033C4800C8C7E6 /* CommonEditorWebCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommonEditorWebCell.h; path = common/CommonEditor/CommonEditorWebCell.h; sourceTree = SOURCE_ROOT; };
-		7174D02320033C4900C8C7E6 /* CommonEditorWebCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonEditorWebCell.m; path = common/CommonEditor/CommonEditorWebCell.m; sourceTree = SOURCE_ROOT; };
 		7186C25B1C97A6EE00CB43F4 /* FunctionTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FunctionTestViewController.h; path = common/Functions/sidemenu/FunctionTestViewController.h; sourceTree = SOURCE_ROOT; };
 		7186C25C1C97A6EE00CB43F4 /* FunctionTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FunctionTestViewController.m; path = common/Functions/sidemenu/FunctionTestViewController.m; sourceTree = SOURCE_ROOT; };
 		718716221C433D5000F25860 /* libScanApiCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libScanApiCore.a; path = ../lib/libScanApiCore.a; sourceTree = "<group>"; };
@@ -684,10 +679,6 @@
 		71BF07071D2F3D2800981938 /* SyncControlPanelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SyncControlPanelViewController.m; path = common/Functions/offline/SyncControlPanelViewController.m; sourceTree = SOURCE_ROOT; };
 		71BF32FB1EFA1D6100842CB4 /* Assets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Assets.bundle; path = common/youtube/Assets.bundle; sourceTree = SOURCE_ROOT; };
 		71BF32FC1EFA1D6100842CB4 /* YouTubeiOSPlayerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YouTubeiOSPlayerHelper.h; path = common/youtube/YouTubeiOSPlayerHelper.h; sourceTree = SOURCE_ROOT; };
-		71BF32FD1EFA1D6100842CB4 /* YTPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTPlayerView.h; path = common/youtube/YTPlayerView.h; sourceTree = SOURCE_ROOT; };
-		71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTPlayerView.m; path = common/youtube/YTPlayerView.m; sourceTree = SOURCE_ROOT; };
-		71BF32FF1EFA1D6100842CB4 /* YTViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YTViewController.h; path = common/youtube/YTViewController.h; sourceTree = SOURCE_ROOT; };
-		71BF33001EFA1D6100842CB4 /* YTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = YTViewController.m; path = common/youtube/YTViewController.m; sourceTree = SOURCE_ROOT; };
 		71C014D61F46958F00DEB153 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = "iSales-NPD/Base.lproj/OLM.storyboard"; sourceTree = SOURCE_ROOT; };
 		71C1D8301F456A9100CEA1C9 /* CUL.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CUL.storyboard; path = "iSales-NPD/CUL.storyboard"; sourceTree = SOURCE_ROOT; };
 		71C1D8321F456ABE00CEA1C9 /* DejaVuSans-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "DejaVuSans-Bold.ttf"; path = "iSales-NPD/DejaVuSans-Bold.ttf"; sourceTree = SOURCE_ROOT; };
@@ -1842,10 +1833,6 @@
 			children = (
 				71BF32FB1EFA1D6100842CB4 /* Assets.bundle */,
 				71BF32FC1EFA1D6100842CB4 /* YouTubeiOSPlayerHelper.h */,
-				71BF32FD1EFA1D6100842CB4 /* YTPlayerView.h */,
-				71BF32FE1EFA1D6100842CB4 /* YTPlayerView.m */,
-				71BF32FF1EFA1D6100842CB4 /* YTViewController.h */,
-				71BF33001EFA1D6100842CB4 /* YTViewController.m */,
 			);
 			name = "youtube player";
 			sourceTree = "<group>";
@@ -1925,8 +1912,6 @@
 				71DF744E1C575E7900F2789C /* CommonEditorCellTextView.m */,
 				71DF744F1C575E7900F2789C /* CommonEditorViewController.h */,
 				71DF74501C575E7900F2789C /* CommonEditorViewController.m */,
-				7174D02220033C4800C8C7E6 /* CommonEditorWebCell.h */,
-				7174D02320033C4900C8C7E6 /* CommonEditorWebCell.m */,
 				71DF74511C575E7900F2789C /* DatePickerViewController.h */,
 				71DF74521C575E7900F2789C /* DatePickerViewController.m */,
 				71DF74531C575E7900F2789C /* EnumSelectorCell.h */,
@@ -2119,7 +2104,6 @@
 				71DF745B1C575E7900F2789C /* CommonEditorCellAction.m in Sources */,
 				7162A5411C58719D00AB630E /* RATreeNode.m in Sources */,
 				7162A5251C58706C00AB630E /* CategoryCellSmall.m in Sources */,
-				7174D02420033C4900C8C7E6 /* CommonEditorWebCell.m in Sources */,
 				712AFEDA1DBA050200254965 /* ImageDrawable.m in Sources */,
 				428980721E24B1E9005F1BD8 /* Singleton.m in Sources */,
 				71E9F6C51F8B58740052C78E /* RANetworkTaskDelegate.m in Sources */,
@@ -2247,7 +2231,6 @@
 				42BEAB2C1FA1D0780024D647 /* EnumSelectAndSortViewController.m in Sources */,
 				42BEF35A1E89FE1200632AB6 /* README.md in Sources */,
 				71DF748D1C57608F00F2789C /* TouchLabel.m in Sources */,
-				71BF33031EFA1D6100842CB4 /* YTViewController.m in Sources */,
 				428980171E24924D005F1BD8 /* SortItemViewController.m in Sources */,
 				42D3A4A11EFA6D36007A54C1 /* ContentPreviewController.m in Sources */,
 				7162A5711C58728D00AB630E /* DetailImageCell.m in Sources */,
@@ -2285,7 +2268,6 @@
 				7141DD3C1C5726B700F7DF59 /* ScanApiHelper.mm in Sources */,
 				7162A5261C58706C00AB630E /* CategoryViewController.m in Sources */,
 				7162A50A1C586FC100AB630E /* NSTimer+Addition.m in Sources */,
-				71BF33021EFA1D6100842CB4 /* YTPlayerView.m in Sources */,
 				71DF745E1C575E7900F2789C /* CommonEditorCellImg.m in Sources */,
 				712AFED91DBA050200254965 /* GroupDrawable.m in Sources */,
 			);