Explorar el Código

160912
offline order detail add control disable edit download orders

Ray Zhang hace 9 años
padre
commit
2b862650c0

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m


+ 9 - 0
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -832,14 +832,19 @@
                 int status_code = [[self.content_data valueForKey:@"orderStatus"] intValue];
                 NSString* lock_user = [self.content_data valueForKey:@"opened_customer"];
                 AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+                bool offline_edit =[[self.content_data valueForKey:@"offline_edit"] boolValue];
                 if(status_code==1)//[status isEqualToString:@"Saved Order"])
                 {
                     //                        [self.btnOpen setImage:[[UIImage imageNamed:@"edit"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
                     //
                     //                        [self.btnCommit setImage:[[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+                    
+                    if(appDelegate.offline_mode==false||offline_edit)
+                    {
                     self.btnOpen.enabled =true;
                     
                     self.btnSign.enabled = true;
+                    }
                     //                if([lock_user isEqualToString:appDelegate.user])
                     //                {
                     //                    self.btnCommit.enabled =true;
@@ -853,9 +858,13 @@
                         //                    [self.btnOpen setImage:[[UIImage imageNamed:@"edit"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
                         //
                         //                    [self.btnCommit setImage:[[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAutomatic]];
+                        
+                                            if(appDelegate.offline_mode==false||offline_edit)
+                                            {
                         self.btnOpen.enabled =true;
                         
                         self.btnSign.enabled = true;
+                                            }
                         //                    self.btnCommit.enabled =false;
                     }
                 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio