Scan order 1.06

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

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		3C16916C27FE7E3000026FE5 /* SignUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C16916B27FE7E3000026FE5 /* SignUpViewController.m */; };
 		3C16916F280004E000026FE5 /* ChangePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C16916E280004E000026FE5 /* ChangePasswordViewController.m */; };
+		3C2D0483285B242800423D97 /* ScanDiscountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D0482285B242800423D97 /* ScanDiscountViewController.m */; };
 		3C2F99B8237BE1790000808F /* PortfolioListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */; };
 		3C3A5AFE27D74E50005F4EFB /* ScanResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3A5AFD27D74E4F005F4EFB /* ScanResultViewController.m */; };
 		3C3A5B0127D74F91005F4EFB /* ScanOrderScanModelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3A5B0027D74F91005F4EFB /* ScanOrderScanModelViewController.m */; };
@@ -343,6 +344,8 @@
 		3C16916B27FE7E3000026FE5 /* SignUpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SignUpViewController.m; sourceTree = "<group>"; };
 		3C16916D280004E000026FE5 /* ChangePasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChangePasswordViewController.h; sourceTree = "<group>"; };
 		3C16916E280004E000026FE5 /* ChangePasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChangePasswordViewController.m; sourceTree = "<group>"; };
+		3C2D0481285B242800423D97 /* ScanDiscountViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScanDiscountViewController.h; sourceTree = "<group>"; };
+		3C2D0482285B242800423D97 /* ScanDiscountViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScanDiscountViewController.m; sourceTree = "<group>"; };
 		3C2F99B6237BE1790000808F /* PortfolioListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PortfolioListTableViewCell.m; path = common/Functions/portfolio/PortfolioListTableViewCell.m; sourceTree = SOURCE_ROOT; };
 		3C2F99B7237BE1790000808F /* PortfolioListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PortfolioListTableViewCell.h; path = common/Functions/portfolio/PortfolioListTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		3C3A5AFC27D74E4F005F4EFB /* ScanResultViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ScanResultViewController.h; path = common/Functions/camscan/ScanResultViewController.h; sourceTree = SOURCE_ROOT; };
@@ -1088,6 +1091,8 @@
 				3CD54A78282CF21D0073A15D /* ScanHomeViewController.m */,
 				3CD54A7A282CF4930073A15D /* ScanHomeCell.h */,
 				3CD54A7B282CF4930073A15D /* ScanHomeCell.m */,
+				3C2D0481285B242800423D97 /* ScanDiscountViewController.h */,
+				3C2D0482285B242800423D97 /* ScanDiscountViewController.m */,
 			);
 			name = OLO;
 			sourceTree = "<group>";
@@ -2446,6 +2451,7 @@
 				712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */,
 				428980481E249339005F1BD8 /* JKMessageBoxController.m in Sources */,
 				7162A5741C58728D00AB630E /* DetailViewController.m in Sources */,
+				3C2D0483285B242800423D97 /* ScanDiscountViewController.m in Sources */,
 				71DF748E1C57608F00F2789C /* UILabel+FontAppearance.m in Sources */,
 				712C40B61C7310F4000E6831 /* CartGeneralNotesViewController.m in Sources */,
 				712AFEDE1DBA050200254965 /* TableDrawable.m in Sources */,
@@ -2695,7 +2701,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 50780;
+				CURRENT_PROJECT_VERSION = 51139;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2712,7 +2718,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.05;
+				MARKETING_VERSION = 1.06;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2739,7 +2745,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 50780;
+				CURRENT_PROJECT_VERSION = 51139;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2756,7 +2762,7 @@
 					"$(PROJECT_DIR)/ScanApiSDK-10.2.227-2/lib",
 					"$(PROJECT_DIR)/GoogleAnalytics/GoogleAnalytics/Libraries",
 				);
-				MARKETING_VERSION = 1.05;
+				MARKETING_VERSION = 1.06;
 				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>3</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 </dict>

RedAnt ERP Mobile/HMLG Scan Order/Base.lproj/Main.storyboard

@@ -1616,7 +1616,7 @@
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_ant_logo" translatesAutoresizingMaskIntoConstraints="NO" id="7er-Pu-WBZ">
+                                    <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="red_ant_logo" translatesAutoresizingMaskIntoConstraints="NO" id="7er-Pu-WBZ">
                                         <rect key="frame" x="24" y="223" width="36" height="36"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="36" id="EKI-by-JCU"/>
@@ -1635,7 +1635,7 @@ Phone: 510.818.9388</string>
                                         <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                                         <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
                                     </textView>
-                                    <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dd8-jB-tBc">
+                                    <textView hidden="YES" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dd8-jB-tBc">
                                         <rect key="frame" x="68" y="202" width="377" height="78"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="78" id="vl3-wA-qey"/>
@@ -2018,10 +2018,10 @@ Email: redantsupport@united-us.net</string>
         <image name="btn_retrieve" width="102" height="30"/>
         <image name="btn_signin" width="100" height="30"/>
         <image name="camera" width="48" height="48"/>
-        <image name="cart_empty" width="72" height="72"/>
+        <image name="cart_empty" width="96" height="96"/>
         <image name="check_1_24" width="24" height="24"/>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="40" height="40"/>
+        <image name="close" width="32" height="32"/>
         <image name="menu_open" width="36" height="36"/>
         <image name="npd_logo" width="110" height="13"/>
         <image name="order" width="72" height="72"/>

RedAnt ERP Mobile/HMLG Scan Order/MainViewController.m

