diff --git a/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 8a48e9fa..2ae39776 100644 --- a/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Bento.xcworkspace/xcuserdata/JosephLauSF.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -142,7 +142,7 @@ moduleName = "Bento Dev" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/JosephLauSF/_github/Bento/Bento/ViewController/SignIn/SignInViewController.m" - timestampString = "475248952.943917" + timestampString = "475251207.511384" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "449" @@ -157,7 +157,7 @@ moduleName = "Bento Dev" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/JosephLauSF/_github/Bento/Bento/ViewController/SignIn/SignInViewController.m" - timestampString = "475248952.945841" + timestampString = "475251207.511548" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "449" @@ -334,11 +334,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Bento/ViewController/DeliveryLocation/DeliveryLocationViewController.m" - timestampString = "475199952.440044" + timestampString = "475251206.426993" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "863" - endingLineNumber = "863"> + startingLineNumber = "862" + endingLineNumber = "862"> + + + + diff --git a/Bento/ViewController/DeliveryLocation/DeliveryLocationViewController.m b/Bento/ViewController/DeliveryLocation/DeliveryLocationViewController.m index 97cbef51..c3985bc6 100755 --- a/Bento/ViewController/DeliveryLocation/DeliveryLocationViewController.m +++ b/Bento/ViewController/DeliveryLocation/DeliveryLocationViewController.m @@ -295,8 +295,16 @@ - (void)doConfirmOrder [self.navigationController popViewControllerAnimated:YES]; } else { + if (loadingHUD == nil) { + loadingHUD = [JGProgressHUD progressHUDWithStyle:JGProgressHUDStyleDark]; + [loadingHUD showInView:self.view]; + } + [[BentoShop sharedInstance] checkIfSelectedLocationIsInAnyZone:self.placeInfo.location.coordinate completion:^(BOOL isSelectedLocationInZone, NSString *appState) { + [loadingHUD dismiss]; + loadingHUD = nil; + if (isSelectedLocationInZone == YES && [appState isEqualToString:@"build"]) { [[NSUserDefaults standardUserDefaults] rm_setCustomObject:self.placeInfo forKey:@"delivery_location"]; [[NSUserDefaults standardUserDefaults] synchronize];