增加账号删除功能 -- Add delete account function(resolve: #14870)

RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2093,6 +2093,7 @@
     }
     
 
+
     
     if(appDelegate.can_show_price)
     {
@@ -2272,6 +2273,14 @@
     
 # endif
     
+    
+    
+    if(appDelegate.bLogin&&!appDelegate.offline_mode)
+    {
+        [map setValue:@"Delete Account" forKey:@"title"];
+        [map setValue:@"rect_announcements" forKey:@"img"];
+        [self.sideMenuItems addObject:map.copy];
+    }
 
     
     [self.sideMenuTable reloadData];
@@ -3254,6 +3263,67 @@
         
         
      }
+    else if([title isEqualToString:@"Delete Account"])
+    {
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Delete Account" message:@"Are you sure you want to permanently delete your account?" preferredStyle:UIAlertControllerStyleAlert];
+            //增加确定按钮
+            [alertController addAction:[UIAlertAction actionWithTitle:@"Delete" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action){
+                //获取第1个输入框；
+                UITextField *titleTextField = alertController.textFields.firstObject;
+                UIApplication * app = [UIApplication sharedApplication];
+                AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+                if([appDelegate.password isEqualToString:titleTextField.text])
+                {
+                    NSLog(@"%@", @"run process");
+                    __block UIAlertController * waitalert = [RAUtils waiting_alert:self title:@"Delete Account" completion:^{
+                        [RANetwork request_delete_account:^(NSMutableDictionary *result) {
+                            NSMutableDictionary* return_json =result;
+                            
+                            [waitalert dismissViewControllerAnimated:YES completion:^{
+                                if([[return_json valueForKey:@"result"] intValue]==2)
+                                {
+                                    //                    [self hideMenu];
+                                    //                    [self switchToHome:nil];
+                                    [appDelegate Logout];
+                                    [self checklogin :false];
+
+                                    [RAUtils message_alert:@"Account deleted." title:nil controller:self];
+                                }
+                                else
+                                {
+                                    [RAUtils message_alert:[return_json valueForKey:@"err_msg"] title:@"Delete Account" controller:self] ;
+                                }
+                            }];
+                                            
+                                            
+                                            
+                                            
+                                            
+                                            
+                                            
+                                        
+                        }];
+                    }];
+                    
+                    
+                }
+                else
+                {
+                    [RAUtils message_alert:@"Wrong password." title:nil controller:self];
+                }
+                
+            }]];
+            //增加取消按钮；
+            [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:nil]];
+            //定义第一个输入框；
+            [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+                textField.placeholder = @"Login Password";
+                textField.textContentType = UITextContentTypePassword;
+            }];
+            [self presentViewController:alertController animated:true completion:nil];
+    }
+        
+        
     else if([title isEqualToString:@"Hide Price"])
     {
         UIApplication * app = [UIApplication sharedApplication];

RedAnt ERP Mobile/common/data_provider/RANetwork.h

@@ -264,6 +264,9 @@ extern NSString *const ScreenCodeOfflineSync;
 //+(void)request_commoneditor_partialrefresh: (NSMutableDictionary*)params url:(NSString*)url completionHandler:(resultHandler)result;
 +(void)request_add_address:(NSMutableDictionary*)params completionHandler:(resultHandler)result;
 +(void)request_commit_order:(NSMutableDictionary*)params completionHandler:(resultHandler)result;
++(void)request_delete_account:(resultHandler)result;
+
+
 #pragma mark offline
 +(void) request_new_offline_ticket:(NSString* )ver  useInternalAddress:(bool)buseinternaladdress vid:(NSString*)vid completionHandler:(resultHandler)result;
 +(void) request_complete_offline_ticket:(NSString* )vid completionHandler:(resultHandler)result;

RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -7100,7 +7100,37 @@ NSString *const ScreenCodeOfflineSync = @"Offline Sync Screen";
     //    else
     //        return nil;
 }
++(void)request_delete_account:(resultHandler)result
+{
+    NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
+    AppDelegate *appDelegate = nil;
+    
+    
+    appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
+    if(appDelegate.user!=nil)
+        [params setValue:appDelegate.user forKey:@"user"];
 
+    if(appDelegate.password!=nil)
+        [params setValue:appDelegate.password forKey:@"password"];
+    
+    if(appDelegate.offline_mode)
+    {
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            NSMutableDictionary* json = [[OLDataProvider offline_notimpl] mutableCopy];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                result(json);
+            });
+        });
+        
+        return;
+    }
+    
+    [self request_interface:URL_DELETE_ACCOUNT parameters:params err_record_url:nil completionHandler:^(NSMutableDictionary *resulti) {
+     
+        result(resulti);
+    } retry:0];
+}
 
 +(void) request_create_order:(resultHandler)result
 {

RedAnt ERP Mobile/iSales-NPD/config.h

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