Sfoglia il codice sorgente

修复 place order 中total没显示(缺少count),增加lift gate、shipping

Pen Li 9 anni fa
parent
commit
b999d9a005

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


+ 28 - 4
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -6711,6 +6711,28 @@
                                        };
     [dic setValue:handling_fee_dic forKey:@"item_1"];
     
+    NSDictionary *shipping_dic = @{
+                                   @"align" : @"right",
+                                   @"aname" : @"Shipping",
+                                   @"control" : @"text",
+                                   @"name" : @"shipping",
+                                   @"required" : @"true",
+                                   @"type" : @"price",
+                                   @"value" : [NSString stringWithFormat:@"%.2f",shipping]
+                                   };
+    [dic setValue:shipping_dic forKey:@"item_2"];
+    
+    NSDictionary *lift_gate_dic = @{
+                                   @"align" : @"right",
+                                   @"aname" : @"Lift Gate",
+                                   @"control" : @"text",
+                                   @"name" : @"lift_gate_value",
+                                   @"required" : @"true",
+                                   @"type" : @"price",
+                                   @"value" : [NSString stringWithFormat:@"%.2f",lift_gate_value]
+                                   };
+    [dic setValue:lift_gate_dic forKey:@"item_3"];
+    
     NSDictionary *total_price_dic = @{
                                       @"align" : @"right",
                                       @"aname" : @"Total",
@@ -6719,7 +6741,7 @@
                                       @"type" : @"price",
                                       @"value" : [NSString stringWithFormat:@"%.2f",totalPrice]
                                       };
-    [dic setValue:total_price_dic forKey:@"item_2"];
+    [dic setValue:total_price_dic forKey:@"item_4"];
     
     NSDictionary *total_cuft_dic = @{
                                      @"align" : @"right",
@@ -6728,7 +6750,7 @@
                                      @"name" : @"",
                                      @"value" : [NSString stringWithFormat:@"%.2f",totalCuft]
                                      };
-    [dic setValue:total_cuft_dic forKey:@"item_3"];
+    [dic setValue:total_cuft_dic forKey:@"item_5"];
     
     NSDictionary *total_weight_dic = @{
                                        @"align" : @"right",
@@ -6737,7 +6759,7 @@
                                        @"name" : @"",
                                        @"value" : [NSString stringWithFormat:@"%.2f",totalWeight]
                                        };
-    [dic setValue:total_weight_dic forKey:@"item_4"];
+    [dic setValue:total_weight_dic forKey:@"item_6"];
     
     NSDictionary *total_carton_dic = @{
                                        @"align" : @"right",
@@ -6746,7 +6768,9 @@
                                        @"name" : @"",
                                        @"value" : [NSString stringWithFormat:@"%d",totalCarton]
                                        };
-    [dic setValue:total_carton_dic forKey:@"item_5"];
+    [dic setValue:total_carton_dic forKey:@"item_7"];
+    
+    [dic setValue:[NSNumber numberWithInteger:8] forKey:@"count"];
     
     return dic;
 }