Procházet zdrojové kódy

修改Order Detail中Payment为Sub Total,同时修改离线数据

Pen Li před 9 roky
rodič
revize
e8040ecd06

binární
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -1971,7 +1971,7 @@
             
             if (self.currentOrderIsMerged) { // 合并过的订单不能编辑价格
                 
-                UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Warning" message:@"Sales Order Can't Edit Price" preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Warning" message:@"Purchase Order Can't Edit Price" preferredStyle:UIAlertControllerStyleAlert];
                 
                 UIAlertAction *action = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
                     [alert dismissViewControllerAnimated:YES completion:nil];

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

@@ -8177,7 +8177,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         // payments/Credits
 //        payments_and_credist = sqlite3_column_double(statement, 34);
         payments_and_credist = allItemPrice;
-        ret[@"Payments/Credits"] = [NSString stringWithFormat:@"$%.2f",payments_and_credist];
+        ret[@"Sub-Total"] = [NSString stringWithFormat:@"$%.2f",payments_and_credist];
         
 //        // total
 //        totalPrice = sqlite3_column_double(statement, 35);
@@ -8192,7 +8192,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         
         // payments/Credits
         payments_and_credist = 0;
-        ret[@"Payments/Credits"] = [NSString stringWithFormat:@"$%.2f",payments_and_credist];
+        ret[@"Sub-Total"] = [NSString stringWithFormat:@"$%.2f",payments_and_credist];
 
 
     }

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

@@ -1732,8 +1732,8 @@
             switch (indexPath.row) {
                 case 0:
                 {
-                    cell.chargeLabel.text =@"Payments/Credits:";
-                    NSString* price=[self.content_data valueForKey:@"Payments/Credits"];
+                    cell.chargeLabel.text =@"Sub-Total:";
+                    NSString* price=[self.content_data valueForKey:@"Sub-Total"];
                     if(appDelegate.can_see_price&&appDelegate.price_hidden==false)
                     {