1.屏蔽Homer offline。

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1748,6 +1748,7 @@
 # endif
     
 #ifdef BUILD_HOMER
+/*    
     if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {
         [map setValue:@"Offline Setting" forKey:@"title"];
@@ -1755,6 +1756,7 @@
         [self.sideMenuItems addObject:map.copy];
         
     }
+ */
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         [map setValue:@"Price Setting" forKey:@"title"];
         //        [map setValue:@"rect_market_news" forKey:@"img"];
@@ -1773,6 +1775,7 @@
 # endif
     
 #ifdef BUILD_GATIT
+/*
     if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
     {
         [map setValue:@"Offline Setting" forKey:@"title"];
@@ -1780,6 +1783,7 @@
         [self.sideMenuItems addObject:map.copy];
         
     }
+*/
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         [map setValue:@"Price Setting" forKey:@"title"];
         //        [map setValue:@"rect_market_news" forKey:@"img"];
@@ -2147,7 +2151,7 @@
     else if([title isEqualToString:@"Function Test"])
     {
         
-//        NSString* url = @"https://www.newpacificdirect.com";
+//        NSString* url = @"https://shopla.homelegance.com/";
 //        
 //        
 //        NSString* title = @"NPD";
@@ -2198,7 +2202,7 @@
     else if([title isEqualToString:@"NPD Website"])
     {
         
-        NSString* url = @"https://www.newpacificdirect.com";//@"https://www.newpacificdirect.com/general.htm?websiteId=1";//
+        NSString* url = @"https://shopla.homelegance.com/";//@"https://shopla.homelegance.com/general.htm?websiteId=1";//
         
         
         NSString* title = @"NPD";
@@ -2220,7 +2224,7 @@
     else if([title isEqualToString:@"Homelegance Website"])
     {
         
-        NSString* url = @"http://207.140.24.83";//@"https://www.newpacificdirect.com/general.htm?websiteId=1";//
+        NSString* url = @"http://207.140.24.83";//@"https://shopla.homelegance.com/general.htm?websiteId=1";//
         
         
         NSString* title = @"Homelegance";
@@ -2276,7 +2280,7 @@
     else if([title isEqualToString:@"NPD Policy"])
     {
         
-        NSString* url = URL_NPD_POLICY;//@"https://www.newpacificdirect.com/general.htm?websiteId=1";//
+        NSString* url = URL_NPD_POLICY;//@"https://shopla.homelegance.com/general.htm?websiteId=1";//
         
         
         NSString* title = @"NPD Policy";

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

@@ -43,13 +43,13 @@
     
 #ifdef BUILD_HOMER
     self.title=COMPANY_SHORT_NAME;
-    self.checkOfflineMode.hidden = NO;
+    self.checkOfflineMode.hidden = YES;
     self.requestLoginBtn.hidden = YES;
 #endif
     
 #ifdef BUILD_GATIT
     self.title=COMPANY_SHORT_NAME;
-    self.checkOfflineMode.hidden = NO;
+    self.checkOfflineMode.hidden = YES;
     self.requestLoginBtn.hidden = YES;
 #endif
     

RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -181,128 +181,128 @@
 
 
 //------------------- 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_UPDATE_AUTH  @"https://shopla.homelegance.com/isales/login.htm"
+#define  URL_LOGOUT  @"https://shopla.homelegance.com/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"https://shopla.homelegance.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_REQUEST_CATMENU  @"https://shopla.homelegance.com/isales/menu.htm"
+#define  URL_LOAD_HOME  @"https://shopla.homelegance.com/isales/homePage.htm"
+#define  URL_CATEGORY @"https://shopla.homelegance.com/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"https://shopla.homelegance.com/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"https://shopla.homelegance.com/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"https://shopla.homelegance.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_ORDER_LIST  @"https://shopla.homelegance.com/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"https://shopla.homelegance.com/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"https://shopla.homelegance.com/isales/createOrder.htm"
+#define URL_SAVE_ORDER @"https://shopla.homelegance.com/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"https://shopla.homelegance.com/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"https://shopla.homelegance.com/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"https://shopla.homelegance.com/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"https://shopla.homelegance.com/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"https://shopla.homelegance.com/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"https://shopla.homelegance.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_CART_SET_PRICE  @"https://shopla.homelegance.com/isales/setPrice.htm"
+#define  URL_CART_INCRESEMENT  @"https://shopla.homelegance.com/isales/increment.htm"
+#define  URL_CART  @"https://shopla.homelegance.com/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"https://shopla.homelegance.com/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"https://shopla.homelegance.com/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"https://shopla.homelegance.com/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"https://shopla.homelegance.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_CART2WISH  @"https://shopla.homelegance.com/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"https://shopla.homelegance.com/isales/wishlistRemoveToCart.htm"
 
-#define  URL_ITEM_DETAIL  @"https://www.newpacificdirect.com/isales/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"https://shopla.homelegance.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_WATCHLIST  @"https://shopla.homelegance.com/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"https://shopla.homelegance.com/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"https://shopla.homelegance.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_ADD_TO_PORTFOLIO @"https://shopla.homelegance.com/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"https://shopla.homelegance.com/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIO  @"https://shopla.homelegance.com/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"https://shopla.homelegance.com/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"https://shopla.homelegance.com/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"https://shopla.homelegance.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"https://shopla.homelegance.com/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"https://shopla.homelegance.com/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"https://shopla.homelegance.com/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"https://shopla.homelegance.com/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"https://shopla.homelegance.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_CONTACT_LIST  @"https://shopla.homelegance.com/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"https://shopla.homelegance.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_ADDRESS_EDOTOR  @"https://shopla.homelegance.com/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"https://shopla.homelegance.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_CREDITCARD_EDOTOR  @"https://shopla.homelegance.com/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"https://shopla.homelegance.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_CUSTOMER_ADV_SEARCH @"https://www.newpacificdirect.com/isales/getContactAdvance.htm"
+#define  URL_CUSTOMER_INFO  @"https://shopla.homelegance.com/isales/getCustomerInfoByContact.htm"
+#define  URL_NEW_CUSTOMER  @"https://shopla.homelegance.com/isales/getAddCustomer.htm"
+#define  URL_CUSTOMER_SAVE  @"https://shopla.homelegance.com/isales/saveCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"https://shopla.homelegance.com/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"https://shopla.homelegance.com/isales/getContactAdvance.htm"
 
 
 
 
 
-#define  URL_ERR_LOG  @"https://www.newpacificdirect.com/isales/er_log.htm"
+#define  URL_ERR_LOG  @"https://shopla.homelegance.com/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"https://www.newpacificdirect.com/isales/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"https://shopla.homelegance.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"
+#define URL_COPY_ORDER @"https://shopla.homelegance.com/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"https://shopla.homelegance.com/isales/updateOrderSign.htm"
+#define  URL_CUSTOMER_UPDATE  @"https://shopla.homelegance.com/isales/updateCustomer.htm"
+#define  URL_CART_GENERAL_NOTES  @"https://shopla.homelegance.com/isales/updateGeneralNote.htm"
+#define  URL_CART_ITEM_NOTES  @"https://shopla.homelegance.com/isales/setItemNotes.htm"
+#define  URL_EDIT_CUSTOMER  @"https://shopla.homelegance.com/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"https://shopla.homelegance.com/isales/hasPendingOrderByContact.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"https://shopla.homelegance.com/isales/deleteTearSheetPdf.htm"
+#define  URL_NPD_POLICY   @"https://shopla.homelegance.com/isales/generalPolicy.htm"
 
 
 
-#define  URL_CHECK_OFFLINE  @"https://www.newpacificdirect.com/offline/initDatas.htm"
+#define  URL_CHECK_OFFLINE  @"https://shopla.homelegance.com/offline/initDatas.htm"
 
-#define  URL_DOWNLOAD_OFFLINE  @"https://www.newpacificdirect.com/offline/downloadDatas.htm"
+#define  URL_DOWNLOAD_OFFLINE  @"https://shopla.homelegance.com/offline/downloadDatas.htm"
 
-#define  URL_FINISH_DOWNLOAD_OFFLINE  @"https://www.newpacificdirect.com/offline/confirmVersion.htm"
-#define  URL_UPLOAD_OFFLINE  @"https://www.newpacificdirect.com/offline/uploadOfflineData.htm"
+#define  URL_FINISH_DOWNLOAD_OFFLINE  @"https://shopla.homelegance.com/offline/confirmVersion.htm"
+#define  URL_UPLOAD_OFFLINE  @"https://shopla.homelegance.com/offline/uploadOfflineData.htm"
 
-#define  URL_CATEGORYADDALL  @"https://www.newpacificdirect.com/isales/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"https://www.newpacificdirect.com/isales/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"https://www.newpacificdirect.com/isales/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"https://shopla.homelegance.com/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"https://shopla.homelegance.com/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"https://shopla.homelegance.com/isales/itemSearchAddAllTo.htm"
 
-#define URL_SET_PRICE_TYPE @"https://www.newpacificdirect.com/isales/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"https://shopla.homelegance.com/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"https://www.newpacificdirect.com/isales/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"https://shopla.homelegance.com/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"https://www.newpacificdirect.com/isales/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"https://shopla.homelegance.com/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"https://www.newpacificdirect.com/isales/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"https://shopla.homelegance.com/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"https://www.newpacificdirect.com/isales/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"https://shopla.homelegance.com/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"https://www.newpacificdirect.com/isales/sendCartEmail.htm"
+#define URL_EMAIL_CART @"https://shopla.homelegance.com/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"https://www.newpacificdirect.com/isales/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"https://shopla.homelegance.com/isales/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"https://www.newpacificdirect.com/isales/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"https://shopla.homelegance.com/isales/sendWishListEmail.htm"
 
-#define URL_BLOG @"https://www.newpacificdirect.com/blog"
+#define URL_BLOG @"https://shopla.homelegance.com/blog"
 
 #endif