Parcourir la source

1.修改选择Customer时刷新Wish List。

Pen Li il y a 8 ans
Parent
commit
03d6afac54

+ 14 - 15
RedAnt ERP Mobile/HMLG Mobile.xcodeproj/project.pbxproj

@@ -39,7 +39,6 @@
 		428980941E24B2C2005F1BD8 /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980891E24B2C2005F1BD8 /* TextDrawable.m */; };
 		428980971E24B2E7005F1BD8 /* ImageUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980961E24B2E7005F1BD8 /* ImageUtils.m */; };
 		4289809A1E24B304005F1BD8 /* TextUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 428980991E24B304005F1BD8 /* TextUtils.m */; };
-		42A85BF31E60039A0058A9CE /* HWWeakTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A85BF21E60039A0058A9CE /* HWWeakTimer.m */; };
 		42A85BFB1E6004180058A9CE /* ERPUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A85BF61E6004180058A9CE /* ERPUtils.m */; };
 		42A85BFD1E6004180058A9CE /* PDFUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 42A85BFA1E6004180058A9CE /* PDFUtils.m */; };
 		42BB2F081E28986B0025C6CE /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42BB2F071E28986B0025C6CE /* signature.storyboard */; };
@@ -58,6 +57,8 @@
 		42BEF39F1E8A4C7D00632AB6 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 42BEF3921E8A4C7D00632AB6 /* README.md */; };
 		42BEF3A21E8A4D0000632AB6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF3A11E8A4D0000632AB6 /* SystemConfiguration.framework */; };
 		42BEF3A41E8A4D0700632AB6 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42BEF3A31E8A4D0700632AB6 /* CoreData.framework */; };
+		42D587B81F789731006B13F5 /* HWWeakTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D587B71F789731006B13F5 /* HWWeakTimer.m */; };
+		42D587BB1F7898F7006B13F5 /* ModelDescriptionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D587BA1F7898F7006B13F5 /* ModelDescriptionController.m */; };
 		715002021D13CDBE00F5927F /* BundleDetailButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 715002011D13CDBE00F5927F /* BundleDetailButton.m */; };
 		715850431CF6F0C400856B20 /* DefaultAppearance.m in Sources */ = {isa = PBXBuildFile; fileRef = 715850421CF6F0C400856B20 /* DefaultAppearance.m */; };
 		716AF8DE1D792157001188E0 /* offline_status_filter_cadedate.json in Resources */ = {isa = PBXBuildFile; fileRef = 716AF8DD1D792157001188E0 /* offline_status_filter_cadedate.json */; };
@@ -241,7 +242,6 @@
 		71C1D8201F45574200CEA1C9 /* PhotoList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71C1D81F1F45574200CEA1C9 /* PhotoList.storyboard */; };
 		71C1D8251F45574B00CEA1C9 /* PhotoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8221F45574B00CEA1C9 /* PhotoPreviewCell.m */; };
 		71C1D8261F45574B00CEA1C9 /* VideoPreviewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8241F45574B00CEA1C9 /* VideoPreviewCell.m */; };
-		71C1D8291F45586700CEA1C9 /* ModelDescriptionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71C1D8281F45586700CEA1C9 /* ModelDescriptionController.m */; };
 		71D30A2A1CFC0EDD006F9477 /* DefaultImageButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 71D30A291CFC0EDD006F9477 /* DefaultImageButton.m */; };
 /* End PBXBuildFile section */
 
