20160325

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

@@ -9,93 +9,13 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479793416.532987"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "480587177.973904"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "394"
-            endingLineNumber = "394"
-            landmarkName = "-printInteractionController:choosePaper:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479793442.717562"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "410"
-            endingLineNumber = "410"
-            landmarkName = "-printInteractionController:choosePaper:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479793713.953588"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "407"
-            endingLineNumber = "407"
-            landmarkName = "-printInteractionController:choosePaper:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479793729.388016"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "395"
-            endingLineNumber = "395"
-            landmarkName = "-printInteractionController:choosePaper:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/order/CreateOrderViewController.m"
-            timestampString = "479875551.741967"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "845"
-            endingLineNumber = "845"
-            landmarkName = "-alertView:clickedButtonAtIndex:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/order/CreateOrderViewController.m"
-            timestampString = "479798976.892655"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "659"
-            endingLineNumber = "659"
-            landmarkName = "-alertView:clickedButtonAtIndex:"
+            startingLineNumber = "1290"
+            endingLineNumber = "1290"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -105,541 +25,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479806607.767167"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "352"
-            endingLineNumber = "352"
-            landmarkName = "-searchForPrinters"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479872745.32574"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "58"
-            endingLineNumber = "58"
-            landmarkName = "-startAirPrintWithData:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/sidemenu/FunctionTestViewController.m"
-            timestampString = "479872767.600379"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
-            endingLineNumber = "60"
-            landmarkName = "-startAirPrintWithData:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "480061027.598852"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1010"
-            endingLineNumber = "1010"
-            landmarkName = "-printPdf:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/category/CategoryViewController.h"
-            timestampString = "479894333.783505"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "63"
-            endingLineNumber = "63"
-            landmarkName = "handler"
-            landmarkType = "19">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/RAUtils.m"
-            timestampString = "479897210.632006"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "293"
-            endingLineNumber = "293"
-            landmarkName = "+add_to_cart:selectorholder:selector:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/RAUtils.m"
-            timestampString = "479897210.632006"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "297"
-            endingLineNumber = "297"
-            landmarkName = "+add_to_cart:selectorholder:selector:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/RAUtils.m"
-            timestampString = "479900171.052357"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "412"
-            endingLineNumber = "412"
-            landmarkName = "+add_to_cart:selectorholder:selector:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/RAUtils.m"
-            timestampString = "479897210.632006"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "299"
-            endingLineNumber = "299"
-            landmarkName = "+add_to_cart:selectorholder:selector:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "479896517.926831"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "560"
-            endingLineNumber = "560"
-            landmarkName = "-addtocart"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/EditModelPriceViewController.m"
-            timestampString = "479975496.881973"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "67"
-            endingLineNumber = "67"
-            landmarkName = "-onSaveClicked:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/order/OrderDetailViewController.m"
-            timestampString = "480230680.313449"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1425"
-            endingLineNumber = "1425"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/CommonEditor/CommonEditorViewController.m"
-            timestampString = "480043458.513115"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "42"
-            endingLineNumber = "42"
-            landmarkName = "-initWithNibName:bundle:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "480051743.462463"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "997"
-            endingLineNumber = "997"
-            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "480051743.462463"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "723"
-            endingLineNumber = "723"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "480322655.000125"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2518"
-            endingLineNumber = "2518"
-            landmarkName = "+parse_authinfo:user:password:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "480322655.000125"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2520"
-            endingLineNumber = "2520"
-            landmarkName = "+parse_authinfo:user:password:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/order/OrderListViewController.m"
-            timestampString = "480060823.857194"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "28"
-            endingLineNumber = "28"
-            landmarkName = "-logout"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/search+itemsearch/ItemSearchViewController.m"
-            timestampString = "480063703.96504"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "463"
-            endingLineNumber = "463"
-            landmarkName = "-reload"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/search+itemsearch/ItemSearchViewController.m"
-            timestampString = "480063703.96504"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "483"
-            endingLineNumber = "483"
-            landmarkName = "-reload"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/MainViewController.m"
-            timestampString = "480329452.531991"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1771"
-            endingLineNumber = "1771"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/MainViewController.m"
-            timestampString = "480329452.531991"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1799"
-            endingLineNumber = "1799"
-            landmarkName = "-tableView:didSelectRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/MainViewController.m"
-            timestampString = "480329646.036923"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1984"
-            endingLineNumber = "1984"
-            landmarkName = "-tableView:didSelectRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/MainViewController.m"
-            timestampString = "480329646.036923"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1983"
-            endingLineNumber = "1983"
-            landmarkName = "-tableView:didSelectRowAtIndexPath:"
-            landmarkType = "5">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[MainViewController tableView:didSelectRowAtIndexPath:]"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/MainViewController.m"
-                  timestampString = "480222562.726986"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1919"
-                  endingLineNumber = "1919"
-                  offsetFromSymbolStart = "2252">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[MainViewController tableView:didSelectRowAtIndexPath:]"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/MainViewController.m"
-                  timestampString = "480222562.727219"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "1919"
-                  endingLineNumber = "1919"
-                  offsetFromSymbolStart = "2284">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/MainViewController.m"
-            timestampString = "480327958.12278"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "652"
-            endingLineNumber = "652"
-            landmarkName = "-switchtowishlist"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/CartViewController.m"
-            timestampString = "480308445.807151"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1283"
-            endingLineNumber = "1283"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/CartViewController.m"
-            timestampString = "480308445.807151"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "850"
-            endingLineNumber = "850"
-            landmarkName = "-refresh_total"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/cart/CartViewController.m"
-            timestampString = "480308445.807151"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1325"
-            endingLineNumber = "1325"
-            landmarkName = "-tableView:cellForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/order/OrderDetailViewController.m"
-            timestampString = "480230653.896611"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "691"
-            endingLineNumber = "691"
-            landmarkName = "-loaddata"
-            landmarkType = "5">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[OrderDetailViewController loaddata]"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/order/OrderDetailViewController.m"
-                  timestampString = "480230653.911286"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "691"
-                  endingLineNumber = "691"
-                  offsetFromSymbolStart = "32">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__37-[OrderDetailViewController loaddata]_block_invoke"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/order/OrderDetailViewController.m"
-                  timestampString = "480230653.911873"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "691"
-                  endingLineNumber = "691"
-                  offsetFromSymbolStart = "24">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PDFListViewController.m"
-            timestampString = "480238589.800966"
+            filePath = "common/Functions/search+itemsearch/SearchViewController.m"
+            timestampString = "480587231.067636"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "579"
-            endingLineNumber = "579"
-            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            startingLineNumber = "1307"
+            endingLineNumber = "1307"
+            landmarkName = "-collectionView:cellForItemAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -650,93 +42,13 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "480321445.494183"
+            timestampString = "480669000.985334"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "102"
-            endingLineNumber = "102"
+            startingLineNumber = "125"
+            endingLineNumber = "125"
             landmarkName = "-reload"
             landmarkType = "5">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__30-[DetailViewController reload]_block_invoke"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/modelDetail/DetailViewController.m"