@@ -53,7 +53,7 @@
 {
     [self.cartViewController logout];
     RASingleton.sharedInstance.scan_cart = nil;
-    RASingleton.sharedInstance.price_type = 0;
+    RASingleton.sharedInstance.price_type = 1;
 }
 -(void) logoutWish
 {
@@ -1675,7 +1675,7 @@
 //
 //                                 cvc.onCancel = ^(){
 //
-//                                     [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                                     [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //
@@ -1871,7 +1871,7 @@
 //
 //                         cvc.onCancel = ^(){
 //
-//                             [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                             [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //
@@ -2589,7 +2589,7 @@
 //            {
 //                if(value==nil)
 //                {
-//                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //                }
 //                else
 //                {
@@ -2669,7 +2669,7 @@
 ////                        self.norefresh = true;
 //                        if(appDelegate.customerInfo==nil)
 //                        {
-//                            [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                            [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //                        }
 //                        else
 //                        {
@@ -2715,7 +2715,7 @@
 //
 //                    cvc.onCancel = ^(){
 //
-//                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //
@@ -2766,7 +2766,7 @@
     
 //    RASingleton.sharedInstance.permissions_edit_order = true;
     
-    
+    RASingleton.sharedInstance.price_type = 1;
     [OLDataProvider createScanTempFolder];
     
     NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"] ;
@@ -3616,7 +3616,7 @@
 //
 //            cvc.onCancel = ^(){
 //
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //

RedAnt ERP Mobile/HMLG Scan Order/SO.storyboard

@@ -143,6 +143,139 @@
             </objects>
             <point key="canvasLocation" x="130.64516129032259" y="109.62047661076787"/>
         </scene>
+        <!--Choose a discount rate-->
+        <scene sceneID="MGa-qa-te4">
+            <objects>
+                <viewController storyboardIdentifier="ScanDiscountViewController" title="Choose a discount rate" useStoryboardIdentifierAsRestorationIdentifier="YES" id="OHW-L2-C58" customClass="ScanDiscountViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="WFI-Em-MeJ">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Discount can’t be combined with others." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="duu-Y5-mBR">
+                                <rect key="frame" x="86" y="45" width="308" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <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="229" width="69" height="31"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Cancel"/>
+                                <connections>
+                                    <action selector="onCancel:" destination="OHW-L2-C58" eventType="touchUpInside" id="TR8-xR-Q6m"/>
+                                </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="229" width="72" height="31"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="Update"/>
+                                <connections>
+                                    <action selector="onUpdate:" destination="OHW-L2-C58" eventType="touchUpInside" id="weC-Bt-Qkn"/>
+                                </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"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="EOy-tz-SaQ"/>
+                                </constraints>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="3%"/>
+                                <connections>
+                                    <action selector="on3:" destination="OHW-L2-C58" eventType="touchUpInside" id="LYD-rg-2Mj"/>
+                                </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"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="7yC-hg-CCg"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="75" id="shA-L7-Hr8"/>
+                                </constraints>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="None"/>
+                                <connections>
+                                    <action selector="onnone:" destination="OHW-L2-C58" eventType="touchUpInside" id="vkr-Ld-pFe"/>
+                                </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"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="rWX-pU-Bpc"/>
+                                </constraints>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="8%"/>
+                                <connections>
+                                    <action selector="on8:" destination="OHW-L2-C58" eventType="touchUpInside" id="WDA-z5-0Bx"/>
+                                </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"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="0JP-zW-FX3"/>
+                                </constraints>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="10%"/>
+                                <connections>
+                                    <action selector="on10:" destination="OHW-L2-C58" eventType="touchUpInside" id="Ahz-5e-Y6n"/>
+                                </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"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="75" id="Vbq-K9-ykh"/>
+                                </constraints>
+                                <color key="tintColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Button"/>
+                                <buttonConfiguration key="configuration" style="plain" title="5%"/>
+                                <connections>
+                                    <action selector="on5:" destination="OHW-L2-C58" eventType="touchUpInside" id="4So-ka-U6z"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="KlS-KE-AcV"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="XyX-ZJ-w5O" firstAttribute="width" secondItem="j4k-ge-lGR" secondAttribute="width" id="23P-rg-3ir"/>
+                            <constraint firstItem="rGb-d5-ylx" firstAttribute="top" secondItem="duu-Y5-mBR" secondAttribute="bottom" constant="60" id="2ZE-eE-Bva"/>
+                            <constraint firstItem="XyX-ZJ-w5O" firstAttribute="leading" secondItem="C8q-nA-CQp" secondAttribute="trailing" constant="11" id="7uY-g4-bOK"/>
+                            <constraint firstItem="TM5-qF-w8m" firstAttribute="width" secondItem="j4k-ge-lGR" secondAttribute="width" id="K1i-4R-QlE"/>
+                            <constraint firstItem="Yd7-ed-ROM" firstAttribute="centerY" secondItem="c2l-a1-1N7" secondAttribute="centerY" id="M0h-dZ-Krs"/>
+                            <constraint firstItem="C8q-nA-CQp" firstAttribute="leading" secondItem="rGb-d5-ylx" secondAttribute="trailing" constant="11" id="OoD-kO-8ua"/>
+                            <constraint firstItem="C8q-nA-CQp" firstAttribute="centerY" secondItem="j4k-ge-lGR" secondAttribute="centerY" id="PAp-MT-OuU"/>
+                            <constraint firstItem="KlS-KE-AcV" firstAttribute="bottom" secondItem="c2l-a1-1N7" secondAttribute="bottom" constant="60" id="PUW-RR-bBg"/>
+                            <constraint firstItem="duu-Y5-mBR" firstAttribute="top" secondItem="WFI-Em-MeJ" secondAttribute="top" constant="45" id="UcA-sh-ZlQ"/>
+                            <constraint firstItem="rGb-d5-ylx" firstAttribute="leading" secondItem="j4k-ge-lGR" secondAttribute="trailing" constant="11" id="WAO-6y-5ZS"/>
+                            <constraint firstItem="TM5-qF-w8m" firstAttribute="centerY" secondItem="j4k-ge-lGR" secondAttribute="centerY" id="YkY-ry-pd0"/>
+                            <constraint firstItem="KlS-KE-AcV" firstAttribute="trailing" secondItem="Yd7-ed-ROM" secondAttribute="trailing" constant="90" id="ecW-xW-YfS"/>
+                            <constraint firstItem="c2l-a1-1N7" firstAttribute="leading" secondItem="KlS-KE-AcV" secondAttribute="leading" constant="90" id="epF-ls-BLB"/>
+                            <constraint firstItem="rGb-d5-ylx" firstAttribute="centerY" secondItem="j4k-ge-lGR" secondAttribute="centerY" id="fYs-3Y-Ou9"/>
+                            <constraint firstItem="KlS-KE-AcV" firstAttribute="trailing" secondItem="TM5-qF-w8m" secondAttribute="trailing" constant="30" id="g90-gR-zbZ"/>
+                            <constraint firstItem="rGb-d5-ylx" firstAttribute="width" secondItem="j4k-ge-lGR" secondAttribute="width" id="inh-LO-vrm"/>
+                            <constraint firstItem="C8q-nA-CQp" firstAttribute="width" secondItem="j4k-ge-lGR" secondAttribute="width" id="nA3-ez-FOO"/>
+                            <constraint firstItem="XyX-ZJ-w5O" firstAttribute="centerY" secondItem="j4k-ge-lGR" secondAttribute="centerY" id="s2J-Ra-NlF"/>
+                            <constraint firstItem="j4k-ge-lGR" firstAttribute="leading" secondItem="KlS-KE-AcV" secondAttribute="leading" constant="30" id="wpy-Wq-lid"/>
+                            <constraint firstItem="TM5-qF-w8m" firstAttribute="leading" secondItem="XyX-ZJ-w5O" secondAttribute="trailing" priority="750" constant="11" id="ywr-th-P1g"/>
+                            <constraint firstItem="duu-Y5-mBR" firstAttribute="centerX" secondItem="WFI-Em-MeJ" secondAttribute="centerX" id="zZ0-pq-ceO"/>
+                        </constraints>
+                    </view>
+                    <value key="contentSizeForViewInPopover" type="size" width="480" height="320"/>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="480" height="320"/>
+                    <connections>
+                        <outlet property="btn10" destination="TM5-qF-w8m" id="ODw-b1-8hM"/>
+                        <outlet property="btn3" destination="rGb-d5-ylx" id="4l4-tM-zGp"/>
+                        <outlet property="btn5" destination="C8q-nA-CQp" id="orJ-Cu-9QK"/>
+                        <outlet property="btn8" destination="XyX-ZJ-w5O" id="rmC-ak-1lY"/>
+                        <outlet property="btnnone" destination="j4k-ge-lGR" id="FeO-y1-Jkz"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="VNW-8q-78U" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="635" y="96"/>
+        </scene>
         <!--Scan History View Controller-->
         <scene sceneID="AyY-er-cCO">
             <objects>
@@ -1171,118 +1304,130 @@ Stock</string>
                                                     <outlet property="stepper" destination="6xs-Lv-Lz6" id="8FR-ez-c8b"/>
                                                 </connections>
                                             </tableViewCell>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="ScanCartItemCell" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ScanCartItemCell" rowHeight="120" id="Dud-Nr-Lt5" customClass="ScanCartItemCell">
+                                            <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="834" height="120"/>
                                                 <autoresizingMask key="autoresizingMask"/>
-                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Dud-Nr-Lt5" id="PQw-Da-A7v">
+                                                <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="834" height="120"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
-                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NIQ-22-rOQ" userLabel="name and description">
+                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6dX-9b-w6l" userLabel="name and description">
                                                             <rect key="frame" x="15" y="37" width="360" height="47"/>
                                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="9999" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="a3S-8x-BFg" userLabel="qty">
+                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="9999" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="V3e-A3-y8I" userLabel="qty">
                                                             <rect key="frame" x="515" y="41.5" width="60" height="32"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="60" id="Ocp-kw-IJU"/>
-                                                                <constraint firstAttribute="height" constant="32" id="i02-Vn-UGg"/>
+                                                                <constraint firstAttribute="width" constant="60" id="W12-Fv-Xth"/>
+                                                                <constraint firstAttribute="height" constant="32" id="d8i-y9-e8i"/>
                                                             </constraints>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                             <connections>
-                                                                <outlet property="delegate" destination="Dud-Nr-Lt5" id="CuZ-Z8-2k1"/>
+                                                                <outlet property="delegate" destination="Bb2-X4-qir" id="fWF-9f-MvK"/>
                                                             </connections>
                                                         </textField>
-                                                        <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="bZK-ve-mQz">
+                                                        <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="S0K-Bu-637">
                                                             <rect key="frame" x="590" y="41.5" width="94" height="32"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="94" id="ije-r7-EKw"/>
-                                                                <constraint firstAttribute="height" constant="32" id="lzG-UR-3lu"/>
+                                                                <constraint firstAttribute="height" constant="32" id="Bwt-Dk-y1D"/>
+                                                                <constraint firstAttribute="width" constant="94" id="NaB-Sw-2Cw"/>
                                                             </constraints>
                                                             <connections>
-                                                                <action selector="setpperChanged:" destination="Dud-Nr-Lt5" eventType="valueChanged" id="iqR-LK-69q"/>
+                                                                <action selector="setpperChanged:" destination="Bb2-X4-qir" eventType="valueChanged" id="TUZ-RB-2lJ"/>
                                                             </connections>
                                                         </stepper>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PfY-2T-g06" userLabel="unit price">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hlt-a1-Obi" userLabel="unit price">
                                                             <rect key="frame" x="390" y="47" width="110" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="110" id="Jln-Q9-O1q"/>
+                                                                <constraint firstAttribute="width" constant="110" id="A1n-Bu-hvn"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <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="Sold in QTY of:9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m36-cN-e8o">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sold in QTY of:9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sfo-Yw-I0g">
                                                             <rect key="frame" x="654" y="11" width="160" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="160" id="TPC-Ef-jTv"/>
-                                                                <constraint firstAttribute="height" constant="21" id="ggQ-hQ-eNM"/>
+                                                                <constraint firstAttribute="width" constant="160" id="4tF-dv-3cb"/>
+                                                                <constraint firstAttribute="height" constant="21" id="6HM-8j-A6Z"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <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" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rNF-bG-daa" userLabel="subtotal price">
+                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8RN-F1-G0M" userLabel="subtotal price">
                                                             <rect key="frame" x="699" y="47" width="115" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="width" constant="115" id="pms-fx-3vJ"/>
+                                                                <constraint firstAttribute="width" constant="115" id="XTi-4B-GAs"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ZW-F8-dwV">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="93p-eO-r5r">
                                                             <rect key="frame" x="15" y="91" width="804" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="21" id="sTv-Iw-lA1"/>
+                                                                <constraint firstAttribute="height" constant="21" id="xJC-Y7-ODb"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <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="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="slt-h5-vgC">
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Cs-3s-CCg">
                                                             <rect key="frame" x="15" y="11" width="44.5" height="21"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="21" id="7zD-0F-bPf"/>
+                                                                <constraint firstAttribute="height" constant="21" id="jqE-UM-qLG"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
                                                             <nil key="textColor"/>
                                                             <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="515" y="78" width="169" height="31"/>
+                                                            <state key="normal" title="Button"/>
+                                                            <buttonConfiguration key="configuration" style="plain" title="Discount"/>
+                                                            <connections>
+                                                                <action selector="onScanDiscount:" destination="oRS-pB-8jo" eventType="touchUpInside" id="d9h-lA-RcO"/>
+                                                            </connections>
+                                                        </button>
                                                     </subviews>
                                                     <constraints>
-                                                        <constraint firstAttribute="trailing" secondItem="rNF-bG-daa" secondAttribute="trailing" constant="20" id="1ic-w3-NSN"/>
-                                                        <constraint firstItem="bZK-ve-mQz" firstAttribute="centerY" secondItem="PfY-2T-g06" secondAttribute="centerY" id="4hC-kB-1vp"/>
-                                                        <constraint firstAttribute="bottom" secondItem="5ZW-F8-dwV" secondAttribute="bottom" constant="8" id="7ka-Kv-FB0"/>
-                                                        <constraint firstItem="bZK-ve-mQz" firstAttribute="leading" secondItem="a3S-8x-BFg" secondAttribute="trailing" constant="15" id="CQb-Bf-hnY"/>
-                                                        <constraint firstItem="slt-h5-vgC" firstAttribute="top" secondItem="PQw-Da-A7v" secondAttribute="top" constant="11" id="NcX-KG-WGp"/>
-                                                        <constraint firstItem="rNF-bG-daa" firstAttribute="leading" secondItem="bZK-ve-mQz" secondAttribute="trailing" constant="15" id="TQ3-dS-BKH"/>
-                                                        <constraint firstItem="5ZW-F8-dwV" firstAttribute="leading" secondItem="PQw-Da-A7v" secondAttribute="leading" constant="15" id="UJI-FD-5cb"/>
-                                                        <constraint firstAttribute="trailing" secondItem="5ZW-F8-dwV" secondAttribute="trailing" constant="15" id="Xa3-Xb-ZPP"/>
-                                                        <constraint firstItem="PfY-2T-g06" firstAttribute="leading" secondItem="NIQ-22-rOQ" secondAttribute="trailing" constant="15" id="c8j-Ry-uiq"/>
-                                                        <constraint firstItem="NIQ-22-rOQ" firstAttribute="leading" secondItem="slt-h5-vgC" secondAttribute="leading" id="cQt-7Y-75o"/>
-                                                        <constraint firstItem="5ZW-F8-dwV" firstAttribute="top" secondItem="NIQ-22-rOQ" secondAttribute="bottom" constant="7" id="cuH-zj-5vr"/>
-                                                        <constraint firstItem="NIQ-22-rOQ" firstAttribute="top" secondItem="slt-h5-vgC" secondAttribute="bottom" constant="5" id="dCJ-Ri-FUQ"/>
-                                                        <constraint firstItem="a3S-8x-BFg" firstAttribute="centerY" secondItem="PfY-2T-g06" secondAttribute="centerY" id="eKx-7s-dmh"/>
-                                                        <constraint firstItem="rNF-bG-daa" firstAttribute="trailing" secondItem="m36-cN-e8o" secondAttribute="trailing" id="pRT-qN-sw2"/>
-                                                        <constraint firstItem="rNF-bG-daa" firstAttribute="top" secondItem="m36-cN-e8o" secondAttribute="bottom" constant="15" id="sa1-Zj-jYM"/>
-                                                        <constraint firstItem="slt-h5-vgC" firstAttribute="leading" secondItem="PQw-Da-A7v" secondAttribute="leading" constant="15" id="usL-R8-XNC"/>
-                                                        <constraint firstItem="a3S-8x-BFg" firstAttribute="leading" secondItem="PfY-2T-g06" secondAttribute="trailing" constant="15" id="yAX-0T-afJ"/>
-                                                        <constraint firstItem="m36-cN-e8o" firstAttribute="top" secondItem="slt-h5-vgC" secondAttribute="top" id="yTl-TA-TlP"/>
-                                                        <constraint firstItem="rNF-bG-daa" firstAttribute="centerY" secondItem="PfY-2T-g06" secondAttribute="centerY" id="yrm-Xn-7s9"/>
+                                                        <constraint firstItem="ATy-eu-2mi" firstAttribute="leading" secondItem="V3e-A3-y8I" secondAttribute="leading" id="24u-kB-ZTW"/>
+                                                        <constraint firstItem="8RN-F1-G0M" firstAttribute="trailing" secondItem="sfo-Yw-I0g" secondAttribute="trailing" id="5gN-4E-b0J"/>
+                                                        <constraint firstItem="V3e-A3-y8I" firstAttribute="leading" secondItem="Hlt-a1-Obi" secondAttribute="trailing" constant="15" id="6TO-z7-7Kt"/>
+                                                        <constraint firstItem="6dX-9b-w6l" firstAttribute="top" secondItem="3Cs-3s-CCg" secondAttribute="bottom" constant="5" id="87y-Z7-Hjd"/>
+                                                        <constraint firstItem="3Cs-3s-CCg" firstAttribute="leading" secondItem="6UY-HP-ApY" secondAttribute="leading" constant="15" id="8sb-DO-kZb"/>
+                                                        <constraint firstAttribute="bottom" secondItem="93p-eO-r5r" secondAttribute="bottom" constant="8" id="Bfi-UY-dkf"/>
+                                                        <constraint firstItem="S0K-Bu-637" firstAttribute="trailing" secondItem="ATy-eu-2mi" secondAttribute="trailing" id="D0a-fG-ado"/>
+                                                        <constraint firstAttribute="bottom" secondItem="ATy-eu-2mi" secondAttribute="bottom" constant="11" id="D1J-WH-H1j"/>
+                                                        <constraint firstItem="S0K-Bu-637" firstAttribute="leading" secondItem="V3e-A3-y8I" secondAttribute="trailing" constant="15" id="GZs-5w-tdj"/>
+                                                        <constraint firstItem="V3e-A3-y8I" firstAttribute="centerY" secondItem="Hlt-a1-Obi" secondAttribute="centerY" id="HZi-R1-rbC"/>
+                                                        <constraint firstAttribute="trailing" secondItem="93p-eO-r5r" secondAttribute="trailing" constant="15" id="Jrg-pz-XQM"/>
+                                                        <constraint firstItem="8RN-F1-G0M" firstAttribute="top" secondItem="sfo-Yw-I0g" secondAttribute="bottom" constant="15" id="OuW-Vh-JF4"/>
+                                                        <constraint firstAttribute="trailing" secondItem="8RN-F1-G0M" secondAttribute="trailing" constant="20" id="Q90-Vd-eCT"/>
+                                                        <constraint firstItem="8RN-F1-G0M" firstAttribute="centerY" secondItem="Hlt-a1-Obi" secondAttribute="centerY" id="R13-ks-goL"/>
+                                                        <constraint firstItem="3Cs-3s-CCg" firstAttribute="top" secondItem="6UY-HP-ApY" secondAttribute="top" constant="11" id="RWt-7Z-Ux1"/>
+                                                        <constraint firstItem="93p-eO-r5r" firstAttribute="top" secondItem="6dX-9b-w6l" secondAttribute="bottom" constant="7" id="U4m-dk-ipl"/>
+                                                        <constraint firstItem="sfo-Yw-I0g" firstAttribute="top" secondItem="3Cs-3s-CCg" secondAttribute="top" id="VHF-PX-bed"/>
+                                                        <constraint firstItem="8RN-F1-G0M" firstAttribute="leading" secondItem="S0K-Bu-637" secondAttribute="trailing" constant="15" id="c2w-AI-hFk"/>
+                                                        <constraint firstItem="S0K-Bu-637" firstAttribute="centerY" secondItem="Hlt-a1-Obi" secondAttribute="centerY" id="lLa-YW-blq"/>
+                                                        <constraint firstItem="Hlt-a1-Obi" firstAttribute="leading" secondItem="6dX-9b-w6l" secondAttribute="trailing" constant="15" id="lui-4P-z76"/>
+                                                        <constraint firstItem="93p-eO-r5r" firstAttribute="leading" secondItem="6UY-HP-ApY" secondAttribute="leading" constant="15" id="n1s-K8-fxD"/>
+                                                        <constraint firstItem="6dX-9b-w6l" firstAttribute="leading" secondItem="3Cs-3s-CCg" secondAttribute="leading" id="whO-dQ-M3N"/>
                                                     </constraints>
                                                 </tableViewCellContentView>
                                                 <connections>
-                                                    <outlet property="editQTY" destination="a3S-8x-BFg" id="kbC-W9-r6i"/>
-                                                    <outlet property="labelDescription" destination="NIQ-22-rOQ" id="ItG-w3-I5L"/>
-                                                    <outlet property="labelModel" destination="slt-h5-vgC" id="wdG-zz-KOG"/>
-                                                    <outlet property="labelMpack" destination="m36-cN-e8o" id="cwU-y9-qf7"/>
-                                                    <outlet property="labelNotes" destination="5ZW-F8-dwV" id="WFA-Pd-uk0"/>
-                                                    <outlet property="labelSubtotal" destination="rNF-bG-daa" id="tQl-xH-b6H"/>
-                                                    <outlet property="labelUnitPrice" destination="PfY-2T-g06" id="4Wm-YA-ZdX"/>
-                                                    <outlet property="setpperQTY" destination="bZK-ve-mQz" id="bzt-R2-tNG"/>
+                                                    <outlet property="btnScanDiscount" destination="ATy-eu-2mi" id="0Cf-UF-gCF"/>
+                                                    <outlet property="editQTY" destination="V3e-A3-y8I" id="FWb-DY-FqR"/>
+                                                    <outlet property="labelDescription" destination="6dX-9b-w6l" id="IFY-dj-vpy"/>
+                                                    <outlet property="labelModel" destination="3Cs-3s-CCg" id="bL7-Bb-deE"/>
+                                                    <outlet property="labelMpack" destination="sfo-Yw-I0g" id="Vmm-hZ-BfX"/>
+                                                    <outlet property="labelNotes" destination="93p-eO-r5r" id="jUe-eq-2M6"/>
+                                                    <outlet property="labelSubtotal" destination="8RN-F1-G0M" id="SmT-Mi-C57"/>
+                                                    <outlet property="labelUnitPrice" destination="Hlt-a1-Obi" id="shy-5B-Yxo"/>
+                                                    <outlet property="setpperQTY" destination="S0K-Bu-637" id="lcy-u9-jZk"/>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="section_header_cell" rowHeight="50" id="PUX-MI-ptL">

RedAnt ERP Mobile/HMLG Scan Order/ScanCartItemCell.h

@@ -20,11 +20,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIStepper *setpperQTY;
 @property (weak, nonatomic) IBOutlet UILabel *labelNotes;
 @property double unit_price;
+@property double discount;
 @property bool noprice;
 @property (strong,nonatomic) NSString* cart_id;
 @property int pre_val;
 -(void) set_Count:(int) count;
 -(void) init_Stepper:(int) step max:(int) max min:(int)min value:(int)value;
+@property (weak, nonatomic) IBOutlet UIButton *btnScanDiscount;
 @property (nonatomic , copy) void (^onReturnQTY)(int qty , NSDictionary* ext);
 @end
 

RedAnt ERP Mobile/HMLG Scan Order/ScanCartItemCell.m

@@ -243,7 +243,7 @@
     
     
 //    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    NSString* price = [NSString stringWithFormat:@"%.2f",self.unit_price*count ];
+    NSString* price = [NSString stringWithFormat:@"%.2f",self.unit_price*count*(1-self.discount/100.0) ];
 //    if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
 //    {
 //        

RedAnt ERP Mobile/HMLG Scan Order/ScanListCell.m

@@ -41,8 +41,8 @@
         // 初始化为 FOB CTNR；
     if(RASingleton.sharedInstance.scan_cart[@"price_type"] ==nil)
     {
-        RASingleton.sharedInstance.scan_cart[@"price_type"] = @0;
-    RASingleton.sharedInstance.price_type = 0;
+        RASingleton.sharedInstance.scan_cart[@"price_type"] = @1;
+    RASingleton.sharedInstance.price_type = 1;
     }
 
         NSMutableDictionary* section =[RASingleton.sharedInstance.scan_cart[@"section_0"] mutableCopy];
@@ -131,7 +131,7 @@
             
         [OLDataProvider saveScanCart:RASingleton.sharedInstance.scan_cart];
 
-    [RAUtils message_alert:@"Successful" title:@"Add to cart" controller:[RAUtils getViewController:self]];
+    [RAUtils message_alert:@"Successful" title:[NSString stringWithFormat: @"%@ added to cart",jitem[@"model"]] controller:[RAUtils getViewController:self]];
     
     
 }

RedAnt ERP Mobile/HMLG Scan Order/ScanModelListCell.m

@@ -48,7 +48,7 @@
     _labelPriceNCA.text=_modelJson[@"price1"];
     _labelPrice25p.text=_modelJson[@"price2"];
     _labelAvailable.text=_modelJson[@"available"];
-        _editQTY.text=_modelJson[@"count"];
+        _editQTY.text=[_modelJson[@"count"] stringValue];
     
     int c =[_modelJson[@"count"] intValue];
     int s =[_modelJson[@"stockUom"] intValue];

RedAnt ERP Mobile/HMLG Scan Order/ScanOrderModelListViewController.m

@@ -12,6 +12,7 @@
 #import "RASingleton.h"
 #import "ActiveViewController.h"
 #import "RAUtils.h"
+#import "RAConvertor.h"
 @interface ScanOrderModelListViewController ()
 
 @end
@@ -263,12 +264,42 @@
        [self textFieldDidEndEditing:self.lastedit];
     
     if(self.edit_check)
-    [self dismissViewControllerAnimated:true completion:^{
-            if(self.returnValue)
-                self.returnValue(self.modellist);
-        }];
+    {
+        NSMutableArray* arrname = [NSMutableArray new];
+        
+        for(int j=0;j<self.modellist.count;j++)
+        {
+            
+            if([self.modellist[j][@"count"] intValue]==0)
+                continue;
+            NSMutableDictionary* jitem = nil;
+             jitem = [self.modellist[j] mutableCopy];
+            
+            
+            [arrname addObject:jitem[@"model"]];
+           
+            
+            
+            
+
+        }
+        
+        NSString* models=[RAConvertor arr2string:arrname separator:@"," trim:false];
+        
+        [RAUtils message_alert:@"Successful" title:[NSString stringWithFormat: @"%@ added to cart",models] controller:self action_handler:^(UIAlertAction * _Nonnull action) {
+            [self dismissViewControllerAnimated:true completion:^{
+                    if(self.returnValue)
+                        self.returnValue(self.modellist);
+            }];
+        } completion:nil];
+        
+//        [RAUtils message_alert:@"Successful" title:[NSString stringWithFormat: @"%@ added to cart",models] controller:[RAUtils getViewController:self]];
+        
+        
+        
     
     
+    }
 }
 
 

RedAnt ERP Mobile/HMLG Scan Order/ServerSettingViewController.m

@@ -458,7 +458,7 @@
             if (addressDic) {
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 MainViewController* main_vc=(MainViewController*)appDelegate.main_vc;
-                main_vc.labelServer.text = [addressDic objectForKey:@"name"];
+                main_vc.labelServer.text = [addressDic objectForKey:@"show_name"];
                 self.nameTextField.text = [addressDic objectForKey:@"name"];
                 self.internalText = [addressDic objectForKey:@"serverAddress"];
 

RedAnt ERP Mobile/common/CartUtils.m

@@ -204,7 +204,7 @@
 
                                 cvc.onCancel = ^(){
 
-                                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+                                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
 
                                     // self.disable_refresh = false;
 
@@ -361,7 +361,7 @@
 
                             cvc.onCancel = ^(){
 
-                                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+                                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
 
                                 // self.disable_refresh = false;
 
@@ -497,7 +497,7 @@
                                                 
                                                 cvc.onCancel = ^(){
                                                     
-                                                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+                                                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
                                                     
                                                     // self.disable_refresh = false;
                                                     
@@ -655,7 +655,7 @@
                                                     
                                                     cvc.onCancel = ^(){
                                                         
-                                                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+                                                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
                                                         
                                                         // self.disable_refresh = false;
                                                         
@@ -815,7 +815,7 @@
 //
 //                                            cvc.onCancel = ^(){
 //
-//                                                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+//                                                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
 //
 //                                                // self.disable_refresh = false;
 //
@@ -970,7 +970,7 @@
 //
 //                                                cvc.onCancel = ^(){
 //
-//                                                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:vc];
+//                                                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:vc];
 //
 //                                                    // self.disable_refresh = false;
 //

RedAnt ERP Mobile/common/ERP_Mobile_Cart.storyboard

@@ -1,6 +1,6 @@
 <?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="ipad12_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
@@ -13,36 +13,36 @@
         <scene sceneID="s6l-Bm-hcn">
             <objects>
                 <viewController storyboardIdentifier="CartViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="K4s-dn-ekA" customClass="CartViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" ambiguous="YES" id="dPU-c4-Qhu">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                    <view key="view" contentMode="scaleToFill" id="dPU-c4-Qhu">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EdG-w6-IAt" userLabel="cart item view">
-                                <rect key="frame" x="0.0" y="40" width="768" height="732"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EdG-w6-IAt" userLabel="cart item view">
+                                <rect key="frame" x="0.0" y="40" width="1024" height="1202"/>
                                 <subviews>
-                                    <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="hlZ-3P-GUS" userLabel="mum">
-                                        <rect key="frame" x="365.5" y="347.5" width="37" height="37"/>
+                                    <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="hlZ-3P-GUS" userLabel="mum">
+                                        <rect key="frame" x="493.5" y="582.5" width="37" height="37"/>
                                         <color key="color" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </activityIndicatorView>
-                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="OMD-NW-nZo">
-                                        <rect key="frame" x="0.0" y="0.0" width="768" height="732"/>
+                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="120" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="OMD-NW-nZo">
+                                        <rect key="frame" x="0.0" y="0.0" width="1024" height="1202"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <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="9d9-Fh-IGR" customClass="ModelItemCell">
-                                                <rect key="frame" x="0.0" y="44.5" width="768" height="146"/>
+                                                <rect key="frame" x="0.0" y="44.5" width="1024" height="146"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9d9-Fh-IGR" id="NLP-mv-Q7E">
-                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="146"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="146"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sj7-pu-c1Y" userLabel="name and description">
-                                                            <rect key="frame" x="123" y="10" width="182" height="100"/>
+                                                            <rect key="frame" x="123" y="10" width="438" height="100"/>
                                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="15"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="9999" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cfH-6d-98v" userLabel="qty">
-                                                            <rect key="frame" x="438" y="41" width="60" height="32"/>
+                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="9999" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cfH-6d-98v" userLabel="qty">
+                                                            <rect key="frame" x="694" y="41" width="60" height="32"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="32" id="9qV-vK-2rq"/>
                                                                 <constraint firstAttribute="width" constant="60" id="Lkj-nL-CD6"/>
@@ -67,8 +67,8 @@
                                                                 <action selector="imgbtnClick:" destination="K4s-dn-ekA" eventType="touchUpInside" id="nsM-B6-1hs"/>
                                                             </connections>
                                                         </button>
-                                                        <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="Icr-T0-BzH">
-                                                            <rect key="frame" x="513" y="41" width="94" height="32"/>
+                                                        <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="Icr-T0-BzH">
+                                                            <rect key="frame" x="769" y="41" width="94" height="32"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="32" id="8h7-sY-BPG"/>
                                                                 <constraint firstAttribute="width" constant="94" id="wmY-Eg-mTQ"/>
@@ -77,8 +77,8 @@
                                                                 <action selector="setpperChanged:" destination="9d9-Fh-IGR" eventType="touchUpInside" id="jbq-k8-acA"/>
                                                             </connections>
                                                         </stepper>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9e7-U4-taE" userLabel="unit price">
-                                                            <rect key="frame" x="313" y="46.5" width="110" height="21"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9e7-U4-taE" userLabel="unit price">
+                                                            <rect key="frame" x="569" y="46.5" width="110" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="W0G-CU-uww"/>
                                                             </constraints>
@@ -87,7 +87,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="30 bundle item with $xxx" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Z9-hg-rlD">
-                                                            <rect key="frame" x="123" y="87.5" width="448" height="21"/>
+                                                            <rect key="frame" x="123" y="87.5" width="704" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="hlq-zF-MhA"/>
                                                             </constraints>
@@ -96,7 +96,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7zr-Zx-7tD" userLabel="price before discount" customClass="StrikethroughLabel">
-                                                            <rect key="frame" x="313" y="10" width="110" height="21"/>
+                                                            <rect key="frame" x="569" y="10" width="110" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="0wV-fW-oya"/>
                                                                 <constraint firstAttribute="height" constant="21" id="1BK-GJ-UM1"/>
@@ -106,7 +106,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="99.99% off" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aTC-Ir-xIh" userLabel="discount">
-                                                            <rect key="frame" x="467" y="10" width="100" height="21"/>
+                                                            <rect key="frame" x="723" y="10" width="100" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="100" id="u3i-gR-l4k"/>
                                                             </constraints>
@@ -115,7 +115,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sold in QTY of:9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6n-Fn-anV">
-                                                            <rect key="frame" x="577" y="10" width="160" height="21"/>
+                                                            <rect key="frame" x="833" y="10" width="160" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="160" id="JFg-Eg-ICy"/>
                                                                 <constraint firstAttribute="height" constant="21" id="bk0-ux-cHr"/>
@@ -124,8 +124,8 @@
                                                             <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" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4CM-f3-iTa" userLabel="subtotal price">
-                                                            <rect key="frame" x="622" y="46.5" width="115" height="21"/>
+                                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4CM-f3-iTa" userLabel="subtotal price">
+                                                            <rect key="frame" x="878" y="46.5" width="115" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="115" id="H2W-Ot-Soh"/>
                                                             </constraints>
@@ -133,7 +133,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ocu-RP-B0J" customClass="BundleDetailButton">
-                                                            <rect key="frame" x="579" y="83" width="50" height="30"/>
+                                                            <rect key="frame" x="835" y="83" width="50" height="30"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="30" id="DSn-b9-pka"/>
                                                                 <constraint firstAttribute="width" constant="50" id="vPF-fd-wAB"/>
@@ -146,7 +146,7 @@
                                                             </connections>
                                                         </button>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="915-GD-PCl">
-                                                            <rect key="frame" x="15" y="117" width="738" height="21"/>
+                                                            <rect key="frame" x="15" y="117" width="994" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="c0W-yh-PhV"/>
                                                             </constraints>
@@ -155,7 +155,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Such Model" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FOL-ZC-Dqb">
-                                                            <rect key="frame" x="61" y="56" width="337" height="42"/>
+                                                            <rect key="frame" x="61" y="60" width="337" height="42"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="337" id="6hb-Mb-KlY"/>
                                                                 <constraint firstAttribute="height" constant="42" id="R9d-BO-jGl"/>
@@ -178,7 +178,7 @@ Stock</string>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dh8-s0-2mU" customClass="BundleDetailButton">
-                                                            <rect key="frame" x="637" y="83" width="100" height="30"/>
+                                                            <rect key="frame" x="893" y="83" width="100" height="30"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="30" id="k4d-bv-5h4"/>
                                                                 <constraint firstAttribute="width" constant="100" id="qzO-hT-b92"/>
@@ -247,19 +247,19 @@ 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="fca-Fb-rTa" customClass="ScanCartItemCell">
-                                                <rect key="frame" x="0.0" y="190.5" width="768" height="120"/>
+                                                <rect key="frame" x="0.0" y="190.5" width="1024" height="120"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fca-Fb-rTa" id="efk-9P-2wE">
-                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="120"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XMk-Dj-kBK" userLabel="name and description">
-                                                            <rect key="frame" x="15" y="37" width="294" height="47"/>
+                                                            <rect key="frame" x="15" y="37" width="550" height="47"/>
                                                             <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="16"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="9999" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ebf-Mu-7C8" userLabel="qty">
-                                                            <rect key="frame" x="449" y="41.5" width="60" height="32"/>
+                                                            <rect key="frame" x="705" y="41.5" width="60" height="32"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="60" id="a5J-gG-uph"/>
                                                                 <constraint firstAttribute="height" constant="32" id="cu4-ts-EDj"/>
@@ -272,7 +272,7 @@ Stock</string>
                                                             </connections>
                                                         </textField>
                                                         <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" maximumValue="99999" translatesAutoresizingMaskIntoConstraints="NO" id="V3E-hA-Dpr">
-                                                            <rect key="frame" x="524" y="41.5" width="94" height="32"/>
+                                                            <rect key="frame" x="780" y="41.5" width="94" height="32"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="32" id="BM9-FK-uOM"/>
                                                                 <constraint firstAttribute="width" constant="94" id="bzi-VK-ZnS"/>
@@ -282,7 +282,7 @@ Stock</string>
                                                             </connections>
                                                         </stepper>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.99" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AMU-gk-9Zx" userLabel="unit price">
-                                                            <rect key="frame" x="324" y="47" width="110" height="21"/>
+                                                            <rect key="frame" x="580" y="47" width="110" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="110" id="JT3-Id-W3x"/>
                                                             </constraints>
@@ -291,7 +291,7 @@ Stock</string>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sold in QTY of:9999" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PK4-TS-WwU">
-                                                            <rect key="frame" x="588" y="11" width="160" height="21"/>
+                                                            <rect key="frame" x="844" y="11" width="160" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="9Bk-jh-lRa"/>
                                                                 <constraint firstAttribute="width" constant="160" id="nj0-ub-luv"/>
@@ -301,7 +301,7 @@ Stock</string>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5O-in-MD6" userLabel="subtotal price">
-                                                            <rect key="frame" x="633" y="47" width="115" height="21"/>
+                                                            <rect key="frame" x="889" y="47" width="115" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="115" id="k1v-RX-amw"/>
                                                             </constraints>
@@ -309,7 +309,7 @@ Stock</string>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JNY-pM-90G">
-                                                            <rect key="frame" x="15" y="91" width="738" height="21"/>
+                                                            <rect key="frame" x="15" y="91" width="994" height="21"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="21" id="vMH-cC-f7Q"/>
                                                             </constraints>
@@ -326,9 +326,18 @@ Stock</string>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kns-xs-xWh">
+                                                            <rect key="frame" x="705" y="78" width="169" height="31"/>
+                                                            <state key="normal" title="Button"/>
+                                                            <buttonConfiguration key="configuration" style="plain" title="Discount"/>
+                                                            <connections>
+                                                                <action selector="onScanDiscount:" destination="K4s-dn-ekA" eventType="touchUpInside" id="BO1-Ms-B3s"/>
+                                                            </connections>
+                                                        </button>
                                                     </subviews>
                                                     <constraints>
                                                         <constraint firstItem="AMU-gk-9Zx" firstAttribute="leading" secondItem="XMk-Dj-kBK" secondAttribute="trailing" constant="15" id="852-B9-roM"/>
+                                                        <constraint firstItem="Kns-xs-xWh" firstAttribute="leading" secondItem="Ebf-Mu-7C8" secondAttribute="leading" id="BVp-hd-aRI"/>
                                                         <constraint firstItem="V3E-hA-Dpr" firstAttribute="leading" secondItem="Ebf-Mu-7C8" secondAttribute="trailing" constant="15" id="EYz-1t-LBc"/>
                                                         <constraint firstItem="JNY-pM-90G" firstAttribute="top" secondItem="XMk-Dj-kBK" secondAttribute="bottom" constant="7" id="H1G-di-Lpl"/>
                                                         <constraint firstItem="zOI-gh-hMy" firstAttribute="leading" secondItem="efk-9P-2wE" secondAttribute="leading" constant="15" id="KKS-Rd-yJb"/>
@@ -338,9 +347,11 @@ Stock</string>
                                                         <constraint firstItem="e5O-in-MD6" firstAttribute="leading" secondItem="V3E-hA-Dpr" secondAttribute="trailing" constant="15" id="UBK-ZD-dMe"/>
                                                         <constraint firstItem="XMk-Dj-kBK" firstAttribute="leading" secondItem="zOI-gh-hMy" secondAttribute="leading" id="WSe-Cf-s6N"/>
                                                         <constraint firstAttribute="trailing" secondItem="e5O-in-MD6" secondAttribute="trailing" constant="20" id="YOm-vb-xse"/>
+                                                        <constraint firstItem="V3E-hA-Dpr" firstAttribute="trailing" secondItem="Kns-xs-xWh" secondAttribute="trailing" id="Yht-Bg-omL"/>
                                                         <constraint firstItem="PK4-TS-WwU" firstAttribute="top" secondItem="zOI-gh-hMy" secondAttribute="top" id="Zxy-Qd-DxD"/>
                                                         <constraint firstItem="Ebf-Mu-7C8" firstAttribute="leading" secondItem="AMU-gk-9Zx" secondAttribute="trailing" constant="15" id="Zzm-kA-ei6"/>
                                                         <constraint firstItem="e5O-in-MD6" firstAttribute="centerY" secondItem="AMU-gk-9Zx" secondAttribute="centerY" id="hET-ct-Ip6"/>
+                                                        <constraint firstAttribute="bottom" secondItem="Kns-xs-xWh" secondAttribute="bottom" constant="11" id="kbe-tz-qNf"/>
                                                         <constraint firstItem="XMk-Dj-kBK" firstAttribute="top" secondItem="zOI-gh-hMy" secondAttribute="bottom" constant="5" id="lYh-ND-XaW"/>
                                                         <constraint firstItem="JNY-pM-90G" firstAttribute="leading" secondItem="efk-9P-2wE" secondAttribute="leading" constant="15" id="phe-j0-b8U"/>
                                                         <constraint firstItem="zOI-gh-hMy" firstAttribute="top" secondItem="efk-9P-2wE" secondAttribute="top" constant="11" id="puk-1s-Kig"/>
@@ -361,13 +372,13 @@ Stock</string>
                                                 </connections>
                                             </tableViewCell>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="section_header_cell" rowHeight="50" id="XyA-7C-sJn">
-                                                <rect key="frame" x="0.0" y="310.5" width="768" height="50"/>
+                                                <rect key="frame" x="0.0" y="310.5" width="1024" height="50"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="XyA-7C-sJn" translatesAutoresizingMaskIntoConstraints="NO" id="Ugp-AX-JtS">
-                                                    <rect key="frame" x="0.0" y="0.0" width="768" height="50"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="50"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" tag="8520" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Section" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksZ-DE-RcA">
-                                                            <rect key="frame" x="15" y="0.0" width="738" height="50"/>
+                                                            <rect key="frame" x="15" y="0.0" width="994" height="50"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="21"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
@@ -394,8 +405,8 @@ Stock</string>
                                             <outlet property="delegate" destination="K4s-dn-ekA" id="Dsa-Vu-1mo"/>
                                         </connections>
                                     </tableView>
-                                    <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8z-jb-g0B">
-                                        <rect key="frame" x="263.5" y="343.5" width="241.5" height="45.5"/>
+                                    <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c8z-jb-g0B">
+                                        <rect key="frame" x="391.5" y="578.5" width="241.5" height="45.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                         <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -413,8 +424,8 @@ Stock</string>
                                     <constraint firstItem="hlZ-3P-GUS" firstAttribute="centerY" secondItem="EdG-w6-IAt" secondAttribute="centerY" id="zRg-dN-0zQ"/>
                                 </constraints>
                             </view>
-                            <toolbar hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JjI-8g-Zx7">
-                                <rect key="frame" x="0.0" y="852" width="768" height="44"/>
+                            <toolbar hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JjI-8g-Zx7">
+                                <rect key="frame" x="0.0" y="1322" width="1024" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="882-wy-gda"/>
                                 </constraints>
@@ -444,11 +455,11 @@ Stock</string>
                                     </barButtonItem>
                                 </items>
                             </toolbar>
-                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gh3-Tt-1Iu">
-                                <rect key="frame" x="0.0" y="772" width="768" height="124"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gh3-Tt-1Iu">
+                                <rect key="frame" x="0.0" y="1242" width="1024" height="124"/>
                                 <subviews>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total QTY:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bJB-df-Qia" userLabel="total price">
-                                        <rect key="frame" x="193" y="10" width="110" height="20"/>
+                                        <rect key="frame" x="767" y="10" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="110" id="ASl-r2-ue5"/>
                                             <constraint firstAttribute="height" constant="20" id="nCB-t9-EXm"/>
@@ -458,7 +469,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subtotal Price:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8a-7k-glR" userLabel="total price">
-                                        <rect key="frame" x="193" y="62" width="110" height="20"/>
+                                        <rect key="frame" x="767" y="62" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="eys-5N-MvF"/>
                                             <constraint firstAttribute="width" constant="110" id="mjO-Mx-uZY"/>
@@ -468,7 +479,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BdK-WN-iBd" userLabel="value">
-                                        <rect key="frame" x="311" y="61.5" width="124" height="20"/>
+                                        <rect key="frame" x="885" y="61.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="124" id="Vtk-fK-PuB"/>
                                             <constraint firstAttribute="height" constant="20" id="att-Sj-4TY"/>
@@ -478,7 +489,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QFj-Yq-8py" userLabel="value">
-                                        <rect key="frame" x="39" y="9.5" width="124" height="20"/>
+                                        <rect key="frame" x="613" y="9.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="fF3-qa-JIv"/>
                                             <constraint firstAttribute="width" constant="124" id="u0P-tW-8Ag"/>
@@ -487,7 +498,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yo2-dv-uQb" userLabel="value">
-                                        <rect key="frame" x="39" y="35.5" width="124" height="20"/>
+                                        <rect key="frame" x="613" y="35.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="124" id="aCa-A9-n1v"/>
                                             <constraint firstAttribute="height" constant="20" id="zlU-CH-UxH"/>
@@ -496,7 +507,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oeZ-Yi-d5I" userLabel="value">
-                                        <rect key="frame" x="39" y="61.5" width="124" height="20"/>
+                                        <rect key="frame" x="613" y="61.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="124" id="Ri7-Tx-fGs"/>
                                             <constraint firstAttribute="height" constant="20" id="xFK-gK-N8c"/>
@@ -505,7 +516,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rdv-8s-Jy6" customClass="DefaultImageButton">
-                                        <rect key="frame" x="305" y="84" width="130" height="30"/>
+                                        <rect key="frame" x="879" y="84" width="130" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="BbJ-vM-qDn"/>
                                             <constraint firstAttribute="width" constant="130" id="Zsq-V3-xKe"/>
@@ -523,7 +534,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WY7-cp-N9a" customClass="DefaultImageButton">
-                                        <rect key="frame" x="255" y="84" width="30" height="30"/>
+                                        <rect key="frame" x="829" y="84" width="30" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="3ZM-R4-EV0"/>
                                             <constraint firstAttribute="height" constant="30" id="A0j-fv-eZx"/>
@@ -552,7 +563,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total CuFt:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jqa-Zp-Sg2">
-                                        <rect key="frame" x="-79" y="10" width="110" height="20"/>
+                                        <rect key="frame" x="495" y="10" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="110" id="OSa-ja-uLx"/>
                                             <constraint firstAttribute="height" constant="20" id="tkj-g6-THx"/>
@@ -562,7 +573,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Weight:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PWY-Zc-LEx">
-                                        <rect key="frame" x="-79" y="36" width="110" height="20"/>
+                                        <rect key="frame" x="495" y="36" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="110" id="ImV-Hf-ek0"/>
                                             <constraint firstAttribute="height" constant="20" id="w5u-XI-iou"/>
@@ -572,7 +583,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Carton:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bF-Cv-KYG">
-                                        <rect key="frame" x="-79" y="62" width="110" height="20"/>
+                                        <rect key="frame" x="495" y="62" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="110" id="6qd-WY-Ify"/>
                                             <constraint firstAttribute="height" constant="20" id="hcr-ZH-FNy"/>
@@ -582,7 +593,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total  Items:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4kM-vh-YbC">
-                                        <rect key="frame" x="193" y="36" width="110" height="20"/>
+                                        <rect key="frame" x="767" y="36" width="110" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="110" id="Umv-oU-RnI"/>
                                             <constraint firstAttribute="height" constant="20" id="bFa-SW-aPi"/>
@@ -603,7 +614,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Da-eJ-p37">
-                                        <rect key="frame" x="311" y="35.5" width="124" height="20"/>
+                                        <rect key="frame" x="885" y="35.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="124" id="Nup-mi-BKD"/>
                                             <constraint firstAttribute="height" constant="20" id="Oji-iQ-rBl"/>
@@ -613,7 +624,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zeq-Qm-obt">
-                                        <rect key="frame" x="311" y="9.5" width="124" height="20"/>
+                                        <rect key="frame" x="885" y="9.5" width="124" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="124" id="OMw-e6-rkf"/>
                                             <constraint firstAttribute="height" constant="20" id="Wzz-8C-fgu"/>
@@ -623,7 +634,7 @@ Stock</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3H2-JS-FOj">
-                                        <rect key="frame" x="135" y="89" width="0.0" height="20"/>
+                                        <rect key="frame" x="135" y="89" width="574" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="8fm-fp-Kxk"/>
                                         </constraints>
@@ -648,7 +659,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y50-hu-fgy">
-                                        <rect key="frame" x="205" y="84" width="30" height="30"/>
+                                        <rect key="frame" x="779" y="84" width="30" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="30" id="aLc-U8-fS9"/>
                                             <constraint firstAttribute="height" constant="30" id="h0h-KZ-y4A"/>
@@ -659,7 +670,7 @@ Stock</string>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y27-jk-l1Z">
-                                        <rect key="frame" x="155" y="84" width="30" height="30"/>
+                                        <rect key="frame" x="729" y="84" width="30" height="30"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="30" id="dEP-Jv-ccc"/>
                                             <constraint firstAttribute="width" constant="30" id="tzu-IE-AXt"/>
@@ -777,13 +788,13 @@ Stock</string>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="d3M-dW-oMp">
-                                <rect key="frame" x="10" y="44" width="460" height="202"/>
+                                <rect key="frame" x="10" y="24" width="460" height="256"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2mZ-oE-Upn" customClass="DefaultImageButton">
-                                <rect key="frame" x="358" y="256" width="102" height="30"/>
+                                <rect key="frame" x="358" y="290" width="102" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="zsK-mj-wNb"/>
                                 </constraints>
@@ -970,7 +981,7 @@ Stock</string>
             <objects>
                 <viewController id="H3V-ep-3dc" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="MLp-rr-7PZ">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <viewLayoutGuide key="safeArea" id="Rxk-rC-Cfr"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1435,7 +1435,7 @@
                                  
                                  cvc.onCancel = ^(){
                                      
-                                     [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                                     [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                                      
                                      
                                      
@@ -1631,7 +1631,7 @@
                          
                          cvc.onCancel = ^(){
                              
-                             [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                             [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                              
                              
                              
@@ -2506,7 +2506,7 @@
             {
                 if(value==nil)
                 {
-                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                 }
                 else
                 {
@@ -2586,7 +2586,7 @@
 //                        self.norefresh = true;
                         if(appDelegate.customerInfo==nil)
                         {
-                            [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                            [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                         }
                         else
                         {
@@ -2632,7 +2632,7 @@
                     
                     cvc.onCancel = ^(){
                         
-                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                         
                         
                         
@@ -3551,7 +3551,7 @@
 //
 //            cvc.onCancel = ^(){
 //
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //

RedAnt ERP Mobile/common/Functions/OLO/OLOSettingViewController.m

@@ -165,7 +165,7 @@
 //                        self.norefresh = true;
                         if(appDelegate.customerInfo==nil)
                         {
-                            [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                            [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                         }
                         else
                         {
@@ -211,7 +211,7 @@
                     
                     cvc.onCancel = ^(){
                         
-                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                         
                         
                         

RedAnt ERP Mobile/common/Functions/OLO/ScanOrderListViewController.m

@@ -456,7 +456,7 @@
     appDelegate.can_set_cart_price = true;
     appDelegate.can_see_price = true;
     RASingleton.sharedInstance.scan_cart = nil;
-    RASingleton.sharedInstance.price_type = 0;
+    RASingleton.sharedInstance.price_type = 1;
     //    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     //    NSString *documents = [paths objectAtIndex:0];
     
@@ -547,7 +547,7 @@
             appDelegate.contact_id = nil;
         }
         RASingleton.sharedInstance.scan_cart = nil;
-        RASingleton.sharedInstance.price_type = 0;
+        RASingleton.sharedInstance.price_type = 1;
         //        [appDelegate updateScanButton:false];
         
         [appDelegate update_count_mark];
@@ -560,7 +560,7 @@
     
     
     //    __block MainViewController *brself= self;
-    if(appDelegate.contact_id.length<=0)
+    if(appDelegate.contact_id.length<=0&&false)
     {
         
         UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:@"New Offline Order" message:nil preferredStyle:UIAlertControllerStyleAlert];
@@ -588,7 +588,7 @@
             {
                 if(value==nil)
                 {
-                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                 }
                 else
                 {
@@ -767,10 +767,11 @@
     
     
     dispatch_sync(dispatch_get_main_queue(), ^{
-        self.table_order.hidden = false;
-        self.table_submit.hidden = false;
+//        self.table_order.hidden = false;
+//        self.table_submit.hidden = false;
         self.reset_result=false;
         [self.table_order reloadData ];
+        [self.table_submit reloadData ];
     });
     return;
     //
@@ -1215,7 +1216,7 @@
 //                    self.norefresh = true;
 //                    if(appDelegate.customerInfo==nil)
 //                    {
-//                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //                    }
 //                    else
 //                    {
@@ -1263,7 +1264,7 @@
 //
 //                cvc.onCancel = ^(){
 //
-//                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //
@@ -1455,7 +1456,7 @@
             UILabel *statuslabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 11, 130, 22)];
             statuslabel.textColor=UIColorFromRGB(color);
             statuslabel.backgroundColor = [UIColor clearColor];
-            statuslabel.text=NSLocalizedString(@"Status", nil);
+            statuslabel.text=NSLocalizedString(@"SO#", nil);
             [statuslabel sizeToFit];
             [myView addSubview:statuslabel];
             
@@ -1484,7 +1485,7 @@
             
             contactlabel.textColor=UIColorFromRGB(color);
             contactlabel.backgroundColor = [UIColor clearColor];
-            contactlabel.text=NSLocalizedString(@"Contact", nil);
+            contactlabel.text=NSLocalizedString(@"Company / Customer ID", nil);
             [contactlabel sizeToFit];
             [myView addSubview:contactlabel];
             
@@ -1913,16 +1914,16 @@
             //            [appDelegate updateScanButton:true];
             [appDelegate SetMode:@""];
             
-            CreateOrderViewController * orderinfoVC = [[CreateOrderViewController alloc] initWithNibName:@"CommonEditor.iPad" bundle:nil];
-            
-            
-            
-            orderinfoVC.disable_dropdown_refresh=true;
-            orderinfoVC.url_type = URL_FILE;
-            orderinfoVC.request_url=[orderdir stringByAppendingPathComponent:@"order.json"];
-            
-            orderinfoVC.params = params;
-            orderinfoVC.title=@"";
+//            CreateOrderViewController * orderinfoVC = [[CreateOrderViewController alloc] initWithNibName:@"CommonEditor.iPad" bundle:nil];
+//
+//
+//
+//            orderinfoVC.disable_dropdown_refresh=true;
+//            orderinfoVC.url_type = URL_FILE;
+//            orderinfoVC.request_url=[orderdir stringByAppendingPathComponent:@"order.json"];
+//
+//            orderinfoVC.params = params;
+//            orderinfoVC.title=@"";
             //            orderinfoVC.delegate=self;
             //
             //    if(checked.count==count)
@@ -1939,7 +1940,9 @@
             [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
 #endif
             
-            [self.navigationController pushViewController:orderinfoVC animated:true];
+//            [self.navigationController pushViewController:orderinfoVC animated:true];
+            
+            [((MainViewController*)appDelegate.main_vc) switchToCart];
             
             return;
             
@@ -2084,7 +2087,7 @@
         //    NSString* order_status= [self.content_data[indexPath.row] valueForKey:@"order_status"];
         //    NSInteger statusCode = [[self.content_data[indexPath.row] valueForKey:@"orderStatus"] integerValue];
         
-        if(appDelegate.user_type==USER_ROLE_EMPLOYEE || (appDelegate.user_type==USER_ROLE_CUSTOMER && appDelegate.customer_type == CustomerTypeCustomer)) {
+        if(true/*appDelegate.user_type==USER_ROLE_EMPLOYEE || (appDelegate.user_type==USER_ROLE_CUSTOMER && appDelegate.customer_type == CustomerTypeCustomer)*/) {
             
             UITableViewRowAction *deleteRowAction = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"Delete" handler:^(UITableViewRowAction *action, NSIndexPath *indexPath) {
                 

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

@@ -35,6 +35,8 @@
 @property int total_QTY;
 @property bool edit_check;
 
+//@property (weak, nonatomic) IBOutlet UIButton *btnScanDiscount;
+
 @property (strong,nonatomic) NSString* notes;
 
 @property (strong, nonatomic) IBOutlet UILabel *labelTotal;

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

@@ -34,8 +34,11 @@
 #endif
 #ifdef BACKORDER_PROCESS
 #import "RAOrderEditorViewController.h"
+#import "ScanDiscountViewController.h"
 #endif
 
+
+
 #import "CustomerEditViewController.h"
 //#define ALERT_FREE 1024
 //#define ALERT_DEL 1025
@@ -1087,11 +1090,21 @@
 #ifdef SCANNER_ORDER
     
     NSString* pricename;
+    
+    NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
+
+     
+     NSString* servername = [addressDic objectForKey:@"show_name"];
+    NSArray* arrsn = [RAConvertor string2arr:servername separator:@","];
+    
+    NSString * shortname = arrsn[0];
+    if(shortname.length==0)
+        shortname = servername;
     switch(RASingleton.sharedInstance.price_type)
     {
-        case 0: pricename = @"DDP";
+        case 0: pricename =[NSString stringWithFormat:@"%@_DDP",shortname];
             break;;
-        case 1: pricename = @"WHSE";
+        case 1: pricename = [NSString stringWithFormat:@"%@_WHSE",shortname];;
             break;;
 //        case 2: pricename = @"25%";
 //            break;
@@ -1646,7 +1659,7 @@
             {
                 if(value==nil)
                 {
-                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                 }
                 else
                 {
@@ -2146,6 +2159,138 @@
 //        });
 //    });
 //}
+- (IBAction)onScanDiscount:(UIButton*)sender {
+    
+    
+#ifdef SCANNER_ORDER
+    
+
+    UITableViewCell* cell =(UITableViewCell*) sender.superview.superview;
+    
+    NSIndexPath *   indexPath = [self.itemListTable indexPathForCell:cell];
+    
+    UIViewController* parentvc=self;
+    
+    
+//    EditModelPriceViewController
+    
+    ScanDiscountViewController * vc =[[UIStoryboard storyboardWithName:@"SO" bundle:nil] instantiateViewControllerWithIdentifier:@"ScanDiscountViewController"];
+    
+    
+    NSMutableDictionary * item_json = nil;
+    if (self.back_order_flag) {
+        item_json = [[self itemJsonAtIndexPath:indexPath] mutableCopy];
+    } else {
+        item_json = [self.content_arr[indexPath.row] mutableCopy];//[[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]] mutableCopy];
+        
+    }
+    
+    
+    
+    
+    vc.discount=[[item_json valueForKey:@"discount"] floatValue];
+    vc.price = [[item_json valueForKey:@"unit_price"] floatValue];
+    vc.cart_id = [item_json valueForKey:@"cart_item_id"];//[NSString stringWithFormat:@"%d",[[item_json valueForKey:@"cart_item_id"] intValue]];
+    __block NSString* cartid=[item_json valueForKey:@"cart_item_id"];
+    //    vc.delegate = parentvc.self;
+    //    loginvc.modalPresentationStyle = UIModalPresentationFormSheet;//有三种状态，自己看看是哪种
+    vc.onSetValue = ^(double price,double discount){
+        
+        bool bmodify=false;
+        if(discount>0)
+            bmodify=true;
+        
+        NSString* notes = [item_json valueForKey:@"note"];
+        if(notes.length==0)
+            notes=@"";
+        if(bmodify)
+        {
+            if([notes isEqualToString:@""])
+                notes=@"PRICE MODIFIED";
+
+            NSRange range;
+            range = [notes rangeOfString:@"PRICE MODIFIED"];
+            if (range.location != NSNotFound) {
+                
+            }else{
+               notes= [notes stringByAppendingString:@"\nPRICE MODIFIED"];
+            }
+        }
+        else
+            
+        {
+            notes =@"";
+        }
+        
+        __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Update Price" completion:^{
+            [RANetwork request_update_cart_modelprice:cartid price:price discount:discount notes:notes completionHandler:^(NSMutableDictionary *result) {
+                                        NSDictionary* cart_json = result;
+                                        
+                            [waitalert dismissViewControllerAnimated:YES completion:^{
+                                if([[cart_json valueForKey:@"result"] intValue]==2)
+                                {
+                                    [item_json setValue:[NSNumber numberWithDouble:price ] forKey:@"unit_price"];
+                                    
+                                    [item_json setValue:[NSNumber numberWithDouble:discount ] forKey:@"discount"];
+                                    [item_json setValue:notes forKey:@"note"];
+                                    if (self.back_order_flag) {
+                                        [self updateItemJson:item_json atIndexPath:indexPath];
+                                    } else {
+                                        self.content_arr[indexPath.row ] = item_json;
+                                    }
+//                                    tableView.editing = false;
+                                    //                        [tableView reloadRowsAtIndexPaths:@[indexPath]withRowAnimation:UITableViewRowAnimationMiddle];
+                                    //                        [self refresh_total];
+                                    
+                                    
+                                    [self reload_data];
+                                    
+            #ifdef RA_NOTIFICATION
+                                    [ActiveViewController Notify:@"OrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+            #else
+                                    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+                                    [((MainViewController*)appDelegate.main_vc) reloadOrder:true immediately:false];
+            #endif
+                                }
+                                else
+                                {
+                                    [RAUtils message_alert:[cart_json valueForKey:@"err_msg"] title:@"Update Price" controller:self] ;
+                                }
+                            }];
+                                        
+                                       
+                                        
+                                        
+                                        
+                                        
+                        }];
+
+        }];
+   
+       
+    };
+    
+    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:vc] ;
+    
+    
+    
+    
+    
+    //    [self hackModalSheetSize:CGSizeMake(450, 200) ofVC:navi];
+    
+    navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态，自己看看是哪种
+    [parentvc presentViewController:navi animated:YES completion:^{
+        
+        //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);
+        
+        DebugLog(@"EditModelPriceViewController present.........");
+        
+        //   self.btop = false;
+        //  <#code#>
+    }];
+#endif
+    
+}
 
 -(void)refresh_total
 {
@@ -2161,11 +2306,19 @@
 #ifdef SCANNER_ORDER
     
     NSString* pricename;
+    
+    NSDictionary *addressDic = [[NSUserDefaults standardUserDefaults] valueForKey:@"ScanAddress"];
+    NSString* servername = [addressDic objectForKey:@"show_name"];
+   NSArray* arrsn = [RAConvertor string2arr:servername separator:@","];
+   
+   NSString * shortname = arrsn[0];
+   if(shortname.length==0)
+       shortname = servername;
     switch(RASingleton.sharedInstance.price_type )
     {
-        case 0: pricename = @"DDP";
+        case 0: pricename =@"DDP";//[NSString stringWithFormat:@"%@_DDP",shortname];
             break;;
-        case 1: pricename = @"WHSE";
+        case 1: pricename = @"WHSE";//[NSString stringWithFormat:@"%@_WHSE",shortname];;
             break;;
 //        case 2: pricename = @"25%";
 //            break;
@@ -2258,7 +2411,12 @@
         subtotal=nil;
         
     }
+    
+#else
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    [OLDataProvider updateScanOrder:appDelegate.order_code];
 #endif
+    
     self.labelTotal.text=subtotal;
     self.label_cuft.text=subcuft;
     self.label_carton.text=subcarton;
@@ -2771,8 +2929,8 @@
     
     double unitprice=[[item_json valueForKey:@"unit_price"] doubleValue];
     
-    
-    
+    double discount=[[item_json valueForKey:@"discount"] doubleValue];
+    cell.discount = discount;
     NSString* product_id = [item_json valueForKey:@"product_id"];
     
 
@@ -2781,9 +2939,9 @@
     CGRect frame = cell.frame;
     cell.labelMpack.text =[NSString stringWithFormat:@"Sold in QTY of:%d", stockUom];
     
-    if(notes.length>0)
+    if(discount>0)
     {
-        cell.labelNotes.text = [@"Note: " stringByAppendingString:[notes stringByReplacingOccurrencesOfString:@"\n" withString:@" "]];
+        cell.labelNotes.text = [NSString stringWithFormat:@"Note: discount %d%% off.",(int)discount];
         frame.size.height = 120;
     }
     else
@@ -2827,7 +2985,7 @@
 //                [item_json setValue:[ext valueForKey:@"weight"] forKey:@"weight"];
         double unit_price = [[item_json valueForKey:@"unit_price"] doubleValue];
         //   double sub_total=[[item_json valueForKey:@"subtotal_price"] doubleValue];
-        [item_json setValue:[NSString stringWithFormat:@"%f",unit_price*qty] forKey:@"subtotal_price"];
+        [item_json setValue:[NSString stringWithFormat:@"%f",unit_price*qty*(1-discount/100.0)] forKey:@"subtotal_price"];
 
         if (weakSelf.back_order_flag) {
             [weakSelf updateItemJson:item_json atIndexPath:indexPath];
@@ -2851,7 +3009,7 @@
     //    cell.labelCurrency.text = currency;
     
     
-    NSString* newprice = [NSString stringWithFormat:@"%.2f",unitprice*count];
+    NSString* newprice = [NSString stringWithFormat:@"%.2f",unitprice*count*(1-discount/100)];
     NSString* newunitprice = [NSString stringWithFormat:@"%.2f",unitprice];
     
     cell.labelModel.text = model;
@@ -4322,7 +4480,11 @@
         }
     }
     else
+#ifndef SCANNER_ORDER
         return @[deleteRowAction,addWatchAction];
+#else
+    return @[deleteRowAction];
+#endif
     
     
 }

RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -3080,7 +3080,7 @@
 //            
 //            cvc.onCancel = ^(){
 //                
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order Error" controller:self];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order Error" controller:self];
 //                
 //                self.disable_refresh = false;
 //                

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

@@ -1982,7 +1982,7 @@
 //            cvc.onCancel = ^(){
 //
 //                UIViewController *vc= [RAUtils getViewController:self];
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order" controller:vc];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order" controller:vc];
 //
 //            };
 //            cvc.onReset = ^(){

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

@@ -1182,7 +1182,7 @@ self.informationLabel.frame = CGRectMake(self.informationLabel.frame.origin.x, s
             cvc.onCancel = ^(){
                 
                 UIViewController *vc= [RAUtils getViewController:self];
-                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"New Order" controller:vc];
+                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"New Order" controller:vc];
                 
             };
             cvc.onReset = ^(){

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

@@ -153,10 +153,11 @@ typedef void(^resultHandler)(NSMutableDictionary *result);
 
 //scan order
 +(void) saveScanCart:(NSMutableDictionary*) cart;
-+(void) save2submitScanOrder;
+//+(void) save2submitScanOrder;
++(void) save2submitScanOrder:(NSString*) soid company:(NSString*) company;
 +(void) deleteScanOrder:(NSString*) order_code;
 +(void) deleteSubmittedOrder:(NSString*) order_code;
-+(void) updateScanOrder:(NSString*) order_code orderitem:(NSMutableDictionary*) orderitem;
++(void) updateScanOrder:(NSString*) order_code ;
 +(NSMutableDictionary*) loadScanTemplate:(NSString*)file;
 +(NSString*) scanTemplatePath:(NSString*)file;
 //+(NSString*) getScanTempPath;

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

@@ -1912,7 +1912,7 @@
 //    
 //    return;
 //}
-+(void) save2submitScanOrder
++(void) save2submitScanOrder:(NSString*) soid company:(NSString*) company
 {
     
     //        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
@@ -1996,7 +1996,9 @@
         
     }
     int submitcount =[submitlist[@"count"] intValue];
-    submititem[@"order_status"] = @"Submitted Order";
+    submititem[@"order_status"] = soid;//@"Submitted Order";
+    submititem[@"customer_name"] = company;//@"Submitted Order";
+    
     submitlist[[NSString stringWithFormat:@"item_%d",submitcount]]=submititem;
     submitlist[@"count"] = @(submitcount+1);
     [RAUtils dicttofile:submitlistPath dict:submitlist];
@@ -2304,7 +2306,7 @@
     [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
 #endif
 }
-+(void) updateScanOrder:(NSString*) order_code orderitem:(NSMutableDictionary*) orderitem
++(void) updateScanOrder:(NSString*) order_code 
 {
     
     NSString *userdir = [OLDataProvider getUserPath];
@@ -2316,20 +2318,7 @@
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
     
-    if([appDelegate.order_code isEqualToString:order_code])
-    {
-        //要删除的订单是当前打开的订单；
-        appDelegate.order_code = nil;
-        appDelegate.customerInfo = nil;
-        RASingleton.sharedInstance.scan_cart = nil;
-        appDelegate.contact_id = nil;
-        //        [appDelegate updateScanButton:false];
-        
-        [appDelegate update_count_mark];
-    }
-    //删除订单目录
-    [[NSFileManager defaultManager] removeItemAtPath:[userdir stringByAppendingPathComponent:order_code] error:nil];
-    //维护订单列表
+  
     NSMutableDictionary* orderlist = nil;
     
     
@@ -2341,14 +2330,10 @@
         // order list 为空，不用维护
         
         
-#ifdef RA_NOTIFICATION
-        [ActiveViewController Notify:@"CartViewController,ScanOrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
-        
-#else
+
+        [ActiveViewController Notify:@"ScanOrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
         
-        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-        [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
-#endif
+
         return;
         
         //                    [orderlist addObject:appDelegate.order_code];
@@ -2369,24 +2354,29 @@
     
 //    NSMutableDictionary* newlist  = [NSMutableDictionary new];
     
-    
+    float p =0;
+    for(int j=0;j<[RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] intValue];j++)
+    {
+        NSDictionary* cartitem =RASingleton.sharedInstance.scan_cart[@"section_0"][[NSString stringWithFormat:@"item_%d",j]];
+        p+=[cartitem[@"unit_price"] doubleValue]*[cartitem[@"count"]intValue] * (1-[cartitem[@"discount"]doubleValue]/100.0);
+    }
 //    int newcount = 0;
     for(int i=0;i<count;i++)
     {
         NSMutableDictionary* item = orderlist[[NSString stringWithFormat:@"item_%d",i]];
         if([item[@"order_code"] isEqualToString: order_code ])
-            orderlist[[NSString stringWithFormat:@"item_%d",i]] = orderitem;
+        {
+            item[@"price"] = [NSString stringWithFormat:@"%.2f",p];
+            item[@"model_count"] =[ NSString stringWithFormat:@"%@",RASingleton.sharedInstance.scan_cart[@"section_0"][@"count"] ];
+            orderlist[[NSString stringWithFormat:@"item_%d",i]] = item;
+        }
        
     }
 //    newlist[@"count"] = @(newcount);
     [RAUtils dicttofile:orderlistPath dict:orderlist];
-#ifdef RA_NOTIFICATION
-    [ActiveViewController Notify:@"CartViewController,ScanOrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
-#else
-    
-    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
-#endif
+
+    [ActiveViewController Notify:@"ScanOrderListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+
 }
 +(void) deleteScanOrder:(NSString*) order_code
 {

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

@@ -3092,7 +3092,8 @@
         NSString *contactpath = [orderdir stringByAppendingPathComponent:@"contact.json"];
         
         
-        
+        if(appDelegate.customerInfo==nil)
+            appDelegate.customerInfo = [NSMutableDictionary new];
         [RAUtils dicttofile:contactpath dict:appDelegate.customerInfo];
         
         
@@ -3175,8 +3176,13 @@
                                 int iresult = [result[@"result"] intValue];
                         if(iresult == RESULT_TRUE)
                         {
+                            NSString* soid = result[@"so_id"];
+                            if(soid.length==0)
+                                soid=@"N/A";
+//                            upparams[@"soid"]=soid;
                             [self scanSave:upparams];
-                            [OLDataProvider save2submitScanOrder];
+                            NSString* company = upparams[@"customer_name"];
+                            [OLDataProvider save2submitScanOrder:soid company:company];
                             [appDelegate closeOrder];
                             RASingleton.sharedInstance.scan_cart = nil;
                             
@@ -3208,7 +3214,15 @@
                             self.realuser = nil;
                             self.realpassword = nil;
                             [RAUtils message_alert:@"Can not submit the order, wrong password" title:@"Submit Order" controller:self];
-                            
+                            if ([[NSFileManager defaultManager] fileExistsAtPath:zippath]) {
+                 
+                                
+                                [[NSFileManager defaultManager] removeItemAtPath:zippath error:nil];
+                                
+                //                    [orderlist addObject:appDelegate.order_code];
+                //                    [RAUtils dicttofile:orderlistPath dict:orderlist];
+                                
+                          }
                             
                             
                         }
@@ -3217,7 +3231,15 @@
                             self.fail_submit = true;
                             [RAUtils message_alert:@"Can not submit the order, please check your network" title:@"Submit Order" controller:self];
                             
-                            
+                            if ([[NSFileManager defaultManager] fileExistsAtPath:zippath]) {
+                 
+                                
+                                [[NSFileManager defaultManager] removeItemAtPath:zippath error:nil];
+                                
+                //                    [orderlist addObject:appDelegate.order_code];
+                //                    [RAUtils dicttofile:orderlistPath dict:orderlist];
+                                
+                          }
                             
                         }
                     }];

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

@@ -444,7 +444,7 @@
                          self.norefresh = true;
                          if(appDelegate.customerInfo==nil)
                          {
-                             [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                             [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                          }
                          else
                          {
@@ -492,7 +492,7 @@
                      
                      cvc.onCancel = ^(){
                          
-                         [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+                         [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
                          
                          
                          
@@ -1022,7 +1022,7 @@
 //                    self.norefresh = true;
 //                    if(appDelegate.customerInfo==nil)
 //                    {
-//                        [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                        [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //                    }
 //                    else
 //                    {
@@ -1070,7 +1070,7 @@
 //                
 //                cvc.onCancel = ^(){
 //                    
-//                    [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                    [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //                    
 //                    
 //                    

RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -2380,7 +2380,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 //
 //            cvc.onCancel = ^(){
 //
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //

RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -1272,7 +1272,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 //
 //            cvc.onCancel = ^(){
 //
-//                [RAUtils message_alert:@"Cannot create order without cursomer infomation." title:@"" controller:self];
+//                [RAUtils message_alert:@"Cannot create order without customer infomation." title:@"" controller:self];
 //
 //
 //

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -8994,7 +8994,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         RASingleton.sharedInstance.scan_cart[@"section_0"] = section;
         [OLDataProvider saveScanCart:RASingleton.sharedInstance.scan_cart];
         result(RASingleton.sharedInstance.scan_cart);
-//        [OLDataProvider updateScanOrder:appDelegate.order_code orderitem:nil];
+        [OLDataProvider updateScanOrder:appDelegate.order_code];
         return;
     }
 #endif
@@ -10356,7 +10356,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
     appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
     
 #ifdef SCANNER_ORDER
-    return;
+//    return;
 //    if(RASingleton.sharedInstance.enable_OfflineOrder)
     {
 //        appDelegate.cart_count = [[RASingleton.sharedInstance.scan_cart valueForKey:@"cart_count"] intValue];
@@ -10382,6 +10382,7 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
         RASingleton.sharedInstance.scan_cart[@"section_0"] = section;
         [OLDataProvider saveScanCart:RASingleton.sharedInstance.scan_cart];
         result(RASingleton.sharedInstance.scan_cart);
+        [OLDataProvider updateScanOrder:appDelegate.order_code];
         return;
     }
 #endif

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

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

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

@@ -301,7 +301,7 @@
                                                     <rect key="frame" x="10" y="32" width="21" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" image="button:hrK-DY-RbO:image"/>
-                                                    <state key="selected" image="DAA6F769-E374-4FCC-973F-6915ACB9C2E4"/>
+                                                    <state key="selected" image="08A17167-2E94-4846-A640-080A3D004369"/>
                                                     <connections>
                                                         <action selector="checkButtonClick:" destination="XXr-fU-67o" eventType="touchUpInside" id="KeU-ld-H4J"/>
                                                     </connections>
@@ -947,7 +947,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hrq-La-ta7">
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hrq-La-ta7">
                                 <rect key="frame" x="314" y="849" width="140" height="31"/>
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="plain" title="Change Password"/>
@@ -1090,7 +1090,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="DAA6F769-E374-4FCC-973F-6915ACB9C2E4" width="24" height="24">
+        <image name="08A17167-2E94-4846-A640-080A3D004369" width="24" height="24">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
 S2V5ZWRBcmNoaXZlctEICVRyb290gAGuCwwZGh8UJCkqMTQ3PUBVJG51bGzWDQ4PEBESExQVFhcYVk5T
@@ -1275,7 +1275,7 @@ QwAAAAAAAAAAAAAAAAAAE5M
 </mutableData>
         </image>
         <image name="checkbox" width="16" height="16"/>
-        <image name="close" width="40" height="40"/>
+        <image name="close" width="32" height="32"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>