20160322

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "480222475.815024"
+            timestampString = "480329452.531991"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1759"
-            endingLineNumber = "1759"
+            startingLineNumber = "1771"
+            endingLineNumber = "1771"
             landmarkName = "-tableView:cellForRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -442,11 +442,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "480222498.666217"
+            timestampString = "480329452.531991"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1787"
-            endingLineNumber = "1787"
+            startingLineNumber = "1799"
+            endingLineNumber = "1799"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -458,11 +458,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "480222522.452595"
+            timestampString = "480329646.036923"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1920"
-            endingLineNumber = "1920"
+            startingLineNumber = "1984"
+            endingLineNumber = "1984"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -474,11 +474,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "480222562.713858"
+            timestampString = "480329646.036923"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1919"
-            endingLineNumber = "1919"
+            startingLineNumber = "1983"
+            endingLineNumber = "1983"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
             <Locations>
@@ -522,11 +522,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "480222583.808556"
+            timestampString = "480327958.12278"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "651"
-            endingLineNumber = "651"
+            startingLineNumber = "652"
+            endingLineNumber = "652"
             landmarkName = "-switchtowishlist"
             landmarkType = "5">
          </BreakpointContent>

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -23,6 +23,7 @@
 #import "WebViewController.h"
 
 #import "FunctionTestViewController.h"
+#import "SimplifiedBuyingProgramViewController.h"
 
 @interface MainViewController ()
 
@@ -1599,6 +1600,17 @@
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
     
+    [map setValue:@"NPD Policy" forKey:@"title"];
+    [map setValue:@"rect_change_password" forKey:@"img"];
+    [self.sideMenuItems addObject:map.copy];
+    
+    [map setValue:@"Simplified Buying Program" forKey:@"title"];
+    [map setValue:@"rect_change_password" forKey:@"img"];
+    [self.sideMenuItems addObject:map.copy];
+    
+    
+
+    
     [self.sideMenuTable reloadData];
     
     //
@@ -1867,7 +1879,7 @@
     else if([title isEqualToString:@"NPD Website"])
     {
         
-        NSString* url = @"https://www.newpacificdirect.com/general.htm?websiteId=1";//@"https://www.newpacificdirect.com";
+        NSString* url = @"https://www.newpacificdirect.com";//@"https://www.newpacificdirect.com/general.htm?websiteId=1";//
         
         
         NSString* title = @"NPD";
@@ -1886,6 +1898,58 @@
         [self.navigationController pushViewController:ViewController animated:YES];
         
     }
+    else if([title isEqualToString:@"NPD Policy"])
+    {
+        
+        NSString* url = URL_NPD_POLICY;//@"https://www.newpacificdirect.com/general.htm?websiteId=1";//
+        
+        
+        NSString* title = @"NPD Policy";
+        //        UIApplication * app = [UIApplication sharedApplication];
+        //        AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+        //        MainViewController* main_vc=(MainViewController*)appDelegate.main_vc;
+        //
+        //
+        
+        WebViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"WebViewController"];
+        ViewController.url = url;
+        ViewController.title = title;
+        
+        
+        
+        [self.navigationController pushViewController:ViewController animated:YES];
+        
+    }
+    
+    else if([title isEqualToString:@"Simplified Buying Program"])
+    {
+        
+        SimplifiedBuyingProgramViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"SimplifiedBuyingProgramViewController"];
+       
+        
+        
+        
+        UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:ViewController] ;
+        
+        
+        
+        
+        
+        //    [self hackModalSheetSize:CGSizeMake(450, 200) ofVC:navi];
+        
+        navi.modalPresentationStyle = UIModalTransitionStyleCrossDissolve;//有三种状态，自己看看是哪种
+        [self presentViewController:navi animated:YES completion:^{
+            
+            //        navi.view.superview.bounds = CGRectMake(0, 0, 480, 320);
+            
+            NSLog(@"about present.........");
+            
+            //   self.btop = false;
+            //  <#code#>
+        }];
+        
+    }
+    
     else if([title isEqualToString:@"About"])
     {
         

RedAnt ERP Mobile/common/Functions/sidemenu/SimplifiedBuyingProgramViewController.h

@@ -0,0 +1,14 @@
+//
+//  MessageViewController.h
+//  iSales-NPD
+//
+//  Created by Ray on 3/22/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SimplifiedBuyingProgramViewController : UIViewController
+
+@property (strong, nonatomic) IBOutlet UITextView *textview;
+@end

RedAnt ERP Mobile/common/Functions/sidemenu/SimplifiedBuyingProgramViewController.m

@@ -0,0 +1,50 @@
+//
+//  MessageViewController.m
+//  iSales-NPD
+//
+//  Created by Ray on 3/22/16.
+//  Copyright © 2016 United Software Applications, Inc. All rights reserved.
+//
+
+#import "SimplifiedBuyingProgramViewController.h"
+
+@interface SimplifiedBuyingProgramViewController ()
+
+@end
+
+@implementation SimplifiedBuyingProgramViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]
+                                                                    style:UIBarButtonItemStylePlain
+                                                                   target:self
+                                                                   action:@selector( onCloseClick:)];
+    
+    
+    self.navigationItem.rightBarButtonItem = closeButton;
+    
+    
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+- (IBAction)onCloseClick:(id)sender {
+    [self dismissViewControllerAnimated:true completion:nil];
+}
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

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

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		7111E5721C76C557004763B3 /* customer_info_template_edit.json in Resources */ = {isa = PBXBuildFile; fileRef = 7111E5711C76C557004763B3 /* customer_info_template_edit.json */; };
+		71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */; };
 		712BABF31C897E3A0007466B /* CategorySearchFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712BABF21C897E3A0007466B /* CategorySearchFilterViewController.m */; };
 		712C40B61C7310F4000E6831 /* CartGeneralNotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712C40B51C7310F4000E6831 /* CartGeneralNotesViewController.m */; };
 		712C40B91C731126000E6831 /* ItemNotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 712C40B81C731126000E6831 /* ItemNotesViewController.m */; };
