Jelajahi Sumber

增加Customer Email变量保存登录时Customer邮件地址
修改Notify Me中邮件地址判断,使之不受订单影响。
修改Email Cart参数Order Code设置防止溢出

Pen Li 9 tahun lalu
induk
melakukan
2e3b8c8507

TEMPAT SAMPAH
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


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

@@ -2,4 +2,23 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            condition = "So == nil"
+            continueAfterRunningActions = "No"
+            filePath = "iSales-NPD/AppDelegate.m"
+            timestampString = "505294860.560773"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "396"
+            endingLineNumber = "396"
+            landmarkName = "-SetSo:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

+ 1 - 1
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -976,7 +976,7 @@ self.isrefreshing=false;
             __weak typeof(self) weakself = self;
             cell.notifyMeBlock = ^{
                 
-                NSString *emailAddr = [appDelegate.customerInfo valueForKey:@"customer_email"];
+                NSString *emailAddr = [Singleton sharedInstance].customer_email;
                 
                 if (!emailAddr.length) {
                     

+ 2 - 1
RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3645,6 +3645,7 @@ repeat:
             [Singleton sharedInstance].deliveryString = [objheader valueForKey:@"delivery_price"];
             [[Singleton sharedInstance] resetGlobalLock];
             [Singleton sharedInstance].customer_can_see_sales_Order = [[objheader valueForKey:@"can_see_salesorder"] boolValue];
+            [Singleton sharedInstance].customer_email = [appDelegate.customerInfo valueForKey:@"customer_email"];
         }
         
         //        DebugLog(@"sessionid=%@ ",appDelegate.sessionid);
@@ -3917,7 +3918,7 @@ repeat:
     if(appDelegate.password!=nil)
         [dic setValue:appDelegate.password forKey:@"password"];
     
-    [dic setValue:[NSNumber numberWithInteger:[so_id integerValue]] forKey:@"orderCode"];
+    [dic setValue:so_id forKey:@"orderCode"];
     [dic setValue:addr forKey:@"email"];
     
     NSData* json=nil;

+ 1 - 0
RedAnt ERP Mobile/iSales-NPD/Singleton.h

@@ -35,6 +35,7 @@ typedef enum {
 @property (nonatomic,strong) NSMutableDictionary *shop_order_status_filter;///<Shop Order Status
 @property (nonatomic,copy) NSString *specialInstruction;///<登陆时传的Special Instruction,在提交订单时显示
 @property (nonatomic,assign) BOOL currentOrderIsMerged;///<当前打开的订单是否为Purchas Order
+@property (nonatomic,copy) NSString *customer_email;///<Customer邮箱地址,登录时保存
 #pragma mark - Employee 
 
 

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

@@ -10,7 +10,7 @@
 #define RedAnt_ERP_Mobile_config_h
 #define BUILD_NPD
 
-#define test_server
+//#define test_server
 #define exception_switch 1
 
 //#define ab_lager @"Delivery price"