Jelajahi Sumber

1.修改NPD,Item Search、Category以及Search增加More Color图标。
2.修改NPD Product表增加字段More Color,Item Search、Category以及Search离线数据增加More Color。

Pen Li 9 tahun lalu
induk
melakukan
b1041d4d7d
32 mengubah file dengan 246 tambahan dan 25 penghapusan
  1. TEMPAT SAMPAH
      RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate
  2. 6 0
      RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m
  3. 28 6
      RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m
  4. 6 3
      RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m
  5. 6 3
      RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m
  6. 5 3
      RedAnt ERP Mobile/common/data_provider/iSalesDB.m
  7. 56 10
      RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard
  8. 1 0
      RedAnt ERP Mobile/iSales-NPD/CategoryCellNPD.h
  9. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16.png
  10. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@2x.png
  11. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@3x.png
  12. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Contents.json
  13. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24.png
  14. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@2x.png
  15. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@3x.png
  16. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Contents.json
  17. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32.png
  18. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@2x.png
  19. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@3x.png
  20. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Contents.json
  21. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16.png
  22. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@2x.png
  23. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@3x.png
  24. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Contents.json
  25. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24.png
  26. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@2x.png
  27. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@3x.png
  28. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Contents.json
  29. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32.png
  30. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@2x.png
  31. TEMPAT SAMPAH
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@3x.png
  32. 23 0
      RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Contents.json

TEMPAT SAMPAH
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 6 - 0
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -1651,6 +1651,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1724,6 +1726,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         
         if(wish_exist)
             cell.mark_wish.hidden=false;
@@ -1778,6 +1782,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         
         if(wish_exist)
             cell.mark_wish.hidden=false;

+ 28 - 6
RedAnt ERP Mobile/common/Functions/offline/OLDataProvider.m

@@ -3424,10 +3424,10 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     
     NSString *sqlQuery = nil;
     if(exactMatch )
-        sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where lower(name) like'%@%%' and m.is_active = 1   order by m.name %@;",appDelegate.order_code, keyword,limit_str]; // select m.name,m.description,m.product_id,w._id,m.closeout from model m left join wishlist w on m.product_id=w.product_id where lower(name) like'%@%%' order by m.name limit %d offset %d ;
+        sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where lower(name) like'%@%%' and m.is_active = 1   order by m.name %@;",appDelegate.order_code, keyword,limit_str]; // select m.name,m.description,m.product_id,w._id,m.closeout from model m left join wishlist w on m.product_id=w.product_id where lower(name) like'%@%%' order by m.name limit %d offset %d ;
     else
         
-        sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where (lower(name) like'%%%@%%' or lower(description) like'%%%@%%') and m.is_active = 1 order by m.name %@ ;",appDelegate.order_code, keyword,keyword,limit_str];// select m.name,m.description,m.product_id,w._id,m.closeout from model m left join wishlist w on m.product_id=w.product_id where lower(name) like'%%%@%%' or
+        sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where (lower(name) like'%%%@%%' or lower(description) like'%%%@%%') and m.is_active = 1 order by m.name %@ ;",appDelegate.order_code, keyword,keyword,limit_str];// select m.name,m.description,m.product_id,w._id,m.closeout from model m left join wishlist w on m.product_id=w.product_id where lower(name) like'%%%@%%' or
     
     DebugLog(@"offline_search sql:%@",sqlQuery);
     sqlite3_stmt * statement;
@@ -3466,6 +3466,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             int closeout = sqlite3_column_int(statement, 4);
             int cid = sqlite3_column_int(statement, 5);
             int wisdelete = sqlite3_column_int(statement, 6);
+            int more_color = sqlite3_column_int(statement, 7);
+            
             NSMutableDictionary* imgjson=[self category_img:product_id  db:db];
             
             if(wid !=0 && wisdelete != 1)
@@ -3483,6 +3485,12 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             else
                 [item setValue:@"true" forKey:@"cart_exists"];
             
+            if (more_color == 0) {
+                [item setObject:@(false) forKey:@"more_color"];
+            } else if (more_color == 1) {
+                [item setObject:@(true) forKey:@"more_color"];
+            }
+            
             [item addEntriesFromDictionary:imgjson];
             
             