@@ -172,6 +173,8 @@
 		56528CA8B8A71F67C2EE5366 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		6C826876B24EFB83AC94A464 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		7111E5711C76C557004763B3 /* customer_info_template_edit.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = customer_info_template_edit.json; path = common/Functions/contact/customer_info_template_edit.json; sourceTree = SOURCE_ROOT; };
+		71131F901CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SimplifiedBuyingProgramViewController.h; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.h; sourceTree = SOURCE_ROOT; };
+		71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SimplifiedBuyingProgramViewController.m; path = common/Functions/sidemenu/SimplifiedBuyingProgramViewController.m; sourceTree = SOURCE_ROOT; };
 		712BABF11C897E3A0007466B /* CategorySearchFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CategorySearchFilterViewController.h; path = common/Functions/category/CategorySearchFilterViewController.h; sourceTree = SOURCE_ROOT; };
 		712BABF21C897E3A0007466B /* CategorySearchFilterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CategorySearchFilterViewController.m; path = common/Functions/category/CategorySearchFilterViewController.m; sourceTree = SOURCE_ROOT; };
 		712C40B41C7310F4000E6831 /* CartGeneralNotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CartGeneralNotesViewController.h; path = common/Functions/cart/CartGeneralNotesViewController.h; sourceTree = SOURCE_ROOT; };
@@ -758,6 +761,8 @@
 				7162A5D91C5876E300AB630E /* SettingViewController.m */,
 				7186C25B1C97A6EE00CB43F4 /* FunctionTestViewController.h */,
 				7186C25C1C97A6EE00CB43F4 /* FunctionTestViewController.m */,
+				71131F901CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.h */,
+				71131F911CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m */,
 			);
 			name = sideMenu;
 			sourceTree = "<group>";
@@ -1250,6 +1255,7 @@
 				71DF748C1C57608F00F2789C /* StrikethroughLabel.m in Sources */,
 				7162A5981C58733400AB630E /* CreateOrderViewController.m in Sources */,
 				7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */,
+				71131F921CA1372300DBF6E2 /* SimplifiedBuyingProgramViewController.m in Sources */,
 				7162A55C1C58724700AB630E /* ContactListTableViewCell.m in Sources */,
 				71DF745C1C575E7900F2789C /* CommonEditorCellEdit.m in Sources */,
 				7186C25D1C97A6EE00CB43F4 /* FunctionTestViewController.m in Sources */,

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

@@ -243,9 +243,9 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="A6K-Xr-CN6" userLabel="so#">
-                                        <rect key="frame" x="49" y="75" width="187" height="21"/>
+                                        <rect key="frame" x="5" y="75" width="158" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <color key="textColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
@@ -281,7 +281,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Kx0-AQ-Y5o" userLabel="MenuButton">
-                                        <rect key="frame" x="0.0" y="20" width="36" height="36"/>
+                                        <rect key="frame" x="0.0" y="20" width="48" height="48"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" title="Button" image="menu_open"/>
                                         <connections>
@@ -306,7 +306,7 @@
                                 </connections>
                             </button>
                             <view hidden="YES" contentMode="scaleToFill" restorationIdentifier="menuView" id="Qz1-qV-4fT" userLabel="sidemenuView">
