Jelajahi Sumber

160823

ADD funcs
offline_updategnotes
offline_movecart2wish
offline_cartremove
offline_cartsetprice
offline_cartsetlnotes
Ray Zhang 9 tahun lalu
induk
melakukan
ac9c8c1f34

TEMPAT SAMPAH
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 88 - 40
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -132,11 +132,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "4489"
-            endingLineNumber = "4489"
+            startingLineNumber = "4509"
+            endingLineNumber = "4509"
             landmarkName = "+offline_itemsearch:"
             landmarkType = "5">
          </BreakpointContent>
@@ -176,7 +176,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
@@ -244,11 +244,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3404"
-            endingLineNumber = "3404"
+            startingLineNumber = "3424"
+            endingLineNumber = "3424"
             landmarkName = "+offline_contactlist:"
             landmarkType = "5">
          </BreakpointContent>
@@ -260,11 +260,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3593"
-            endingLineNumber = "3593"
+            startingLineNumber = "3613"
+            endingLineNumber = "3613"
             landmarkName = "+offline_contactlist:"
             landmarkType = "5">
          </BreakpointContent>
@@ -276,11 +276,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3705"
-            endingLineNumber = "3705"
+            startingLineNumber = "3725"
+            endingLineNumber = "3725"
             landmarkName = "+offline_createContact:"
             landmarkType = "5">
          </BreakpointContent>
@@ -292,11 +292,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3694"
-            endingLineNumber = "3694"
+            startingLineNumber = "3714"
+            endingLineNumber = "3714"
             landmarkName = "+offline_createContact:"
             landmarkType = "5">
          </BreakpointContent>
@@ -308,11 +308,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3797"
-            endingLineNumber = "3797"
+            startingLineNumber = "3817"
+            endingLineNumber = "3817"
             landmarkName = "+offline_saveContact:update:"
             landmarkType = "5">
          </BreakpointContent>
@@ -324,11 +324,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "3695"
-            endingLineNumber = "3695"
+            startingLineNumber = "3715"
+            endingLineNumber = "3715"
             landmarkName = "+offline_createContact:"
             landmarkType = "5">
          </BreakpointContent>
@@ -356,11 +356,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1800"
-            endingLineNumber = "1800"
+            startingLineNumber = "1820"
+            endingLineNumber = "1820"
             landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
@@ -372,11 +372,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1896"
-            endingLineNumber = "1896"
+            startingLineNumber = "1916"
+            endingLineNumber = "1916"
             landmarkName = "+offline_login:"
             landmarkType = "5">
          </BreakpointContent>
@@ -404,11 +404,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/data_provider/iSalesNetwork.m"
-            timestampString = "493538894.027185"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2984"
-            endingLineNumber = "2984"
+            startingLineNumber = "3001"
+            endingLineNumber = "3001"
             landmarkName = "+parse_authinfo:user:password:"
             landmarkType = "5">
          </BreakpointContent>
@@ -436,11 +436,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2018"
-            endingLineNumber = "2018"
+            startingLineNumber = "2038"
+            endingLineNumber = "2038"
             landmarkName = "+offline_contactinfo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -468,11 +468,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2037"
-            endingLineNumber = "2037"
+            startingLineNumber = "2057"
+            endingLineNumber = "2057"
             landmarkName = "+offline_contactinfo:"
             landmarkType = "5">
          </BreakpointContent>
@@ -596,11 +596,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/offline/OLDataProvider.m"
-            timestampString = "493606701.497055"
+            timestampString = "493617690.116092"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2576"
-            endingLineNumber = "2576"
+            startingLineNumber = "2596"
+            endingLineNumber = "2596"
             landmarkName = "+model_selector:field:db:"
             landmarkType = "5">
          </BreakpointContent>
@@ -891,5 +891,53 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493616761.723881"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1798"
+            endingLineNumber = "1798"
+            landmarkName = "+offline_updategnotes:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493616993.252884"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1806"
+            endingLineNumber = "1806"
+            landmarkName = "+offline_cartremove:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/offline/OLDataProvider.m"
+            timestampString = "493616993.766346"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1802"
+            endingLineNumber = "1802"
+            landmarkName = "+offline_movecart2wish:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 5 - 0
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.h

