1.撤销NPD Order Address新格式。

2.修改NPD Portfolio离线Group By。
3.修改NPD Portfolio属性离线默认值。
4.修改NPD Order Detail，删除Internal Notes，Remarks Content -> Remarks和General Note新格式。
5.修改NPD离线Order Detail地址拼写。
6.修改NPD离线Place Order，删除Internal Notes。
7.修改NPD离线Place Order提交按钮图片。

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

@@ -294,9 +294,14 @@
                                               target:self
                                               action:@selector(onSaveClick:)];
     
+    UIImage *submit_img = [[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAutomatic];
+    
+#ifdef BUILD_NPD
+    submit_img = [[UIImage imageNamed:@"submit_red"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+#endif
     
     self.btnSubmitOrder = nil;
-    self.btnSubmitOrder =[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"commit"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+    self.btnSubmitOrder =[[UIBarButtonItem alloc] initWithImage:submit_img
                                                           style:UIBarButtonItemStylePlain
                                                          target:self
                                                          action:@selector(onCommitOrderClick:)];
@@ -351,9 +356,9 @@
     
     if(appDelegate.can_submit_order)
     {
+
+        [self.btnSubmitOrder setImage:submit_img];
         
-        
-        [self.btnSubmitOrder setImage:[UIImage imageNamed:@"commit"]];
         self.btnSubmitOrder.enabled = true;
     }
     else
@@ -3362,40 +3367,10 @@
                 //                valuestr = [self getValue:valuefrom];
                 if(true)
                 {
-                    if(valuestr.length>0) {
-                        NSString *control = [modify_item objectForKey:@"control"];
-                        if ([control isEqualToString:@"enum"]) {
-                            NSMutableDictionary *cadedate = [[modify_item objectForKey:@"cadedate"] mutableCopy];
-                            int count = [[cadedate objectForKey:@"count"] intValue];
-                            for (int i = 0; i < count; i++) {
-                                NSString *key = [NSString stringWithFormat:@"val_%d",i];
-                                NSMutableDictionary *val = [[cadedate objectForKey:key] mutableCopy];
-                                int check = [[val objectForKey:@"check"] intValue];
-                                NSString *val_id = [val objectForKey:@"value_id"];
-                                NSString *val_value = [val objectForKey:@"value"];
-                                // state 通过id判断， country 通过value判断
-                                if (check == 1 && (![val_id isEqualToString:valuestr] && ![val_value isEqualToString:valuestr])) {
-                                    check = 0;
-                                    [val setObject:@(check) forKey:@"check"];
-                                    [cadedate setObject:val forKey:key];
-                                }
-                                
-                                if ([val_id isEqualToString:valuestr] || [val_value isEqualToString:valuestr]) {
-                                    check = 1;
-                                    [val setObject:@(check) forKey:@"check"];
-                                    [cadedate setObject:val forKey:key];
-                                }
-                                
-                            }
-                            [modify_item setObject:cadedate forKey:@"cadedate"];
-                        } else {
-                            [modify_item setValue:valuestr forKey:@"value"];
-                        }
-                        
-                    }
-                    else {
+                    if(valuestr.length>0)
+                        [modify_item setValue:valuestr forKey:@"value"];
+                    else
                         [modify_item setValue:@"" forKey:@"value"];
-                    }
                     [modify_item setValue:@"true" forKey:@"dirty"];
                     [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
                 }
@@ -3894,424 +3869,5 @@
     });
 }
 
--(void) handle_action_return:(NSMutableDictionary *)value indexPath :(NSIndexPath*) indexPath action:(int) action_code
-{
-    DebugLog(@"commoneditor return %ld_%ld",(long)indexPath.section,(long)indexPath.row);
-    NSMutableDictionary* section_json=nil;
-    
-    NSMutableDictionary* item_json =[((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row] mutableCopy];
-    
-    bool is_subaction = [value[@"is_subaction"] boolValue];
-    int subaction_tag= [value[@"subaction_tag"] intValue];
-    [value removeObjectForKey:@"is_subaction"];
-    [value removeObjectForKey:@"subaction_tag"];
-    if(is_subaction)
-    {
-        NSMutableDictionary* sub_action = [[item_json objectForKey:[NSString stringWithFormat:@"item_%d",subaction_tag]] mutableCopy];
-        int refresh = [[sub_action valueForKey:@"refresh"] intValue];
-        NSString* refresh_trigger = [sub_action valueForKey:@"name"];
-        NSDictionary * restore_json=[sub_action objectForKeyedSubscript:@"restore"];
-        
-        
-        
-        NSString* subid=[sub_action valueForKey:@"subid"];
-        
-        UITableViewCell *cell = [self.editorTable cellForRowAtIndexPath:indexPath];
-        
-        NSString* required = [sub_action valueForKey:@"required"];
-        if([required isEqualToString:@"true"] && value.count==0)
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor redColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        else
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor clearColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        if(value.count!=0)
-        {
-            
-            if(action_code==ACTION_SAVE_DATA)
-            {
-                [sub_action setObject:value forKey:@"data"];
-                
-                
-                if(subid==nil)
-                {
-                    [sub_action setValue:@"true" forKey:@"dirty"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int count=0;
-                    
-                    count=[[section_json valueForKey:@"count"] intValue];
-                    
-                    for(int i=0;i<count;i++)
-                    {
-                        NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        if([[olditem valueForKey:@"name"] isEqualToString:[sub_action valueForKey:@"name" ]])
-                        {
-                            // sub_action = [item_json objectForKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                            [item_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                            [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        }
-                        
-                    }
-                }
-                else
-                {
-                    
-                    assert(@"not impl");
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    sub_action= [self enum_subitem_changed:[olditem mutableCopy] subid:idarr value:sub_action step:2];
-                    [sub_action setValue:@"true" forKey:@"dirty"];
-                    
-                    [item_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                    [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-            }
-            else if(action_code==ACTION_FILL_SECTION)
-            {
-                
-                if(subid==nil)
-                {
-                    NSDictionary* jsonmap=[sub_action valueForKey:@"key_map"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int icount=[[section_json valueForKey:@"count"] intValue];
-                    for (int ic=0;ic<icount;ic++)
-                    {
-                        NSMutableDictionary* modify_item= [[section_json objectForKey:[NSString stringWithFormat:@"item_%d",ic ]] mutableCopy];
-                        
-                        NSString* valuefrom= [jsonmap valueForKey:[modify_item valueForKey:@"name"]];
-                        
-                        NSString* valuestr= [value valueForKey:valuefrom];
-                        
-                        if(valuestr !=nil)
-                        {
-                            // 2018-01-19 Place Order Select Ship To未刷新State Enum
-                            NSString *control = [modify_item objectForKey:@"control"];
-                            if ([control isEqualToString:@"enum"]) {
-                                NSMutableDictionary *cadedate = [[modify_item objectForKey:@"cadedate"] mutableCopy];
-                                int count = [[cadedate objectForKey:@"count"] intValue];
-                                for (int i = 0; i < count; i++) {
-                                    NSString *key = [NSString stringWithFormat:@"val_%d",i];
-                                    NSMutableDictionary *val = [[cadedate objectForKey:key] mutableCopy];
-                                    int check = [[val objectForKey:@"check"] intValue];
-                                    NSString *val_id = [val objectForKey:@"value_id"];
-                                    NSString *val_value = [val objectForKey:@"value"];
-                                    // state 通过id判断， country 通过value判断
-                                    if (check == 1 && (![val_id isEqualToString:valuestr] && ![val_value isEqualToString:valuestr])) {
-                                        check = 0;
-                                        [val setObject:@(check) forKey:@"check"];
-                                        [cadedate setObject:val forKey:key];
-                                    }
-                                    
-                                    if ([val_id isEqualToString:valuestr] || [val_value isEqualToString:valuestr]) {
-                                        check = 1;
-                                        [val setObject:@(check) forKey:@"check"];
-                                        [cadedate setObject:val forKey:key];
-                                    }
-                                    
-                                }
-                                [modify_item setObject:cadedate forKey:@"cadedate"];
-                            } else {
-                                [modify_item setValue:valuestr forKey:@"value"];
-                            }
-                            
-                            //                            [modify_item setValue:valuestr forKey:@"value"];
-                            
-                            [modify_item setValue:@"true" forKey:@"dirty"];
-                            [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
-                        }
-                    }
-                }
-                else
-                {
-                    
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    NSDictionary* jsonmap=[sub_action valueForKey:@"key_map"];
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSMutableDictionary * olditem=[[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]] mutableCopy];
-                    NSMutableDictionary* olditem_sub_action = [[olditem objectForKey:[NSString stringWithFormat:@"item_%d",subaction_tag]] mutableCopy];
-                    
-                    olditem_sub_action=   [self fill_switch_subitem:olditem subid:nil source:value mapping:jsonmap ];
-                    
-                    
-                    [olditem_sub_action setValue:@"true" forKey:@"dirty"];
-                    [olditem setObject:olditem_sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                    [section_json setObject:olditem  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-                
-                
-                
-            }
-            
-            
-            
-            //    [section_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row ]];
-            
-            [self.content_data_download setObject:section_json forKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]];
-        }
-        
-        DebugLog(@"CONTENT UPDATE:%@",[RAConvertor DataTOjsonString:self.content_data_download]);
-        self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
-        
-        
-        
-        if(refresh==1)
-        {
-            
-            if(restore_json!=nil)
-            {
-                int rc=[[restore_json valueForKey:@"count"] intValue];
-                for(int ir=0;ir<rc;ir++)
-                {
-                    NSString* name = [restore_json valueForKey:[NSString stringWithFormat:@"item_%d",ir]];
-                    
-                    
-                    int section_count=[[self.content_data_download valueForKey:@"section_count"] intValue];
-                    for(int i=0;i<section_count;i++)
-                    {
-                        NSMutableDictionary * sectionjson = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        //                    NSMutableDictionary * to_sectionjson = [[to objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        int item_count = [[sectionjson valueForKey:@"count"] intValue];
-                        for(int j=0;j<item_count;j++)
-                        {
-                            NSMutableDictionary * itemjson=[[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            //             NSMutableDictionary * to_itemjson=[[to_sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            
-                            if([[itemjson valueForKey:@"name"] isEqualToString:name])
-                            {
-                                [itemjson removeObjectForKey:@"dirty"];
-                                [sectionjson setObject:itemjson forKey:[NSString stringWithFormat:@"item_%d",j ]];
-                            }
-                            
-                        }
-                        [self.content_data_download setObject:sectionjson forKey:[NSString stringWithFormat:@"section_%d",i ]];
-                    }
-                    
-                    
-                }
-                
-            }
-            [self refresh:refresh_trigger] ;
-            return ;
-        }
-        
-        
-        
-        //    DebugLog(@"CONTENT translate:%@",[iSalesNetwork DataTOjsonString:self.content_data]);
-        [self.editorTable reloadData ];
-        
-    }
-    else
-    {
-        
-        
-        
-        int refresh = [[item_json valueForKey:@"refresh"] intValue];
-        NSString* refresh_trigger = [item_json valueForKey:@"name"];
-        NSDictionary * restore_json=[item_json objectForKeyedSubscript:@"restore"];
-        
-        
-        
-        NSString* subid=[item_json valueForKey:@"subid"];
-        
-        UITableViewCell *cell = [self.editorTable cellForRowAtIndexPath:indexPath];
-        
-        NSString* required = [item_json valueForKey:@"required"];
-        if([required isEqualToString:@"true"] && value.count==0)
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor redColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        else
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor clearColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        if(value.count!=0)
-        {
-            
-            if(action_code==ACTION_SAVE_DATA)
-            {
-                [item_json setObject:value forKey:@"data"];
-                
-                
-                if(subid==nil)
-                {
-                    [item_json setValue:@"true" forKey:@"dirty"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int count=0;
-                    
-                    count=[[section_json valueForKey:@"count"] intValue];
-                    
-                    for(int i=0;i<count;i++)
-                    {
-                        NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        if([[olditem valueForKey:@"name"] isEqualToString:[item_json valueForKey:@"name" ]])
-                            [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        
-                        
-                    }
-                }
-                else
-                {
-                    
-                    assert(@"not impl");
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    item_json= [self enum_subitem_changed:[olditem mutableCopy] subid:idarr value:item_json step:2];
-                    [item_json setValue:@"true" forKey:@"dirty"];
-                    [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-            }
-            else if(action_code==ACTION_FILL_SECTION)
-            {
-                
-                if(subid==nil)
-                {
-                    NSDictionary* jsonmap=[item_json valueForKey:@"key_map"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int icount=[[section_json valueForKey:@"count"] intValue];
-                    for (int ic=0;ic<icount;ic++)
-                    {
-                        NSMutableDictionary* modify_item= [[section_json objectForKey:[NSString stringWithFormat:@"item_%d",ic ]] mutableCopy];
-                        
-                        NSString* valuefrom= [jsonmap valueForKey:[modify_item valueForKey:@"name"]];
-                        
-                        NSString* valuestr= [value valueForKey:valuefrom];
-                        
-                        if(valuestr !=nil)
-                        {
-                            
-                            [modify_item setValue:valuestr forKey:@"value"];
-                            
-                            [modify_item setValue:@"true" forKey:@"dirty"];
-                            [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
-                        }
-                    }
-                }
-                else
-                {
-                    
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    NSDictionary* jsonmap=[item_json valueForKey:@"key_map"];
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSMutableDictionary * olditem=[[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]] mutableCopy];
-                    
-                    olditem=   [self fill_switch_subitem:olditem subid:nil source:value mapping:jsonmap ];
-                    
-                    
-                    [olditem setValue:@"true" forKey:@"dirty"];
-                    [section_json setObject:olditem  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-                
-                
-                
-            }
-            
-            
-            
-            //    [section_json setObject:item_json forKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row ]];
-            
-            [self.content_data_download setObject:section_json forKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]];
-        }
-        
-        DebugLog(@"CONTENT UPDATE:%@",[RAConvertor DataTOjsonString:self.content_data_download]);
-        self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
-        
-        
-        
-        if(refresh==1)
-        {
-            
-            if(restore_json!=nil)
-            {
-                int rc=[[restore_json valueForKey:@"count"] intValue];
-                for(int ir=0;ir<rc;ir++)
-                {
-                    NSString* name = [restore_json valueForKey:[NSString stringWithFormat:@"item_%d",ir]];
-                    
-                    
-                    int section_count=[[self.content_data_download valueForKey:@"section_count"] intValue];
-                    for(int i=0;i<section_count;i++)
-                    {
-                        NSMutableDictionary * sectionjson = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        //                    NSMutableDictionary * to_sectionjson = [[to objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        int item_count = [[sectionjson valueForKey:@"count"] intValue];
-                        for(int j=0;j<item_count;j++)
-                        {
-                            NSMutableDictionary * itemjson=[[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            //             NSMutableDictionary * to_itemjson=[[to_sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            
-                            if([[itemjson valueForKey:@"name"] isEqualToString:name])
-                            {
-                                [itemjson removeObjectForKey:@"dirty"];
-                                [sectionjson setObject:itemjson forKey:[NSString stringWithFormat:@"item_%d",j ]];
-                            }
-                            
-                        }
-                        [self.content_data_download setObject:sectionjson forKey:[NSString stringWithFormat:@"section_%d",i ]];
-                    }
-                    
-                    
-                }
-                
-            }
-            [self refresh:refresh_trigger] ;
-            return ;
-        }
-        
-        
-        
-        //    DebugLog(@"CONTENT translate:%@",[iSalesNetwork DataTOjsonString:self.content_data]);
-        [self.editorTable reloadData ];
-    }
-}
 
 @end

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

@@ -1096,39 +1096,10 @@ static const int totalPage = 3;
                 //                valuestr = [self getValue:valuefrom];
                 if(true)
                 {
-                    if(valuestr.length>0) {
-                        NSString *control = [modify_item objectForKey:@"control"];
-                        if ([control isEqualToString:@"enum"]) {
-                            NSMutableDictionary *cadedate = [[modify_item objectForKey:@"cadedate"] mutableCopy];
-                            int count = [[cadedate objectForKey:@"count"] intValue];
-                            for (int i = 0; i < count; i++) {
-                                NSString *key = [NSString stringWithFormat:@"val_%d",i];
-                                NSMutableDictionary *val = [[cadedate objectForKey:key] mutableCopy];
-                                int check = [[val objectForKey:@"check"] intValue];
-                                NSString *val_id = [val objectForKey:@"value_id"];
-                                NSString *val_value = [val objectForKey:@"value"];
-                                // state 通过id判断， country 通过value判断
-                                if (check == 1 && (![val_id isEqualToString:valuestr] && ![val_value isEqualToString:valuestr])) {
-                                    check = 0;
-                                    [val setObject:@(check) forKey:@"check"];
-                                    [cadedate setObject:val forKey:key];
-                                }
-                                
-                                if ([val_id isEqualToString:valuestr] || [val_value isEqualToString:valuestr]) {
-                                    check = 1;
-                                    [val setObject:@(check) forKey:@"check"];
-                                    [cadedate setObject:val forKey:key];
-                                }
-                                
-                            }
-                            [modify_item setObject:cadedate forKey:@"cadedate"];
-                        } else {
-                            [modify_item setValue:valuestr forKey:@"value"];
-                        }
-                    }
-                    else {
+                    if(valuestr.length>0)
+                        [modify_item setValue:valuestr forKey:@"value"];
+                    else
                         [modify_item setValue:@"" forKey:@"value"];
-                    }
                     [modify_item setValue:@"true" forKey:@"dirty"];
                     [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
                 }
@@ -1517,424 +1488,5 @@ static const int totalPage = 3;
     self.request_url = [urgencyDic objectForKey:@"request_url"];
 }
 
--(void) handle_action_return:(NSMutableDictionary *)value indexPath :(NSIndexPath*) indexPath action:(int) action_code
-{
-    DebugLog(@"commoneditor return %ld_%ld",(long)indexPath.section,(long)indexPath.row);
-    NSMutableDictionary* section_json=nil;
-    
-    NSMutableDictionary* item_json =[((NSMutableArray*)self.content_data_control[indexPath.section])[indexPath.row] mutableCopy];
-    
-    bool is_subaction = [value[@"is_subaction"] boolValue];
-    int subaction_tag= [value[@"subaction_tag"] intValue];
-    [value removeObjectForKey:@"is_subaction"];
-    [value removeObjectForKey:@"subaction_tag"];
-    if(is_subaction)
-    {
-        NSMutableDictionary* sub_action = [[item_json objectForKey:[NSString stringWithFormat:@"item_%d",subaction_tag]] mutableCopy];
-        int refresh = [[sub_action valueForKey:@"refresh"] intValue];
-        NSString* refresh_trigger = [sub_action valueForKey:@"name"];
-        NSDictionary * restore_json=[sub_action objectForKeyedSubscript:@"restore"];
-        
-        
-        
-        NSString* subid=[sub_action valueForKey:@"subid"];
-        
-        UITableViewCell *cell = [self.editorTable cellForRowAtIndexPath:indexPath];
-        
-        NSString* required = [sub_action valueForKey:@"required"];
-        if([required isEqualToString:@"true"] && value.count==0)
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor redColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        else
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor clearColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        if(value.count!=0)
-        {
-            
-            if(action_code==ACTION_SAVE_DATA)
-            {
-                [sub_action setObject:value forKey:@"data"];
-                
-                
-                if(subid==nil)
-                {
-                    [sub_action setValue:@"true" forKey:@"dirty"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int count=0;
-                    
-                    count=[[section_json valueForKey:@"count"] intValue];
-                    
-                    for(int i=0;i<count;i++)
-                    {
-                        NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        if([[olditem valueForKey:@"name"] isEqualToString:[sub_action valueForKey:@"name" ]])
-                        {
-                            // sub_action = [item_json objectForKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                            [item_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                            [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        }
-                        
-                    }
-                }
-                else
-                {
-                    
-                    assert(@"not impl");
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    sub_action= [self enum_subitem_changed:[olditem mutableCopy] subid:idarr value:sub_action step:2];
-                    [sub_action setValue:@"true" forKey:@"dirty"];
-                    
-                    [item_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                    [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-            }
-            else if(action_code==ACTION_FILL_SECTION)
-            {
-                
-                if(subid==nil)
-                {
-                    NSDictionary* jsonmap=[sub_action valueForKey:@"key_map"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int icount=[[section_json valueForKey:@"count"] intValue];
-                    for (int ic=0;ic<icount;ic++)
-                    {
-                        NSMutableDictionary* modify_item= [[section_json objectForKey:[NSString stringWithFormat:@"item_%d",ic ]] mutableCopy];
-                        
-                        NSString* valuefrom= [jsonmap valueForKey:[modify_item valueForKey:@"name"]];
-                        
-                        NSString* valuestr= [value valueForKey:valuefrom];
-                        
-                        if(valuestr !=nil)
-                        {
-                            // 2018-01-19 Place Order Select Ship To未刷新State Enum
-                            NSString *control = [modify_item objectForKey:@"control"];
-                            if ([control isEqualToString:@"enum"]) {
-                                NSMutableDictionary *cadedate = [[modify_item objectForKey:@"cadedate"] mutableCopy];
-                                int count = [[cadedate objectForKey:@"count"] intValue];
-                                for (int i = 0; i < count; i++) {
-                                    NSString *key = [NSString stringWithFormat:@"val_%d",i];
-                                    NSMutableDictionary *val = [[cadedate objectForKey:key] mutableCopy];
-                                    int check = [[val objectForKey:@"check"] intValue];
-                                    NSString *val_id = [val objectForKey:@"value_id"];
-                                    NSString *val_value = [val objectForKey:@"value"];
-                                    // state 通过id判断， country 通过value判断
-                                    if (check == 1 && (![val_id isEqualToString:valuestr] && ![val_value isEqualToString:valuestr])) {
-                                        check = 0;
-                                        [val setObject:@(check) forKey:@"check"];
-                                        [cadedate setObject:val forKey:key];
-                                    }
-                                    
-                                    if ([val_id isEqualToString:valuestr] || [val_value isEqualToString:valuestr]) {
-                                        check = 1;
-                                        [val setObject:@(check) forKey:@"check"];
-                                        [cadedate setObject:val forKey:key];
-                                    }
-                                    
-                                }
-                                [modify_item setObject:cadedate forKey:@"cadedate"];
-                            } else {
-                                [modify_item setValue:valuestr forKey:@"value"];
-                            }
-                            
-                            //                            [modify_item setValue:valuestr forKey:@"value"];
-                            
-                            [modify_item setValue:@"true" forKey:@"dirty"];
-                            [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
-                        }
-                    }
-                }
-                else
-                {
-                    
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    NSDictionary* jsonmap=[sub_action valueForKey:@"key_map"];
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSMutableDictionary * olditem=[[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]] mutableCopy];
-                    NSMutableDictionary* olditem_sub_action = [[olditem objectForKey:[NSString stringWithFormat:@"item_%d",subaction_tag]] mutableCopy];
-                    
-                    olditem_sub_action=   [self fill_switch_subitem:olditem subid:nil source:value mapping:jsonmap ];
-                    
-                    
-                    [olditem_sub_action setValue:@"true" forKey:@"dirty"];
-                    [olditem setObject:olditem_sub_action forKey:[NSString stringWithFormat:@"item_%d",[value[@"subaction_tag"] intValue]]];
-                    [section_json setObject:olditem  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-                
-                
-                
-            }
-            
-            
-            
-            //    [section_json setObject:sub_action forKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row ]];
-            
-            [self.content_data_download setObject:section_json forKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]];
-        }
-        
-        DebugLog(@"CONTENT UPDATE:%@",[RAConvertor DataTOjsonString:self.content_data_download]);
-        self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
-        
-        
-        
-        if(refresh==1)
-        {
-            
-            if(restore_json!=nil)
-            {
-                int rc=[[restore_json valueForKey:@"count"] intValue];
-                for(int ir=0;ir<rc;ir++)
-                {
-                    NSString* name = [restore_json valueForKey:[NSString stringWithFormat:@"item_%d",ir]];
-                    
-                    
-                    int section_count=[[self.content_data_download valueForKey:@"section_count"] intValue];
-                    for(int i=0;i<section_count;i++)
-                    {
-                        NSMutableDictionary * sectionjson = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        //                    NSMutableDictionary * to_sectionjson = [[to objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        int item_count = [[sectionjson valueForKey:@"count"] intValue];
-                        for(int j=0;j<item_count;j++)
-                        {
-                            NSMutableDictionary * itemjson=[[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            //             NSMutableDictionary * to_itemjson=[[to_sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            
-                            if([[itemjson valueForKey:@"name"] isEqualToString:name])
-                            {
-                                [itemjson removeObjectForKey:@"dirty"];
-                                [sectionjson setObject:itemjson forKey:[NSString stringWithFormat:@"item_%d",j ]];
-                            }
-                            
-                        }
-                        [self.content_data_download setObject:sectionjson forKey:[NSString stringWithFormat:@"section_%d",i ]];
-                    }
-                    
-                    
-                }
-                
-            }
-            [self refresh:refresh_trigger] ;
-            return ;
-        }
-        
-        
-        
-        //    DebugLog(@"CONTENT translate:%@",[iSalesNetwork DataTOjsonString:self.content_data]);
-        [self.editorTable reloadData ];
-        
-    }
-    else
-    {
-        
-        
-        
-        int refresh = [[item_json valueForKey:@"refresh"] intValue];
-        NSString* refresh_trigger = [item_json valueForKey:@"name"];
-        NSDictionary * restore_json=[item_json objectForKeyedSubscript:@"restore"];
-        
-        
-        
-        NSString* subid=[item_json valueForKey:@"subid"];
-        
-        UITableViewCell *cell = [self.editorTable cellForRowAtIndexPath:indexPath];
-        
-        NSString* required = [item_json valueForKey:@"required"];
-        if([required isEqualToString:@"true"] && value.count==0)
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor redColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        else
-        {
-            CALayer *layer = [cell.contentView layer];
-            //            layer.borderColor = [[UIColor redColor] CGColor];
-            //            layer.borderWidth = 1.0;
-            
-            layer.shadowColor = [UIColor clearColor].CGColor;
-            layer.shadowOffset = CGSizeMake(0, 0);
-            layer.shadowOpacity = 1;
-            layer.shadowRadius = 2.0;
-        }
-        if(value.count!=0)
-        {
-            
-            if(action_code==ACTION_SAVE_DATA)
-            {
-                [item_json setObject:value forKey:@"data"];
-                
-                
-                if(subid==nil)
-                {
-                    [item_json setValue:@"true" forKey:@"dirty"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int count=0;
-                    
-                    count=[[section_json valueForKey:@"count"] intValue];
-                    
-                    for(int i=0;i<count;i++)
-                    {
-                        NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        if([[olditem valueForKey:@"name"] isEqualToString:[item_json valueForKey:@"name" ]])
-                            [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",i ]];
-                        
-                        
-                    }
-                }
-                else
-                {
-                    
-                    assert(@"not impl");
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSDictionary * olditem=[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    item_json= [self enum_subitem_changed:[olditem mutableCopy] subid:idarr value:item_json step:2];
-                    [item_json setValue:@"true" forKey:@"dirty"];
-                    [section_json setObject:item_json  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-            }
-            else if(action_code==ACTION_FILL_SECTION)
-            {
-                
-                if(subid==nil)
-                {
-                    NSDictionary* jsonmap=[item_json valueForKey:@"key_map"];
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]] mutableCopy];
-                    int icount=[[section_json valueForKey:@"count"] intValue];
-                    for (int ic=0;ic<icount;ic++)
-                    {
-                        NSMutableDictionary* modify_item= [[section_json objectForKey:[NSString stringWithFormat:@"item_%d",ic ]] mutableCopy];
-                        
-                        NSString* valuefrom= [jsonmap valueForKey:[modify_item valueForKey:@"name"]];
-                        
-                        NSString* valuestr= [value valueForKey:valuefrom];
-                        
-                        if(valuestr !=nil)
-                        {
-                            
-                            [modify_item setValue:valuestr forKey:@"value"];
-                            
-                            [modify_item setValue:@"true" forKey:@"dirty"];
-                            [section_json setObject:modify_item  forKey:[NSString stringWithFormat:@"item_%d",ic ]];
-                        }
-                    }
-                }
-                else
-                {
-                    
-                    NSArray* idarr=[subid componentsSeparatedByString:@"_"];
-                    int section = [(NSString*)idarr[0] intValue];
-                    int item=[(NSString*)idarr[1] intValue];
-                    NSDictionary* jsonmap=[item_json valueForKey:@"key_map"];
-                    
-                    section_json = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d", section]] mutableCopy];
-                    NSMutableDictionary * olditem=[[section_json objectForKey:[NSString stringWithFormat:@"item_%d",item ]] mutableCopy];
-                    
-                    olditem=   [self fill_switch_subitem:olditem subid:nil source:value mapping:jsonmap ];
-                    
-                    
-                    [olditem setValue:@"true" forKey:@"dirty"];
-                    [section_json setObject:olditem  forKey:[NSString stringWithFormat:@"item_%d",item ]];
-                    
-                }
-                
-                
-                
-            }
-            
-            
-            
-            //    [section_json setObject:item_json forKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row ]];
-            
-            [self.content_data_download setObject:section_json forKey:[NSString stringWithFormat:@"section_%ld",(long)indexPath.section ]];
-        }
-        
-        DebugLog(@"CONTENT UPDATE:%@",[RAConvertor DataTOjsonString:self.content_data_download]);
-        self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
-        
-        
-        
-        if(refresh==1)
-        {
-            
-            if(restore_json!=nil)
-            {
-                int rc=[[restore_json valueForKey:@"count"] intValue];
-                for(int ir=0;ir<rc;ir++)
-                {
-                    NSString* name = [restore_json valueForKey:[NSString stringWithFormat:@"item_%d",ir]];
-                    
-                    
-                    int section_count=[[self.content_data_download valueForKey:@"section_count"] intValue];
-                    for(int i=0;i<section_count;i++)
-                    {
-                        NSMutableDictionary * sectionjson = [[self.content_data_download objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        //                    NSMutableDictionary * to_sectionjson = [[to objectForKey:[NSString stringWithFormat:@"section_%d",i ]] mutableCopy];
-                        int item_count = [[sectionjson valueForKey:@"count"] intValue];
-                        for(int j=0;j<item_count;j++)
-                        {
-                            NSMutableDictionary * itemjson=[[sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            //             NSMutableDictionary * to_itemjson=[[to_sectionjson objectForKey:[NSString stringWithFormat:@"item_%d",j ]] mutableCopy];
-                            
-                            if([[itemjson valueForKey:@"name"] isEqualToString:name])
-                            {
-                                [itemjson removeObjectForKey:@"dirty"];
-                                [sectionjson setObject:itemjson forKey:[NSString stringWithFormat:@"item_%d",j ]];
-                            }
-                            
-                        }
-                        [self.content_data_download setObject:sectionjson forKey:[NSString stringWithFormat:@"section_%d",i ]];
-                    }
-                    
-                    
-                }
-                
-            }
-            [self refresh:refresh_trigger] ;
-            return ;
-        }
-        
-        
-        
-        //    DebugLog(@"CONTENT translate:%@",[iSalesNetwork DataTOjsonString:self.content_data]);
-        [self.editorTable reloadData ];
-    }
-}
 
 @end

RedAnt ERP Mobile/iSales-NPD/TearSheet.json

@@ -135,7 +135,7 @@
 		"item_13": {
 			"control": "switch",
 			"name": "set",
-			"value": "false",
+			"value": "true",
 			"aname": "Set"
 		},
 		"item_4": {
@@ -159,7 +159,7 @@
 		"item_11": {
 			"control": "switch",
 			"name": "volume",
-			"value": "true",
+			"value": "false",
 			"aname": "Volume"
 		},
 		"item_6": {
@@ -171,7 +171,7 @@
 		"item_9": {
 			"control": "switch",
 			"name": "material",
-			"value": "false",
+			"value": "true",
 			"aname": "Material"
 		},
 		"item_10": {
@@ -183,7 +183,7 @@
 		"item_8": {
 			"control": "switch",
 			"name": "seat_height",
-			"value": "false",
+			"value": "true",
 			"aname": "Seat Height"
 		}
 	},

RedAnt ERP Mobile/iSales-NPD/more_info.html

@@ -6,12 +6,8 @@
 <div style='width:75%;float:left;'>ShipToCompany_or_</div>
 <div style='width:25%;float:left;'>Name:</div>
 <div style='width:75%;float:left;'>ShipToName_or_</div>
-<div style='width:25%;float:left;'>Address1:</div>
-<div style='width:75%;float:left;'>ShipToAddress_1_or_</div>
-<div style='width:25%;float:left;'>Address2:</div>
-<div style='width:75%;float:left;'>ShipToAddress_2_or_</div>
-<div style='width:100%;float:left;'>ShipTo_City_State_ZipCode_Country_or</div>
-
+<div style='width:25%;float:left;'>Address:</div>
+<div style='width:75%;float:left;'>ShipToAddress_or_</div>
 </div>
 </div>
 <div><p><b style='font-size:20px;'>Ship from information</b></p>
@@ -20,12 +16,8 @@
 <div style='width:75%;float:left;'>ShipFromCompany_or_</div>
 <div style='width:25%;float:left;'>Name:</div>
 <div style='width:75%;float:left;'>ShipFromName_or_</div>
-<div style='width:25%;float:left;'>Address1:</div>
-<div style='width:75%;float:left;'>ShipFromAddress_1_or_</div>
-<div style='width:25%;float:left;'>Address2:</div>
-<div style='width:75%;float:left;'>ShipFromAddress_2_or_</div>
-<div style='width:100%;float:left;'>ShipFrom_City_State_ZipCode_Country_or</div>
-
+<div style='width:25%;float:left;'>Address:</div>
+<div style='width:75%;float:left;'>ShipFromAddress_or_</div>
 </div></div>
 <div><p><b style='font-size:20px;'>Freight bill to information</b></p>
 <div style='margin-left:15px;word-wrap:break-word;word-break:break-all;'>
@@ -33,12 +25,8 @@
 <div style='width:75%;float:left;'>FreightBillToCompany_or_</div>
 <div style='width:25%;float:left;'>Name:</div>
 <div style='width:75%;float:left;'>FreightBillToName_or_</div>
-<div style='width:25%;float:left;'>Address1:</div>
-<div style='width:75%;float:left;'>FreightBillToAddress_1_or_</div>
-<div style='width:25%;float:left;'>Address2:</div>
-<div style='width:75%;float:left;'>FreightBillToAddress_2_or_</div>
-<div style='width:100%;float:left;'>FreightBillTo_City_State_ZipCode_Country_or</div>
-
+<div style='width:25%;float:left;'>Address:</div>
+<div style='width:75%;float:left;'>FreightBillToAddress_or_</div>
 </div></div></div> 
 <div id='right-div' style='width:45%;float:left;margin-left:55px;margin-bottom:55px;'>
 <div><p><b style='font-size:20px;'>Merchandise bill to information</b></p>
@@ -47,12 +35,8 @@
 <div style='width:75%;float:left;'>MerchandiseBillToCompany_or_</div>
 <div style='width:25%;float:left;'>Name:</div>
 <div style='width:75%;float:left;'>MerchandiseBillToName_or_</div>
-<div style='width:25%;float:left;'>Address1:</div>
-<div style='width:75%;float:left;'>MerchandiseBillToAddress_1_or_</div>
-<div style='width:25%;float:left;'>Address2:</div>
-<div style='width:75%;float:left;'>MerchandiseBillToAddress_2_or_</div>
-<div style='width:100%;float:left;'>MerchandiseBillTo_City_State_ZipCode_Country_or</div>
-
+<div style='width:25%;float:left;'>Address:</div>
+<div style='width:75%;float:left;'>MerchandiseBillToAddress_or_</div>
 </div></div>
 <div><p><b style='font-size:20px;'>Return to information</b></p>
 <div style='margin-left:15px;word-wrap:break-word;word-break:break-all;'>
@@ -60,11 +44,7 @@
 <div style='width:75%;float:left;'>ReturnToCompany_or_</div>
 <div style='width:25%;float:left;'>Name:</div>
 <div style='width:75%;float:left;'>ReturnToName_or_</div>
-<div style='width:25%;float:left;'>Address1:</div>
-<div style='width:75%;float:left;'>ReturnToAddress_1_or_</div>
-<div style='width:25%;float:left;'>Address2:</div>
-<div style='width:75%;float:left;'>ReturnToAddress_2_or_</div>
-<div style='width:100%;float:left;'>ReturnTo_City_State_ZipCode_Country_or</div>
-
+<div style='width:25%;float:left;'>Address:</div>
+<div style='width:75%;float:left;'>ReturnToAddress_or_</div>
 </div></div></div>
-</body>
+</body>

RedAnt ERP Mobile/iSales-NPD/order_info.html

@@ -27,13 +27,13 @@
     Payment_info_or_nbsp
 </div></div>
 <div id='left_div' style='width:45%;float:left;padding-left:15px;margin-bottom:55px;'>
-<div><p><b style='font-size:20px;'>Remarks Content</b></p>
+<div><p><b style='font-size:20px;'>Remarks</b></p>
 <div style='margin-left:15px;word-wrap:break-word;word-break:break-all;'>Liftgate Fee(No loading dock): LiftgateFee_or_nbsp<br>
 <div style='width:32%;float:left;'>General notes:</div>
 <div style='width:68%;float:left;'>GeneralNotes_or_nbsp</div>
-<div style='width:32%;float:left;'>Internal notes:</div>
-<div style='width:68%;float:left;'>InternalNotes_or_nbsp</div>
+<!--<div style='width:32%;float:left;'>Internal notes:</div>-->
+<!--<div style='width:68%;float:left;'>InternalNotes_or_nbsp</div>-->
 </div></div></div>
 <div style='clear:both;'></div>
 </div>
-</body>
+</body>