161206

Change:
shop login
shop order print receipt when state is saved / transmitted
sales order print sales order when state is submitted.

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

@@ -67,5 +67,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderDetailViewController.m"
+            timestampString = "502684300.770064"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "337"
+            endingLineNumber = "337"
+            landmarkName = "-onDownloadOrderClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderListViewController.m"
+            timestampString = "502685695.7746"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1103"
+            endingLineNumber = "1103"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/order/OrderDetailViewController.m"
+            timestampString = "502686274.990095"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "933"
+            endingLineNumber = "933"
+            landmarkName = "-loaddata"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.h

@@ -15,6 +15,7 @@
 @property (strong,nonatomic) NSString* orderid;
 @property (strong,nonatomic) NSString* order_code;
 @property int order_status;
+@property bool is_shoporder;
 @property (strong,nonatomic) NSString* orderstatus;
 //@property bool isTempOrder;
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *btnOpen;

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -1116,7 +1116,7 @@
     };
     NSString* order_code =[self.content_data[indexPath.row] valueForKey:@"order_code"];
     
-    
+    dvc.is_shoporder=(self.orderType == 0);
     dvc.order_code = order_code;
     dvc.order_status =[[self.content_data[indexPath.row] valueForKey:@"orderStatus"] intValue];
     //    bool temp_order = false ;