160918

Add: offline_resetorder;
offline_copyorder

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

@@ -250,11 +250,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2606"
-            endingLineNumber = "2606"
+            startingLineNumber = "2610"
+            endingLineNumber = "2610"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -266,11 +266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2608"
-            endingLineNumber = "2608"
+            startingLineNumber = "2612"
+            endingLineNumber = "2612"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -282,11 +282,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2609"
-            endingLineNumber = "2609"
+            startingLineNumber = "2613"
+            endingLineNumber = "2613"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -298,11 +298,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2600"
-            endingLineNumber = "2600"
+            startingLineNumber = "2604"
+            endingLineNumber = "2604"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -314,11 +314,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2603"
-            endingLineNumber = "2603"
+            startingLineNumber = "2607"
+            endingLineNumber = "2607"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -330,11 +330,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2607"
-            endingLineNumber = "2607"
+            startingLineNumber = "2611"
+            endingLineNumber = "2611"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -346,11 +346,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "495535520.904054"
+            timestampString = "495862645.888779"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2602"
-            endingLineNumber = "2602"
+            startingLineNumber = "2606"
+            endingLineNumber = "2606"
             landmarkName = "+Category_addall:customid:price_template:sort:filter:keyword:offset:limit:alert:qty:available:price:bestseller:modelname:modeldescrip:orderCode:addTo:"
             landmarkType = "5">
          </BreakpointContent>

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

@@ -57,7 +57,8 @@
 +(NSData*) offline_cancelorder :(NSMutableDictionary *) params;
 +(NSData*) offline_signorder :(NSMutableDictionary *) params;
 +(NSData*) offline_saveorder :(NSMutableDictionary *) params;
-
++(NSData*) offline_resetorder :(NSMutableDictionary *) params;
++(NSData*) offline_copyorder :(NSMutableDictionary *) params;
 
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 +(NSData*) offline_add2cartbyname :(NSMutableDictionary *) params;

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

@@ -8657,7 +8657,16 @@
     
     return  ret;
 }
-
++(NSData*) offline_resetorder :(NSMutableDictionary *) params
+{
+        NSMutableDictionary *dic = [NSMutableDictionary dictionary];
+        [dic setValue:[NSNumber numberWithInteger:2] forKey:@"result"];
+    return [RAUtils dict2data:dic];
+}
++(NSData*) offline_copyorder :(NSMutableDictionary *) params;
+{
+    return [RAUtils dict2data:[self offline_notimpl]];
+}
 +(NSData*) offline_saveorder :(NSMutableDictionary *) param
 {
 //  "logistic_note" = "PERSONAL PICK UP";

RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -701,14 +701,18 @@ repeat:
     [params setValue:order_code forKey:@"code"];
     //    [params setValue:sourceid forKey:@"sourceid"];
     //    [params setValue:editor forKey:@"editor"];
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_copyorder:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_COPY_ORDER parameters:params];
+    json=[self get_json:URL_COPY_ORDER parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;
@@ -929,14 +933,18 @@ 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_resetorder:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_RELEASE_ORDER parameters:params];
+    json=[self get_json:URL_RELEASE_ORDER parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;