@@ -310,8 +310,6 @@
 		428980961E24B2E7005F1BD8 /* ImageUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImageUtils.m; path = common/ImageUtils.m; sourceTree = SOURCE_ROOT; };
 		428980981E24B304005F1BD8 /* TextUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextUtils.h; path = common/TextUtils.h; sourceTree = SOURCE_ROOT; };
 		428980991E24B304005F1BD8 /* TextUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextUtils.m; path = common/TextUtils.m; sourceTree = SOURCE_ROOT; };
-		42A85BF11E60039A0058A9CE /* HWWeakTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HWWeakTimer.h; sourceTree = "<group>"; };
-		42A85BF21E60039A0058A9CE /* HWWeakTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWWeakTimer.m; sourceTree = "<group>"; };
 		42A85BF51E6004180058A9CE /* ERPUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ERPUtils.h; path = common/ERPUtils.h; sourceTree = SOURCE_ROOT; };
 		42A85BF61E6004180058A9CE /* ERPUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ERPUtils.m; path = common/ERPUtils.m; sourceTree = SOURCE_ROOT; };
 		42A85BF91E6004180058A9CE /* PDFUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFUtils.h; path = common/PDFUtils.h; sourceTree = SOURCE_ROOT; };
@@ -351,6 +349,10 @@
 		42BEF3921E8A4C7D00632AB6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		42BEF3A11E8A4D0000632AB6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		42BEF3A31E8A4D0700632AB6 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		42D587B61F789731006B13F5 /* HWWeakTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HWWeakTimer.h; path = common/AutoScrollImage/HWWeakTimer.h; sourceTree = SOURCE_ROOT; };
+		42D587B71F789731006B13F5 /* HWWeakTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HWWeakTimer.m; path = common/AutoScrollImage/HWWeakTimer.m; sourceTree = SOURCE_ROOT; };
+		42D587B91F7898F7006B13F5 /* ModelDescriptionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ModelDescriptionController.h; path = common/Functions/modelDetail/ModelDescriptionController.h; sourceTree = SOURCE_ROOT; };
+		42D587BA1F7898F7006B13F5 /* ModelDescriptionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ModelDescriptionController.m; path = common/Functions/modelDetail/ModelDescriptionController.m; sourceTree = SOURCE_ROOT; };
 		715002001D13CDBE00F5927F /* BundleDetailButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BundleDetailButton.h; path = common/Functions/BundleDetailButton.h; sourceTree = SOURCE_ROOT; };
 		715002011D13CDBE00F5927F /* BundleDetailButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BundleDetailButton.m; path = common/Functions/BundleDetailButton.m; sourceTree = SOURCE_ROOT; };
 		715850411CF6F0C400856B20 /* DefaultAppearance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultAppearance.h; path = common/Functions/DefaultAppearance.h; sourceTree = SOURCE_ROOT; };
@@ -696,8 +698,6 @@
 		71C1D8221F45574B00CEA1C9 /* PhotoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PhotoPreviewCell.m; path = View/PhotoPreviewCell.m; sourceTree = "<group>"; };
 		71C1D8231F45574B00CEA1C9 /* VideoPreviewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoPreviewCell.h; path = View/VideoPreviewCell.h; sourceTree = "<group>"; };
 		71C1D8241F45574B00CEA1C9 /* VideoPreviewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoPreviewCell.m; path = View/VideoPreviewCell.m; sourceTree = "<group>"; };
-		71C1D8271F45586700CEA1C9 /* ModelDescriptionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModelDescriptionController.h; sourceTree = "<group>"; };
-		71C1D8281F45586700CEA1C9 /* ModelDescriptionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModelDescriptionController.m; sourceTree = "<group>"; };
 		71D30A281CFC0EDD006F9477 /* DefaultImageButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultImageButton.h; path = common/Functions/DefaultImageButton.h; sourceTree = SOURCE_ROOT; };
 		71D30A291CFC0EDD006F9477 /* DefaultImageButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DefaultImageButton.m; path = common/Functions/DefaultImageButton.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -1132,8 +1132,8 @@
 		7183E8931CF29F3900524787 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				42A85BF11E60039A0058A9CE /* HWWeakTimer.h */,
-				42A85BF21E60039A0058A9CE /* HWWeakTimer.m */,
+				42D587B61F789731006B13F5 /* HWWeakTimer.h */,
+				42D587B71F789731006B13F5 /* HWWeakTimer.m */,
 				42BEF3631E8A4C7D00632AB6 /* GoogleAnalytics */,
 				428980731E24B2C2005F1BD8 /* pdfCreator */,
 				428980561E24935E005F1BD8 /* UIColor+HEX */,
@@ -1460,8 +1460,8 @@
 		7183E9851CF29FCB00524787 /* DetailView */ = {
 			isa = PBXGroup;
 			children = (
-				71C1D8271F45586700CEA1C9 /* ModelDescriptionController.h */,
-				71C1D8281F45586700CEA1C9 /* ModelDescriptionController.m */,
+				42D587B91F7898F7006B13F5 /* ModelDescriptionController.h */,
+				42D587BA1F7898F7006B13F5 /* ModelDescriptionController.m */,
 				7183E9791CF29FCB00524787 /* DetailHeaderCell.h */,
 				7183E97A1CF29FCB00524787 /* DetailHeaderCell.m */,
 				7183E97B1CF29FCB00524787 /* DetailImageCell.h */,
@@ -1766,7 +1766,6 @@
 				TargetAttributes = {
 					7183E8431CF2913E00524787 = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = HXWLAA5YN5;
 					};
 				};
 			};
