Parcourir la source

160920
Add: delete temp order logic

Ray Zhang il y a 9 ans
Parent
commit
5fbfbf3a71

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


+ 64 - 32
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -143,7 +143,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1319"
             endingLineNumber = "1319"
-            landmarkName = "-check_offline:useInternalAddress:parentvc:"
+            landmarkName = "-download_offline:useInternalAddress:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -154,11 +154,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2300"
-            endingLineNumber = "2300"
+            startingLineNumber = "2311"
+            endingLineNumber = "2311"
             landmarkName = "+model_subtotal:count:db:compute_part:"
             landmarkType = "5">
          </BreakpointContent>
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2415"
-            endingLineNumber = "2415"
+            startingLineNumber = "2426"
+            endingLineNumber = "2426"
             landmarkName = "+offline_requestcart:"
             landmarkType = "5">
          </BreakpointContent>
@@ -186,11 +186,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2179"
-            endingLineNumber = "2179"
+            startingLineNumber = "2190"
+            endingLineNumber = "2190"
             landmarkName = "+model_bundle:db:compute_part:"
             landmarkType = "5">
          </BreakpointContent>
@@ -202,11 +202,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2281"
-            endingLineNumber = "2281"
+            startingLineNumber = "2292"
+            endingLineNumber = "2292"
             landmarkName = "+model_subtotal:count:db:compute_part:"
             landmarkType = "5">
          </BreakpointContent>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3347"
-            endingLineNumber = "3347"
+            startingLineNumber = "3358"
+            endingLineNumber = "3358"
             landmarkName = "+category_img:db:"
             landmarkType = "5">
          </BreakpointContent>
@@ -234,11 +234,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495515134.297926"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3351"
-            endingLineNumber = "3351"
+            startingLineNumber = "3362"
+            endingLineNumber = "3362"
             landmarkName = "+category_img:db:"
             landmarkType = "5">
          </BreakpointContent>
@@ -463,7 +463,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1982"
             endingLineNumber = "1982"
-            landmarkName = "-connectionDidFinishLoading:"
+            landmarkName = "-connection:didReceiveData:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -522,11 +522,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495941323.231705"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2657"
-            endingLineNumber = "2657"
+            startingLineNumber = "2668"
+            endingLineNumber = "2668"
             landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
@@ -554,11 +554,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495941528.063804"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2659"
-            endingLineNumber = "2659"
+            startingLineNumber = "2670"
+            endingLineNumber = "2670"
             landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
@@ -650,11 +650,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495947579.790595"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4185"
-            endingLineNumber = "4185"
+            startingLineNumber = "4196"
+            endingLineNumber = "4196"
             landmarkName = "+offline_contactlist:"
             landmarkType = "5">
          </BreakpointContent>
@@ -666,11 +666,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "495947687.684496"
+            timestampString = "496043845.130687"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4368"
-            endingLineNumber = "4368"
+            startingLineNumber = "4379"
+            endingLineNumber = "4379"
             landmarkName = "+offline_contactlist:"
             landmarkType = "5">
          </BreakpointContent>
@@ -979,5 +979,37 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/data_provider/iSalesNetwork.m"
+            timestampString = "496043381.841446"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "930"
+            endingLineNumber = "930"
+            landmarkName = "+release_Order:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "496043845.130687"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "9104"
+            endingLineNumber = "9104"
+            landmarkName = "+offline_resetorder:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -1813,8 +1813,12 @@
 }
 +(NSDictionary*) offline_logout :(NSMutableDictionary *) params
 {
+    UIApplication * app = [UIApplication sharedApplication];
+    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
     
-    
+    appDelegate.disable_trigger=true;
+    [iSalesDB execSql:@"delete from offline_order where status=0;"];
+    appDelegate.disable_trigger=false;
     //
     //    NSString* user = [params valueForKey:@"user"];
     //
@@ -1826,8 +1830,7 @@
     
     ret[@"result"]=[NSNumber numberWithInt:2 ];
     
-    UIApplication * app = [UIApplication sharedApplication];
-    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+
     
     appDelegate.cart_count = 0;//[[jsobj valueForKey:@"cart_count"] intValue];
     appDelegate.wish_count =0;//[[jsobj valueForKey:@"wish_count"] intValue];
@@ -1960,6 +1963,14 @@
 }
 +(NSData*) offline_createorder :(NSMutableDictionary *) params
 {
+    
+    UIApplication * app = [UIApplication sharedApplication];
+    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+    
+    appDelegate.disable_trigger=true;
+    [iSalesDB execSql:@"delete from offline_order where status=0;"];
+    appDelegate.disable_trigger=false;
+    
     NSMutableDictionary* ret = [[NSMutableDictionary alloc] init];
     
     NSString* customer_cid = [self translateSingleQuote:params[@"customer_cid"]];
@@ -9089,6 +9100,14 @@
 
 +(NSData*) offline_resetorder :(NSMutableDictionary *) params
 {
+    
+    UIApplication * app = [UIApplication sharedApplication];
+    AppDelegate *appDelegate = (AppDelegate *)[app delegate];
+    
+    appDelegate.disable_trigger=true;
+    [iSalesDB execSql:@"delete from offline_order where status=0;"];
+    appDelegate.disable_trigger=false;
+    
     NSMutableDictionary *dic = [NSMutableDictionary dictionary];
     [dic setValue:[NSNumber numberWithInteger:2] forKey:@"result"];
     return [RAUtils dict2data:dic];