Browse Source

USAI Mobile
更换部分图标
更新url

Ray Zhang 8 năm trước cách đây
mục cha
commit
e0fe27dba0

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

@@ -202,7 +202,7 @@
                   moduleName = "USAI Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "540007607.0373321"
+                  timestampString = "540019554.469039"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"
@@ -217,7 +217,7 @@
                   moduleName = "USAI Mobile"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
-                  timestampString = "540007607.041309"
+                  timestampString = "540019554.476943"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "1999"

+ 3 - 3
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/about.imageset/Contents.json

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

BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/about.imageset/red_ant_logo.png


BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/about.imageset/red_ant_logo@2x.png


BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/about.imageset/red_ant_logo@3x.png


+ 3 - 3
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/npd_logo.imageset/Contents.json

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

BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/npd_logo.imageset/red_ant_logo.png


BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/npd_logo.imageset/red_ant_logo@2x.png


BIN
RedAnt ERP Mobile/iSales-USAI/Images.xcassets/npd_logo.imageset/red_ant_logo@3x.png


+ 78 - 78
RedAnt ERP Mobile/iSales-USAI/config.h

@@ -185,97 +185,97 @@
 
 
 //------------------- NPD server-----------------------
-#define  URL_UPDATE_AUTH  @"https://central.united-us.com/demo/shopping/login.htm"
-#define  URL_LOGOUT  @"https://central.united-us.com/demo/shopping/loginOut.htm"
-#define  URL_RETRIEVE_PASS  @"https://central.united-us.com/demo/shopping/forgotPassword.htm"
+#define  URL_UPDATE_AUTH  @"https://central.united-us.com/demo/shopping/isales/login.htm"
+#define  URL_LOGOUT  @"https://central.united-us.com/demo/shopping/isales/loginOut.htm"
+#define  URL_RETRIEVE_PASS  @"https://central.united-us.com/demo/shopping/isales/forgotPassword.htm"
 
-#define  URL_REQUEST_CATMENU  @"https://central.united-us.com/demo/shopping/menu.htm"
-#define  URL_LOAD_HOME  @"https://central.united-us.com/demo/shopping/homePage.htm"
-#define  URL_CATEGORY @"https://central.united-us.com/demo/shopping/distinctCategory.htm"
-#define  URL_SEARCH  @"https://central.united-us.com/demo/shopping/search.htm"
-#define  URL_ITEM_SEARCH  @"https://central.united-us.com/demo/shopping/itemSearch.htm"
-#define  URL_CATEGORY_LOADMORE  @"https://central.united-us.com/demo/shopping/categoryMore.htm"
+#define  URL_REQUEST_CATMENU  @"https://central.united-us.com/demo/shopping/isales/menu.htm"
+#define  URL_LOAD_HOME  @"https://central.united-us.com/demo/shopping/isales/homePage.htm"
+#define  URL_CATEGORY @"https://central.united-us.com/demo/shopping/isales/distinctCategory.htm"
+#define  URL_SEARCH  @"https://central.united-us.com/demo/shopping/isales/search.htm"
+#define  URL_ITEM_SEARCH  @"https://central.united-us.com/demo/shopping/isales/itemSearch.htm"
+#define  URL_CATEGORY_LOADMORE  @"https://central.united-us.com/demo/shopping/isales/categoryMore.htm"
 
 
-#define  URL_ORDER_LIST  @"https://central.united-us.com/demo/shopping/orderList.htm"
-#define  URL_ORDER_DETAIL  @"https://central.united-us.com/demo/shopping/orderDetail.htm"
-#define URL_COMMIT_ORDER @"https://central.united-us.com/demo/shopping/createOrder.htm"
-#define URL_SAVE_ORDER @"https://central.united-us.com/demo/shopping/saveOrder.htm"
-#define URL_UPDATE_ORDERCUSTOMER @"https://central.united-us.com/demo/shopping/updateOrderCustomerInfo.htm"
-#define  URL_NEW_ORDER  @"https://central.united-us.com/demo/shopping/createNewOrder.htm"
-#define  URL_OPEN_ORDER  @"https://central.united-us.com/demo/shopping/openOrder.htm"
-#define  URL_RELEASE_ORDER  @"https://central.united-us.com/demo/shopping/closeOrder.htm"
-#define  URL_DELETE_ORDER  @"https://central.united-us.com/demo/shopping/deleteOrder.htm"
-#define  URL_CANCEL_ORDER  @"https://central.united-us.com/demo/shopping/cancelOrder.htm"
+#define  URL_ORDER_LIST  @"https://central.united-us.com/demo/shopping/isales/orderList.htm"
+#define  URL_ORDER_DETAIL  @"https://central.united-us.com/demo/shopping/isales/orderDetail.htm"
+#define URL_COMMIT_ORDER @"https://central.united-us.com/demo/shopping/isales/createOrder.htm"
+#define URL_SAVE_ORDER @"https://central.united-us.com/demo/shopping/isales/saveOrder.htm"
+#define URL_UPDATE_ORDERCUSTOMER @"https://central.united-us.com/demo/shopping/isales/updateOrderCustomerInfo.htm"
+#define  URL_NEW_ORDER  @"https://central.united-us.com/demo/shopping/isales/createNewOrder.htm"
+#define  URL_OPEN_ORDER  @"https://central.united-us.com/demo/shopping/isales/openOrder.htm"
+#define  URL_RELEASE_ORDER  @"https://central.united-us.com/demo/shopping/isales/closeOrder.htm"
+#define  URL_DELETE_ORDER  @"https://central.united-us.com/demo/shopping/isales/deleteOrder.htm"
+#define  URL_CANCEL_ORDER  @"https://central.united-us.com/demo/shopping/isales/cancelOrder.htm"
 
 
-#define  URL_CART_SET_PRICE  @"https://central.united-us.com/demo/shopping/setPrice.htm"
-#define  URL_CART_INCRESEMENT  @"https://central.united-us.com/demo/shopping/increment.htm"
-#define  URL_CART  @"https://central.united-us.com/demo/shopping/cartDtail.htm"
-#define  URL_CARTDELIVERY  @"https://central.united-us.com/demo/shopping/cartDelivery.htm"
-#define  URL_ADD_TO_CART  @"https://central.united-us.com/demo/shopping/addToCart.htm"
-#define  URL_CART_REMOVE  @"https://central.united-us.com/demo/shopping/deleteToCart.htm"
-#define  URL_CART_CHECK  @"https://central.united-us.com/demo/shopping/checkCartItem.htm"
+#define  URL_CART_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales/setPrice.htm"
+#define  URL_CART_INCRESEMENT  @"https://central.united-us.com/demo/shopping/isales/increment.htm"
+#define  URL_CART  @"https://central.united-us.com/demo/shopping/isales/cartDtail.htm"
+#define  URL_CARTDELIVERY  @"https://central.united-us.com/demo/shopping/isales/cartDelivery.htm"
+#define  URL_ADD_TO_CART  @"https://central.united-us.com/demo/shopping/isales/addToCart.htm"
+#define  URL_CART_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToCart.htm"
+#define  URL_CART_CHECK  @"https://central.united-us.com/demo/shopping/isales/checkCartItem.htm"
 
-#define  URL_CART2WISH  @"https://central.united-us.com/demo/shopping/cartRemoveToWishlist.htm"
-#define  URL_WISH2CART  @"https://central.united-us.com/demo/shopping/wishlistRemoveToCart.htm"
+#define  URL_CART2WISH  @"https://central.united-us.com/demo/shopping/isales/cartRemoveToWishlist.htm"
+#define  URL_WISH2CART  @"https://central.united-us.com/demo/shopping/isales/wishlistRemoveToCart.htm"
 
-#define  URL_ITEM_DETAIL  @"https://central.united-us.com/demo/shopping/modelDetail.htm"
+#define  URL_ITEM_DETAIL  @"https://central.united-us.com/demo/shopping/isales/modelDetail.htm"
 
-#define  URL_ADD_TO_WATCHLIST  @"https://central.united-us.com/demo/shopping/addToWishList.htm"
-#define  URL_WATCHLIST  @"https://central.united-us.com/demo/shopping/wishList.htm"
-#define  URL_WATCHLIST_REMOVE  @"https://central.united-us.com/demo/shopping/deleteToWishList.htm"
+#define  URL_ADD_TO_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales/addToWishList.htm"
+#define  URL_WATCHLIST  @"https://central.united-us.com/demo/shopping/isales/wishList.htm"
+#define  URL_WATCHLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToWishList.htm"
 
 
 
-#define  URL_ADD_TO_PORTFOLIO @"https://central.united-us.com/demo/shopping/addToPortfolio.htm"
-#define  URL_PORTFOLIO_REMOVE  @"https://central.united-us.com/demo/shopping/deleteToPortfolio.htm"
-#define  URL_PORTFOLIO  @"https://central.united-us.com/demo/shopping/portfolios.htm"
-#define  URL_PORTFOLIO_SET_PRICE  @"https://central.united-us.com/demo/shopping/setTearSheetPrice.htm"
-#define  URL_DM_PARAMS @"https://central.united-us.com/demo/shopping/selectTearSheetParam.htm"
-#define  URL_REQUEST_DM @"https://central.united-us.com/demo/shopping/getTearSheetPdf.htm"
-#define  URL_SAVE_DM_DIRECT @"https://central.united-us.com/demo/shopping/getTearSheetPdf.htm"
-#define  URL_SAVE_DM @"https://central.united-us.com/demo/shopping/saveTearSheetPdf.htm"
-#define  URL_DM_LIST @"https://central.united-us.com/demo/shopping/tearSheetPdfList.htm"
-//#define  URL_DM_SET_QTY @"https://central.united-us.com/demo/shopping/setTearSheetAvailableQty.htm"
-#define  URL_REQUEST_MODEL_QTY @"https://central.united-us.com/demo/shopping/getTearSheetAvailableQty.htm"
+#define  URL_ADD_TO_PORTFOLIO @"https://central.united-us.com/demo/shopping/isales/addToPortfolio.htm"
+#define  URL_PORTFOLIO_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteToPortfolio.htm"
+#define  URL_PORTFOLIO  @"https://central.united-us.com/demo/shopping/isales/portfolios.htm"
+#define  URL_PORTFOLIO_SET_PRICE  @"https://central.united-us.com/demo/shopping/isales/setTearSheetPrice.htm"
+#define  URL_DM_PARAMS @"https://central.united-us.com/demo/shopping/isales/selectTearSheetParam.htm"
+#define  URL_REQUEST_DM @"https://central.united-us.com/demo/shopping/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM_DIRECT @"https://central.united-us.com/demo/shopping/isales/getTearSheetPdf.htm"
+#define  URL_SAVE_DM @"https://central.united-us.com/demo/shopping/isales/saveTearSheetPdf.htm"
+#define  URL_DM_LIST @"https://central.united-us.com/demo/shopping/isales/tearSheetPdfList.htm"
+//#define  URL_DM_SET_QTY @"https://central.united-us.com/demo/shopping/isales/setTearSheetAvailableQty.htm"
+#define  URL_REQUEST_MODEL_QTY @"https://central.united-us.com/demo/shopping/isales/getTearSheetAvailableQty.htm"
 
 
-#define  URL_CONTACT_LIST  @"https://central.united-us.com/demo/shopping/getAllContact.htm"
-#define  URL_SHIPTO_LIST  @"https://central.united-us.com/demo/shopping/getShipToContact.htm"
+#define  URL_CONTACT_LIST  @"https://central.united-us.com/demo/shopping/isales/getAllContact.htm"
+#define  URL_SHIPTO_LIST  @"https://central.united-us.com/demo/shopping/isales/getShipToContact.htm"
 
-#define  URL_ADDRESS_EDOTOR  @"https://central.united-us.com/demo/shopping/getAddAddress.htm"
-#define  URL_ADDRESS_SAVE  @"https://central.united-us.com/demo/shopping/saveAddress.htm"
+#define  URL_ADDRESS_EDOTOR  @"https://central.united-us.com/demo/shopping/isales/getAddAddress.htm"
+#define  URL_ADDRESS_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveAddress.htm"
 
 
-#define  URL_CREDITCARD_EDOTOR  @"https://central.united-us.com/demo/shopping/creditCard.htm"
-#define  URL_CREDITCARD_SAVE  @"https://central.united-us.com/demo/shopping/saveAddress.htm"
+#define  URL_CREDITCARD_EDOTOR  @"https://central.united-us.com/demo/shopping/isales/creditCard.htm"
+#define  URL_CREDITCARD_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveAddress.htm"
 
 
 
-#define  URL_CUSTOMER_INFO  @"https://central.united-us.com/demo/shopping/getCustomerInfoByContact.htm"
-#define  URL_NEW_CUSTOMER  @"https://central.united-us.com/demo/shopping/getAddCustomer.htm"
-#define  URL_CUSTOMER_SAVE  @"https://central.united-us.com/demo/shopping/saveCustomer.htm"
-#define  URL_UPDATE_CUSTOMER_BCARD  @"https://central.united-us.com/demo/shopping/updateCustomerBusiCard.htm"
-#define  URL_CUSTOMER_ADV_SEARCH @"https://central.united-us.com/demo/shopping/getContactAdvance.htm"
+#define  URL_CUSTOMER_INFO  @"https://central.united-us.com/demo/shopping/isales/getCustomerInfoByContact.htm"
+#define  URL_NEW_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales/getAddCustomer.htm"
+#define  URL_CUSTOMER_SAVE  @"https://central.united-us.com/demo/shopping/isales/saveCustomer.htm"
+#define  URL_UPDATE_CUSTOMER_BCARD  @"https://central.united-us.com/demo/shopping/isales/updateCustomerBusiCard.htm"
+#define  URL_CUSTOMER_ADV_SEARCH @"https://central.united-us.com/demo/shopping/isales/getContactAdvance.htm"
 
 
 
 
 
-#define  URL_ERR_LOG  @"https://central.united-us.com/demo/shopping/er_log.htm"
+#define  URL_ERR_LOG  @"https://central.united-us.com/demo/shopping/isales/er_log.htm"
 
-#define  URL_UPLOAD_IMG  @"https://central.united-us.com/demo/shopping/uploadImg.htm"
+#define  URL_UPLOAD_IMG  @"https://central.united-us.com/demo/shopping/isales/uploadImg.htm"
 
-#define URL_COPY_ORDER @"https://central.united-us.com/demo/shopping/copyOrder.htm"
-#define URL_SIGN_ORDER @"https://central.united-us.com/demo/shopping/updateOrderSign.htm"
-#define  URL_CUSTOMER_UPDATE  @"https://central.united-us.com/demo/shopping/updateCustomer.htm"
-#define  URL_CART_GENERAL_NOTES  @"https://central.united-us.com/demo/shopping/updateGeneralNote.htm"
-#define  URL_CART_ITEM_NOTES  @"https://central.united-us.com/demo/shopping/setItemNotes.htm"
-#define  URL_EDIT_CUSTOMER  @"https://central.united-us.com/demo/shopping/getUpdateCustomerInfoByContact.htm"
-#define  URL_CUSTOMER_PENDINGORDER  @"https://central.united-us.com/demo/shopping/hasPendingOrderByContact.htm"
-#define  URL_PORTFOLIOLIST_REMOVE  @"https://central.united-us.com/demo/shopping/deleteTearSheetPdf.htm"
-#define  URL_NPD_POLICY   @"https://central.united-us.com/demo/shopping/generalPolicy.htm"
+#define URL_COPY_ORDER @"https://central.united-us.com/demo/shopping/isales/copyOrder.htm"
+#define URL_SIGN_ORDER @"https://central.united-us.com/demo/shopping/isales/updateOrderSign.htm"
+#define  URL_CUSTOMER_UPDATE  @"https://central.united-us.com/demo/shopping/isales/updateCustomer.htm"
+#define  URL_CART_GENERAL_NOTES  @"https://central.united-us.com/demo/shopping/isales/updateGeneralNote.htm"
+#define  URL_CART_ITEM_NOTES  @"https://central.united-us.com/demo/shopping/isales/setItemNotes.htm"
+#define  URL_EDIT_CUSTOMER  @"https://central.united-us.com/demo/shopping/isales/getUpdateCustomerInfoByContact.htm"
+#define  URL_CUSTOMER_PENDINGORDER  @"https://central.united-us.com/demo/shopping/isales/hasPendingOrderByContact.htm"
+#define  URL_PORTFOLIOLIST_REMOVE  @"https://central.united-us.com/demo/shopping/isales/deleteTearSheetPdf.htm"
+#define  URL_NPD_POLICY   @"https://central.united-us.com/demo/shopping/isales/generalPolicy.htm"
 
 
 