@@ -1888,7 +1887,6 @@
 				7183E8A81CF29F3900524787 /* iSalesDB.m in Sources */,
 				7183E9071CF29F4500524787 /* PulldownMenu.m in Sources */,
 				7183E9E31CF29FCB00524787 /* WebViewController.m in Sources */,
-				42A85BF31E60039A0058A9CE /* HWWeakTimer.m in Sources */,
 				7183E9FC1CF29FCB00524787 /* RATreeView+TableViewDelegate.m in Sources */,
 				428980531E249340005F1BD8 /* JKLockButton.m in Sources */,
 				7183E9101CF29F4500524787 /* CommonEditorCellEdit.m in Sources */,
@@ -1900,6 +1898,7 @@
 				7183EA471CF2A06E00524787 /* iSalesNavigationController.m in Sources */,
 				7183E9EA1CF29FCB00524787 /* CartViewController.m in Sources */,
 				4289808B1E24B2C2005F1BD8 /* GridDrawable.m in Sources */,
+				42D587B81F789731006B13F5 /* HWWeakTimer.m in Sources */,
 				7183E8A01CF29F3900524787 /* split.c in Sources */,
 				7183EA2F1CF29FCB00524787 /* LoginViewController.m in Sources */,
 				7183E8981CF29F3900524787 /* ZipArchive.mm in Sources */,
@@ -1907,7 +1906,7 @@
 				428980381E2492E0005F1BD8 /* CategoryPriceCell.m in Sources */,
 				7183EA341CF29FCB00524787 /* FunctionTestViewController.m in Sources */,
 				7183E9211CF29F4500524787 /* DeviceInfo.m in Sources */,
-				71C1D8291F45586700CEA1C9 /* ModelDescriptionController.m in Sources */,
+				42D587BB1F7898F7006B13F5 /* ModelDescriptionController.m in Sources */,
 				7183E90F1CF29F4500524787 /* CommonEditorCellAction.m in Sources */,
 				428980591E24935E005F1BD8 /* UIColor+JK_HEX.m in Sources */,
 				7183EA211CF29FCB00524787 /* TearSheetParamViewController.m in Sources */,
@@ -2160,7 +2159,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",
@@ -2193,7 +2192,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",

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


