160824

Fix bug Cart edit delete / move without checkmark.
Add func
offline_cartsetqty
offline_cancelorder

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

@@ -176,7 +176,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
@@ -361,7 +361,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1820"
             endingLineNumber = "1820"
-            landmarkName = "+offline_cartsetlnotes:"
+            landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -404,11 +404,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "493633177.587166"
+            timestampString = "493694672.763421"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3002"
-            endingLineNumber = "3002"
+            startingLineNumber = "3009"
+            endingLineNumber = "3009"
             landmarkName = "+parse_authinfo:user:password:"
             landmarkType = "5">
          </BreakpointContent>
@@ -919,7 +919,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1806"
             endingLineNumber = "1806"
-            landmarkName = "+offline_movecart2wish:"
+            landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -935,7 +935,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1802"
             endingLineNumber = "1802"
-            landmarkName = "+offline_updategnotes:"
+            landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1003,5 +1003,53 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493636604.083141"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5535"
+            endingLineNumber = "5535"
+            landmarkName = "+offline_cartsetprice:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493636605.506382"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "5536"
+            endingLineNumber = "5536"
+            landmarkName = "+offline_cartsetprice:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493636790.107116"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1678"
+            endingLineNumber = "1678"
+            landmarkName = "+offline_requestcart:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -532,7 +532,7 @@
                 if(result==2||result==1||result==0)
                 {
                     
-                    
+                    [self.edit_select_arr removeAllObjects];
                     
                     self.itemListTable.hidden = false;
                     UIApplication * app = [UIApplication sharedApplication];

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

@@ -48,6 +48,7 @@
 +(NSData*) offline_orderlist :(NSMutableDictionary *) params;
 +(NSData*) offline_orderdetail :(NSMutableDictionary *) params;
 +(NSData*) offline_editorder :(NSMutableDictionary *) params;
++(NSData*) offline_cancelorder :(NSMutableDictionary *) params;
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 +(NSData*) offline_requestcart :(NSMutableDictionary *) params;
 +(NSData*) offline_updategnotes :(NSMutableDictionary *) params;
@@ -55,6 +56,8 @@
 +(NSData*) offline_cartremove :(NSMutableDictionary *) params;
 +(NSData*) offline_cartsetprice :(NSMutableDictionary *) params;
 +(NSData*) offline_cartsetlnotes :(NSMutableDictionary *) params;
++(NSData*) offline_cartsetqty :(NSMutableDictionary *) params;
+
 +(NSDictionary*) offline_category_menu ;
 +(NSDictionary*) offline_home ;
 

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

@@ -1412,7 +1412,10 @@
     
     
 }
-
++(NSData*) offline_cancelorder :(NSMutableDictionary *) params
+{
+    return nil;
+}
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 {
     NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
@@ -5569,7 +5572,10 @@
     return [RAUtils dict2data:dic];
 }
 
-
++(NSData*) offline_cartsetqty :(NSMutableDictionary *) params
+{
+    return nil;
+}
 
 
 @end

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -881,13 +881,17 @@ repeat:
     [params setValue:order_code forKey:@"orderCode"];
     //    [params setValue:sourceid forKey:@"sourceid"];
     //    [params setValue:editor forKey:@"editor"];
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json=[OLDataProvider offline_cancelorder:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
-    NSData* json=[self get_json:URL_CANCEL_ORDER parameters:params];
+    json=[self get_json:URL_CANCEL_ORDER parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;
@@ -2078,15 +2082,18 @@ repeat:
     
     [params setValue:[NSString stringWithFormat:@"%d",value] forKey:@"inputInt"];
     
-    
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_cartsetqty:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART_INCRESEMENT parameters:params];
+    json=[self get_json:URL_CART_INCRESEMENT parameters:params];
+    }
     if(json==nil)
         return nil;
     NSError *error=nil;