160815

ADD func offline_modeldetail
change test server address
modify offline_cart table define

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

@@ -46,6 +46,7 @@
 
 +(NSData*) offline_createorder :(NSMutableDictionary *) params;
 +(NSData*) offline_orderlist :(NSMutableDictionary *) params;
++(NSData*) offline_orderdetail :(NSMutableDictionary *) params;
 
 +(NSDictionary*) offline_category_menu ;
 +(NSDictionary*) offline_home ;

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

@@ -1366,7 +1366,10 @@
     
     return [RAUtils dict2data:ret];
 }
-
++(NSData*) offline_orderdetail :(NSMutableDictionary *) params
+{
+    return nil;
+}
 
 +(NSDictionary*) offline_login :(NSMutableDictionary *) params
 {

RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -657,7 +657,7 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     
     
     
-    NSString* create_offline_cart=@"CREATE TABLE IF NOT EXISTS offline_cart ( _id INTEGER PRIMARY KEY, product_id INTEGER,price float , discount float , so_no VARCHAR(40));";
+    NSString* create_offline_cart=@"CREATE TABLE IF NOT EXISTS offline_cart ( _id INTEGER PRIMARY KEY, product_id INTEGER,price float , discount float , so_no VARCHAR(40), item_count integer,line_note text,bundle_item integer);";
     NSString* create_offline_wish=@"CREATE TABLE IF NOT EXISTS offline_wishlist ( _id INTEGER PRIMARY KEY, product_id INTEGER);";
     
     

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -11,6 +11,7 @@
 #define BUILD_NPD
 
 #define test_server
+
 //#define ENCRYPT_OFF
 
 #define CONTACT_LIST 1
@@ -26,105 +27,105 @@
 #ifdef test_server
 
 //------------------- chen server-----------------------
-#define  URL_UPDATE_AUTH  @"http://192.168.0.111:8080/site/isales/login.htm"
-#define  URL_LOGOUT  @"http://192.168.0.111:8080/site/isales/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"http://192.168.0.111:8080/site/isales/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"http://192.168.0.126:8080/site/isales/login.htm"
+#define  URL_LOGOUT  @"http://192.168.0.126:8080/site/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"http://192.168.0.126:8080/site/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"http://192.168.0.111:8080/site/isales/menu.htm"
-#define  URL_LOAD_HOME  @"http://192.168.0.111:8080/site/isales/homePage.htm"
-#define  URL_CATEGORY @"http://192.168.0.111:8080/site/isales/distinctCategory.htm"
-#define  URL_SEARCH  @"http://192.168.0.111:8080/site/isales/search.htm"
-#define  URL_ITEM_SEARCH  @"http://192.168.0.111:8080/site/isales/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.111:8080/site/isales/categoryMore.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.111:8080/site/isales/getContactAdvance.htm"
+#define  URL_REQUEST_CATMENU  @"http://192.168.0.126:8080/site/isales/menu.htm"
+#define  URL_LOAD_HOME  @"http://192.168.0.126:8080/site/isales/homePage.htm"
+#define  URL_CATEGORY @"http://192.168.0.126:8080/site/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"http://192.168.0.126:8080/site/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"http://192.168.0.126:8080/site/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"http://192.168.0.126:8080/site/isales/categoryMore.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"http://192.168.0.126:8080/site/isales/getContactAdvance.htm"
 
 
-#define  URL_ORDER_LIST  @"http://192.168.0.111:8080/site/isales/orderList.htm"
-#define  URL_ORDER_DETAIL  @"http://192.168.0.111:8080/site/isales/orderDetail.htm"
-#define URL_COMMIT_ORDER @"http://192.168.0.111:8080/site/isales/createOrder.htm"
-#define URL_COPY_ORDER @"http://192.168.0.111:8080/site/isales/copyOrder.htm"
-#define URL_SIGN_ORDER @"http://192.168.0.111:8080/site/isales/updateOrderSign.htm"
-#define URL_SAVE_ORDER @"http://192.168.0.111:8080/site/isales/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.111:8080/site/isales/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"http://192.168.0.111:8080/site/isales/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"http://192.168.0.111:8080/site/isales/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"http://192.168.0.111:8080/site/isales/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"http://192.168.0.111:8080/site/isales/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"http://192.168.0.111:8080/site/isales/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"http://192.168.0.126:8080/site/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"http://192.168.0.126:8080/site/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"http://192.168.0.126:8080/site/isales/createOrder.htm"
+#define URL_COPY_ORDER @"http://192.168.0.126:8080/site/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"http://192.168.0.126:8080/site/isales/updateOrderSign.htm"
+#define URL_SAVE_ORDER @"http://192.168.0.126:8080/site/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"http://192.168.0.126:8080/site/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"http://192.168.0.126:8080/site/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"http://192.168.0.126:8080/site/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"http://192.168.0.126:8080/site/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"http://192.168.0.126:8080/site/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"http://192.168.0.126:8080/site/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setPrice.htm"
-#define  URL_CART_ITEM_NOTES  @"http://192.168.0.111:8080/site/isales/setItemNotes.htm"
-#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.111:8080/site/isales/updateGeneralNote.htm"
+#define  URL_CART_SET_PRICE  @"http://192.168.0.126:8080/site/isales/setPrice.htm"
+#define  URL_CART_ITEM_NOTES  @"http://192.168.0.126:8080/site/isales/setItemNotes.htm"
+#define  URL_CART_GENERAL_NOTES  @"http://192.168.0.126:8080/site/isales/updateGeneralNote.htm"
 
-#define  URL_CART_INCRESEMENT  @"http://192.168.0.111:8080/site/isales/increment.htm"
-#define  URL_CART  @"http://192.168.0.111:8080/site/isales/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"http://192.168.0.111:8080/site/isales/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"http://192.168.0.111:8080/site/isales/addToCart.htm"
-#define  URL_CART_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToCart.htm"
-#define  URL_CART_CHECK  @"http://192.168.0.111:8080/site/isales/checkCartItem.htm"
-#define  URL_CART2WISH  @"http://192.168.0.111:8080/site/isales/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"http://192.168.0.111:8080/site/isales/wishlistRemoveToCart.htm"
+#define  URL_CART_INCRESEMENT  @"http://192.168.0.126:8080/site/isales/increment.htm"
+#define  URL_CART  @"http://192.168.0.126:8080/site/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"http://192.168.0.126:8080/site/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"http://192.168.0.126:8080/site/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"http://192.168.0.126:8080/site/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"http://192.168.0.126:8080/site/isales/checkCartItem.htm"
+#define  URL_CART2WISH  @"http://192.168.0.126:8080/site/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"http://192.168.0.126:8080/site/isales/wishlistRemoveToCart.htm"
 
 
 
 
-#define  URL_ITEM_DETAIL  @"http://192.168.0.111:8080/site/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"http://192.168.0.126:8080/site/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.111:8080/site/isales/addToWishList.htm"
-#define  URL_WATCHLIST  @"http://192.168.0.111:8080/site/isales/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"http://192.168.0.126:8080/site/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"http://192.168.0.126:8080/site/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"http://192.168.0.126:8080/site/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.111:8080/site/isales/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteToPortfolio.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.111:8080/site/isales/deleteTearSheetPdf.htm"
-#define  URL_PORTFOLIO  @"http://192.168.0.111:8080/site/isales/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.111:8080/site/isales/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"http://192.168.0.111:8080/site/isales/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"http://192.168.0.111:8080/site/isales/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"http://192.168.0.111:8080/site/isales/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"http://192.168.0.111:8080/site/isales/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"http://192.168.0.111:8080/site/isales/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.111:8080/site/isales/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"http://192.168.0.126:8080/site/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"http://192.168.0.126:8080/site/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"http://192.168.0.126:8080/site/isales/deleteTearSheetPdf.htm"
+#define  URL_PORTFOLIO  @"http://192.168.0.126:8080/site/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"http://192.168.0.126:8080/site/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"http://192.168.0.126:8080/site/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"http://192.168.0.126:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"http://192.168.0.126:8080/site/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"http://192.168.0.126:8080/site/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"http://192.168.0.126:8080/site/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"http://192.168.0.126:8080/site/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"http://192.168.0.126:8080/site/isales/getTearSheetAvailableQty.htm"
 
-#define  URL_CONTACT_LIST  @"http://192.168.0.111:8080/site/isales/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"http://192.168.0.111:8080/site/isales/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"http://192.168.0.126:8080/site/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"http://192.168.0.126:8080/site/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.111:8080/site/isales/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"http://192.168.0.126:8080/site/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"http://192.168.0.126:8080/site/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.111:8080/site/isales/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"http://192.168.0.111:8080/site/isales/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"http://192.168.0.126:8080/site/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"http://192.168.0.126:8080/site/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"http://192.168.0.111:8080/site/isales/getCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.111:8080/site/isales/hasPendingOrderByContact.htm"
-#define  URL_NEW_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getAddCustomer.htm"
-#define  URL_EDIT_CUSTOMER  @"http://192.168.0.111:8080/site/isales/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_SAVE  @"http://192.168.0.111:8080/site/isales/saveCustomer.htm"
-#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.111:8080/site/isales/updateCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.111:8080/site/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_INFO  @"http://192.168.0.126:8080/site/isales/getCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"http://192.168.0.126:8080/site/isales/hasPendingOrderByContact.htm"
+#define  URL_NEW_CUSTOMER  @"http://192.168.0.126:8080/site/isales/getAddCustomer.htm"
+#define  URL_EDIT_CUSTOMER  @"http://192.168.0.126:8080/site/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_SAVE  @"http://192.168.0.126:8080/site/isales/saveCustomer.htm"
+#define  URL_CUSTOMER_UPDATE  @"http://192.168.0.126:8080/site/isales/updateCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"http://192.168.0.126:8080/site/isales/updateCustomerBusiCard.htm"
 
 
 
 
 
 
-#define  URL_ERR_LOG  @"http://192.168.0.111:8080/site/isales/er_log.htm"
+#define  URL_ERR_LOG  @"http://192.168.0.126:8080/site/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"http://192.168.0.111:8080/site/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"http://192.168.0.126:8080/site/isales/uploadImg.htm"
 
-#define  URL_NPD_POLICY  @"http://192.168.0.111:8080/site/isales/generalPolicy.htm"
+#define  URL_NPD_POLICY  @"http://192.168.0.126:8080/site/isales/generalPolicy.htm"
 
 
-#define  URL_CHECK_OFFLINE  @"http://192.168.0.111:8080/site/offline/initDatas.htm"
+#define  URL_CHECK_OFFLINE  @"http://192.168.0.126:8080/site/offline/initDatas.htm"
 
-#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.111:8080/site/offline/downloadDatas.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"http://192.168.0.126:8080/site/offline/downloadDatas.htm"
 
 #else