+ 1 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -2203,7 +2203,7 @@
     else if([title isEqualToString:@"NPD Website"])
     {
         
-        NSString* url = @"https://shopla.homelegance.com/";//@"https://shopla.homelegance.com/general.htm?websiteId=1";//
+        NSString* url = @"https://www.newpacificdirect.com";//@"https://shopla.homelegance.com/general.htm?websiteId=1";//
         
         
         NSString* title = @"NPD";

+ 2 - 2
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -27,7 +27,7 @@
 #import "NotificationNameCenter.h"
 #import "Singleton.h"
 #import "JKMessageBoxController.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 
 #define ALERT_FREE 1024
 #define ALERT_DEL 1025
@@ -2882,7 +2882,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
 
 - (IBAction)printCartButtonClick:(UIButton *)sender {
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = self.print_url;
     ViewController.canSave = false;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/modelDetail/DetailViewController.m

@@ -26,7 +26,7 @@
 
 #import "CartUtils.h"
 #import "ImageUtils.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 
 #import "ModelDescriptionController.h"
 
@@ -2382,7 +2382,7 @@ self.isrefreshing=false;
     
     name = [NSString stringWithFormat:@"%@ Assembly Instruction",name];
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = link;
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;

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

@@ -19,7 +19,7 @@
 #import "RTLabel.h"
 #import "DetailViewController.h"
 
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "SignatureViewController.h"
 #import "MainViewController.h"
 #import "AFHTTPSessionManager.h"
@@ -45,7 +45,7 @@
 
 - (void)saleOrderWithPath:(NSString *)path {
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = path;
     ViewController.canSave = false;
@@ -340,7 +340,7 @@
     __weak typeof(self) weakself = self;
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.mail_content = [self.content_data valueForKey:@"email_content"];
     

+ 2 - 2
RedAnt ERP Mobile/common/Functions/portfolio/PDFListViewController.m

@@ -9,7 +9,7 @@
 #import "PDFListViewController.h"
 #import "PDFListTableViewCell.h"
 #import "iSalesNetwork.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "MainViewController.h"
 #import "DefaultAppearance.h"
 #import "DefaultTableHeaderView.h"
@@ -518,7 +518,7 @@
 
     BOOL isLocalFile= [[self.content_data[indexPath.row] valueForKey:@"isLocalFile"] boolValue];
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = url;
     ViewController.canSave = false;
     ViewController.isLocalfile=isLocalFile;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -18,7 +18,7 @@
 #import "ContactListViewController.h"
 #import "PortfolioEditQTYViewController.h"
 
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "DefaultTableHeaderView.h"
 #import "DefaultAppearance.h"
 #import "SortItemViewController.h"
@@ -405,7 +405,7 @@
        // NSString* name=[self.content_data[indexPath.row] valueForKey:@"tear_name"];
        // NSString* url= [self.content_data[indexPath.row] valueForKey:@"pdf_path"];
         
-        PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+        RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
         ViewController.url = url;
         ViewController.canSave = false;
         ViewController.isLocalfile=isLocalFile;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/portfolio/TearSheetParamViewController.m

@@ -8,7 +8,7 @@
 
 #import "TearSheetParamViewController.h"
 #import "iSalesNetwork.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "MainViewController.h"
 #import "Singleton.h"
 #import "TextUtils.h"
@@ -295,7 +295,7 @@
                 NSString* url = [editor_json valueForKey:@"pdf_path"];
                 NSString* path = [editor_json valueForKey:@"pdf_real_path"];
                 bool isLocalFile = [[editor_json valueForKey:@"isLocalFile"] boolValue];
-                PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+                RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
                 ViewController.url = url;
                 ViewController.canSave = true;
                 ViewController.isLocalfile=isLocalFile;

+ 2 - 2
RedAnt ERP Mobile/common/Functions/watchlist/WatchListViewController.m

@@ -22,7 +22,7 @@
 #import "SortButton.h"
 #import "UIColor+JK_HEX.h"
 #import "CartUtils.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "JKMessageBoxController.h"
 
 #define ALERT_DEL 1025
@@ -1298,7 +1298,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
         [RAUtils message_alert:@"There is no resource to print" title:@"Warning" controller:self];
     }
     
-    PDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     
     ViewController.url = self.print_url;
     ViewController.canSave = false;

+ 3 - 3
RedAnt ERP Mobile/common/pdfCreator/pdfCreator.m

@@ -9,14 +9,14 @@
 #import "pdfCreator.h"
 #import "UIKit/UIDocument.h"
 
-#import "PDFPage.h"
+#import "RAPDFPage.h"
 @implementation pdfCreator
 
 
 +(void) drawPage:(CGContextRef)context template:(NSMutableDictionary*) page size:(CGRect) rect dataSource:(NSMutableDictionary*)data
 {
     
-    PDFPage* pdfPage = [[PDFPage alloc] init:page size:rect];
+    RAPDFPage* pdfPage = [[RAPDFPage alloc] init:page size:rect];
     
     [pdfPage Draw:context dataSource:data];
     
@@ -27,7 +27,7 @@
 +(int) QueryPageCount:(CGContextRef)context template:(NSMutableDictionary*) page size:(CGRect) rect dataSource:(NSMutableDictionary*)data
 {
     
-    PDFPage* pdfPage = [[PDFPage alloc] init:page size:rect];
+    RAPDFPage* pdfPage = [[RAPDFPage alloc] init:page size:rect];
     
     return [pdfPage QueryPageCount:context dataSource:data];
     

+ 1 - 1
RedAnt ERP Mobile/iSales-HOMER/config.h

@@ -18,7 +18,7 @@
 #define  COMPANY_FULL_NAME @"HOMELEGANCE LA, INC."
 
 # ifdef DEBUG
-#define test_server
+//#define test_server
 # endif
 
 #define exception_switch 1

+ 14 - 15
RedAnt ERP Mobile/iSales-NPD.xcodeproj/project.pbxproj

@@ -70,7 +70,7 @@
 		712AFEDA1DBA050200254965 /* ImageDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFECC1DBA050200254965 /* ImageDrawable.m */; };
 		712AFEDB1DBA050200254965 /* LineDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFECE1DBA050200254965 /* LineDrawable.m */; };
 		712AFEDC1DBA050200254965 /* PDFDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED01DBA050200254965 /* PDFDrawable.m */; };
-		712AFEDD1DBA050200254965 /* PDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED21DBA050200254965 /* PDFPage.m */; };
+		712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED21DBA050200254965 /* RAPDFPage.m */; };
 		712AFEDE1DBA050200254965 /* TableDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED41DBA050200254965 /* TableDrawable.m */; };
 		712AFEDF1DBA050200254965 /* TextDrawable.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFED61DBA050200254965 /* TextDrawable.m */; };
 		712AFEE21DBA077F00254965 /* pdfCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = 712AFEE11DBA077F00254965 /* pdfCreator.m */; };