@@ -286,31 +286,31 @@
 #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_CATEGORYADDALL  @"https://central.united-us.com/demo/shopping/categoryAddAllTo.htm"
-#define  URL_SEARCHADDALL  @"https://central.united-us.com/demo/shopping/searchAddAllTo.htm"
-#define  URL_ITEMSEARCHADDALL @"https://central.united-us.com/demo/shopping/itemSearchAddAllTo.htm"
+#define  URL_CATEGORYADDALL  @"https://central.united-us.com/demo/shopping/isales/categoryAddAllTo.htm"
+#define  URL_SEARCHADDALL  @"https://central.united-us.com/demo/shopping/isales/searchAddAllTo.htm"
+#define  URL_ITEMSEARCHADDALL @"https://central.united-us.com/demo/shopping/isales/itemSearchAddAllTo.htm"
 
-#define URL_SET_PRICE_TYPE @"https://central.united-us.com/demo/shopping/setSeePriceType.htm"
+#define URL_SET_PRICE_TYPE @"https://central.united-us.com/demo/shopping/isales/setSeePriceType.htm"
 
-#define URL_GET_CIVEN_PRICE @"https://central.united-us.com/demo/shopping/getSeeGivenPrice.htm"
+#define URL_GET_CIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales/getSeeGivenPrice.htm"
 
-#define URL_SET_GIVEN_PRICE @"https://central.united-us.com/demo/shopping/setSeeGivenPrice.htm"
+#define URL_SET_GIVEN_PRICE @"https://central.united-us.com/demo/shopping/isales/setSeeGivenPrice.htm"
 
-#define URL_SET_MERGE_ORDER @"https://central.united-us.com/demo/shopping/mergeOrder.htm"
+#define URL_SET_MERGE_ORDER @"https://central.united-us.com/demo/shopping/isales/mergeOrder.htm"
 
-#define URL_REQUEST_LOGIN @"https://central.united-us.com/demo/shopping/requestLogin.htm"
+#define URL_REQUEST_LOGIN @"https://central.united-us.com/demo/shopping/isales/requestLogin.htm"
 
-#define URL_EMAIL_CART @"https://central.united-us.com/demo/shopping/sendCartEmail.htm"
+#define URL_EMAIL_CART @"https://central.united-us.com/demo/shopping/isales/sendCartEmail.htm"
 
-#define URL_NOTIFY_ME @"https://central.united-us.com/demo/shopping/notifyMeEmail.htm"
+#define URL_NOTIFY_ME @"https://central.united-us.com/demo/shopping/isales/notifyMeEmail.htm"
 
-#define URL_EMAIL_WISHLIST @"https://central.united-us.com/demo/shopping/sendWishListEmail.htm"
+#define URL_EMAIL_WISHLIST @"https://central.united-us.com/demo/shopping/isales/sendWishListEmail.htm"
 
 #define URL_BLOG @"https://www.newpacificdirect.com/blog"
 
-#define  URL_MOVE_TO_BACK_ORDER @"https://central.united-us.com/demo/shopping/moveToBackOrder.htm"
+#define  URL_MOVE_TO_BACK_ORDER @"https://central.united-us.com/demo/shopping/isales/moveToBackOrder.htm"
 
-#define  URL_BACK_ORDER_PREVIEW  @"https://central.united-us.com/demo/shopping/cartDeliveryBackOrderReview.htm"
+#define  URL_BACK_ORDER_PREVIEW  @"https://central.united-us.com/demo/shopping/isales/cartDeliveryBackOrderReview.htm"
 
 #endif