Pārlūkot izejas kodu

160903
cart support rate model

Ray Zhang 9 gadi atpakaļ
vecāks
revīzija
925803c19d

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


+ 19 - 3
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -266,14 +266,30 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "iSales-NPD/AppDelegate.m"
-            timestampString = "494411854.570303"
+            timestampString = "494577508.773682"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "991"
-            endingLineNumber = "991"
+            startingLineNumber = "1020"
+            endingLineNumber = "1020"
             landmarkName = "-check_offline:useInternalAddress:parentvc:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/cart/CartViewController.m"
+            timestampString = "494582436.342054"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "392"
+            endingLineNumber = "392"
+            landmarkName = "-imgbtnClick:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -390,6 +390,10 @@
     
     NSString* product_id = [item_json valueForKey:@"product_id"];
     
+    int is_rate = [item_json[@"is_rate"] intValue];
+    if(is_rate==1)
+        return;
+    
     DetailViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DetailViewController" ];
     //            dvc
     
@@ -2030,7 +2034,8 @@
         NSMutableDictionary * item_json = [self.content_arr[indexPath.row ] mutableCopy];// [[self.content_data objectForKey:[NSString stringWithFormat:@"item_%ld",(long)indexPath.row]]
         NSString* product_id = [item_json valueForKey:@"product_id"];
         
-        
+        int is_rate = [item_json[@"is_rate"] intValue];
+
         NSMutableArray* arr=[@[] mutableCopy];
         
         if(product_id.length>0)
@@ -2038,10 +2043,10 @@
         
         [arr addObject:deleteRowAction];
         
-        if(product_id.length>0)
+        if(product_id.length>0&& is_rate==0)
             [arr addObject:addWatchAction];
         
-        if(appDelegate.can_set_cart_price && product_id.length>0)
+        if(appDelegate.can_set_cart_price && product_id.length>0&& is_rate==0)
         {
             [arr addObject:editRowAction];
             // [arr addObject:freeRowAction];