Просмотр исходного кода

修改离线Place Order,删除Handling Fee。
Order Detail恢复Handling Fee。

Pen Li 9 лет назад
Родитель
Сommit
9615ae5331

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


+ 14 - 13
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -8331,7 +8331,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
 
     }
     // total
-    totalPrice = payments_and_credist + lift_gate + handlingFee + shippingFee;
+    totalPrice = payments_and_credist + lift_gate + shippingFee + handlingFee;
     ret[@"Total"] = [NSString stringWithFormat:@"$%.2f",totalPrice];
     
     ret[@"order_info"]= orderinfo;
@@ -8525,7 +8525,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     }];
     
     // total
-    total = payments_and_credist + lift_gate + handlingFee + shippingFee;
+    total = payments_and_credist + lift_gate + shippingFee + handlingFee;
 
 
     if (close) {
@@ -9956,15 +9956,16 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                                };
     [dic setValue:payments_dic forKey:@"item_0"];
     
-    NSDictionary *handling_fee_dic = @{
-                                       @"align" : @"right",
-                                       @"aname" : @"Handling Fee",
-                                       @"control" : @"text",
-                                       @"name" : @"handling_fee_value",
-                                       @"required" : @"true",
-                                       @"type" : @"price",
-                                       @"value" : @"Shipping To Be Quoted"/*[NSString stringWithFormat:@"%.2f",handling_fee]*/
-                                       };
+    // version 1.71 remove
+//    NSDictionary *handling_fee_dic = @{
+//                                       @"align" : @"right",
+//                                       @"aname" : @"Handling Fee",
+//                                       @"control" : @"text",
+//                                       @"name" : @"handling_fee_value",
+//                                       @"required" : @"true",
+//                                       @"type" : @"price",
+//                                       @"value" : @"Shipping To Be Quoted"/*[NSString stringWithFormat:@"%.2f",handling_fee]*/
+//                                       };
    
     
     NSDictionary *shipping_dic = @{
@@ -10006,8 +10007,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         }
     }
 
-    
-    [dic setValue:handling_fee_dic forKey:[NSString stringWithFormat:@"item_%d",item_count++]];
+    // version 1.71 remove
+//    [dic setValue:handling_fee_dic forKey:[NSString stringWithFormat:@"item_%d",item_count++]];
     
     
     

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

@@ -1412,7 +1412,7 @@
         }
     }
     if(section==3)
-        return 5;
+        return 6;
     return 0;
     
 }
@@ -1793,14 +1793,19 @@
                     cell.priceLabel.text =[self.content_data valueForKey:@"Liftgate Fee(No loading dock)"];
                     break;
                 case 3: {
-//                    cell.chargeLabel.text = @"Handling Fee:";
-//                    cell.priceLabel.text =[self.content_data valueForKey:@"Handling Fee"];
+                    cell.chargeLabel.text = @"Handling Fee:";
+                    cell.priceLabel.text =[self.content_data valueForKey:@"Handling Fee"];
+            
+                }
+                    break;
+                case 4: {
                     cell.chargeLabel.text = @"Tax:";
                     NSString *tax = [self.content_data valueForKey:@"Tax"] ? [self.content_data valueForKey:@"Tax"] : @"$0.00";
                     cell.priceLabel.text = tax;
                 }
                     break;
-                case 4: {
+                case 5:
+                {
                     NSString* price=[self.content_data valueForKey:@"Total"];
                     if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
                     {
@@ -1812,11 +1817,6 @@
                     }
                     cell.chargeLabel.text = @"Total:";
                     cell.priceLabel.text =price;
-                }
-                    break;
-                case 5:
-                {
-                    
                     break;
                 }
                 default: