Ver código fonte

修复离线Scanner扫描加入购物车错误。

Pen Li 9 anos atrás
pai
commit
0f7ca08858

+ 4 - 0
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -39,6 +39,7 @@
 		428980941E24B2C2005F1BD8 /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980891E24B2C2005F1BD8 /* TextDrawable.m */; };
 		428980971E24B2E7005F1BD8 /* ImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980961E24B2E7005F1BD8 /* ImageUtils.m */; };
 		4289809A1E24B304005F1BD8 /* TextUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980991E24B304005F1BD8 /* TextUtils.m */; };
+		42BB2F081E28986B0025C6CE /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42BB2F071E28986B0025C6CE /* signature.storyboard */; };
 		715002021D13CDBE00F5927F /* BundleDetailButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 715002011D13CDBE00F5927F /* BundleDetailButton.m */; };
 		715850431CF6F0C400856B20 /* DefaultAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = 715850421CF6F0C400856B20 /* DefaultAppearance.m */; };
 		716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */ = {isa = PBXBuildFile; fileRef = 716AF8DD1D792157001188E0 /* offline_status_filter_cadedate.json */; };
@@ -285,6 +286,7 @@
 		428980961E24B2E7005F1BD8 /* ImageUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageUtils.m; path = common/ImageUtils.m; sourceTree = SOURCE_ROOT; };
 		428980981E24B304005F1BD8 /* TextUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextUtils.h; path = common/TextUtils.h; sourceTree = SOURCE_ROOT; };
 		428980991E24B304005F1BD8 /* TextUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextUtils.m; path = common/TextUtils.m; sourceTree = SOURCE_ROOT; };
+		42BB2F071E28986B0025C6CE /* signature.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = signature.storyboard; path = common/Functions/signature/signature.storyboard; sourceTree = SOURCE_ROOT; };
 		715002001D13CDBE00F5927F /* BundleDetailButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BundleDetailButton.h; path = common/Functions/BundleDetailButton.h; sourceTree = SOURCE_ROOT; };
 		715002011D13CDBE00F5927F /* BundleDetailButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BundleDetailButton.m; path = common/Functions/BundleDetailButton.m; sourceTree = SOURCE_ROOT; };
 		715850411CF6F0C400856B20 /* DefaultAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultAppearance.h; path = common/Functions/DefaultAppearance.h; sourceTree = SOURCE_ROOT; };
@@ -1309,6 +1311,7 @@
 		7183E9C71CF29FCB00524787 /* Signature */ = {
 			isa = PBXGroup;
 			children = (
+				42BB2F071E28986B0025C6CE /* signature.storyboard */,
 				7183E9C31CF29FCB00524787 /* SignatureView.h */,
 				7183E9C41CF29FCB00524787 /* SignatureView.m */,
 				7183E9C51CF29FCB00524787 /* SignatureViewController.h */,
@@ -1490,6 +1493,7 @@
 				7183EA4B1CF2A1F300524787 /* Pods.debug.xcconfig in Resources */,
 				7183EA031CF29FCB00524787 /* customer_advanced_search.json in Resources */,
 				7183E8FD1CF29F4500524787 /* PhotoBorder.png in Resources */,
+				42BB2F081E28986B0025C6CE /* signature.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 80 - 80
RedAnt ERP Mobile/HMLG Mobile/config.h

@@ -33,131 +33,131 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.113:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.113:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.113:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.132:8080/site/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.132:8080/site/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.132:8080/site/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.113:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.113:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.113:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.113:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.113:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.113:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.113:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.132:8080/site/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.132:8080/site/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.132:8080/site/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.132:8080/site/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.132:8080/site/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.132:8080/site/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.132:8080/site/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.113:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.113:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.113:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.113:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.113:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.113:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.113:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.113:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.113:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.113:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.113:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.113:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.132:8080/site/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.132:8080/site/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.132:8080/site/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.132:8080/site/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.132:8080/site/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.132:8080/site/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.132:8080/site/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.132:8080/site/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.132:8080/site/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.132:8080/site/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.132:8080/site/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.132:8080/site/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.113:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.113:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.113:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.132:8080/site/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.132:8080/site/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.113:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.113:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.113:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.113:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.113:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.113:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.113:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.132:8080/site/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.132:8080/site/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.132:8080/site/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.132:8080/site/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.132:8080/site/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.132:8080/site/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.132:8080/site/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.113:8080/site/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.113:8080/site/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.113:8080/site/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.0.132:8080/site/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.0.132:8080/site/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.0.132:8080/site/isales/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.113:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.132:8080/site/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.113:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.113:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.132:8080/site/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.132:8080/site/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.113:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.113:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.113:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.113:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.113:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.113:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.113:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.113:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.113:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.113:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.132:8080/site/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.132:8080/site/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.132:8080/site/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.132:8080/site/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.132:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.132:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.132:8080/site/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.113:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.113:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.132:8080/site/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.132:8080/site/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.113:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.113:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.132:8080/site/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.113:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.113:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.132:8080/site/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.113:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.113:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.113:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.113:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.113:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.113:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.113:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.132:8080/site/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.132:8080/site/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.132:8080/site/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.132:8080/site/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.132:8080/site/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.113:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.132:8080/site/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.113:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.132:8080/site/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.113:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.132:8080/site/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.113:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.132:8080/site/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.113:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.132:8080/site/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.113:8080/site/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.132:8080/site/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.113:8080/site/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.132:8080/site/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.113:8080/site/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.132:8080/site/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.113:8080/site/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.132:8080/site/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.113:8080/site/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.132:8080/site/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.113:8080/site/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.132:8080/site/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.113:8080/site/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.132:8080/site/isales/notifyMeEmail.htm"
 
 #else
 

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 74 - 0
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -20,5 +20,79 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "iSales-NPD/AppDelegate.m"
+            timestampString = "505961244.831024"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2038"
+            endingLineNumber = "2038"
+            landmarkName = "-connection:didReceiveResponse:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "506231926.092123"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3050"
+            endingLineNumber = "3050"
+            landmarkName = "+offline_model:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "506231946.276864"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3060"
+            endingLineNumber = "3060"
+            landmarkName = "+offline_model:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "506232077.762841"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "3351"
+            endingLineNumber = "3351"
+            landmarkName = "+offline_model:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 13 - 3
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -2631,10 +2631,20 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
                     
                     
                 }
-                [self.content_arr insertObject:newitem atIndex:0];
                 
-                [self.itemListTable reloadData];
-                [self refresh_total];
+                if(appDelegate.offline_mode) {
+                    
+                    [self ReloadData];
+                    
+                } else {
+                    
+                    [self.content_arr insertObject:newitem atIndex:0];
+                    
+                    [self.itemListTable reloadData];
+                    [self refresh_total];
+                    
+                }
+                
                 //                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
                 
                 [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];

+ 80 - 80
RedAnt ERP Mobile/iSales-NPD/config.h

@@ -38,131 +38,131 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.113:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.113:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.113:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.132:8080/site/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.132:8080/site/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.132:8080/site/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.113:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.113:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.113:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.113:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.113:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.113:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.113:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.132:8080/site/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.132:8080/site/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.132:8080/site/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.132:8080/site/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.132:8080/site/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.132:8080/site/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.132:8080/site/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.113:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.113:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.113:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.113:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.113:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.113:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.113:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.113:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.113:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.113:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.113:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.113:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.132:8080/site/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.132:8080/site/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.132:8080/site/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.132:8080/site/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.132:8080/site/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.132:8080/site/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.132:8080/site/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.132:8080/site/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.132:8080/site/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.132:8080/site/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.132:8080/site/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.132:8080/site/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.113:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.113:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.113:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.132:8080/site/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.132:8080/site/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.113:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.113:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.113:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.113:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.113:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.113:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.113:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.132:8080/site/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.132:8080/site/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.132:8080/site/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.132:8080/site/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.132:8080/site/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.132:8080/site/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.132:8080/site/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_CATEGORYADDALL  @"http://192.168.0.113:8080/site/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"http://192.168.0.113:8080/site/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"http://192.168.0.113:8080/site/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"http://192.168.0.132:8080/site/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"http://192.168.0.132:8080/site/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"http://192.168.0.132:8080/site/isales/itemSearchAddAllTo.htm"
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.113:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.132:8080/site/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.113:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.113:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.132:8080/site/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.132:8080/site/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.113:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.113:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.113:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.113:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.113:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.113:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.113:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.113:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.113:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.113:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.113:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.132:8080/site/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.132:8080/site/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.132:8080/site/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.132:8080/site/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.132:8080/site/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.132:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.132:8080/site/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.132:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.132:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.132:8080/site/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.113:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.113:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.132:8080/site/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.132:8080/site/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.113:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.113:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.132:8080/site/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.113:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.113:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.132:8080/site/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.132:8080/site/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.113:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.113:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.113:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.113:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.113:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.113:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.113:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.132:8080/site/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.132:8080/site/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.132:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.132:8080/site/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.132:8080/site/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.132:8080/site/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.113:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.132:8080/site/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.113:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.132:8080/site/isales/uploadImg.htm"
 
 
-#define  URL_NPD_POLICY  @"http://192.168.0.113:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.132:8080/site/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.113:8080/site/offline/initDatas.htm"
-#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/uploadOfflineData.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.132:8080/site/offline/initDatas.htm"
+#define  URL_UPLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/uploadOfflineData.htm"
 
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/downloadDatas.htm"
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.113:8080/site/offline/confirmVersion.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/downloadDatas.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"http://192.168.0.132:8080/site/offline/confirmVersion.htm"
 
 
-#define  URL_GET_RESULT  @"http://192.168.0.113:8080/site/offline/getResultBySerial.htm"
+#define  URL_GET_RESULT  @"http://192.168.0.132:8080/site/offline/getResultBySerial.htm"
 
-#define URL_SET_PRICE_TYPE @"http://192.168.0.113:8080/site/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"http://192.168.0.132:8080/site/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"http://192.168.0.113:8080/site/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"http://192.168.0.132:8080/site/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"http://192.168.0.113:8080/site/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"http://192.168.0.132:8080/site/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"http://192.168.0.113:8080/site/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"http://192.168.0.132:8080/site/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"http://192.168.0.113:8080/site/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"http://192.168.0.132:8080/site/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"http://192.168.0.113:8080/site/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"http://192.168.0.132:8080/site/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"http://192.168.0.113:8080/site/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"http://192.168.0.132:8080/site/isales/notifyMeEmail.htm"
 
 #else