-                  timestampString = "480321445.500227"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "102"
-                  endingLineNumber = "102"
-                  offsetFromSymbolStart = "612">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__30-[DetailViewController reload]_block_invoke_2"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///ios_workspace/RedAnt%20ERP%20Mobile/common/Functions/modelDetail/DetailViewController.m"
-                  timestampString = "480321445.500458"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "102"
-                  endingLineNumber = "102"
-                  offsetFromSymbolStart = "21">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PortfolioViewController.m"
-            timestampString = "480322670.805525"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "972"
-            endingLineNumber = "972"
-            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PortfolioEditQTYViewController.m"
-            timestampString = "480322937.7237"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "-requestqty"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/portfolio/PortfolioEditQTYViewController.m"
-            timestampString = "480323871.547628"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "45"
-            endingLineNumber = "45"
-            landmarkName = "-requestqty"
-            landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

RedAnt ERP Mobile/common/CommonEditor/CommonEditorViewController.m

@@ -1434,39 +1434,39 @@
     NSString *cty_string = [arrcty componentsJoinedByString:@", "];
     
     
-    NSString* customer_phone= [customerinfo valueForKey:@"customer_phone"];
-    NSString* customer_fax= [customerinfo valueForKey:@"customer_fax"];
-    
-    NSMutableArray* arrpho = [[NSMutableArray alloc] init];
-    if(customer_phone.length>0)
-    {
-        customer_phone = [NSString stringWithFormat:@"TEL: %@",customer_phone];
-        [arrpho addObject:customer_phone];
-    }
-    if(customer_fax.length>0)
-    {
-        customer_fax = [NSString stringWithFormat:@"FAX: %@",customer_fax];
-        [arrpho addObject:customer_fax];
-    }
-    NSString *phone_string = [arrpho componentsJoinedByString:@", "];
-    
-    
-    NSString* customer_contact= [customerinfo valueForKey:@"customer_contact"];
-    if(customer_contact.length>0)
-    {
-        customer_contact = [NSString stringWithFormat:@"ATTN: %@",customer_contact];
-        
-    }
-    NSString *contact_string = customer_contact;
-    
-    
-    NSString* customer_email= [customerinfo valueForKey:@"customer_email"];
-    if(customer_email.length>0)
-    {
-        customer_email = [NSString stringWithFormat:@"Email: %@",customer_email];
-        
-    }
-    NSString *email_string = customer_email;
+//    NSString* customer_phone= [customerinfo valueForKey:@"customer_phone"];
+//    NSString* customer_fax= [customerinfo valueForKey:@"customer_fax"];
+//    
+//    NSMutableArray* arrpho = [[NSMutableArray alloc] init];
+//    if(customer_phone.length>0)
+//    {
+//        customer_phone = [NSString stringWithFormat:@"TEL: %@",customer_phone];
+//        [arrpho addObject:customer_phone];
+//    }
+//    if(customer_fax.length>0)
+//    {
+//        customer_fax = [NSString stringWithFormat:@"FAX: %@",customer_fax];
+//        [arrpho addObject:customer_fax];
+//    }
+//    NSString *phone_string = [arrpho componentsJoinedByString:@", "];
+//    
+//    
+//    NSString* customer_contact= [customerinfo valueForKey:@"customer_contact"];
+//    if(customer_contact.length>0)
+//    {
+//        customer_contact = [NSString stringWithFormat:@"ATTN: %@",customer_contact];
+//        
+//    }
+//    NSString *contact_string = customer_contact;
+//    
+//    
+//    NSString* customer_email= [customerinfo valueForKey:@"customer_email"];
+//    if(customer_email.length>0)
+//    {
+//        customer_email = [NSString stringWithFormat:@"Email: %@",customer_email];
+//        
+//    }
+//    NSString *email_string = customer_email;
     
     
     NSMutableArray* arrext = [[NSMutableArray alloc] init];
@@ -1474,12 +1474,12 @@
         [arrext addObject:addr_string];
     if(cty_string.length>0)
         [arrext addObject:cty_string];
-    if(phone_string.length>0)
-        [arrext addObject:phone_string];
-    if(contact_string.length>0)
-        [arrext addObject:contact_string];
-    if(email_string.length>0)
-        [arrext addObject:email_string];
+//    if(phone_string.length>0)
+//        [arrext addObject:phone_string];
+//    if(contact_string.length>0)
+//        [arrext addObject:contact_string];
+//    if(email_string.length>0)
+//        [arrext addObject:email_string];
     
     ret = [arrext componentsJoinedByString:@"\r\n"];
     
@@ -2562,7 +2562,8 @@
                     
                     NSString* title = [item_json valueForKey:@"aname"] ;
                     NSString* value =[item_json valueForKey:@"value"];
-                    
+                    NSString* color =[item_json valueForKey:@"color"];
+                    cell.labelValue.textColor = [RAUtils strColor:color];
                     NSString* align =[item_json valueForKey:@"align"];
                     if([align isEqualToString:@"right"])
                     {
@@ -4213,10 +4214,13 @@
     
     BOOL canChange = [string isEqualToString:filtered];
     
-    
-    
-    
+    int lenth = [[item_json valueForKey:@"length"] intValue];
+    if(lenth==0)
     return canChange;
+    else
+    {
+        return canChange&& lenth>textField.text.length;
+    }
 }
 - (void)textFieldDidEndEditing:(UITextField *)textField
 {

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1363,6 +1363,9 @@
 }
 -(NSString*) categoryString:(NSString*) categoryid node:(NSDictionary*) json level:(int) level;
 {
+    
+    if(categoryid.length==0)
+        return @">All Products>";
     //NSString* idString = [NSString stringWithFormat:@"%d",categoryid];
     NSString* categoryString =@">";
     int count = [[json valueForKey:@"count"] intValue];
@@ -1377,7 +1380,11 @@
         
         //        NSString *ds1=[categoryid substringToIndex:3+level*3];
         //        NSString*ds2 = [cid substringToIndex:3+level*3];
+        if(cid.length<3+level*3)
+            continue;
         
+        if(categoryid.length<3+level*3)
+            continue;
         if([[categoryid substringToIndex:3+level*3] isEqualToString: [cid substringToIndex:3+level*3]])
         {
             //categoryString = [categoryString stringByAppendingString:@">"];
@@ -1591,7 +1598,7 @@
 //    }
 //    
     
-    [map setValue:@"About" forKey:@"title"];
+    [map setValue:@"About us" forKey:@"title"];
     [map setValue:@"rect_change_password" forKey:@"img"];
     [self.sideMenuItems addObject:map.copy];
     
@@ -1950,7 +1957,7 @@
         
     }
     
-    else if([title isEqualToString:@"About"])
+    else if([title isEqualToString:@"About us"])
     {
         
         

RedAnt ERP Mobile/common/Functions/contact/customer_advanced_search.json

@@ -1,6 +1,6 @@
 {
     "result": 1,
-    "title": "Contact Advanced Search",
+    "title": "Contact Advance Search",
     "section_count": 1,
     "section_0": {
         "title": "Contact Information",
@@ -86,7 +86,7 @@
         },
         "item_11": {
             "aname": "Sales Rep",
-            "name": "sales_rep",
+            "name": "customer_sales_rep",
             "control": "edit",
             "value": "",
             "keyboard": "default"

RedAnt ERP Mobile/common/Functions/home/HomeViewController.m

@@ -683,7 +683,7 @@
         
         [main_vc switchToItemSearch:covertype];
     }
-    else if([action isEqualToString:@"Category"])
+    else if([action isEqualToString:@"category"])
     {
         NSString* cid = [item_json valueForKeyPath:@"category_id"];
         

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

@@ -122,6 +122,37 @@ dispatch_async(dispatch_get_main_queue(), ^{
             if([[detail_json valueForKey:@"result"] intValue]==2)
             {
                 self.detailTable.hidden = false;
+                
+                NSString* model_name = self.detail_data[@"img_section"][@"model_name"];
+                
+                 NSString* img_url = self.detail_data[@"img_section"][@"model_img"];
+                
+                
+                NSMutableDictionary* item = [[NSMutableDictionary alloc]init];
+                [item setValue:self.product_id forKey:@"product_id"];
+                [item setValue:self.category_id forKey:@"category"];
+                [item setValue:model_name forKey:@"fash_name"];
+                [item setValue:img_url forKey:@"picture_path"];
+                
+                
+                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+                int count=[appDelegate.recent_model[@"count"] intValue];
+                bool bexist = false;
+                for(int i=0;i<count;i++)
+                {
+                    NSMutableDictionary * mitem= appDelegate.recent_model[[NSString stringWithFormat:@"item_%d",i]];
+                    if([mitem[@"product_id"] isEqualToString:self.product_id])
+                    {
+                        bexist=true;
+                        break;
+                    }
+                }
+                
+                if(!bexist)
+                {
+                [appDelegate.recent_model setObject:item forKey:[NSString stringWithFormat:@"item_%d",count]];
+                appDelegate.recent_model[@"count"]=[NSString stringWithFormat:@"%d",count+1];
+                }
 
             }
             else

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

@@ -18,6 +18,9 @@
 #import "ContactListViewController.h"
 #import "PortfolioEditQTYViewController.h"
 
+#import "PDFViewController.h"
+
+
 #define ALERT_DEL 1025
 @interface PortfolioViewController ()
 
@@ -361,6 +364,44 @@
         self.path = path;
         self.remove_item = remove_item;
     };
+    VC.onSaved=^(NSString* url,NSString* name)
+    {
+       // NSString* name=[self.content_data[indexPath.row] valueForKey:@"tear_name"];
+       // NSString* url= [self.content_data[indexPath.row] valueForKey:@"pdf_path"];
+        
+        PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+        ViewController.url = url;
+        ViewController.canSave = false;
+        NSString* subject;
+        //                    if (company.length==0) {
+        
+        NSString* cur_time =[RAUtils current_date];
+        subject =name;//[NSString stringWithFormat:@"NPD Product List %@",cur_time];
+        
+        AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+        NSString* customer_email=    [appDelegate.customerInfo valueForKey:@"customer_email"];
+        
+        
+        NSMutableArray* send_to = [[NSMutableArray alloc]init];
+        if(customer_email.length>0)
+        {
+            send_to=[[customer_email componentsSeparatedByString:NSLocalizedString(@";", nil)] mutableCopy];
+            //                            customer_email compo
+            //                            [send_to addObject:customer_email];
+        }
+        ViewController.mail_to = send_to;
+        
+        //                    }
+        //                    else
+        //                    {
+        //                        subject = [NSString stringWithFormat:@"Tear sheet for %@",company ];
+        //                    }
+        ViewController.attachment_name = [NSString stringWithFormat:@"NPD_Product_List %@.pdf",cur_time];
+        ViewController.mail_subject = subject;
+        
+        ViewController.hidenavi = false;
+        [self.navigationController pushViewController:ViewController animated:YES];
+    };
 //    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     VC.onDismiss=^(NSString* catelog_name)
     {

RedAnt ERP Mobile/common/Functions/portfolio/TearSheetParamViewController.h

@@ -10,6 +10,7 @@
 
 @interface TearSheetParamViewController : CommonEditorViewController
 @property (nonatomic , copy) void (^return_url)(NSString* url ,NSString* path, bool remove_item);
+@property (nonatomic , copy) void (^onSaved)(NSString* url,NSString* name);
 @property (nonatomic , copy) void (^onDismiss)(NSString* nouse);
 @property (nonatomic , copy) UIBarButtonItem* savebtn;
 @end

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

@@ -646,12 +646,13 @@
                     {
                         AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                         
-                        [RAUtils alert_view:nil title:@"Portfolio saved. You can find it from View Portfolios" ] ;
-                        
+                     //   [RAUtils alert_view:nil title:@"Portfolio saved. You can find it from View Portfolios" ] ;
+                        NSString* url = [editor_json valueForKey:@"pdf_path"];
                         [self.navigationController dismissViewControllerAnimated:true completion:^{
                             [((MainViewController*)appDelegate.main_vc) reloadDocuments:true immediately:false];
                             [((MainViewController*)appDelegate.main_vc) reloadPortfolio:true immediately:true];
-
+                            if(self.onSaved)
+                                self.onSaved(url,saveName);
                         }];
                         
                     }

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

@@ -17,7 +17,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    
+      self.edgesForExtendedLayout = UIRectEdgeNone;
     
     // Do any additional setup after loading the view.
     

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

@@ -300,88 +300,88 @@
         });
     });
 }
-- (IBAction)onCreateTearSheet:(id)sender {
-    
-    
-    self.pdf_url= nil;
-    NSMutableArray* checked = [[NSMutableArray alloc] init];
-    
-    NSMutableArray* checked_iid = [[NSMutableArray alloc] init];
-    
-    int count = [[self.content_data valueForKey:@"count"] intValue];
-    for(int i=0;i<count;i++)
-    {
-        NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%d",i]] mutableCopy];
-        bool check = [[item_json valueForKey:@"check"] boolValue];
-        if(check)
-        {
-            [checked addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"product_id"] intValue]]];
-            [checked_iid addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"item_id"] intValue]]];
-        }
-    }
-    //     disable for debug
-    if(checked.count==0)
-    {
-        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Create Portfolio." controller:self] ;
-        return;
-    }
-
-    
-    
-    NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
-    
-       NSString * string = [checked componentsJoinedByString:@","];
-    
-      NSString * string_iid = [checked_iid componentsJoinedByString:@","];
-      [params setValue:string forKey:@"product_ids"];
-    [params setValue:string_iid forKey:@"item_ids"];
-    TearSheetParamViewController * VC =[ self.storyboard instantiateViewControllerWithIdentifier:@"TearSheetParamViewController"];
-    
-    
-    VC.url_type = URL_REMOTE;
-    VC.request_url=URL_DM_PARAMS;
-    
-    VC.params = params;
-    
-//    VC.delegate=self;
-    
-    VC.return_url=^(NSString* url,NSString* path, bool remove_item)
-    {
-        self.pdf_url = url;
-        self.path = path;
-        self.remove_item = remove_item;
-    };
-//AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-    VC.onDismiss=^(NSString* catelog_name)
-    {
-
-    };
-    
-    //
-    //    if(checked.count==count)
-    //    {
-    //    orderinfoVC.have_tail = true
-    //    }
-    
-    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:VC] ;
-    
-    
-    
-    
-    
-    navi.modalPresentationStyle = UIModalPresentationPageSheet;//有三种状态，自己看看是哪种
-    [self presentViewController:navi animated:YES completion:^{
-        
-        NSLog(@"TearSheetParamViewController present.........");
-        
-        //   self.btop = false;
-        //  <#code#>
-    }];
-    
-    [self.btnselect setTitle:@"Select all"];
-
-    
-}
+//- (IBAction)onCreateTearSheet:(id)sender {
+//    
+//    
+//    self.pdf_url= nil;
+//    NSMutableArray* checked = [[NSMutableArray alloc] init];
+//    
+//    NSMutableArray* checked_iid = [[NSMutableArray alloc] init];
+//    
+//    int count = [[self.content_data valueForKey:@"count"] intValue];
+//    for(int i=0;i<count;i++)
+//    {
+//        NSMutableDictionary * item_json = [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%d",i]] mutableCopy];
+//        bool check = [[item_json valueForKey:@"check"] boolValue];
+//        if(check)
+//        {
+//            [checked addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"product_id"] intValue]]];
+//            [checked_iid addObject:[NSNumber numberWithInt:[[item_json valueForKey:@"item_id"] intValue]]];
+//        }
+//    }
+//    //     disable for debug
+//    if(checked.count==0)
+//    {
+//        [RAUtils message_alert:@"You must select at least one model." title:@"Cannot Create Portfolio." controller:self] ;
+//        return;
+//    }
+//
+//    
+//    
+//    NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
+//    
+//       NSString * string = [checked componentsJoinedByString:@","];
+//    
+//      NSString * string_iid = [checked_iid componentsJoinedByString:@","];
+//      [params setValue:string forKey:@"product_ids"];
+//    [params setValue:string_iid forKey:@"item_ids"];
+//    TearSheetParamViewController * VC =[ self.storyboard instantiateViewControllerWithIdentifier:@"TearSheetParamViewController"];
+//    
+//    
+//    VC.url_type = URL_REMOTE;
+//    VC.request_url=URL_DM_PARAMS;
+//    
+//    VC.params = params;
+//    
+////    VC.delegate=self;
+//    
+//    VC.return_url=^(NSString* url,NSString* path, bool remove_item)
+//    {
+//        self.pdf_url = url;
+//        self.path = path;
+//        self.remove_item = remove_item;
+//    };
+////AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+//    VC.onDismiss=^(NSString* catelog_name)
+//    {
+//
+//    };
+//    
+//    //
+//    //    if(checked.count==count)
+//    //    {
+//    //    orderinfoVC.have_tail = true
+//    //    }
+//    
+//    UINavigationController* navi = [[UINavigationController alloc] initWithRootViewController:VC] ;
+//    
+//    
+//    
+//    
+//    
+//    navi.modalPresentationStyle = UIModalPresentationPageSheet;//有三种状态，自己看看是哪种
+//    [self presentViewController:navi animated:YES completion:^{
+//        
+//        NSLog(@"TearSheetParamViewController present.........");
+//        
+//        //   self.btop = false;
+//        //  <#code#>
+//    }];
+//    
+//    [self.btnselect setTitle:@"Select all"];
+//
+//    
+//}
 
 - (void)viewDidLoad
 {

RedAnt ERP Mobile/common/RAUtils.h

@@ -27,7 +27,7 @@ typedef void (^add_to_cart_Handler)(void);
 +(UIAlertView * ) waiting_alert :(NSString*) msg title:(NSString*) title;
 + (float)fileSizeForDir:(NSString*)path;//计算文件夹下文件的总大小；
 +(void) deletefiles :(NSString*) path;
-
++(UIColor*) strColor:(NSString*) color;
 +(NSDictionary*) string2dict:(NSString*) str;
 +(NSString*) dict2string:(NSDictionary*) dict;
 +(NSString*) arr2string:(NSArray *) arr separator:(NSString*)separator trim:(bool) btrim;

RedAnt ERP Mobile/common/RAUtils.m

@@ -1023,6 +1023,13 @@
     NSLog(@"%@",string2dic);
     return string2dic;
 }
