|
|
@@ -144,16 +144,17 @@
|
|
|
data[@"CURRENT_PAGE"]=0;
|
|
|
NSMutableDictionary* grid = [[NSMutableDictionary alloc]init];
|
|
|
|
|
|
-
|
|
|
+ BOOL show_group_by = [[params objectForKey:@"show_group_by"] boolValue];
|
|
|
bool show_stockout=[params[@"show_stockout"] boolValue];
|
|
|
NSString *sql = nil;
|
|
|
+ // v1.90 more color
|
|
|
if(values==nil)
|
|
|
{
|
|
|
- sql=[NSString stringWithFormat:@"select a.product_id,a.name,a.description,a.price,a.sheet_discount,a.qty,a.is_percentage,a.item_id,a.fashion_id,a.line_note,a.percent,a._id,b.availability,b.color,b.legcolor,b.demension,b.seat_height,b.material,b.box_dim,b.volume,b.weight,stockuom,b.load_ability,b.fabric_content,b.assembling,b.made_in from (select _id, product_id,name,description,ifnull(sheet_price,'null') as price,sheet_discount,ifnull(available_qty,'null') as qty,percentage as is_percentage,item_id,fashion_id,line_note,percent from offline_portfolio where product_id in(%@)) a left join (select * from product where product_id in(%@)) b on a.product_id=b.product_id order by a.name",params[@"product_ids"],params[@"product_ids"]];
|
|
|
+ sql=[NSString stringWithFormat:@"select a.product_id,a.name,a.description,a.price,a.sheet_discount,a.qty,a.is_percentage,a.item_id,a.fashion_id,a.line_note,a.percent,a._id,b.availability,b.color,b.legcolor,b.demension,b.seat_height,b.material,b.box_dim,b.volume,b.weight,stockuom,b.load_ability,b.fabric_content,b.assembling,b.made_in,b.more_color from (select _id, product_id,name,description,ifnull(sheet_price,'null') as price,sheet_discount,ifnull(available_qty,'null') as qty,percentage as is_percentage,item_id,fashion_id,line_note,percent from offline_portfolio where product_id in(%@)) a left join (select * from product where product_id in(%@)) b on a.product_id=b.product_id order by a.name",params[@"product_ids"],params[@"product_ids"]];
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- sql=[NSString stringWithFormat:@"select product_id,name,description,null,null,null,null,item_id,null,null,null,-1,availability,color,legcolor,demension,seat_height,material,box_dim,volume,weight,stockuom,load_ability,fabric_content,assembling,made_in from product where product_id in(%@) order by name",params[@"product_ids"]];
|
|
|
+ sql=[NSString stringWithFormat:@"select product_id,name,description,null,null,null,null,item_id,null,null,null,-1,availability,color,legcolor,demension,seat_height,material,box_dim,volume,weight,stockuom,load_ability,fabric_content,assembling,made_in,more_color from product where product_id in(%@) order by name",params[@"product_ids"]];
|
|
|
}
|
|
|
|
|
|
__block NSMutableDictionary *dic = [NSMutableDictionary dictionary];
|
|
|
@@ -207,7 +208,7 @@
|
|
|
NSString *fabric_content = [self textAtColumn:23 statement:stmt];
|
|
|
NSString *assembling = [self textAtColumn:24 statement:stmt];
|
|
|
NSString *made_in = [self textAtColumn:25 statement:stmt];
|
|
|
-
|
|
|
+ NSInteger more_color_int = sqlite3_column_int(stmt, 26);
|
|
|
|
|
|
|
|
|
NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:item_id price:[params[@"regular_price"] intValue] db:db];
|
|
|
@@ -402,7 +403,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
[UIImagePNGRepresentation(qrimg)writeToFile: qrpath atomically:YES];
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ NSString *more_color_path = [[NSBundle mainBundle] pathForResource:@"more_color_64" ofType:@"png"];
|
|
|
|
|
|
|
|
|
|
|
|
@@ -415,6 +416,9 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
item[@"description"]=description;
|
|
|
item[@"detail"]=detail;
|
|
|
item[@"img"]=img_path;
|
|
|
+ if (show_group_by && more_color_int != 0) {
|
|
|
+ item[@"more_color"] = more_color_path;
|
|
|
+ }
|
|
|
|
|
|
// @{
|
|
|
// //@"linenotes": line_note,
|
|
|
@@ -12001,7 +12005,10 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
|
|
|
|
|
|
// model info
|
|
|
- NSString *sql = [NSString stringWithFormat:@"select product_id,ifnull(sheet_price,'null'),ifnull(sheet_discount,'null'),ifnull(available_qty,'null'),percentage,item_id,line_note,percent from offline_portfolio where product_id in (%@);",product_ids];
|
|
|
+// NSString *sql = [NSString stringWithFormat:@"select product_id,ifnull(sheet_price,'null'),ifnull(sheet_discount,'null'),ifnull(available_qty,'null'),percentage,item_id,line_note,percent from offline_portfolio where product_id in (%@);",product_ids];
|
|
|
+
|
|
|
+ // V1.90 more color
|
|
|
+ NSString *sql = [NSString stringWithFormat:@"select p.product_id,ifnull(p.sheet_price,'null'),ifnull(p.sheet_discount,'null'),ifnull(p.available_qty,'null'),p.percentage,p.item_id,p.line_note,p.percent,m.more_color from offline_portfolio as p left join product as m on p.product_id = m.product_id where p.product_id in (%@);",product_ids];
|
|
|
|
|
|
__block NSMutableDictionary *dic = [NSMutableDictionary dictionary];
|
|
|
__block NSMutableString *product_ids_string = [NSMutableString string]; // configure参数
|
|
|
@@ -12023,6 +12030,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
int item_id = sqlite3_column_int(stmt, 5);
|
|
|
NSString *line_note = [self textAtColumn:6 statement:stmt];
|
|
|
double percent = sqlite3_column_double(stmt, 7);
|
|
|
+ int more_color = sqlite3_column_int(stmt, 8);
|
|
|
|
|
|
NSString *price_null = [self textAtColumn:1 statement:stmt];
|
|
|
/* if ([price_null isEqualToString:@"null"]) {
|
|
|
@@ -12063,6 +12071,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
@"line_note": line_note,
|
|
|
@"product_id": product_id_string,
|
|
|
@"available_qty": @(qty),
|
|
|
+ @"more_color":@(more_color),
|
|
|
@"item_id": [NSString stringWithFormat:@"%d",item_id],
|
|
|
@"regular_price" : regular_price_str,
|
|
|
@"special_price" : [NSString stringWithFormat:@"%.2f",price]
|
Pen Li
