修复离线Add All Add To Portfolio错误。

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,89 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            condition = "[nscontact_id isEqualToString:@&quot;ECODYN0001&quot;]"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507027587.197879"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "6361"
-            endingLineNumber = "6361"
-            landmarkName = "+offline_contactlist:"
-            landmarkType = "7">
-            <Actions>
-               <BreakpointActionProxy
-                  ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
-                  <ActionContent
-                     consoleCommand = "">
-                  </ActionContent>
-               </BreakpointActionProxy>
-            </Actions>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "507027587.197879"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "5672"
-            endingLineNumber = "5672"
-            landmarkName = "+offline_getStateByCountryCodeId:checkedState:"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "+[OLDataProvider offline_getPrice]"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/macmini1/project/RedAnt%20ERP%20Mobile/common/Functions/offline/OLDataProvider.m"
-                  timestampString = "507014833.451939"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "5669"
-                  endingLineNumber = "5669"
-                  offsetFromSymbolStart = "86">
-               </Location>
-               <Location
-                  shouldBeEnabled = "No"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "__34+[OLDataProvider offline_getPrice]_block_invoke"
-                  moduleName = "NPD Mobile"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/macmini1/project/RedAnt%20ERP%20Mobile/common/Functions/offline/OLDataProvider.m"
-                  timestampString = "507014833.454764"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "5671"
-                  endingLineNumber = "5671"
-                  offsetFromSymbolStart = "84">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -5513,7 +5513,15 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     } else if([add_to isEqualToString:@"portfolio"]) {
         
         
+        NSDictionary *newParams = @{
+                                    @"product_id" : product_id_str
+                                    };
+        NSData *data = [self offline_add2Portfolio:newParams.mutableCopy];
+        NSMutableDictionary *retDic = [[NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:nil] mutableCopy];
+        
+        [retDic setValue:[NSNumber numberWithInteger:count] forKey:@"count"];
         
+        ret = [RAUtils dict2data:retDic];
     }
     
     return ret;
@@ -7876,7 +7884,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             if(logist==nil)
                 logist= "";
             NSString *nslogist=[[NSString alloc]initWithUTF8String:logist];
-            if (status == -11 || status == 10 || status == 11) {
+            if (/*status == -11 || */status == 10 || status == 11) {
                 nslogist = [self textAtColumn:59 statement:statement];
             };
             
@@ -7901,6 +7909,15 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
                 ret[@"Liftgate Fee(No loading dock)"] = @"Shipping To Be Quoted";
             }
             
+//            if ([nslogist isEqualToString:@"WILL CALL"]) {
+//                [ret removeObjectForKey:@"Shipping"];
+//                [ret removeObjectForKey:@"Liftgate Fee(No loading dock)"];
+//            }
+//            
+//            if (have_lift_gate) {
+//                [ret removeObjectForKey:@"Liftgate Fee(No loading dock)"];
+//            }
+            
             char *general_notes = (char*)sqlite3_column_text(statement, 14);
             if(general_notes==nil)
                 general_notes= "";