-                                <rect key="frame" x="-900" y="0.0" width="364" height="1024"/>
+                                <rect key="frame" x="-300" y="0.0" width="364" height="1024"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
                                 <subviews>
                                     <view alpha="0.80000000000000004" contentMode="scaleToFill" id="dR0-Te-FbY" userLabel="backgroundView">
@@ -335,14 +335,14 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pki-xD-OOT">
-                                                            <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
+                                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="a18-fA-KeX">
-                                                            <rect key="frame" x="233.5" y="12" width="41.5" height="19.5"/>
+                                                            <rect key="frame" x="234" y="12" width="41" height="20"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                             <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
@@ -487,7 +487,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Hjj-gq-Qs5" id="bKF-1X-6DE">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="119.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567890.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MZM-06-tL3" userLabel="item price">
@@ -591,7 +591,7 @@
                                         <rect key="frame" x="0.0" y="22" width="768" height="120"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="L9J-GT-Vuy" id="8jz-dG-ECN">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="120"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="119.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1234567890.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0CU-0E-u4Q" userLabel="item price">
@@ -2012,7 +2012,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QWz-EJ-Yzy" id="E1L-su-dvV">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="PJV-YE-GvQ">
@@ -2036,7 +2036,7 @@
                                         <rect key="frame" x="0.0" y="44" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TID-OY-afi" id="yuC-0D-Ebs">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Diskspace" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pVO-Tx-wMs">
@@ -2064,7 +2064,7 @@
                                         <rect key="frame" x="0.0" y="88" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <rect key="frame" x="0.0" y="0.0" width="682" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="682" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AHm-p1-51h">
@@ -2112,7 +2112,7 @@
                                         <rect key="frame" x="0.0" y="22" width="540" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KaA-n8-IuZ" id="C6b-m1-PvY">
-                                            <rect key="frame" x="0.0" y="0.0" width="507" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="507" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -5455,7 +5455,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="22" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6hT-I3-WW3" id="gKI-En-sgV">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="Eyx-Zr-PLO" customClass="RTLabel">
@@ -5473,7 +5473,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="66" width="768" height="190"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lSe-2G-cT7" id="KDS-aU-tYT">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="190"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="189.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12345678.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yQq-ma-HdT" userLabel="unit price">
@@ -5597,7 +5597,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="256" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9rG-Hv-ICg" id="e5s-wc-IkL">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$123456789.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fNL-sW-tkk" userLabel="price">
@@ -5625,7 +5625,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="300" width="768" height="186"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9hm-qp-u5H" id="PQ9-FQ-6Si">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="186"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="185.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <webView userInteractionEnabled="NO" contentMode="scaleToFill" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" keyboardDisplayRequiresUserAction="NO" id="9m6-iq-KMk">
@@ -5644,7 +5644,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="486" width="768" height="148"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="s5l-6k-iWO" id="8ms-PN-eNw">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="148"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="147.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="wjN-UC-W3J">
@@ -7365,7 +7365,7 @@ redantsupport@united-us.net</string>
                                         <rect key="frame" x="0.0" y="28" width="728" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nP5-gn-0Jl" id="MCy-CI-ivv">
-                                            <rect key="frame" x="0.0" y="0.0" width="728" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="728" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HwF-54-hzr">
@@ -7702,6 +7702,57 @@ redantsupport@united-us.net</string>
             </objects>
             <point key="canvasLocation" x="5223" y="-442"/>
         </scene>
+        <!--Simplified Buying Program-->
+        <scene sceneID="OPQ-2k-rNf">
+            <objects>
+                <viewController storyboardIdentifier="SimplifiedBuyingProgramViewController" title="Simplified Buying Program" useStoryboardIdentifierAsRestorationIdentifier="YES" id="kCP-Oi-KFm" customClass="SimplifiedBuyingProgramViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="zqU-tz-4Of">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="njU-8s-bxi">
+                                <rect key="frame" x="189" y="270" width="102" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                <state key="normal" backgroundImage="btn_ok">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="15"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="onCloseClick:" destination="kCP-Oi-KFm" eventType="touchUpInside" id="JB0-Mq-NUy"/>
+                                </connections>
+                            </button>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" usesAttributedText="YES" id="faW-Ga-DNl">
+                                <rect key="frame" x="20" y="20" width="440" height="236"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <attributedString key="attributedText">
+                                    <fragment>
+                                        <string key="content">Our Simplified Buying Program offers a nationwide flat freight rate of 15% (contiguous states), with a special 10% rate for customers in California.  To take advantage of this program, you must meet a $600 minimum and you are shipping to an address within the same zone of the Billing address.  If you are shipping out of zone, the freight to be quoted.  Additional services, such as lift-gate, inside delivery, re-routing fee, guarantee time, other delivery services are not included. Additional fee to be charged accordingly.</string>
+                                        <attributes>
+                                            <font key="NSFont" size="17" name="HelveticaNeue"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="2" tighteningFactorForTruncation="0.0"/>
+                                        </attributes>
+                                    </fragment>
+                                </attributedString>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="480" height="320"/>
+                    <connections>
+                        <outlet property="textview" destination="faW-Ga-DNl" id="vak-UX-Qyg"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="s2Y-oo-PI6" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5223" y="-836"/>
+        </scene>
         <!--EditModelPriceViewController-->
         <scene sceneID="8Ge-4D-Bfq">
             <objects>
