|
|
@@ -4697,12 +4697,9 @@
|
|
|
ret[@"orderStatus"] = [NSNumber numberWithInteger:status];
|
|
|
ret[@"order_status"] = nsstatus;
|
|
|
|
|
|
-// double TotalCuft = sqlite3_column_double(statement, 5);
|
|
|
-// double TotalWeight = sqlite3_column_double(statement, 6);
|
|
|
-// double TotalCarton = sqlite3_column_double(statement, 7);
|
|
|
- double TotalCuft;
|
|
|
- double TotalWeight;
|
|
|
- double TotalCarton;
|
|
|
+ double TotalCuft = 0;
|
|
|
+ double TotalWeight = 0;
|
|
|
+ double TotalCarton = 0;
|
|
|
|
|
|
char *company_name = (char*)sqlite3_column_text(statement, 5);
|
|
|
if(company_name==nil)
|
|
|
@@ -4788,18 +4785,18 @@
|
|
|
orderinfo = [self replaceHtml:orderinfo String:@"SO_or_nbsp" withString:nssoid];
|
|
|
orderinfo = [self replaceHtml:orderinfo String:@"PO_or_nbsp" withString:nspoNumber];
|
|
|
orderinfo = [self replaceHtml:orderinfo String:@"OrderDate_or_nbsp" withString:nscreate_time];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"OrderStatus_or_nbsp" withString:nsstatus];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"TotalCuft_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",TotalCuft]];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"TotalWeight_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",TotalWeight]];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"OrderStatus_or_nbsp" withString:nsstatus];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"TotalCuft_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",TotalCuft]];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"TotalWeight_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",TotalWeight]];
|
|
|
orderinfo = [self replaceHtml:orderinfo String:@"TotalCarton_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",TotalCarton]];
|
|
|
- orderinfo =[self replaceHtml:orderinfo String:@"CustomerInfo_or_nbsp" withString:nscompany_name];
|
|
|
- orderinfo =[self replaceHtml:orderinfo String:@"CustomerName_or_nbsp" withString:nscustomer_contact];
|
|
|
- orderinfo =[self replaceHtml:orderinfo String:@"CustomerAddress_or_nbsp" withString:customer_address];
|
|
|
- orderinfo =[self replaceHtml:orderinfo String:@"ShippingMethod_or_nbsp" withString:nslogist];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"Shipping_or_nbsp" withString:shipping];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"LiftgateFee_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",lift_gate]];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"GeneralNotes_or_nbsp" withString:nsgeneral_notes];
|
|
|
- orderinfo=[self replaceHtml:orderinfo String:@"InternalNotes_or_nbsp" withString:nsinternal_notes];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"CustomerInfo_or_nbsp" withString:nscompany_name];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"CustomerName_or_nbsp" withString:nscustomer_contact];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"CustomerAddress_or_nbsp" withString:customer_address];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"ShippingMethod_or_nbsp" withString:nslogist];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"Shipping_or_nbsp" withString:shipping];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"LiftgateFee_or_nbsp" withString:[NSString stringWithFormat:@"%.2f",lift_gate]];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"GeneralNotes_or_nbsp" withString:nsgeneral_notes];
|
|
|
+ orderinfo = [self replaceHtml:orderinfo String:@"InternalNotes_or_nbsp" withString:nsinternal_notes];
|
|
|
|
|
|
NSString *payment = nil;
|
|
|
if([nspayment_type isEqualToString:@"Credit Card"])
|