@@ -116,7 +116,7 @@
 		7161FEB51D61B24900157EE1 /* creditcardpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB21D61B24900157EE1 /* creditcardpayment.html */; };
 		7161FEB61D61B24900157EE1 /* normalpayment.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB31D61B24900157EE1 /* normalpayment.html */; };
 		7161FEB71D61B24900157EE1 /* orderinfo.html in Resources */ = {isa = PBXBuildFile; fileRef = 7161FEB41D61B24900157EE1 /* orderinfo.html */; };
-		7162A4FE1C585FFB00AB630E /* PDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* PDFViewController.m */; };
+		7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */; };
 		7162A4FF1C585FFB00AB630E /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A4FD1C585FFB00AB630E /* WebViewController.m */; };
 		7162A5021C586F5B00AB630E /* AddressEditorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5011C586F5B00AB630E /* AddressEditorViewController.m */; };
 		7162A5091C586FC100AB630E /* CycleScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7162A5041C586FC100AB630E /* CycleScrollView.m */; };
@@ -391,8 +391,8 @@
 		712AFECE1DBA050200254965 /* LineDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LineDrawable.m; path = common/pdfCreator/LineDrawable.m; sourceTree = SOURCE_ROOT; };
 		712AFECF1DBA050200254965 /* PDFDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFDrawable.h; path = common/pdfCreator/PDFDrawable.h; sourceTree = SOURCE_ROOT; };
 		712AFED01DBA050200254965 /* PDFDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFDrawable.m; path = common/pdfCreator/PDFDrawable.m; sourceTree = SOURCE_ROOT; };
-		712AFED11DBA050200254965 /* PDFPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFPage.h; path = common/pdfCreator/PDFPage.h; sourceTree = SOURCE_ROOT; };
-		712AFED21DBA050200254965 /* PDFPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFPage.m; path = common/pdfCreator/PDFPage.m; sourceTree = SOURCE_ROOT; };
+		712AFED11DBA050200254965 /* RAPDFPage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFPage.h; path = common/pdfCreator/RAPDFPage.h; sourceTree = SOURCE_ROOT; };
+		712AFED21DBA050200254965 /* RAPDFPage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFPage.m; path = common/pdfCreator/RAPDFPage.m; sourceTree = SOURCE_ROOT; };
 		712AFED31DBA050200254965 /* TableDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableDrawable.h; path = common/pdfCreator/TableDrawable.h; sourceTree = SOURCE_ROOT; };
 		712AFED41DBA050200254965 /* TableDrawable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TableDrawable.m; path = common/pdfCreator/TableDrawable.m; sourceTree = SOURCE_ROOT; };
 		712AFED51DBA050200254965 /* TextDrawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDrawable.h; path = common/pdfCreator/TextDrawable.h; sourceTree = SOURCE_ROOT; };
@@ -469,8 +469,8 @@
 		7161FEB21D61B24900157EE1 /* creditcardpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = creditcardpayment.html; path = common/Functions/offline/creditcardpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB31D61B24900157EE1 /* normalpayment.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = normalpayment.html; path = common/Functions/offline/normalpayment.html; sourceTree = SOURCE_ROOT; };
 		7161FEB41D61B24900157EE1 /* orderinfo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = orderinfo.html; path = common/Functions/offline/orderinfo.html; sourceTree = SOURCE_ROOT; };
-		7162A4FA1C585FFB00AB630E /* PDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PDFViewController.h; path = "common/Functions/PDF+Web/PDFViewController.h"; sourceTree = SOURCE_ROOT; };
-		7162A4FB1C585FFB00AB630E /* PDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PDFViewController.m; path = "common/Functions/PDF+Web/PDFViewController.m"; sourceTree = SOURCE_ROOT; };
+		7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "common/Functions/PDF+Web/RAPDFViewController.h"; sourceTree = SOURCE_ROOT; };
+		7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "common/Functions/PDF+Web/RAPDFViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A4FC1C585FFB00AB630E /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "common/Functions/PDF+Web/WebViewController.h"; sourceTree = SOURCE_ROOT; };
 		7162A4FD1C585FFB00AB630E /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "common/Functions/PDF+Web/WebViewController.m"; sourceTree = SOURCE_ROOT; };
 		7162A5001C586F5B00AB630E /* AddressEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddressEditorViewController.h; path = common/Functions/address/AddressEditorViewController.h; sourceTree = SOURCE_ROOT; };
@@ -1119,8 +1119,8 @@
 				712AFECE1DBA050200254965 /* LineDrawable.m */,
 				712AFECF1DBA050200254965 /* PDFDrawable.h */,
 				712AFED01DBA050200254965 /* PDFDrawable.m */,
