Browse Source

修改Order Detail,在HMLG中去除Lift Gate Fee和 Handling Fee。

Pen Li 9 năm trước cách đây
mục cha
commit
62b981e9fc

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


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

@@ -1411,8 +1411,13 @@
             return 0;
         }
     }
-    if(section==3)
+    if(section==3) {
+#ifdef BUILD_NPD
         return 6;
+#else
+        return 4;
+#endif
+    }
     return 0;
     
 }
@@ -1793,13 +1798,34 @@
                     cell.chargeLabel.text = @"Shipping:";
                     cell.priceLabel.text =[self.content_data valueForKey:@"Shipping"];
                     break;
-                case 2:
+                case 2: {
+#ifdef BUILD_NPD
                     cell.chargeLabel.text = @"Liftgate Fee(No loading dock):";
                     cell.priceLabel.text =[self.content_data valueForKey:@"Liftgate Fee(No loading dock)"];
+#else
+                    cell.chargeLabel.text = @"Tax:";
+                    NSString *tax = [self.content_data valueForKey:@"Tax"] ? [self.content_data valueForKey:@"Tax"] : @"$0.00";
+                    cell.priceLabel.text = tax;
+#endif
+                }
                     break;
                 case 3: {
+#ifdef BUILD_NPD
                     cell.chargeLabel.text = @"Handling Fee:";
                     cell.priceLabel.text =[self.content_data valueForKey:@"Handling Fee"];
+#else
+                    NSString* price=[self.content_data valueForKey:@"Total"];
+                    if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
+                    {
+                        
+                    }
+                    else
+                    {
+                        price=nil;
+                    }
+                    cell.chargeLabel.text = @"Total:";
+                    cell.priceLabel.text =price;
+#endif
             
                 }
                     break;