@@ -7816,7 +7867,7 @@ redantsupport@united-us.net</string>
         <image name="mark_cart_32" width="32" height="32"/>
         <image name="mark_closeout_32" width="32" height="32"/>
         <image name="mark_wish_32" width="32" height="32"/>
-        <image name="menu_open" width="36" height="36"/>
+        <image name="menu_open" width="72" height="72"/>
         <image name="newcustomer" width="32" height="32"/>
         <image name="neworder" width="40" height="40"/>
         <image name="npd_logo" width="69" height="50"/>

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/contact.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "contact(2).png",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "contact(2)@2x.png",
+      "filename" : "appicon-1.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "contact(2)@3x.png",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/menu.imageset/Contents.json

@@ -2,15 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "appicon.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "font-61532.png"
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "appicon-2.png",
       "scale" : "3x"
     }
   ],

RedAnt ERP Mobile/iSales-NPD/Images.xcassets/menu_open.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "5_36pt.png"
+      "filename" : "appicon.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "5_36pt@2x.png"
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "5_36pt@3x.png"
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -16,195 +16,198 @@
 #define LOCAL_URL_CUSTOMER_INFO_EDITOR @"customer_info_template"
 #define LOCAL_URL_CUSTOMER_INFO_EDIT @"customer_info_template_edit"
 #define LOCAL_URL_CUSTOMER_ADV_SEARCH @"customer_advanced_search"
+//
+//
+////------------------- chen server-----------------------
+//#define  URL_UPDATE_AUTH  @"http://192.168.0.119:8080/site/isales/login.htm"
+//#define  URL_LOGOUT  @"http://192.168.0.119:8080/site/isales/loginOut.htm"
+//#define  URL_RETRIEVE_PASS  @"http://192.168.0.119:8080/site/isales/forgotPassword.htm"
+//
+//#define  URL_REQUEST_CATMENU  @"http://192.168.0.119:8080/site/isales/menu.htm"
+//#define  URL_LOAD_HOME  @"http://192.168.0.119:8080/site/isales/homePage.htm"
+//#define  URL_CATEGORY @"http://192.168.0.119:8080/site/isales/distinctCategory.htm"
+//#define  URL_SEARCH  @"http://192.168.0.119:8080/site/isales/search.htm"
+//#define  URL_ITEM_SEARCH  @"http://192.168.0.119:8080/site/isales/itemSearch.htm"
+//#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.119:8080/site/isales/categoryMore.htm"
+//
+//
+//
+//#define  URL_ORDER_LIST  @"http://192.168.0.119:8080/site/isales/orderList.htm"
+//#define  URL_ORDER_DETAIL  @"http://192.168.0.119:8080/site/isales/orderDetail.htm"
+//#define URL_COMMIT_ORDER @"http://192.168.0.119:8080/site/isales/createOrder.htm"
+//#define URL_COPY_ORDER @"http://192.168.0.119:8080/site/isales/copyOrder.htm"
+//#define URL_SIGN_ORDER @"http://192.168.0.119:8080/site/isales/updateOrderSign.htm"
+//#define URL_SAVE_ORDER @"http://192.168.0.119:8080/site/isales/saveOrder.htm"
+//#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.119:8080/site/isales/updateOrderCustomerInfo.htm"
+//#define  URL_NEW_ORDER  @"http://192.168.0.119:8080/site/isales/createNewOrder.htm"
+//#define  URL_OPEN_ORDER  @"http://192.168.0.119:8080/site/isales/openOrder.htm"
+//#define  URL_RELEASE_ORDER  @"http://192.168.0.119:8080/site/isales/closeOrder.htm"
+//#define  URL_DELETE_ORDER  @"http://192.168.0.119:8080/site/isales/deleteOrder.htm"
+//#define  URL_CANCEL_ORDER  @"http://192.168.0.119:8080/site/isales/cancelOrder.htm"
+//
+//
+//#define  URL_CART_SET_PRICE  @"http://192.168.0.119:8080/site/isales/setPrice.htm"
+//#define  URL_CART_ITEM_NOTES  @"http://192.168.0.119:8080/site/isales/setItemNotes.htm"
+//#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.119:8080/site/isales/updateGeneralNote.htm"
+//
+//#define  URL_CART_INCRESEMENT  @"http://192.168.0.119:8080/site/isales/increment.htm"
+//#define  URL_CART  @"http://192.168.0.119:8080/site/isales/cartDtail.htm"
+//#define  URL_CARTDELIVERY  @"http://192.168.0.119:8080/site/isales/cartDelivery.htm"
+//#define  URL_ADD_TO_CART  @"http://192.168.0.119:8080/site/isales/addToCart.htm"
+//#define  URL_CART_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToCart.htm"
+//#define  URL_CART_CHECK  @"http://192.168.0.119:8080/site/isales/checkCartItem.htm"
+//#define  URL_CART2WISH  @"http://192.168.0.119:8080/site/isales/cartRemoveToWishlist.htm"
+//#define  URL_WISH2CART  @"http://192.168.0.119:8080/site/isales/wishlistRemoveToCart.htm"
+//
+//
+//
+//
+//#define  URL_ITEM_DETAIL  @"http://192.168.0.119:8080/site/isales/modelDetail.htm"
+//
+//#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.119:8080/site/isales/addToWishList.htm"
+//#define  URL_WATCHLIST  @"http://192.168.0.119:8080/site/isales/wishList.htm"
+//#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToWishList.htm"
+//
+//
+//
+//#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.119:8080/site/isales/addToPortfolio.htm"
+//#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToPortfolio.htm"
+//#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteTearSheetPdf.htm"
+//#define  URL_PORTFOLIO  @"http://192.168.0.119:8080/site/isales/portfolios.htm"
+//#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.119:8080/site/isales/setTearSheetPrice.htm"
+//#define  URL_DM_PARAMS @"http://192.168.0.119:8080/site/isales/selectTearSheetParam.htm"
+//#define  URL_REQUEST_DM @"http://192.168.0.119:8080/site/isales/getTearSheetPdf.htm"
+//#define  URL_SAVE_DM_DIRECT @"http://192.168.0.119:8080/site/isales/getTearSheetPdf.htm"
+//#define  URL_SAVE_DM @"http://192.168.0.119:8080/site/isales/saveTearSheetPdf.htm"
+//#define  URL_DM_LIST @"http://192.168.0.119:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.119:8080/site/isales/setTearSheetAvailableQty.htm"
+//#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.119:8080/site/isales/getTearSheetAvailableQty.htm"
+//
+//#define  URL_CONTACT_LIST  @"http://192.168.0.119:8080/site/isales/getAllContact.htm"
+//#define  URL_SHIPTO_LIST  @"http://192.168.0.119:8080/site/isales/getShipToContact.htm"
+//
+//#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.119:8080/site/isales/getAddAddress.htm"
+//#define  URL_ADDRESS_SAVE  @"http://192.168.0.119:8080/site/isales/saveAddress.htm"
+//
+//
+//#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.119:8080/site/isales/creditCard.htm"
+//#define  URL_CREDITCARD_SAVE  @"http://192.168.0.119:8080/site/isales/saveAddress.htm"
+//
+//
+//
+//#define  URL_CUSTOMER_INFO  @"http://192.168.0.119:8080/site/isales/getCustomerInfoByContact.htm"
+//#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.119:8080/site/isales/hasPendingOrderByContact.htm"
+//#define  URL_NEW_CUSTOMER  @"http://192.168.0.119:8080/site/isales/getAddCustomer.htm"
+//#define  URL_EDIT_CUSTOMER  @"http://192.168.0.119:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+//#define  URL_CUSTOMER_SAVE  @"http://192.168.0.119:8080/site/isales/saveCustomer.htm"
+//#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.119:8080/site/isales/updateCustomer.htm"
+//#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.119:8080/site/isales/updateCustomerBusiCard.htm"
+//
+//
+//
+//
+//
+//
+//#define  URL_ERR_LOG  @"http://192.168.0.119:8080/site/isales/er_log.htm"
+//
+//#define  URL_UPLOAD_IMG  @"http://192.168.0.119:8080/site/isales/uploadImg.htm"
+//
+//#define  URL_NPD_POLICY  @"http://192.168.0.119:8080/site/isales/generalPolicy.htm"
+//
 
 
-//------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.119:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.119:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.119:8080/site/isales/forgotPassword.htm"
-
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.119:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.119:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.119:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.119:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.119:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.119:8080/site/isales/categoryMore.htm"
-
-
-
-#define  URL_ORDER_LIST  @"http://192.168.0.119:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.119:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.119:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.119:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.119:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.119:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.119:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.119:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.119:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.119:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.119:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.119:8080/site/isales/cancelOrder.htm"
+//------------------- NPD server-----------------------
+#define  URL_UPDATE_AUTH  @"https://www.newpacificdirect.com/isales/login.htm"
+#define  URL_LOGOUT  @"https://www.newpacificdirect.com/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"https://www.newpacificdirect.com/isales/forgotPassword.htm"
 