@@ -7267,7 +7275,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     NSString *where = [NSString stringWithFormat:@"category like'%%#%@#%%' and is_active = 1",category];
     
     
-    NSString *sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category from product m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id  where m.category like'%%#%@#%%' and m.is_active = 1 order by m.name %@ ;",appDelegate.order_code, category,limit_str];
+    NSString *sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category,m.more_color from product m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id  where m.category like'%%#%@#%%' and m.is_active = 1 order by m.name %@ ;",appDelegate.order_code, category,limit_str];
     
     
     double price_min = 0;
@@ -7384,7 +7392,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         // where bestseller > 0 order by bestseller desc
         // sql query: alert     availability(int)   best_seller(int)    price    qty
         
-        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category from (select name,description,product_id,closeout,best_seller,category from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;",cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
+        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.category,m.more_color from (select name,description,product_id,closeout,best_seller,category from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;",cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
         
         
         where =[NSString stringWithFormat:@"%@ %@ %@ %@ %@ %@ and is_active = 1",cateWhere,best_seller,alert,available_condition,qty,price];
@@ -7434,6 +7442,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             int cid = sqlite3_column_int(statement, 5);
             int wisdelete = sqlite3_column_int(statement, 6);
             NSString *categoryStr = [self textAtColumn:7 statement:statement];
+            int more_color = sqlite3_column_int(statement, 8);
             
             // Defaul Category ID
             __block NSString *categoryID = nil;
@@ -7497,6 +7506,12 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             else
                 [item setValue:@"true" forKey:@"cart_exists"];
             
+            if (more_color == 0) {
+                [item setObject:@(false) forKey:@"more_color"];
+            } else if (more_color == 1) {
+                [item setObject:@(true) forKey:@"more_color"];
+            }
+            
             [item addEntriesFromDictionary:imgjson];
             
             
@@ -7600,7 +7615,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
     
     NSString *sqlQuery = nil;
     where = [where stringByAppendingString:@" and m.is_active = 1"];
-    sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where %@ order by %@ %@;",appDelegate.order_code, where,orderby,limit_str];
+    sqlQuery=[NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from product m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id where %@ order by %@ %@;",appDelegate.order_code, where,orderby,limit_str];
     
     
     double price_min = 0;
@@ -7760,7 +7775,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
         // where bestseller > 0 order by bestseller desc
         // sql query: alert     availability(int)   best_seller(int)    price    qty
         
-        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete from (select name,description,product_id,closeout,best_seller from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;", cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
+        sqlQuery = [NSString stringWithFormat:@"select m.name,m.description,m.product_id,w._id,m.closeout,c._id,w.is_delete,m.more_color from (select name,description,product_id,closeout,best_seller from product where %@ %@ %@ %@ %@ %@ and is_active = 1) m left join wishlist w on m.product_id=w.product_id  left join (select _id,product_id from offline_cart where so_no='%@') c on c.product_id=m.product_id order by %@ %@;", cateWhere,best_seller,alert,available_condition,qty,price,appDelegate.order_code,order_best_seller,limit_str];
         
         
         // count
@@ -7814,6 +7829,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             int closeout = sqlite3_column_int(statement, 4);
             int cid = sqlite3_column_int(statement, 5);
             int wisdelete = sqlite3_column_int(statement, 6);
+            int more_color = sqlite3_column_int(statement, 7);
             NSMutableDictionary* imgjson=[self category_img:product_id db:db];
             
             if(wid !=0 && wisdelete != 1)
@@ -7831,6 +7847,12 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
             else
                 [item setValue:@"true" forKey:@"cart_exists"];
             
+            if (more_color == 0) {
+                [item setObject:@(false) forKey:@"more_color"];
+            } else if (more_color == 1) {
+                [item setObject:@(true) forKey:@"more_color"];
+            }
+            
             [item addEntriesFromDictionary:imgjson];
             
             

+ 6 - 3
RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -1523,7 +1523,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else
@@ -1590,7 +1591,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else
@@ -1648,7 +1650,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else

+ 6 - 3
RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -1544,7 +1544,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else
@@ -1609,7 +1610,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else
@@ -1670,7 +1672,8 @@
         bool wish_exist = [[item_json valueForKey:@"wish_exists"]boolValue];
         bool cart_exists = [[item_json valueForKey:@"cart_exists"]boolValue];
         bool closeout = [[item_json valueForKey:@"is_closeout"]boolValue];
-        
+        BOOL more_color = [[item_json valueForKey:@"more_color"] boolValue];
+        cell.mark_moreColor.hidden = !more_color;
         if(wish_exist)
             cell.mark_wish.hidden=false;
         else

+ 5 - 3
RedAnt ERP Mobile/common/data_provider/iSalesDB.m

@@ -677,7 +677,7 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     
     // [self execSql:@"PRAGMA journal_mode = WAL;" db:db];
     
-    NSString* create_product=@"CREATE TABLE IF NOT EXISTS product ( _id INTEGER PRIMARY KEY, name VARCHAR(20,0), description VARCHAR(20,0), product_id INTEGER, color VARCHAR(20,0), legcolor VARCHAR(20,0), availability INTEGER, incoming_stock INTEGER, ETA DATE, demension VARCHAR(20,0), seat_height VARCHAR(20,0), material VARCHAR(20,0), box_dim VARCHAR(20,0), volume VARCHAR(20,0), weight VARCHAR(20,0), model_set VARCHAR(20,0), load_ability VARCHAR(20,0), default_category VARCHAR(20,0), category VARCHAR(100,0), fabric_content VARCHAR(20,0), assembling VARCHAR(20,0), made_in VARCHAR(20,0), special_remarks VARCHAR(20,0), stockUom integer, fashion VARCHAR(20,0), isnew integer, property_field VARCHAR(20,0), property_display VARCHAR(20,0), selector_field VARCHAR(20,0), selector_display VARCHAR(20,0), product_group VARCHAR(20,0), packaging VARCHAR(20,0), closeout integer ,best_seller integer,alert VARCHAR(20,0),has_bundle integer,is_active integer,item_id integer);";
+    NSString* create_product=@"CREATE TABLE IF NOT EXISTS product ( _id INTEGER PRIMARY KEY, name VARCHAR(20,0), description VARCHAR(20,0), product_id INTEGER, color VARCHAR(20,0), legcolor VARCHAR(20,0), availability INTEGER, incoming_stock INTEGER, ETA DATE, demension VARCHAR(20,0), seat_height VARCHAR(20,0), material VARCHAR(20,0), box_dim VARCHAR(20,0), volume VARCHAR(20,0), weight VARCHAR(20,0), model_set VARCHAR(20,0), load_ability VARCHAR(20,0), default_category VARCHAR(20,0), category VARCHAR(100,0), fabric_content VARCHAR(20,0), assembling VARCHAR(20,0), made_in VARCHAR(20,0), special_remarks VARCHAR(20,0), stockUom integer, fashion VARCHAR(20,0), isnew integer, property_field VARCHAR(20,0), property_display VARCHAR(20,0), selector_field VARCHAR(20,0), selector_display VARCHAR(20,0), product_group VARCHAR(20,0), packaging VARCHAR(20,0), closeout integer ,best_seller integer,alert VARCHAR(20,0),has_bundle integer,is_active integer,item_id integer,more_color integer);";
     
     NSString* create_catalog=@"CREATE TABLE IF NOT EXISTS catalog ( _id INTEGER PRIMARY KEY, name VARCHAR(20,0), description VARCHAR(20,0), item_id INTEGER,is_active integer,ulength float,uwidth float,uheight float,uweight float,pcs integer,mpack integer,mlength float,mwidth float,mheight float,mweigth float,ipack integer,ilength float,iwidth float,iheight float, iweight float,ucbf float,icbf float, mcbf float,is_single_model integer, is_master_model integer,is_rate integer,is_part integer);";
     
@@ -799,8 +799,10 @@ void decryptfield (sqlite3_context *context, int argc, sqlite3_value **argv) {
     /*************************ALTER TABLE From V1.4 to V1.5************************************/
    
 //    [self alterTable:@"model" columns:@"product" rename:YES db:db];
-    
-    [self alterTable:@"product" columns:@"has_bundle integer;is_active integer;item_id integer" rename:NO db:db];
+    /**
+     2017-06-01 v1.81+ add more_color
+     */
+    [self alterTable:@"product" columns:@"has_bundle integer;is_active integer;item_id integer;more_color integer" rename:NO db:db];
     
     [self alterTable:@"model_image" columns:@"item_id integer;picture_id integer" rename:NO db:db];
     

+ 56 - 10
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16A323" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES" initialViewController="jsC-F8-zYF">
     <device id="ipad9_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="1808" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
         <capability name="Navigation items with more than one left or right bar item" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -956,10 +956,10 @@
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailHeaderCell" rowHeight="550" id="PCZ-Ci-oQf" customClass="DetailHeaderCell">
-                                        <rect key="frame" x="0.0" y="55.5" width="768" height="550"/>
+                                        <rect key="frame" x="0.0" y="56" width="768" height="550"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PCZ-Ci-oQf" id="DiR-eY-PiR">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="549.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="549"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USD 123.45" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="fD8-Km-IT3">
@@ -1208,7 +1208,7 @@
                                         <rect key="frame" x="0.0" y="605.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zzF-db-bsq" id="rZ0-x8-h3B">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Refreshing...
Please wait." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bSP-hh-M2A">
@@ -1274,15 +1274,15 @@
                                         <rect key="frame" x="0.0" y="1205.5" width="768" height="600"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gSx-f2-mrB" id="k28-H7-ddZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="599"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="DetailInfoCell" rowHeight="44" id="hYM-aE-rjR" customClass="DetailKVCell">
-                                        <rect key="frame" x="0.0" y="1805.5" width="768" height="44"/>
+                                        <rect key="frame" x="0.0" y="1806" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hYM-aE-rjR" id="o59-aa-UU2">
-                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="EOR-Ov-zPZ">
@@ -1379,6 +1379,10 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="7fM-wP-luR">
+                                                    <rect key="frame" x="8" y="153" width="16" height="16"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="gaL-IK-TsI">
                                                     <rect key="frame" x="148" y="8" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -1403,6 +1407,7 @@
                                             <outlet property="cellImageView" destination="x9x-qb-ApL" id="hKH-JG-dHy"/>
                                             <outlet property="checkImageView" destination="gaL-IK-TsI" id="5jp-BD-b8k"/>
                                             <outlet property="mark_closeout" destination="fST-2x-E5l" id="ENR-5u-uo8"/>
+                                            <outlet property="mark_moreColor" destination="7fM-wP-luR" id="inF-8V-b2M"/>
                                             <outlet property="mark_order" destination="lPz-NX-Jmy" id="Lsr-9R-725"/>
                                             <outlet property="mark_wish" destination="EHD-fY-XCs" id="Cvk-Km-Z6S"/>
                                             <outlet property="modelNoLabel" destination="NU1-5F-jwF" id="exa-7O-GFt"/>
@@ -1449,6 +1454,10 @@
                                                     <rect key="frame" x="8" y="8" width="32" height="32"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Luv-07-ZAU">
+                                                    <rect key="frame" x="8" y="320" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                             </subviews>
                                         </view>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1457,6 +1466,7 @@
                                             <outlet property="cellImageView" destination="Uuf-NG-kvA" id="EFv-Ac-MiN"/>
                                             <outlet property="checkImageView" destination="KD9-gq-Htz" id="BET-IN-yue"/>
                                             <outlet property="mark_closeout" destination="d5L-xs-fNS" id="Xe8-dN-G7G"/>
+                                            <outlet property="mark_moreColor" destination="Luv-07-ZAU" id="Keo-3k-tzV"/>
                                             <outlet property="mark_order" destination="cDb-nA-JP7" id="Fw5-gJ-Hsf"/>
                                             <outlet property="mark_wish" destination="XPF-bQ-IGN" id="h8d-c9-sxb"/>
                                             <outlet property="modelNoLabel" destination="r5v-jF-1ZF" id="fmc-mk-hdH"/>
@@ -1503,6 +1513,10 @@
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Z2a-02-p0m">
+                                                    <rect key="frame" x="636" y="88" width="24" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                             </subviews>
                                         </view>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1511,6 +1525,7 @@
                                             <outlet property="cellImageView" destination="oEb-Xw-BBg" id="mGu-qy-DXj"/>
                                             <outlet property="checkImageView" destination="EMD-KI-n8h" id="mVf-mi-KgC"/>
                                             <outlet property="mark_closeout" destination="nZs-lx-XFZ" id="RMW-Yw-pwB"/>
+                                            <outlet property="mark_moreColor" destination="Z2a-02-p0m" id="JWx-Yu-6PU"/>
                                             <outlet property="mark_order" destination="bee-uQ-zhs" id="IH1-cP-Ief"/>
                                             <outlet property="mark_wish" destination="e2t-uK-RWB" id="EkV-XL-1eS"/>
                                             <outlet property="modelNoLabel" destination="drL-KU-Xb0" id="u0y-F2-cgu"/>
@@ -2133,7 +2148,7 @@
                                         <rect key="frame" x="0.0" y="88" width="768" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Pol-lE-P45" id="FAm-1c-nX0">
-                                            <rect key="frame" x="0.0" y="0.0" width="730" height="44"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="702" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Clean Cache" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="AHm-p1-51h">
@@ -6021,6 +6036,10 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Km8-l7-rIl">
+                                                    <rect key="frame" x="8" y="320" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="A7V-vO-woe">
                                                     <rect key="frame" x="0.0" y="410" width="369" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -6059,6 +6078,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="qc7-BP-4rg" id="cZm-WM-riy"/>
                                             <outlet property="checkImageView" destination="rAf-0L-pbK" id="l0v-jJ-fNK"/>
                                             <outlet property="mark_closeout" destination="AFr-WF-8bZ" id="MHV-UN-zoo"/>
+                                            <outlet property="mark_moreColor" destination="Km8-l7-rIl" id="e0m-F7-a58"/>
                                             <outlet property="mark_order" destination="EIw-L6-PhB" id="mCX-0i-cfA"/>
                                             <outlet property="mark_wish" destination="Xey-8O-fKw" id="olA-qt-qSh"/>
                                             <outlet property="modelNoLabel" destination="A7V-vO-woe" id="YEb-BP-G1Z"/>
@@ -6091,6 +6111,10 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="8rb-ze-4cD">
+                                                    <rect key="frame" x="8" y="153" width="16" height="16"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="xfS-o7-Ud1">
                                                     <rect key="frame" x="148" y="8" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -6115,6 +6139,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="MoH-KH-aty" id="NhY-BD-gm0"/>
                                             <outlet property="checkImageView" destination="xfS-o7-Ud1" id="SPV-9H-eUk"/>
                                             <outlet property="mark_closeout" destination="Rxf-z0-1gK" id="ZhV-YJ-b9i"/>
+                                            <outlet property="mark_moreColor" destination="8rb-ze-4cD" id="Hqg-8i-gWw"/>
                                             <outlet property="mark_order" destination="EhG-vX-tlV" id="WPh-Qt-ec5"/>
                                             <outlet property="mark_wish" destination="IId-oZ-YW3" id="1dW-MC-sBa"/>
                                             <outlet property="modelNoLabel" destination="4XV-sU-Xhf" id="d03-Tr-bOE"/>
@@ -6161,6 +6186,10 @@ Email: redantsupport@united-us.net</string>
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="yop-ju-4DF">
+                                                    <rect key="frame" x="638" y="88" width="24" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                             </subviews>
                                         </view>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -6169,6 +6198,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="hSM-1l-11A" id="4ja-Pb-vko"/>
                                             <outlet property="checkImageView" destination="T5M-kg-gS2" id="eJg-fE-NGK"/>
                                             <outlet property="mark_closeout" destination="VgK-Vd-NgS" id="Ism-Yp-1bq"/>
+                                            <outlet property="mark_moreColor" destination="yop-ju-4DF" id="yhc-X2-FB6"/>
                                             <outlet property="mark_order" destination="Eko-q1-Tzx" id="nXg-lu-0Cc"/>
                                             <outlet property="mark_wish" destination="lS3-9V-Lry" id="U0M-Cb-GdN"/>
                                             <outlet property="modelNoLabel" destination="WW2-iu-yna" id="w9u-Co-yeX"/>
@@ -7119,6 +7149,10 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="Byl-UD-AE8">
+                                                    <rect key="frame" x="8" y="320" width="32" height="32"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="$139.99" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rSL-hV-BoQ">
                                                     <rect key="frame" x="0.0" y="410" width="369" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -7157,6 +7191,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="6nt-yR-Fuh" id="wzA-Ty-VYd"/>
                                             <outlet property="checkImageView" destination="e3A-ze-7Hy" id="XUy-zI-6wA"/>
                                             <outlet property="mark_closeout" destination="SZV-WG-FBT" id="tWR-r3-xZG"/>
+                                            <outlet property="mark_moreColor" destination="Byl-UD-AE8" id="PCQ-4m-ejU"/>
                                             <outlet property="mark_order" destination="lac-kI-whs" id="AVg-vp-s1e"/>
                                             <outlet property="mark_wish" destination="oRd-HS-sFX" id="02N-vI-vYG"/>
                                             <outlet property="modelNoLabel" destination="rSL-hV-BoQ" id="Mun-8c-nLk"/>
@@ -7189,6 +7224,10 @@ Email: redantsupport@united-us.net</string>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="scg-Vi-nab">
+                                                    <rect key="frame" x="8" y="153" width="16" height="16"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="f0r-NM-Tvb">
                                                     <rect key="frame" x="148" y="8" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -7213,6 +7252,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="FG4-BF-H7h" id="p9D-Ax-a8u"/>
                                             <outlet property="checkImageView" destination="f0r-NM-Tvb" id="2RB-Ny-Vwb"/>
                                             <outlet property="mark_closeout" destination="lQE-7J-7o5" id="7Zg-jf-Qhd"/>
+                                            <outlet property="mark_moreColor" destination="scg-Vi-nab" id="sXx-Cw-4tt"/>
                                             <outlet property="mark_order" destination="ZG6-Bz-HLs" id="nLX-aK-UEW"/>
                                             <outlet property="mark_wish" destination="Geb-mf-gLr" id="HRw-8i-c7I"/>
                                             <outlet property="modelNoLabel" destination="HSu-nc-ciB" id="HXF-Vx-TDU"/>
@@ -7259,6 +7299,10 @@ Email: redantsupport@united-us.net</string>
                                                     <rect key="frame" x="673" y="88" width="24" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Color_Indicator2_32" id="DSb-h2-y4N">
+                                                    <rect key="frame" x="631" y="88" width="24" height="24"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                </imageView>
                                             </subviews>
                                         </view>
                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -7267,6 +7311,7 @@ Email: redantsupport@united-us.net</string>
                                             <outlet property="cellImageView" destination="yCl-h4-h7g" id="FTd-xe-YbQ"/>
                                             <outlet property="checkImageView" destination="IAq-hp-eeN" id="K56-eZ-9vk"/>
                                             <outlet property="mark_closeout" destination="R3G-EF-EGV" id="3Py-It-AjH"/>
+                                            <outlet property="mark_moreColor" destination="DSb-h2-y4N" id="iuP-WQ-WHV"/>
                                             <outlet property="mark_order" destination="at2-gw-iu5" id="eOM-gd-NKL"/>
                                             <outlet property="mark_wish" destination="6Jo-jO-onF" id="SJs-0o-6Nn"/>
                                             <outlet property="modelNoLabel" destination="f9n-2Z-4Ae" id="dVI-gF-dbL"/>
@@ -7863,7 +7908,7 @@ Email: redantsupport@united-us.net</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HwF-54-hzr">
-                                                    <rect key="frame" x="15" y="0.0" width="698" height="43.5"/>
+                                                    <rect key="frame" x="28" y="0.0" width="672" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -8613,6 +8658,7 @@ Email: redantsupport@united-us.net</string>
         </scene>
     </scenes>
     <resources>
+        <image name="Color_Indicator2_32" width="32" height="32"/>
         <image name="Combinegray" width="40" height="40"/>
         <image name="about" width="96" height="96"/>
         <image name="add_180" width="180" height="180"/>

+ 1 - 0
RedAnt ERP Mobile/iSales-NPD/CategoryCellNPD.h

@@ -15,6 +15,7 @@
 @property (strong, nonatomic) IBOutlet UIImageView *checkImageView;
 @property (strong, nonatomic) IBOutlet UIImageView *mark_order;
 @property (strong, nonatomic) IBOutlet UIImageView *mark_closeout;
+@property (strong, nonatomic) IBOutlet UIImageView *mark_moreColor;
 
 @property (strong, nonatomic) IBOutlet UIImageView *mark_wish;
 

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Color_Indicator1_16@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_16.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_16.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_16@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Color_Indicator1_24@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_24.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_24.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Color_Indicator1_32@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator1_32.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator1_32@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Color_Indicator2_16@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_16.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_16.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_16@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Color_Indicator2_24@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_24.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_24.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@2x.png


TEMPAT SAMPAH
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Color_Indicator2_32@3x.png


+ 23 - 0
RedAnt ERP Mobile/iSales-NPD/Images.xcassets/Color_Indicator2_32.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_32.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Color_Indicator2_32@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}