|
@@ -1346,7 +1346,7 @@
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
|
- UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Switch to cart", nil) message:NSLocalizedString(@"Do you want to Switch to a pending order?", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"Cancel", nil) otherButtonTitles:NSLocalizedString(@"Switcht to pending order", nil), nil];
|
|
|
|
|
|
|
+ UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Switch to cart", nil) message:NSLocalizedString(@"Do you want to Switch to a pending order?", nil) delegate:self cancelButtonTitle:NSLocalizedString(@"Cancel", nil) otherButtonTitles:NSLocalizedString(@"Switch to pending order", nil), nil];
|
|
|
|
|
|
|
|
// alert.
|
|
// alert.
|
|
|
[alert show];
|
|
[alert show];
|
|
@@ -1718,11 +1718,12 @@
|
|
|
// [map setValue:@"rect_search_history" forKey:@"img"];
|
|
// [map setValue:@"rect_search_history" forKey:@"img"];
|
|
|
// [self.sideMenuItems addObject:map.copy];
|
|
// [self.sideMenuItems addObject:map.copy];
|
|
|
//
|
|
//
|
|
|
|
|
+#ifdef BUILD_NPD
|
|
|
[map setValue:@"Scanner Setting" forKey:@"title"];
|
|
[map setValue:@"Scanner Setting" forKey:@"title"];
|
|
|
[map setValue:@"rect_change_password" forKey:@"img"];
|
|
[map setValue:@"rect_change_password" forKey:@"img"];
|
|
|
[self.sideMenuItems addObject:map.copy];
|
|
[self.sideMenuItems addObject:map.copy];
|
|
|
|
|
|
|
|
-#ifdef BUILD_NPD
|
|
|
|
|
|
|
+
|
|
|
if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
|
|
if(appDelegate.user_type==USER_ROLE_EMPLOYEE)
|
|
|
{
|
|
{
|
|
|
[map setValue:@"Offline Setting" forKey:@"title"];
|
|
[map setValue:@"Offline Setting" forKey:@"title"];
|