|
|
@@ -401,7 +401,7 @@
|
|
|
ViewController.mail_to = send_to;
|
|
|
NSString* subject = nil;
|
|
|
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
subject=[NSString stringWithFormat:@"%@ -- SO# %@ from %@",company,so,COMPANY_NAME];
|
|
|
|
|
|
if (appDelegate.user_type == USER_ROLE_CUSTOMER&&self.is_shoporder) {
|
|
|
@@ -687,7 +687,7 @@
|
|
|
// [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
|
|
|
// if(self.selectOrder)
|
|
|
// self.selectOrder(self.content_data);
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
int count = [[self.content_data objectForKey:@"count"] intValue];
|
|
|
for (int i = 0; i < count; i++) {
|
|
|
NSString *key = [NSString stringWithFormat:@"section_%d",i];
|
|
|
@@ -775,7 +775,7 @@
|
|
|
if([[order_json valueForKey:@"result"] intValue]==2)
|
|
|
{
|
|
|
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
int count = [[weakSelf.content_data objectForKey:@"count"] intValue];
|
|
|
for (int i = 0; i < count; i++) {
|
|
|
NSString *key = [NSString stringWithFormat:@"section_%d",i];
|
|
|
@@ -1363,7 +1363,7 @@
|
|
|
// return 150;
|
|
|
|
|
|
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",indexPath.section]];
|
|
|
NSDictionary *data = [section_item objectForKey:@"data"];
|
|
|
NSString *type = [section_item objectForKey:@"type"];
|
|
|
@@ -1568,7 +1568,7 @@
|
|
|
|
|
|
NSString*labeltitle = nil;
|
|
|
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]];
|
|
|
NSString *title = [section_item objectForKey:@"title"];
|
|
|
labeltitle = title;
|
|
|
@@ -1748,7 +1748,7 @@
|
|
|
self.content_data_control = [self translate_json:self.content_data_download changed:self.changed_data];
|
|
|
|
|
|
*/
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
NSUInteger section = sender.tag;
|
|
|
NSMutableDictionary *section_item = [[self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]] mutableCopy];
|
|
|
NSString *title = [section_item objectForKey:@"title"];
|
|
|
@@ -1857,7 +1857,7 @@
|
|
|
|
|
|
if(self.content_data==nil)
|
|
|
return 0;
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
return [[self.content_data objectForKey:@"count"] integerValue];
|
|
|
#endif
|
|
|
|
|
|
@@ -1879,7 +1879,7 @@
|
|
|
}
|
|
|
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
|
|
|
{
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
|
|
|
NSDictionary *section_item = [self.content_data objectForKey:[NSString stringWithFormat:@"section_%ld",section]];
|
|
|
NSDictionary *data = [section_item objectForKey:@"data"];
|
|
|
@@ -1974,7 +1974,7 @@
|
|
|
}
|
|
|
}
|
|
|
if(section==3) {
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
return 6;
|
|
|
#endif
|
|
|
|
|
|
@@ -1999,7 +1999,7 @@
|
|
|
UIApplication * app = [UIApplication sharedApplication];
|
|
|
AppDelegate *appDelegate = (AppDelegate *)[app delegate];
|
|
|
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
/**
|
|
|
* ver1.90
|
|
|
*/
|
|
|
@@ -3181,7 +3181,7 @@
|
|
|
cell.priceLabel.text =[self.content_data valueForKey:@"Shipping"];
|
|
|
break;
|
|
|
case 2: {
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
cell.chargeLabel.text = @"Liftgate Fee(No loading dock):";
|
|
|
cell.priceLabel.text =[self.content_data valueForKey:@"Liftgate Fee(No loading dock)"];
|
|
|
#endif
|
|
|
@@ -3199,7 +3199,7 @@
|
|
|
}
|
|
|
break;
|
|
|
case 3: {
|
|
|
-#if defined(BUILD_NPD) || defined(BUILD_USAI)
|
|
|
+#if defined(BUILD_NPD) || defined(BUILD_USAI) || defined(BUILD_UWAVER)
|
|
|
cell.chargeLabel.text = @"Handling Fee:";
|
|
|
cell.priceLabel.text =[self.content_data valueForKey:@"Handling Fee"];
|
|
|
#endif
|