20170301

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

@@ -307,5 +307,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/cart/CartViewController.m"
+            timestampString = "510041351.481276"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1923"
+            endingLineNumber = "1923"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "common/Functions/cart/CartViewController.m"
+            timestampString = "510041357.515178"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1933"
+            endingLineNumber = "1933"
+            landmarkName = "-tableView:editActionsForRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RedAnt ERP Mobile/common/Functions/PDF+Web/PDFViewController.m

@@ -72,6 +72,23 @@
         self.navigationItem.rightBarButtonItems =items;
         
         
+       if (self.navigationController.viewControllers[0]==self )
+       {
+           UIBarButtonItem *closeButton =nil;
+           
+           
+           
+           closeButton=[[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"close"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+                                                        style:UIBarButtonItemStylePlain
+                                                       target:self
+                                                       action:@selector( onCloseClick:)];
+           //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
+           //    closeButton.title = @"Close";
+           
+           self.navigationItem.leftBarButtonItem = closeButton;
+       }
+
+        
     }
     else
     {
@@ -152,6 +169,11 @@
     
     [self.navigationController popViewControllerAnimated:FALSE];
 }
+- (void)onCloseClick:(UIButton *)sender {
+    
+    [self dismissViewControllerAnimated:false completion:nil];
+    //[self.navigationController popViewControllerAnimated:FALSE];
+}
 -(void)ReloadData
 {
     
@@ -253,11 +275,15 @@
                 self.btnemail.enabled =true;
                 self.btnsave.enabled =true;
                 
-                if(self.onLoadSuccess)
-                    self.onLoadSuccess(self.url);
                 
-                if(self.autoPrint)
-                    [self startAirPrintWithData:self.content];
+                
+                NSURL *url = [NSURL fileURLWithPath:filePath];
+                NSURLRequest *request = [NSURLRequest requestWithURL:url];
+                [self.webView loadRequest:request];
+                
+                
+
+                
                 
                 
  //               int a=0;
@@ -277,7 +303,7 @@
             
 //            DebugLog(urlResponse.MIMEType);
             
-            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
+//            [self.webView loadData:self.content MIMEType:urlResponse.MIMEType textEncodingName:nil baseURL:nil];
             
             
             
@@ -647,8 +673,17 @@
     self.mum.hidden=true;
     
     
+    if(self.onLoadSuccess)
+        self.onLoadSuccess(self.url);
+    
+    if(self.autoPrint)
+        [self startAirPrintWithData:self.content];
+    
+}
+- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error
+{
+    
 }
-
 #pragma mark -MFMailComposeViewControllerDelegate delegate
 
 - (void)mailComposeController:(MFMailComposeViewController*)controller

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

@@ -1753,7 +1753,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 }
 /*
  #pragma mark - Navigation
- 
+  
  // In a storyboard-based application, you will often want to do a little preparation before navigation
  - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
  // Get the new view controller using [segue destinationViewController].

RedAnt ERP Mobile/common/Functions/signature/signature.storyboard

@@ -49,7 +49,7 @@
                                         <rect key="frame" x="0.0" y="28" width="376" height="128"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pJ2-Li-nq4" id="hwz-Mn-MnM">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="127"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="128"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="5Hk-1I-EQp">
@@ -125,14 +125,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="g0z-bw-GId">
-                                                    <rect key="frame" x="15" y="4" width="34" height="21"/>
+                                                    <rect key="frame" x="15" y="5" width="34" height="21"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PC3-Mi-xw7">
-                                                    <rect key="frame" x="15" y="25" width="33" height="15"/>
+                                                    <rect key="frame" x="15" y="26" width="33" height="14"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <nil key="textColor"/>

RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -1545,6 +1545,7 @@
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
 						DevelopmentTeam = HXWLAA5YN5;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};