++(UIColor*) strColor:(NSString*) color
+{
+    if([color.lowercaseString isEqualToString:@"red"])
+        return [UIColor redColor];
+    
+    return [UIColor blackColor];
+}
 +(NSString*) dict2string:(NSDictionary*) dict
 {
 

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -2006,7 +2006,7 @@ repeat:{
     
     [params setValue:[NSString stringWithFormat:@"%d",price_template]  forKey:@"price_template"];
     [params setValue:[NSString stringWithFormat:@"%d",customid]  forKey:@"custom_id"];
-    [params setValue:[NSString stringWithFormat:@"%@",category]  forKey:@"category"];
+    [params setValue:category  forKey:@"category"];
     [params setValue:[NSString stringWithFormat:@"%d",sort_by]  forKey:@"sort_by"];
        [params setValue:[NSString stringWithFormat:@"%d",sort_by]  forKey:@"sort_by"];
        [params setValue:[NSString stringWithFormat:@"%ld",limit]  forKey:@"limit"];

RedAnt ERP Mobile/iSales-NPD/AppDelegate.h

@@ -33,6 +33,7 @@
 @property (strong,nonatomic)UIViewController* active_controller;
 
 @property (strong,nonatomic)NSMutableDictionary* customerInfo;
+@property (strong,nonatomic)NSMutableDictionary* recent_model;
 
 @property (strong,nonatomic) NSString* order_code;
 //@property (strong,nonatomic) NSString* so;

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -392,13 +392,16 @@
 //        
 //    }
     
+    
+    self.recent_model = [[NSMutableDictionary alloc]init];
     self.offline_mode = OFFLINE_MODE;
     // Override point for customization after application launch.
     
     if (! [iSalesDB initializeDb])
         // TODO: alert the user!
-        DebugLog(@"couldn't init db");
-    [[UIApplication sharedApplication] registerForRemoteNotificationTypes: UIRemoteNotificationTypeBadge |UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert];
+        DebugLog(@"init db failed");
+    // disable apn
+//    [[UIApplication sharedApplication] registerForRemoteNotificationTypes: UIRemoteNotificationTypeBadge |UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert];
     self.contact_id=nil;
     
     NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
@@ -481,17 +484,19 @@
     self.customerInfo = nil;
     self.order_code = nil;
     
+    [self.recent_model removeAllObjects];
     
     [self SetMode:nil];
     
 }
--(void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
-    self.duid = [[[[NSString stringWithFormat:@"%@",deviceToken] substringWithRange:NSMakeRange(0, 72)] substringWithRange:NSMakeRange(1, 71)] stringByReplacingOccurrencesOfString:@" " withString:@""];
-    NSLog(@"regisger success:%@",deviceToken);
-    
-    //注册成功，将deviceToken保存到应用服务器数据库中
-}
+//disable apn
+//-(void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+//{
+//    self.duid = [[[[NSString stringWithFormat:@"%@",deviceToken] substringWithRange:NSMakeRange(0, 72)] substringWithRange:NSMakeRange(1, 71)] stringByReplacingOccurrencesOfString:@" " withString:@""];
+//    NSLog(@"regisger success:%@",deviceToken);
+//    
+//    //注册成功，将deviceToken保存到应用服务器数据库中
+//}
 #pragma mark - Scaner
 -(void)onTimer: (NSTimer*)theTimer{
     if(theTimer==ScanApiConsumer){

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appicon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appicon-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

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

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

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -16,198 +16,200 @@
 #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"
+
+
 //
+////------------------- 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"
 //
-////------------------- 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_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_CART2WISH  @"https://www.newpacificdirect.com/isales/cartRemoveToWishlist.htm"
+//#define  URL_WISH2CART  @"https://www.newpacificdirect.com/isales/wishlistRemoveToCart.htm"
 //
-//#define  URL_ITEM_DETAIL  @"http://192.168.0.119:8080/site/isales/modelDetail.htm"
+//#define  URL_ITEM_DETAIL  @"https://www.newpacificdirect.com/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_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_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_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_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  @"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_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_NPD_POLICY  @"http://192.168.0.119:8080/site/isales/generalPolicy.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"
 
 
-//------------------- 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_REQUEST_MODEL_QTY @"https://www.newpacificdirect.com/isales/getTearSheetAvailableQty.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>160322</string>
+	<string>160325</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>