@@ -50,6 +50,11 @@
 +(NSData*) offline_editorder :(NSMutableDictionary *) params;
 +(NSData*) offline_add2cart :(NSMutableDictionary *) params;
 +(NSData*) offline_requestcart :(NSMutableDictionary *) params;
++(NSData*) offline_updategnotes :(NSMutableDictionary *) params;
++(NSData*) offline_movecart2wish :(NSMutableDictionary *) params;
++(NSData*) offline_cartremove :(NSMutableDictionary *) params;
++(NSData*) offline_cartsetprice :(NSMutableDictionary *) params;
++(NSData*) offline_cartsetlnotes :(NSMutableDictionary *) params;
 +(NSDictionary*) offline_category_menu ;
 +(NSDictionary*) offline_home ;
 

+ 20 - 0
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -1793,6 +1793,26 @@
     
     return [RAUtils dict2data:ret];
 }
++(NSData*) offline_updategnotes :(NSMutableDictionary *) params
+{
+    return nil;
+}
++(NSData*) offline_movecart2wish :(NSMutableDictionary *) params
+{
+    return nil;
+}
++(NSData*) offline_cartremove :(NSMutableDictionary *) params
+{
+    return nil;
+}
++(NSData*) offline_cartsetprice :(NSMutableDictionary *) params
+{
+    return nil;
+}
++(NSData*) offline_cartsetlnotes :(NSMutableDictionary *) params
+{
+    return nil;
+}
 +(NSData*) offline_login :(NSMutableDictionary *) params
 {
     

+ 29 - 12
RedAnt ERP Mobile/common/data_provider/iSalesNetwork.m

@@ -492,14 +492,18 @@ repeat:
         [params setValue:appDelegate.order_code forKey:@"orderCode"];
     [params setValue:item_ids forKey:@"cartItemId"];
     //    [params setValue:editor forKey:@"editor"];
+    NSData* json = nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_movecart2wish:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART2WISH parameters:params];
+    json=[self get_json:URL_CART2WISH parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;
@@ -578,14 +582,17 @@ repeat:
         [params setValue:appDelegate.order_code forKey:@"orderCode"];
     [params setValue:item_ids forKey:@"cartItemId"];
     //    [params setValue:editor forKey:@"editor"];
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_cartremove:params];
     }
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART_REMOVE parameters:params];
+    json=[self get_json:URL_CART_REMOVE parameters:params];
+    }
     if(json!=nil)
     {
         NSError *error=nil;
@@ -1861,15 +1868,18 @@ repeat:
     [params setValue:[NSString stringWithFormat:@"%f",price] forKey:@"price"];
     
     [params setValue:[NSString stringWithFormat:@"%f",discount] forKey:@"discount"];
-    
+    NSData* json= nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json=[OLDataProvider offline_cartsetprice:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART_SET_PRICE parameters:params];
+   json=[self get_json:URL_CART_SET_PRICE parameters:params];
+    }
     if(json==nil)
         return nil;
     NSError *error=nil;
@@ -1959,14 +1969,18 @@ repeat:
     
     
     [params setValue:notes forKey:@"comments"];
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_updategnotes:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART_GENERAL_NOTES parameters:params];
+     json=[self get_json:URL_CART_GENERAL_NOTES parameters:params];
+    }
     if(json==nil)
         return nil;
     NSError *error=nil;
@@ -1991,15 +2005,18 @@ repeat:
     
     
     [params setValue:notes forKey:@"notes"];
-    
+    NSData* json=nil;
     if(appDelegate.offline_mode)
     {
-        return [OLDataProvider offline_notimpl];
+        json= [OLDataProvider offline_cartsetlnotes:params];
     }
+    else
+    {
     if(![self IsNetworkAvailable])
         return [RAUtils error_json:RESULT_NET_NOTAVAILABLE err_msg:nil];
     
-    NSData* json=[self get_json:URL_CART_ITEM_NOTES parameters:params];
+    json=[self get_json:URL_CART_ITEM_NOTES parameters:params];
+    }
     if(json==nil)
         return nil;
     NSError *error=nil;