修复OrderDetail中Notify Me 按钮在未打开订单时隐藏，Add To Cart可响应。

增加Purchase Order Status Filter。

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,22 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "506856910.270393"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3854"
-            endingLineNumber = "3854"
-            landmarkName = "+merge_order:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -967,7 +967,7 @@ self.isrefreshing=false;
         if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
             cell.btnaddPortfolio.hidden = YES;
             
-            if (!notifyMe_switch || ![Singleton sharedInstance].currentOrderIsMerged) {
+            if (!notifyMe_switch || (![Singleton sharedInstance].currentOrderIsMerged) && appDelegate.order_code) {
                 
                 cell.btnNotifyMe.hidden = YES;
                 CGRect wishListFrame = cell.btnaddWish.frame;

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -186,7 +186,7 @@
     
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         self.shop_order_filter = [Singleton sharedInstance].shop_order_status_filter;
-        self.sales_order_filter = appDelegate.OrderFilter;
+        self.sales_order_filter = [Singleton sharedInstance].sales_order_status_filter;
         if(self.init_style==OL_OPEN)
         {
             NSData *data=[NSData dataWithContentsOfFile:[[NSBundle mainBundle]  pathForResource:@"status_filter_cadedate_open" ofType:@"json" ]];

RedAnt ERP Mobile/common/Singleton.h

@@ -31,6 +31,7 @@ typedef enum {
 @property (nonatomic,assign) BOOL global_lock;///<全局锁，Yes表示订单不能查看Detail，需要密码验证Price Setting，Hide Price
 @property (nonatomic,assign) BOOL customer_can_see_sales_Order;///<是否有权查看Sales Order，控制Order List
 @property (nonatomic,strong) NSMutableDictionary *shop_order_status_filter;///<Shop Order Status
+@property (nonatomic,strong) NSMutableDictionary *sales_order_status_filter;///<Sales Order Status
 @property (nonatomic,  copy) NSString *specialInstruction;///<登陆时传的Special Instruction，在提交订单时显示
 @property (nonatomic,assign) BOOL currentOrderIsMerged;///<当前打开的订单是否为Purchas Order
 @property (nonatomic,  copy) NSString *customer_email;///<Customer邮箱地址，登录时保存

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -3628,6 +3628,9 @@ repeat:
             // shop order status filter
             NSString *shopOrderStatusFilterStr = [objheader valueForKey:@"shopOrderFilter"] ;
             [Singleton sharedInstance].shop_order_status_filter = [[RAUtils string2dict:shopOrderStatusFilterStr] mutableCopy];
+            // Sales order status filter
+            NSString *salesOrderStatusFilterStr = [objheader valueForKey:@"purchaseOrderFilter"] ;
+            [Singleton sharedInstance].sales_order_status_filter = [[RAUtils string2dict:salesOrderStatusFilterStr] mutableCopy];
             
             // specialInstruction
             [Singleton sharedInstance].specialInstruction = [objheader valueForKey:@"specialInstruction"];