+#define  URL_REQUEST_CATMENU  @"https://www.newpacificdirect.com/isales/menu.htm"
+#define  URL_LOAD_HOME  @"https://www.newpacificdirect.com/isales/homePage.htm"
+#define  URL_CATEGORY @"https://www.newpacificdirect.com/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"https://www.newpacificdirect.com/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"https://www.newpacificdirect.com/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"https://www.newpacificdirect.com/isales/categoryMore.htm"
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.119:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.119:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.119:8080/site/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.119:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.119:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.119:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.119:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.119:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.119:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.119:8080/site/isales/wishlistRemoveToCart.htm"
 
+#define  URL_ORDER_LIST  @"https://www.newpacificdirect.com/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"https://www.newpacificdirect.com/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"https://www.newpacificdirect.com/isales/createOrder.htm"
+#define URL_SAVE_ORDER @"https://www.newpacificdirect.com/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"https://www.newpacificdirect.com/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"https://www.newpacificdirect.com/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"https://www.newpacificdirect.com/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"https://www.newpacificdirect.com/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"https://www.newpacificdirect.com/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"https://www.newpacificdirect.com/isales/cancelOrder.htm"
 
 
+#define  URL_CART_SET_PRICE  @"https://www.newpacificdirect.com/isales/setPrice.htm"
+#define  URL_CART_INCRESEMENT  @"https://www.newpacificdirect.com/isales/increment.htm"
+#define  URL_CART  @"https://www.newpacificdirect.com/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"https://www.newpacificdirect.com/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"https://www.newpacificdirect.com/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"https://www.newpacificdirect.com/isales/checkCartItem.htm"
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.119:8080/site/isales/modelDetail.htm"
+#define  URL_CART2WISH  @"https://www.newpacificdirect.com/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"https://www.newpacificdirect.com/isales/wishlistRemoveToCart.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.119:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.119:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToWishList.htm"
+#define  URL_ITEM_DETAIL  @"https://www.newpacificdirect.com/isales/modelDetail.htm"
 
+#define  URL_ADD_TO_WATCHLIST  @"https://www.newpacificdirect.com/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"https://www.newpacificdirect.com/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToWishList.htm"
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.119:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.119:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.119:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.119:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.119:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.119:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.119:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.119:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.119:8080/site/isales/tearSheetPdfList.htm"
-#define  URL_DM_SET_QTY @"http://192.168.0.119:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.119:8080/site/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.119:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.119:8080/site/isales/getShipToContact.htm"
+#define  URL_ADD_TO_PORTFOLIO @"https://www.newpacificdirect.com/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIO  @"https://www.newpacificdirect.com/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"https://www.newpacificdirect.com/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"https://www.newpacificdirect.com/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"https://www.newpacificdirect.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"https://www.newpacificdirect.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"https://www.newpacificdirect.com/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"https://www.newpacificdirect.com/isales/tearSheetPdfList.htm"
+#define  URL_DM_SET_QTY @"https://www.newpacificdirect.com/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"https://www.newpacificdirect.com/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.119:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.119:8080/site/isales/saveAddress.htm"
 
+#define  URL_CONTACT_LIST  @"https://www.newpacificdirect.com/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"https://www.newpacificdirect.com/isales/getShipToContact.htm"
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.119:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.119:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"https://www.newpacificdirect.com/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"https://www.newpacificdirect.com/isales/saveAddress.htm"
 
 
+#define  URL_CREDITCARD_EDOTOR  @"https://www.newpacificdirect.com/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"https://www.newpacificdirect.com/isales/saveAddress.htm"
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.119:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.119:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.119:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.119:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.119:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.119:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.119:8080/site/isales/updateCustomerBusiCard.htm"
 
 
+#define  URL_CUSTOMER_INFO  @"https://www.newpacificdirect.com/isales/getCustomerInfoByContact.htm"
+#define  URL_NEW_CUSTOMER  @"https://www.newpacificdirect.com/isales/getAddCustomer.htm"
+#define  URL_CUSTOMER_SAVE  @"https://www.newpacificdirect.com/isales/saveCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"https://www.newpacificdirect.com/isales/updateCustomerBusiCard.htm"
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.119:8080/site/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.119:8080/site/isales/uploadImg.htm"
 
