|
|
@@ -7181,7 +7181,7 @@
|
|
|
__block int TotalCarton = 0;
|
|
|
__block double payments = 0;
|
|
|
|
|
|
- NSString *sql = [NSString stringWithFormat:@"select c.item_id,c.item_count,m.stockUom,c.price,c.discount,m.name,m.description from (select _id,product_id,decrypt(str_price) as price,discount,item_count,line_note,item_id from offline_cart where so_no='%@') c left join product m on c.product_id=m.product_id;",orderCode];
|
|
|
+ NSString *sql = [NSString stringWithFormat:@"select c.item_id,c.item_count,m.stockUom,c.price,c.discount,m.name,m.description,c.line_note from (select _id,product_id,decrypt(str_price) as price,discount,item_count,line_note,item_id from offline_cart where so_no='%@') c left join product m on c.product_id=m.product_id;",orderCode];
|
|
|
|
|
|
AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
|
|
|
|
|
|
@@ -7224,6 +7224,9 @@
|
|
|
NSString *description = [self textAtColumn:6 statement:stmt];
|
|
|
description = [NSString stringWithFormat:@"%@\n%@",name,description ];
|
|
|
|
|
|
+ // line note
|
|
|
+ NSString *line_note = [self textAtColumn:7 statement:stmt];
|
|
|
+
|
|
|
// img
|
|
|
NSString *img = [self item_image:[NSString stringWithFormat:@"%@",[NSNumber numberWithInt:item_id]] db:db];
|
|
|
|
|
|
@@ -7249,6 +7252,7 @@
|
|
|
[model_dic setValue:@"model" forKey:@"control"];
|
|
|
[model_dic setValue:[NSString stringWithFormat:@"%d",item_count] forKey:@"count"];
|
|
|
[model_dic setValue:description forKey:@"description"];
|
|
|
+ [model_dic setValue:line_note forKey:@"note"];
|
|
|
[model_dic setValue:img forKey:@"img_url"];
|
|
|
[model_dic setValue:[NSNumber numberWithInteger:stockUom] forKey:@"stockUom"];
|
|
|
[model_dic setValue:[NSString stringWithFormat:@"%.2f",subTotal] forKey:@"total_price"];
|
|
|
@@ -8336,11 +8340,11 @@
|
|
|
|
|
|
NSString *lift_gate_value = [self valueInParams:param key:@"lift_gate_value"]; // Shipping To Be Quoted
|
|
|
NSString *lift_gate_placeholder = @"";
|
|
|
- if ([handling_fee_value isEqualToString:@""]) {
|
|
|
+ if ([lift_gate_value isEqualToString:@""]) {
|
|
|
|
|
|
lift_gate_placeholder = @"";
|
|
|
|
|
|
- } else if ([handling_fee_value isEqualToString:@"Shipping To Be Quoted"]) {
|
|
|
+ } else if ([lift_gate_value isEqualToString:@"Shipping To Be Quoted"]) {
|
|
|
|
|
|
lift_gate_placeholder = @"";
|
|
|
|