|
|
@@ -857,6 +857,9 @@
|
|
|
[img_section setObject:[self model_selector:nsproduct_group field:nsselector_field db:db] forKey:@"selector"];
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
NSString* Availability=nil;
|
|
|
if(availability>0)
|
|
|
Availability=[NSString stringWithFormat:@"%d",availability];
|
|
|
@@ -1535,7 +1538,7 @@
|
|
|
int have_lift_gate = sqlite3_column_int(statement, 20);
|
|
|
|
|
|
NSError *error = nil;
|
|
|
- NSString* orderinfo = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"orderinfo" ofType:@"template"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
+ NSString* orderinfo = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"orderinfo" ofType:@"html"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
orderinfo=[orderinfo stringByReplacingOccurrencesOfString:@"SO_PLACEHOLDER" withString:nssoid];
|
|
|
orderinfo=[orderinfo stringByReplacingOccurrencesOfString:@"PO_PLACEHOLDER" withString:nspoNumber];
|
|
|
orderinfo=[orderinfo stringByReplacingOccurrencesOfString:@"ORDERDATE_PLACEHOLDER" withString:nscreate_time];
|
|
|
@@ -1555,12 +1558,12 @@
|
|
|
NSString *payment = nil;
|
|
|
if([nspayment_type isEqualToString:@"Credit Card"])
|
|
|
{
|
|
|
- payment=[NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"creditcardpayment" ofType:@"template"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
+ payment=[NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"creditcardpayment" ofType:@"html"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
//payment=[payment stringByReplacingOccurrencesOfString:@"PAYMENTTYPE_PLACEHOLDER" withString:nspayment_type];
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- payment=[NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"normalpayment" ofType:@"template"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
+ payment=[NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"normalpayment" ofType:@"html"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
payment=[payment stringByReplacingOccurrencesOfString:@"PAYMENTTYPE_PLACEHOLDER" withString:nspayment_type];
|
|
|
}
|
|
|
orderinfo=[orderinfo stringByReplacingOccurrencesOfString:@"PAYMENT_PLACEHOLDER" withString:payment];
|
|
|
@@ -1685,11 +1688,20 @@
|
|
|
|
|
|
[header setValue:nsusername forKey:@"username"];
|
|
|
|
|
|
+ NSError* error=nil;
|
|
|
+
|
|
|
+ NSString* statusFilter =[NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"status_filter_cadedate_open" ofType:@"json"] encoding:NSUTF8StringEncoding error:&error];
|
|
|
+ [header setValue:statusFilter forKey:@"statusFilter"];
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
[ret setObject:header forKey:@"header"];
|
|
|
[ret setValue:nsmode forKey:@"mode"];
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|