+#define  URL_ERR_LOG  @"https://www.newpacificdirect.com/isales/er_log.htm"
 
+#define  URL_UPLOAD_IMG  @"https://www.newpacificdirect.com/isales/uploadImg.htm"
 
+#define URL_COPY_ORDER @"https://www.newpacificdirect.com/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"https://www.newpacificdirect.com/isales/updateOrderSign.htm"
+#define  URL_CUSTOMER_UPDATE  @"https://www.newpacificdirect.com/isales/updateCustomer.htm"
+#define  URL_CART_GENERAL_NOTES  @"https://www.newpacificdirect.com/isales/updateGeneralNote.htm"
+#define  URL_CART_ITEM_NOTES  @"https://www.newpacificdirect.com/isales/setItemNotes.htm"
+#define  URL_EDIT_CUSTOMER  @"https://www.newpacificdirect.com/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"https://www.newpacificdirect.com/isales/hasPendingOrderByContact.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteTearSheetPdf.htm"
 //
-////------------------- NPD server-----------------------
-//#define  URL_UPDATE_AUTH  @"https://www.newpacificdirect.com/isales/login.htm"
-//#define  URL_LOGOUT  @"https://www.newpacificdirect.com/isales/loginOut.htm"
-//#define  URL_RETRIEVE_PASS  @"https://www.newpacificdirect.com/isales/forgotPassword.htm"
-//
-//#define  URL_REQUEST_CATMENU  @"https://www.newpacificdirect.com/isales/menu.htm"
-//#define  URL_LOAD_HOME  @"https://www.newpacificdirect.com/isales/homePage.htm"
-//#define  URL_CATEGORY @"https://www.newpacificdirect.com/isales/distinctCategory.htm"
-//#define  URL_SEARCH  @"https://www.newpacificdirect.com/isales/search.htm"
-//#define  URL_ITEM_SEARCH  @"https://www.newpacificdirect.com/isales/itemSearch.htm"
-//#define  URL_CATEGORY_LOADMORE  @"https://www.newpacificdirect.com/isales/categoryMore.htm"
-//
-//
-//
-//#define  URL_ORDER_LIST  @"https://www.newpacificdirect.com/isales/orderList.htm"
-//#define  URL_ORDER_DETAIL  @"https://www.newpacificdirect.com/isales/orderDetail.htm"
-//#define URL_COMMIT_ORDER @"https://www.newpacificdirect.com/isales/createOrder.htm"
-//#define URL_SAVE_ORDER @"https://www.newpacificdirect.com/isales/saveOrder.htm"
-//#define URL_UPDATE_ORDERCUSTOMER @"https://www.newpacificdirect.com/isales/updateOrderCustomerInfo.htm"
-//#define  URL_NEW_ORDER  @"https://www.newpacificdirect.com/isales/createNewOrder.htm"
-//#define  URL_OPEN_ORDER  @"https://www.newpacificdirect.com/isales/openOrder.htm"
-//#define  URL_RELEASE_ORDER  @"https://www.newpacificdirect.com/isales/closeOrder.htm"
-//#define  URL_DELETE_ORDER  @"https://www.newpacificdirect.com/isales/deleteOrder.htm"
-//#define  URL_CANCEL_ORDER  @"https://www.newpacificdirect.com/isales/cancelOrder.htm"
-//
-//
-//#define  URL_CART_SET_PRICE  @"https://www.newpacificdirect.com/isales/setPrice.htm"
-//#define  URL_CART_INCRESEMENT  @"https://www.newpacificdirect.com/isales/increment.htm"
-//#define  URL_CART  @"https://www.newpacificdirect.com/isales/cartDtail.htm"
-//#define  URL_CARTDELIVERY  @"https://www.newpacificdirect.com/isales/cartDelivery.htm"
-//#define  URL_ADD_TO_CART  @"https://www.newpacificdirect.com/isales/addToCart.htm"
-//#define  URL_CART_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToCart.htm"
-//#define  URL_CART_CHECK  @"https://www.newpacificdirect.com/isales/checkCartItem.htm"
-//
-//#define  URL_CART2WISH  @"https://www.newpacificdirect.com/isales/cartRemoveToWishlist.htm"
-//#define  URL_WISH2CART  @"https://www.newpacificdirect.com/isales/wishlistRemoveToCart.htm"
-//
-//#define  URL_ITEM_DETAIL  @"https://www.newpacificdirect.com/isales/modelDetail.htm"
-//
-//#define  URL_ADD_TO_WATCHLIST  @"https://www.newpacificdirect.com/isales/addToWishList.htm"
-//#define  URL_WATCHLIST  @"https://www.newpacificdirect.com/isales/wishList.htm"
-//#define  URL_WATCHLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToWishList.htm"
-//
-//
-//
-//#define  URL_ADD_TO_PORTFOLIO @"https://www.newpacificdirect.com/isales/addToPortfolio.htm"
-//#define  URL_PORTFOLIO_REMOVE  @"https://www.newpacificdirect.com/isales/deleteToPortfolio.htm"
-//#define  URL_PORTFOLIO  @"https://www.newpacificdirect.com/isales/portfolios.htm"
-//#define  URL_PORTFOLIO_SET_PRICE  @"https://www.newpacificdirect.com/isales/setTearSheetPrice.htm"
-//#define  URL_DM_PARAMS @"https://www.newpacificdirect.com/isales/selectTearSheetParam.htm"
-//#define  URL_REQUEST_DM @"https://www.newpacificdirect.com/isales/getTearSheetPdf.htm"
-//#define  URL_SAVE_DM_DIRECT @"https://www.newpacificdirect.com/isales/getTearSheetPdf.htm"
-//#define  URL_SAVE_DM @"https://www.newpacificdirect.com/isales/saveTearSheetPdf.htm"
-//#define  URL_DM_LIST @"https://www.newpacificdirect.com/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"https://www.newpacificdirect.com/isales/setTearSheetAvailableQty.htm"
-//
-//#define  URL_CONTACT_LIST  @"https://www.newpacificdirect.com/isales/getAllContact.htm"
-//#define  URL_SHIPTO_LIST  @"https://www.newpacificdirect.com/isales/getShipToContact.htm"
-//
-//#define  URL_ADDRESS_EDOTOR  @"https://www.newpacificdirect.com/isales/getAddAddress.htm"
-//#define  URL_ADDRESS_SAVE  @"https://www.newpacificdirect.com/isales/saveAddress.htm"
-//
-//
-//#define  URL_CREDITCARD_EDOTOR  @"https://www.newpacificdirect.com/isales/creditCard.htm"
-//#define  URL_CREDITCARD_SAVE  @"https://www.newpacificdirect.com/isales/saveAddress.htm"
-//
-//
-//
-//#define  URL_CUSTOMER_INFO  @"https://www.newpacificdirect.com/isales/getCustomerInfoByContact.htm"
-//#define  URL_NEW_CUSTOMER  @"https://www.newpacificdirect.com/isales/getAddCustomer.htm"
-//#define  URL_CUSTOMER_SAVE  @"https://www.newpacificdirect.com/isales/saveCustomer.htm"
-//#define  URL_UPDATE_CUSTOMER_BCARD  @"https://www.newpacificdirect.com/isales/updateCustomerBusiCard.htm"
-//
-//
-//
-//
-//
-//
-//#define  URL_ERR_LOG  @"https://www.newpacificdirect.com/isales/er_log.htm"
-//
-//#define  URL_UPLOAD_IMG  @"https://www.newpacificdirect.com/isales/uploadImg.htm"
-//
-//#define URL_COPY_ORDER @"https://www.newpacificdirect.com/isales/copyOrder.htm"
-//#define URL_SIGN_ORDER @"https://www.newpacificdirect.com/isales/updateOrderSign.htm"
-//#define  URL_CUSTOMER_UPDATE  @"https://www.newpacificdirect.com/isales/updateCustomer.htm"
-//#define  URL_CART_GENERAL_NOTES  @"https://www.newpacificdirect.com/isales/updateGeneralNote.htm"
-//#define  URL_CART_ITEM_NOTES  @"https://www.newpacificdirect.com/isales/setItemNotes.htm"
-//#define  URL_EDIT_CUSTOMER  @"https://www.newpacificdirect.com/isales/getUpdateCustomerInfoByContact.htm"
-//#define  URL_CUSTOMER_PENDINGORDER  @"https://www.newpacificdirect.com/isales/hasPendingOrderByContact.htm"
-//#define  URL_PORTFOLIOLIST_REMOVE  @"https://www.newpacificdirect.com/isales/deleteTearSheetPdf.htm"
-////
-
+#define  URL_NPD_POLICY   @"https://www.newpacificdirect.com/isales/generalPolicy.htm"
 #endif

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>160321</string>
+	<string>160322</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -35,6 +35,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
 	<key>UISupportedExternalAccessoryProtocols</key>
 	<array>
 		<string>com.socketmobile.chs</string>