-				712AFED11DBA050200254965 /* PDFPage.h */,
-				712AFED21DBA050200254965 /* PDFPage.m */,
+				712AFED11DBA050200254965 /* RAPDFPage.h */,
+				712AFED21DBA050200254965 /* RAPDFPage.m */,
 				712AFED31DBA050200254965 /* TableDrawable.h */,
 				712AFED41DBA050200254965 /* TableDrawable.m */,
 				712AFED51DBA050200254965 /* TextDrawable.h */,
@@ -1586,8 +1586,8 @@
 		7190F1091BBBCAF100B2F243 /* PDF+Web */ = {
 			isa = PBXGroup;
 			children = (
-				7162A4FA1C585FFB00AB630E /* PDFViewController.h */,
-				7162A4FB1C585FFB00AB630E /* PDFViewController.m */,
+				7162A4FA1C585FFB00AB630E /* RAPDFViewController.h */,
+				7162A4FB1C585FFB00AB630E /* RAPDFViewController.m */,
 				7162A4FC1C585FFB00AB630E /* WebViewController.h */,
 				7162A4FD1C585FFB00AB630E /* WebViewController.m */,
 			);
@@ -1874,7 +1874,6 @@
 				ORGANIZATIONNAME = "United Software Applications, Inc";
 				TargetAttributes = {
 					713F76A51929F4A7006A7305 = {
-						DevelopmentTeam = HXWLAA5YN5;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -2125,7 +2124,7 @@
 				7162A54A1C58719D00AB630E /* RATreeView+UIScrollView.m in Sources */,
 				7162A55D1C58724700AB630E /* ContactListViewController.m in Sources */,
 				7162A5751C58728D00AB630E /* LineView.m in Sources */,
-				712AFEDD1DBA050200254965 /* PDFPage.m in Sources */,
+				712AFEDD1DBA050200254965 /* RAPDFPage.m in Sources */,
 				428980481E249339005F1BD8 /* JKMessageBoxController.m in Sources */,
 				7162A5741C58728D00AB630E /* DetailViewController.m in Sources */,
 				7162A52A1C58713200AB630E /* CategoryCellNPD.m in Sources */,
@@ -2173,7 +2172,7 @@
 				7162A51A1C58704600AB630E /* ModelItemCell.m in Sources */,
 				7141DD511C57459B00F7DF59 /* qrencode.c in Sources */,
 				7162A5451C58719D00AB630E /* RATreeView.m in Sources */,
-				7162A4FE1C585FFB00AB630E /* PDFViewController.m in Sources */,
+				7162A4FE1C585FFB00AB630E /* RAPDFViewController.m in Sources */,
 				71DF74841C57608F00F2789C /* ImageScrollerViewController.m in Sources */,
 				71DF74861C57608F00F2789C /* ImageViewController.m in Sources */,
 				7162A5821C5872EF00AB630E /* HomeTableViewCellButtonBanner.m in Sources */,
@@ -2341,7 +2340,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",
@@ -2385,7 +2384,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/GoogleAnalytics/FirebaseAnalytics/Frameworks",

+ 2 - 2
RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -9,7 +9,7 @@
 #import "AppDelegate.h"
 #import "UILabel+FontAppearance.h"
 #import "MainViewController.h"
-#import "PDFViewController.h"
+#import "RAPDFViewController.h"
 #import "ZipArchive.h"
 #import "DefaultAppearance.h"
 #import "OLDataProvider.h"
@@ -2929,7 +2929,7 @@ void UncaughtExceptionHandler(NSException *exception) {
 
 -(void) printPdf:(NSString*) url company:(NSString*)company send_to:(NSString*)send_to soid:(NSString*)soid content:(NSString*)content
 {
-    PDFViewController *ViewController = [self.main_vc.storyboard instantiateViewControllerWithIdentifier:@"PDFViewController"];
+    RAPDFViewController *ViewController = [self.main_vc.storyboard instantiateViewControllerWithIdentifier:@"RAPDFViewController"];
     ViewController.url = url;
     ViewController.canSave = false;
     

Fichier diff supprimé car celui-ci est trop grand
+ 130 - 125
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff