Przeglądaj źródła

161121
update offline sales order progress
add receipt option for customer sales order.

Ray Zhang 9 lat temu
rodzic
commit
d183a6c749

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


+ 16 - 0
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2226,5 +2226,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderDetailViewController.m"
+            timestampString = "501400341.714921"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "384"
+            endingLineNumber = "384"
+            landmarkName = "-onDownloadOrderClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 3 - 3
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -383,9 +383,9 @@
     
         int status_code = [[self.content_data valueForKey:@"orderStatus"] intValue];
     NSString* alertthreetitle=@"Without Thumbnails";
-        if(appDelegate.user_type==USER_ROLE_CUSTOMER&& status_code==1)
+        if(appDelegate.user_type==USER_ROLE_CUSTOMER&& (status_code==1 ||status_code==0))
         {
-            alertthreetitle=@"Receipt";
+            alertthreetitle=@"Show Receipt";
         }
     UIAlertAction *alertthree = [UIAlertAction actionWithTitle:alertthreetitle style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         
@@ -414,7 +414,7 @@
     
 
 
-    if(appDelegate.user_type==USER_ROLE_CUSTOMER&& status_code==1)//[status isEqualToString:@"Saved Order"])
+    if(appDelegate.user_type==USER_ROLE_CUSTOMER&& (status_code==1 ||status_code==0))//[status isEqualToString:@"Saved Order"])
     {
         [alertControl addAction:alertthree];
         [alertControl addAction:alertCancel];