Permalink
Browse files

PUSH NOTIFICATIONS!!

  • Loading branch information...
1 parent 3f4731b commit b32dcd42b3b3fa922f9adfa89cef3bc60390bf6f @jovhenni19 committed Feb 13, 2014
View
8 AgentBridge.xcodeproj/project.pbxproj
@@ -25,7 +25,6 @@
6E5AEF8D184C7C2800FE7B9E /* RequestAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF8C184C7C2700FE7B9E /* RequestAccess.m */; };
6E5AEF90184C7C2900FE7B9E /* RequestNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF8F184C7C2900FE7B9E /* RequestNetwork.m */; };
6E5AEF93184CA8AF00FE7B9E /* Buyer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF92184CA8AF00FE7B9E /* Buyer.m */; };
- 6E63C55B18ABD0810001616B /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E63C55518ABD0810001616B /* libTestFlight.a */; };
6E63C55C18ABD0810001616B /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 6E63C55618ABD0810001616B /* README.md */; };
6E63C55D18ABD0810001616B /* release_notes.md in Resources */ = {isa = PBXBuildFile; fileRef = 6E63C55718ABD0810001616B /* release_notes.md */; };
6E63DF0318A63EA1007931EE /* ABridge_MembershipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E63DF0218A63EA1007931EE /* ABridge_MembershipViewController.m */; };
@@ -47,6 +46,7 @@
6EBBD76C1834B1FE00166D63 /* ABridge_ActivityViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EBBD76B1834B1FE00166D63 /* ABridge_ActivityViewController.m */; };
6EBBD7701834B48A00166D63 /* ABridge_ActivityPagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EBBD76E1834B48A00166D63 /* ABridge_ActivityPagesViewController.m */; };
6EBBD7751834CA2200166D63 /* ABridge_AgentProfileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EBBD7741834CA2200166D63 /* ABridge_AgentProfileViewController.m */; };
+ 6EC6A9A618ACD52F00B745A1 /* libTestFlight.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E63C55518ABD0810001616B /* libTestFlight.a */; };
6EDF11B61845A762001BFC6B /* OpenSans-Bold-webfont.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6EDF11B51845A762001BFC6B /* OpenSans-Bold-webfont.ttf */; };
6EDF11B91845D5FA001BFC6B /* AgentProfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EDF11B81845D5FA001BFC6B /* AgentProfile.m */; };
6EEF583518337E4000C3214E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EEF583418337E4000C3214E /* Foundation.framework */; };
@@ -278,7 +278,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 6E63C55B18ABD0810001616B /* libTestFlight.a in Frameworks */,
+ 6EC6A9A618ACD52F00B745A1 /* libTestFlight.a in Frameworks */,
6EFF61501851BBBC00A5A86A /* libz.dylib in Frameworks */,
6EFF614E1851BBAF00A5A86A /* MobileCoreServices.framework in Frameworks */,
6EFF614C1851BBA700A5A86A /* SystemConfiguration.framework in Frameworks */,
@@ -1014,7 +1014,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lxml2";
PRODUCT_NAME = "$(TARGET_NAME)";
- PROVISIONING_PROFILE = "AB61BDC2-9539-41BC-9B73-C836E729B625";
+ PROVISIONING_PROFILE = "DCBDD2CD-63CA-4E1D-93FC-25765A038B3A";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
@@ -1044,7 +1044,7 @@
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = "-lxml2";
PRODUCT_NAME = "$(TARGET_NAME)";
- PROVISIONING_PROFILE = "AB61BDC2-9539-41BC-9B73-C836E729B625";
+ PROVISIONING_PROFILE = "DCBDD2CD-63CA-4E1D-93FC-25765A038B3A";
TARGETED_DEVICE_FAMILY = 1;
WRAPPER_EXTENSION = app;
};
View
BIN ...j/project.xcworkspace/xcuserdata/host24_iosdev.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
View
2 AgentBridge/ABridge_AppDelegate.h
@@ -16,6 +16,8 @@
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;
@property (strong, nonatomic) UIStoryboard* initalStoryboard;
+@property (strong, nonatomic) NSString *deviceTokenString;
+@property (strong, nonatomic) NSString *tokenId;
- (void)saveContext;
- (NSURL *)applicationDocumentsDirectory;
View
22 AgentBridge/ABridge_AppDelegate.m
@@ -15,10 +15,18 @@ @implementation ABridge_AppDelegate
@synthesize managedObjectModel = _managedObjectModel;
@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
@synthesize initalStoryboard = _initalStoryboard;
+@synthesize deviceTokenString = _deviceTokenString;
+@synthesize tokenId = _tokenId;
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
// Override point for customization after application launch.
+
+ [[UIApplication sharedApplication] registerForRemoteNotificationTypes:
+ (UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert)];
+// UIRemoteNotificationType enabledTypes = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
+
+
UIImage *tabBackground = [[UIImage imageNamed:@"nav_bg.png"]
resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0)];
@@ -42,7 +50,19 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
return YES;
}
-
+- (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken
+ {
+ NSLog(@"My token is: %@", deviceToken);
+ NSString *token = [[deviceToken description] stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@"<>"]];
+ token = [token stringByReplacingOccurrencesOfString:@" " withString:@""];
+ self.deviceTokenString = token;
+ NSLog(@"content---%@", token);
+ }
+
+- (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error
+ {
+ NSLog(@"Failed to get token, error: %@", error);
+ }
- (void)applicationWillResignActive:(UIApplication *)application
{
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
View
2 AgentBridge/ABridge_FeeCollectionViewController.m
@@ -1826,7 +1826,7 @@ - (void) createPaymentPDF {
NSString *grossCommissionSale = [formatter stringFromNumber: [NSNumber numberWithDouble:[self.grossCommission doubleValue]]];
- NSString *htmlStringForPDF = [NSString stringWithFormat:HTMLSTRING_PAYMENT, payment_date, self.referral_name, self.loginDetails.user_id, self.profile.broker_name, self.referral_name, self.profile.broker_name,self.textFieldBrokerLicense.text, agent_name, self.textFieldAgentLicense.text, self.textFieldPhoneNumber.text, self.textFieldEmail.text, self.textFieldTaxId.text, self.referral_name, self.client_number, self.client_email, self.client_address, self.client_type, [NSString stringWithFormat:@"%f%%",(self.referral_fee * 100.0f) ], payment_date, grossCommissionSale, [NSString stringWithFormat:@"%f%%",(self.referral_fee * 100.0f) ], referralFeeDetail];
+ NSString *htmlStringForPDF = [NSString stringWithFormat:HTMLSTRING_PAYMENT, payment_date, self.referral_name, self.loginDetails.user_id, self.profile.broker_name, self.referral_name, self.profile.broker_name,self.textFieldBrokerLicense.text, agent_name, self.textFieldAgentLicense.text, self.textFieldPhoneNumber.text, self.textFieldEmail.text, self.textFieldTaxId.text, self.referral_name, self.client_number, self.client_email, self.client_address, self.client_type, [NSString stringWithFormat:@"%f%%",(self.referral_fee * 100.0f) ], payment_date, grossCommissionSale, [NSString stringWithFormat:@"%f%%",(self.referral_fee * 100.0f) ], referralFeeDetail,self.profile.broker_name, agent_name, self.referral_name, grossCommissionSale,self.profile.broker_name,self.profile.street_address,self.profile.city,self.profile.state_name,self.profile.zip,self.profile.countries_name,agent_name,self.profile.email];
self.payment_id = [NSString stringWithFormat:@"Payment_%@_%@_%@",self.user_id,self.user_id,[date_today stringByReplacingOccurrencesOfString:@"-" withString:@"_"]];
View
26 AgentBridge/ABridge_LoginViewController.m
@@ -11,6 +11,7 @@
#import "LoginDetails.h"
#import "ABridge_AppDelegate.h"
#import "AgentProfile.h"
+#import "ASIHTTPRequest.h"
@interface ABridge_LoginViewController ()
@property (weak, nonatomic) IBOutlet UIImageView *imageViewBackground;
@@ -309,6 +310,31 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
if (self.urlConnectionProfile) {
self.labelLoading.text = @"Retrieving Profile.";
+
+ NSString *deviceToken = ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).deviceTokenString;
+ NSInteger user_id = [self.item.user_id integerValue];
+
+
+ NSString *urlString = [NSString stringWithFormat:@"http://keydiscoveryinc.com/agent_bridge/webservice/register_device.php?user_id=%i&token=%@", user_id, deviceToken];
+// NSLog(@"urlString:%@",urlString);
+ __block NSError *errorData = nil;
+ __weak ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:urlString]];
+ [request setCompletionBlock:^{
+ // Use when fetching text data
+ // NSString *responseString = [request responseString];
+ // Use when fetching binary data
+ NSData *responseData = [request responseData];
+ NSDictionary *json = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingAllowFragments error:&errorData];
+// NSLog(@"json:%@",json);
+ ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).tokenId = [[[json objectForKey:@"data"] firstObject] objectForKey:@"token_id"];
+ }];
+ [request setFailedBlock:^{
+ NSError *error = [request error];
+ NSLog(@"error:%@",error);
+ }];
+ [request startAsynchronous];
+
+
// //NSLog(@"Connection Successful");
}
else {
View
1 AgentBridge/ABridge_MembershipViewController.h
@@ -7,6 +7,7 @@
//
#import "ABridge_ParentViewController.h"
+#import "ASIHTTPRequest.h"
@interface ABridge_MembershipViewController : ABridge_ParentViewController <UIScrollViewDelegate, UITableViewDataSource>
View
77 AgentBridge/ABridge_MembershipViewController.m
@@ -7,6 +7,7 @@
//
#import "ABridge_MembershipViewController.h"
+#import "AgentProfile.h"
@interface ABridge_MembershipViewController ()
@property (weak, nonatomic) IBOutlet UIScrollView *scrollViewPlans;
@@ -89,6 +90,82 @@ - (void)viewDidLoad
self.labelAnnualSave.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.buttonMembershipAnnual.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+
+ self.labelMonthlyCurrent.hidden = YES;
+ self.labelQuarterlyCurrent.hidden = YES;
+ self.labelAnnualCurrent.hidden = YES;
+
+ //get profile user_id
+
+
+ NSManagedObjectContext *context = ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).managedObjectContext;
+
+ NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+ NSEntityDescription *entity = [NSEntityDescription entityForName:@"LoginDetails"
+ inManagedObjectContext:context];
+ [fetchRequest setEntity:entity];
+ NSError *error = nil;
+ NSArray *fetchedObjects = [context executeFetchRequest:fetchRequest error:&error];
+
+ NSInteger login_user_id = [[[fetchedObjects firstObject] valueForKey:@"user_id"] integerValue];
+
+
+ NSFetchRequest *fetchRequestProfile = [[NSFetchRequest alloc] init];
+ NSEntityDescription *entityProfile = [NSEntityDescription entityForName:@"AgentProfile"
+ inManagedObjectContext:context];
+ [fetchRequestProfile setEntity:entityProfile];
+
+// NSPredicate *predicate = [NSPredicate predicateWithFormat:@"user_id == %i",login_user_id];
+//
+// [fetchRequestProfile setPredicate:predicate];
+
+ NSError *errorProfile = nil;
+ NSArray *fetchedObjectsProfile = [context executeFetchRequest:fetchRequestProfile error:&errorProfile];
+
+// BOOL found = NO;
+ AgentProfile *profileFound;
+
+ for (AgentProfile *profile in fetchedObjectsProfile) {
+ if ([profile.user_id integerValue] == login_user_id) {
+// found = YES;
+ profileFound = profile;
+ break;
+ }
+ }
+
+ NSInteger profile_user_id = [profileFound.profile_id integerValue];
+
+ NSString *parameters = [NSString stringWithFormat:@"?user_id=%i",profile_user_id];
+
+ NSMutableString *urlString = [NSMutableString stringWithString:@"http://keydiscoveryinc.com/agent_bridge/webservice/get_membership_fee.php"];
+ [urlString appendString:parameters];
+ NSLog(@"url:%@",urlString);
+ __block NSError *errorData = nil;
+ __weak ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:urlString]];
+ // [self.activityIndicator startAnimating];
+ // self.activityIndicator.hidden = NO;
+ [request setCompletionBlock:
+ ^{
+ NSData *responseData = [request responseData];
+ NSDictionary *json = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingAllowFragments error:&errorData];
+ NSLog(@"json:%@",json);
+ if ([[json objectForKey:@"data"] count]) {
+ self.labelMonthlyName.text = [[[json objectForKey:@"data"] firstObject] objectForKey:@"fee_title"];
+
+ }
+ else {
+
+ }
+
+ [self.searchDisplayController.searchResultsTableView reloadData];
+ }];
+ [request setFailedBlock:^{
+ NSError *error = [request error];
+ NSLog(@" error:%@",error);
+ }];
+
+ [request startAsynchronous];
+
dummy_data_monthly:
{
if (self.arrayBenefitsMonthly == nil) {
View
24 AgentBridge/ABridge_MenuViewController.m
@@ -11,6 +11,7 @@
#import "LoginDetails.h"
#import "AgentProfile.h"
#import "Constants.h"
+#import "ASIHTTPRequest.h"
@interface ABridge_MenuViewController ()
@property (weak, nonatomic) IBOutlet UIButton *buttonProfile;
@@ -322,7 +323,28 @@ - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)butto
[self deleteDataFromEntity:@"RequestNetwork"] &&
[self deleteDataFromEntity:@"RequestAccess"]) {
- [((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]) resetWindowToInitialView];
+ NSString *tokenid = ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).tokenId;
+
+
+ NSString *urlString = [NSString stringWithFormat:@"http://keydiscoveryinc.com/agent_bridge/webservice/delete_device_token.php?token_id=%@", tokenid];
+
+ __block NSError *errorData = nil;
+ __weak ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:urlString]];
+ [request setCompletionBlock:^{
+ // Use when fetching text data
+ // NSString *responseString = [request responseString];
+ // Use when fetching binary data
+ NSData *responseData = [request responseData];
+ NSDictionary *json = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingAllowFragments error:&errorData];
+ NSLog(@"json:%@",json);
+ [((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]) resetWindowToInitialView];
+ }];
+ [request setFailedBlock:^{
+ NSError *error = [request error];
+ NSLog(@"error:%@",error);
+ }];
+ [request startAsynchronous];
+
}
else {
//NSLog(@"error on deleting");
View
37 AgentBridge/ABridge_SearchViewController.m
@@ -57,6 +57,7 @@ - (void)viewDidLoad
self.slidingViewController.underRightWidthLayout = ECVariableRevealWidth;
self.searchDisplayController.searchBar.showsScopeBar = YES;
+ self.searchDisplayController.searchResultsTableView.hidden = YES;
self.viewOverlay = [[UIView alloc] initWithFrame:CGRectMake(10.0f, 10.0f, 50.0f, 50.0f)];
@@ -65,6 +66,7 @@ - (void)viewDidLoad
self.viewOverlay.layer.masksToBounds = YES;
CGPoint center = self.view.center;
+ center.x -= 15.0f;
self.viewOverlay.center = center;
UIActivityIndicatorView *activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
@@ -79,17 +81,6 @@ - (void)viewDidLoad
timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(checkIfLoading) userInfo:nil repeats:YES];
- NSManagedObjectContext *context = ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).managedObjectContext;
-
- NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
- NSEntityDescription *entity = [NSEntityDescription entityForName:@"LoginDetails"
- inManagedObjectContext:context];
- [fetchRequest setEntity:entity];
- NSError *error = nil;
- NSArray *fetchedObjects = [context executeFetchRequest:fetchRequest error:&error];
-
- self.login_user_id = [[[fetchedObjects firstObject] valueForKey:@"user_id"] integerValue];
- self.agent_name = [[[[fetchedObjects firstObject] valueForKey:@"name"] componentsSeparatedByString:@" "] firstObject];
}
- (void)didReceiveMemoryWarning
@@ -105,6 +96,7 @@ - (void) checkIfLoading {
}
else {
self.viewOverlay.hidden = YES;
+ self.searchDisplayController.searchResultsTableView.hidden = NO;
[timer invalidate];
}
}
@@ -120,6 +112,7 @@ - (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar
frame.size.width = [UIScreen mainScreen].bounds.size.width;
}
self.view.frame = frame;
+ self.searchDisplayController.searchResultsTableView.hidden = YES;
} onComplete:nil];
searchBar.showsScopeBar = YES;
@@ -165,8 +158,24 @@ - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
}
- (void) loadResults {
+ if (self.login_user_id == 0) {
+ NSManagedObjectContext *context = ((ABridge_AppDelegate *)[[UIApplication sharedApplication] delegate]).managedObjectContext;
+
+ NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] init];
+ NSEntityDescription *entity = [NSEntityDescription entityForName:@"LoginDetails"
+ inManagedObjectContext:context];
+ [fetchRequest setEntity:entity];
+ NSError *error = nil;
+ NSArray *fetchedObjects = [context executeFetchRequest:fetchRequest error:&error];
+
+ self.login_user_id = [[[fetchedObjects firstObject] valueForKey:@"user_id"] integerValue];
+ self.agent_name = [[[[fetchedObjects firstObject] valueForKey:@"name"] componentsSeparatedByString:@" "] firstObject];
+// NSLog(@"id:%i name:%@",self.login_user_id, self.agent_name);
+ }
+
self.viewOverlay.hidden = NO;
+ self.searchDisplayController.searchResultsTableView.hidden = YES;
if (self.selectedScope == 1) {
self.arrayPOPs = nil;
@@ -181,10 +190,10 @@ - (void) loadResults {
if ([fields containsObject:[keywords objectAtIndex:index]]) {
if (index == 0) {
- parameters = [NSString stringWithFormat:@"?field=%@&keyword=%@",[keywords objectAtIndex:index], @""];
+ parameters = [NSString stringWithFormat:@"?field=%@&keyword=%@&user_id=%i",[keywords objectAtIndex:index], @"", self.login_user_id];
}
else {
- parameters = [NSString stringWithFormat:@"?field=%@&keyword=%@",[keywords objectAtIndex:index], [keywords objectAtIndex:index-1]];
+ parameters = [NSString stringWithFormat:@"?field=%@&keyword=%@&user_id=%i",[keywords objectAtIndex:index], [keywords objectAtIndex:index-1],self.login_user_id];
}
[urlString setString:@"http://keydiscoveryinc.com/agent_bridge/webservice/search_pops_by_field.php"];
@@ -198,7 +207,7 @@ - (void) loadResults {
}
[urlString appendString:parameters];
-// NSLog(@"url:%@",urlString);
+ NSLog(@"url:%@",urlString);
__block NSError *errorData = nil;
__weak ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:urlString]];
// [self.activityIndicator startAnimating];
View
2 AgentBridge/AgentBridge-Info.plist
@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.0.63</string>
+ <string>1.0.65</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIAppFonts</key>
View
1 AgentBridge/AgentBridge.xcdatamodeld/AgentBridge.xcdatamodel/contents
@@ -42,6 +42,7 @@
<attribute name="countries_iso_code_3" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="countries_name" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="email" optional="YES" attributeType="String" syncable="YES"/>
+ <attribute name="fee_id" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="firstname" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="image" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="image_data" optional="YES" attributeType="Binary" syncable="YES"/>
View
10 AgentBridge/Constants.h
@@ -358,22 +358,22 @@
""\
"<tr><td>&nbsp;</td></tr>"\
"<tr>"\
-"<td>Please Issue Payment to All Moves care of Rebekah Roque for client Bono in amount of $25,000</td>"\
+"<td>Please Issue Payment to %@ care of %@ for client %@ in amount of %@</td>"\
"</tr>"\
"<tr><td>&nbsp;</td></tr>"\
"<tr>"\
"<td>"\
"<ul style=\"list-style:none; margin:0; padding:0;\">"\
"<li style=\"margin-bottom:5px;\"><strong>Mail to:</strong></li>"\
-"<li>All Moves</li>"\
-"<li>Rodeo Drive<br />Beverly Hills, California 90210<br />United States</li>"\
+"<li>%@</li>"\
+"<li>%@<br />%@, %@ %@<br />%@</li>"\
"</ul>"\
"</td>"\
"</tr>"\
"<tr><td>&nbsp;</td></tr>"\
"<tr>"\
-"<td>Please enclose Closing Statement or HUD 1 with check. If wire transfer preferred, please email Rebekah Roque"\
-"at <a href=\"#\" style=\" color:#0d4a6f; text-decoration:none; \">rebekah.roque@yopmail.com</a> to receive wire instructions.</td>"\
+"<td>Please enclose Closing Statement or HUD 1 with check. If wire transfer preferred, please email %@"\
+"at <a href=\"#\" style=\" color:#0d4a6f; text-decoration:none; \">%@</a> to receive wire instructions.</td>"\
"</tr>"\
""\
"</table>"\
View
3 AgentBridge/CoreData Objects/AgentProfile.h
@@ -44,6 +44,7 @@
@property (nonatomic, retain) NSString * user_id;
@property (nonatomic, retain) NSString * zip;
@property (nonatomic, retain) NSString * zipcodes;
-@property (nonatomic, retain) NSString * is_term_accepted;
+ @property (nonatomic, retain) NSString * is_term_accepted;
+ @property (nonatomic, retain) NSString * fee_id;
@end
View
3 AgentBridge/CoreData Objects/AgentProfile.m
@@ -43,6 +43,7 @@ @implementation AgentProfile
@dynamic user_id;
@dynamic zip;
@dynamic zipcodes;
-@dynamic is_term_accepted;
+ @dynamic is_term_accepted;
+ @dynamic fee_id;
@end
View
2 AgentBridge/Main.storyboard
@@ -3165,7 +3165,7 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
- <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" pagingEnabled="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" id="bW1-Ve-cdc">
+ <scrollView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" delaysContentTouches="NO" canCancelContentTouches="NO" bouncesZoom="NO" id="bW1-Ve-cdc">
<rect key="frame" x="0.0" y="56" width="320" height="322"/>
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
<subviews>
View
2 AgentBridge/Reachability/Reachability.m
@@ -171,7 +171,7 @@ static void logNetworkStatus_(const char *name, int line, NetworkStatus status)
break;
}
- //NSLog(@"%s (%d) \n\tNetwork Status: %@", name, line, statusString);
+ NSLog(@"%s (%d) \n\tNetwork Status: %@", name, line, statusString);
} // logNetworkStatus_()

0 comments on commit b32dcd4

Please sign in to comment.