Browse Source

实现item search、category、search全选加入cart、portfolio、wishlist

Pen Li 9 years ago
parent
commit
28c59e1141

BIN
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 0
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.h

@@ -71,4 +71,9 @@ typedef void (^add_to_cart_Handler)(void);
 //@property (copy, nonatomic)void (^add_to_cart_Handler)(void);
 //@property (copy, nonatomic)void (^add_to_cart_Handler)(void);
 @property (copy, nonatomic) add_to_cart_Handler handler;
 @property (copy, nonatomic) add_to_cart_Handler handler;
 //@property bool disable_refresh;
 //@property bool disable_refresh;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllBtn;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllCheckBtn;
+
+
 @end
 @end

+ 51 - 5
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -41,6 +41,8 @@
 
 
 @interface CategoryViewController ()
 @interface CategoryViewController ()
 
 
+@property (nonatomic,assign) BOOL addAll;
+
 @end
 @end
 
 
 @implementation CategoryViewController
 @implementation CategoryViewController
@@ -258,7 +260,7 @@
     if (self.selectallBtn.tag == 0)
     if (self.selectallBtn.tag == 0)
     {
     {
         self.selectallBtn.tag = 1;
         self.selectallBtn.tag = 1;
-        [self.selectallBtn setTitle:@"Deselect all"];
+        [self.selectallBtn setTitle:@"Deselect"];
         if(count>0)
         if(count>0)
         {
         {
             self.addWishBtn.enabled = true;
             self.addWishBtn.enabled = true;
@@ -271,7 +273,7 @@
     else
     else
     {
     {
         self.selectallBtn.tag = 0;
         self.selectallBtn.tag = 0;
-        [self.selectallBtn setTitle:@"Select all"];
+        [self.selectallBtn setTitle:@"Select"];
         self.addWishBtn.enabled = false;
         self.addWishBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addPortfolioBtn.enabled=false;
         self.addPortfolioBtn.enabled=false;
@@ -630,7 +632,13 @@
     
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toCart_byName:ids];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork Category_addall:self.categoryid customid:0 price_template:0 sort:0 filter:nil keyword:nil offset:self.offset limit:20 alert:self.p_alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller modelname:self.modelname modeldescrip:self.modeldescrip orderCode:appDelegate.order_code  addTo:@"cart"];
+        } else {
+            return_json = [iSalesNetwork add_toCart_byName:ids];
+        }
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             
             
@@ -721,7 +729,13 @@
 
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toPortfolio:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork Category_addall:self.categoryid customid:0 price_template:0 sort:0 filter:nil keyword:nil offset:self.offset limit:20 alert:self.p_alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller modelname:self.modelname modeldescrip:self.modeldescrip orderCode:nil  addTo:@"portfolio"];
+        } else {
+            return_json = [iSalesNetwork add_toPortfolio:ids ];
+        }
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -798,7 +812,15 @@
     
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toWatchList:ids ];
+        
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            return_json = [iSalesNetwork Category_addall:self.categoryid customid:0 price_template:0 sort:0 filter:nil keyword:nil offset:self.offset limit:20 alert:self.p_alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller modelname:self.modelname modeldescrip:self.modeldescrip orderCode:nil  addTo:@"wishlist"];
+        } else {
+            return_json = [iSalesNetwork add_toWatchList:ids ];
+        }
+
+        
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -1257,6 +1279,9 @@
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     self.mum.layer.masksToBounds = YES;
     
     
+    self.addAll = NO;
+    [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    
     
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];
     //            tap.minimumPressDuration = 0.8; //定义按的时间
     //            tap.minimumPressDuration = 0.8; //定义按的时间
@@ -2257,4 +2282,25 @@
     
     
     
     
 }
 }
+
+#pragma mark Jack
+
+- (void)addALlModel {
+    self.addAll = !self.addAll;
+    if (self.addAll) {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_1_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    } else {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    }
+    
+}
+
+- (IBAction)addAllBtnClick:(id)sender {
+    [self addALlModel];
+}
+
+- (IBAction)allAllCheckBtnClick:(id)sender {
+    [self addALlModel];
+}
+
 @end
 @end

+ 5 - 0
RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.h

@@ -60,4 +60,9 @@
 
 
 
 
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllCheckBtn;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllBtn;
+
+
 @end
 @end

+ 49 - 5
RedAnt ERP Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m

@@ -29,6 +29,9 @@
 
 
 @interface ItemSearchViewController ()
 @interface ItemSearchViewController ()
 
 
+@property (nonatomic,assign) BOOL addAll;
+
+
 @end
 @end
 
 
 @implementation ItemSearchViewController
 @implementation ItemSearchViewController
@@ -160,7 +163,7 @@
     if (self.selectallBtn.tag == 0)
     if (self.selectallBtn.tag == 0)
     {
     {
         self.selectallBtn.tag = 1;
         self.selectallBtn.tag = 1;
-        [self.selectallBtn setTitle:@"Deselect all"];
+        [self.selectallBtn setTitle:@"Deselect"];
         if(count>0)
         if(count>0)
         {
         {
             self.addWishBtn.enabled = true;
             self.addWishBtn.enabled = true;
@@ -173,7 +176,7 @@
     else
     else
     {
     {
         self.selectallBtn.tag = 0;
         self.selectallBtn.tag = 0;
-        [self.selectallBtn setTitle:@"Select all"];
+        [self.selectallBtn setTitle:@"Select"];
         self.addWishBtn.enabled = false;
         self.addWishBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addPortfolioBtn.enabled=false;
         self.addPortfolioBtn.enabled=false;
@@ -209,6 +212,9 @@
     self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.backgroundColor = [UIColor colorWithHEX:0xA5A5A5 alpha:0.5];
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     self.mum.layer.masksToBounds = YES;
+    
+    self.addAll = NO;
+    [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
 
 
     
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(refresh_btn_click:)];
@@ -1024,7 +1030,13 @@
     
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toCart_byName:ids];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork ItemSearch_addall:self.offset limit:20 covertype:self.covertype ctgid:self.ctgid modelname:self.modelname modeldescrip:self.modeldescrip alert:self.alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller orderCode:appDelegate.order_code addTo:@"cart"];
+        } else {
+            return_json = [iSalesNetwork add_toCart_byName:ids];
+        }
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -1113,7 +1125,14 @@
     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Portfolio"];
     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Portfolio"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toPortfolio:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork ItemSearch_addall:self.offset limit:20 covertype:self.covertype ctgid:self.ctgid modelname:self.modelname modeldescrip:self.modeldescrip alert:self.alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller orderCode:nil addTo:@"portfolio"];
+        } else {
+            return_json = [iSalesNetwork add_toPortfolio:ids ];
+        }
+
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             
             
@@ -1187,7 +1206,14 @@
      UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
      UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toWatchList:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork ItemSearch_addall:self.offset limit:20 covertype:self.covertype ctgid:self.ctgid modelname:self.modelname modeldescrip:self.modeldescrip alert:self.alert qty:self.p_QTY available:self.p_available price:self.p_price bestseller:self.p_bestseller orderCode:nil addTo:@"wishlist"];
+        } else {
+            return_json = [iSalesNetwork add_toWatchList:ids ];
+        }
+
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -2011,5 +2037,23 @@
     // Pass the selected object to the new view controller.
     // Pass the selected object to the new view controller.
 }
 }
 */
 */
+#pragma mark Jack
+
+- (void)addALlItem {
+    self.addAll = !self.addAll;
+    if (self.addAll) {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_1_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    } else {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    }
+    
+}
+
+- (IBAction)addAllBtnClick:(id)sender {
+    [self addALlItem];
+}
+- (IBAction)addAllCheckBtnClick:(id)sender {
+    [self addALlItem];
+}
 
 
 @end
 @end

+ 5 - 0
RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.h

@@ -41,4 +41,9 @@
 @property (strong, nonatomic) IBOutlet UISwitch *switch_matchfull;
 @property (strong, nonatomic) IBOutlet UISwitch *switch_matchfull;
 
 
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
 @property (strong, nonatomic) IBOutlet UILabel *label_net_err;
+
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllCheckBtn;
+@property (strong, nonatomic) IBOutlet UIBarButtonItem *addAllBtn;
+
+
 @end
 @end

+ 55 - 7
RedAnt ERP Mobile/common/Functions/search+itemsearch/SearchViewController.m

@@ -26,6 +26,8 @@
 
 
 @interface SearchViewController ()
 @interface SearchViewController ()
 
 
+@property (nonatomic,assign) BOOL addAll;
+
 @end
 @end
 
 
 @implementation SearchViewController
 @implementation SearchViewController
@@ -112,7 +114,7 @@
     
     
     
     
     self.selectallBtn.tag = 0;
     self.selectallBtn.tag = 0;
-    [self.selectallBtn setTitle:@"Select all"];
+    [self.selectallBtn setTitle:@"Select"];
     
     
     self.isSelectionMode=false;
     self.isSelectionMode=false;
     
     
@@ -148,9 +150,11 @@
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.cornerRadius = 5.0f;
     self.mum.layer.masksToBounds = YES;
     self.mum.layer.masksToBounds = YES;
 
 
+    self.addAll = NO;
+    [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
     
     
     
     
-    self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Selece all", @"Deselect all", nil];
+    self.selectallBtn.possibleTitles = [NSSet setWithObjects:@"Select", @"Deselect", nil];
     
     
     self.categoryViewType = CATEGORY_VIEWTYPE_SMALL;
     self.categoryViewType = CATEGORY_VIEWTYPE_SMALL;
     UICollectionViewFlowLayout*  layout =(UICollectionViewFlowLayout*)self.collectionview.collectionViewLayout;
     UICollectionViewFlowLayout*  layout =(UICollectionViewFlowLayout*)self.collectionview.collectionViewLayout;
@@ -291,7 +295,7 @@
     if (self.selectallBtn.tag == 0)
     if (self.selectallBtn.tag == 0)
     {
     {
         self.selectallBtn.tag = 1;
         self.selectallBtn.tag = 1;
-        [self.selectallBtn setTitle:@"Deselect all"];
+        [self.selectallBtn setTitle:@"Deselect"];
         if(count>0)
         if(count>0)
         {
         {
         self.addWishBtn.enabled = true;
         self.addWishBtn.enabled = true;
@@ -304,7 +308,7 @@
     else
     else
     {
     {
         self.selectallBtn.tag = 0;
         self.selectallBtn.tag = 0;
-        [self.selectallBtn setTitle:@"Select all"];
+        [self.selectallBtn setTitle:@"Select"];
         self.addWishBtn.enabled = false;
         self.addWishBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addCartBtn.enabled = false;
         self.addPortfolioBtn.enabled=false;
         self.addPortfolioBtn.enabled=false;
@@ -846,7 +850,14 @@
     
     
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toCart_byName:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork Search_addall:self.offset limit:20 keywords:self.keywords matchfull:self.loadmore_matchfull orderCode:appDelegate.order_code addTo:@"cart"];
+        } else {
+            return_json = [iSalesNetwork add_toCart_byName:ids ];
+        }
+
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             
             
@@ -928,7 +939,14 @@
     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Portfolio"];
     UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Portfolio"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toPortfolio:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork Search_addall:self.offset limit:20 keywords:self.keywords matchfull:self.loadmore_matchfull orderCode:nil addTo:@"portfolio"];
+        } else {
+            return_json = [iSalesNetwork add_toPortfolio:ids ];
+        }
+
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
             [waitalert dismissWithClickedButtonIndex:0 animated:FALSE];
@@ -1002,7 +1020,14 @@
      UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
      UIAlertView * waitalert = [RAUtils waiting_alert:@"Please wait..." title:@"Add Models To Wish List"];
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         
         
-        NSDictionary* return_json = [iSalesNetwork add_toWatchList:ids ];
+        NSDictionary* return_json = nil;
+        if (self.addAll) {
+            AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
+            return_json = [iSalesNetwork Search_addall:self.offset limit:20 keywords:self.keywords matchfull:self.loadmore_matchfull orderCode:nil addTo:@"wishlist"];
+        } else {
+            return_json = [iSalesNetwork add_toWatchList:ids ];
+        }
+
         
         
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             
             
@@ -2030,4 +2055,27 @@
 
 
     
     
 }
 }
+
+
+#pragma mark Jack
+
+- (void)addALlItem {
+    self.addAll = !self.addAll;
+    if (self.addAll) {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_1_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    } else {
+        [self.addAllCheckBtn setImage:[[UIImage imageNamed:@"check_0_24"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
+    }
+    
+}
+
+
+- (IBAction)addAllCheckBtnClick:(id)sender {
+    [self addALlItem];
+}
+
+- (IBAction)addAllClick:(id)sender {
+    [self addALlItem];
+}
+
 @end
 @end

+ 51 - 12
RedAnt ERP Mobile/iSales-NPD/Base.lproj/Main.storyboard

@@ -1568,25 +1568,36 @@
                                             <action selector="onAddWishlistClick:" destination="O3B-N1-SIn" id="KAN-fB-Uzb"/>
                                             <action selector="onAddWishlistClick:" destination="O3B-N1-SIn" id="KAN-fB-Uzb"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="MuA-4g-FjC"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="bhv-KA-Llm"/>
                                     <barButtonItem title="Add to Cart" id="lye-m8-iPD">
                                     <barButtonItem title="Add to Cart" id="lye-m8-iPD">
                                         <connections>
                                         <connections>
                                             <action selector="onAddCartClick:" destination="O3B-N1-SIn" id="SIZ-33-bBN"/>
                                             <action selector="onAddCartClick:" destination="O3B-N1-SIn" id="SIZ-33-bBN"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="EHV-qu-X3q"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="SSS-Pd-KaQ"/>
                                     <barButtonItem title="Add to Portfolio" id="ult-1U-am5">
                                     <barButtonItem title="Add to Portfolio" id="ult-1U-am5">
                                         <connections>
                                         <connections>
                                             <action selector="onAddPortfolioClick:" destination="O3B-N1-SIn" id="fJw-2S-uZT"/>
                                             <action selector="onAddPortfolioClick:" destination="O3B-N1-SIn" id="fJw-2S-uZT"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="Rx1-fM-hkH"/>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="Rx1-fM-hkH"/>
-                                    <barButtonItem title="Select all" id="6EL-jA-Khm">
+                                    <barButtonItem image="check_1_24" width="18" id="wE3-wc-tx3">
+                                        <connections>
+                                            <action selector="allAllCheckBtnClick:" destination="O3B-N1-SIn" id="FV9-J8-R5v"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem title="Add All" id="Roj-vw-oZ1">
+                                        <connections>
+                                            <action selector="addAllBtnClick:" destination="O3B-N1-SIn" id="nl2-Ha-vDF"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="g6e-9v-9se"/>
+                                    <barButtonItem title="Select" id="6EL-jA-Khm">
                                         <connections>
                                         <connections>
                                             <action selector="onSelectAllClick:" destination="O3B-N1-SIn" id="mXB-JK-4IF"/>
                                             <action selector="onSelectAllClick:" destination="O3B-N1-SIn" id="mXB-JK-4IF"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="s0X-RR-Q9q"/>
+                                    <barButtonItem width="30" style="plain" systemItem="fixedSpace" id="s0X-RR-Q9q"/>
                                     <barButtonItem title="Cancel" id="nCF-kM-OkN" userLabel="Cancel">
                                     <barButtonItem title="Cancel" id="nCF-kM-OkN" userLabel="Cancel">
                                         <connections>
                                         <connections>
                                             <action selector="onCancelSelectClick:" destination="O3B-N1-SIn" id="K8K-KU-9Bh"/>
                                             <action selector="onCancelSelectClick:" destination="O3B-N1-SIn" id="K8K-KU-9Bh"/>
@@ -1609,6 +1620,8 @@
                         </subviews>
                         </subviews>
                     </view>
                     </view>
                     <connections>
                     <connections>
+                        <outlet property="addAllBtn" destination="Roj-vw-oZ1" id="DcD-Qg-zuH"/>
+                        <outlet property="addAllCheckBtn" destination="wE3-wc-tx3" id="7vB-T1-PdF"/>
                         <outlet property="addCartBtn" destination="lye-m8-iPD" id="1pe-VP-2iO"/>
                         <outlet property="addCartBtn" destination="lye-m8-iPD" id="1pe-VP-2iO"/>
                         <outlet property="addPortfolioBtn" destination="ult-1U-am5" id="Qgz-Qn-RIO"/>
                         <outlet property="addPortfolioBtn" destination="ult-1U-am5" id="Qgz-Qn-RIO"/>
                         <outlet property="addWishBtn" destination="Zcg-2a-cqw" id="MUf-Ms-LfL"/>
                         <outlet property="addWishBtn" destination="Zcg-2a-cqw" id="MUf-Ms-LfL"/>
@@ -6231,20 +6244,31 @@ Email: redantsupport@united-us.net</string>
                                             <action selector="onAddWishlistClick:" destination="yq3-iF-ow0" id="WRe-8l-1AU"/>
                                             <action selector="onAddWishlistClick:" destination="yq3-iF-ow0" id="WRe-8l-1AU"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="BRY-vn-AcQ"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="mBy-1A-6FC"/>
                                     <barButtonItem title="Add to Cart" id="gEd-lK-iv4">
                                     <barButtonItem title="Add to Cart" id="gEd-lK-iv4">
                                         <connections>
                                         <connections>
                                             <action selector="onAddCartClick:" destination="yq3-iF-ow0" id="qzE-tF-mvy"/>
                                             <action selector="onAddCartClick:" destination="yq3-iF-ow0" id="qzE-tF-mvy"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="smi-HL-cjJ"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="xg9-cU-JRY"/>
                                     <barButtonItem title="Add to Portfolio" id="NFT-r9-yyN">
                                     <barButtonItem title="Add to Portfolio" id="NFT-r9-yyN">
                                         <connections>
                                         <connections>
                                             <action selector="onAddPortfolioClick:" destination="yq3-iF-ow0" id="uXk-y3-LrD"/>
                                             <action selector="onAddPortfolioClick:" destination="yq3-iF-ow0" id="uXk-y3-LrD"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="IyK-YV-fZT"/>
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="IyK-YV-fZT"/>
-                                    <barButtonItem title="Select all" id="sBd-1t-dfF">
+                                    <barButtonItem image="check_0_24" width="18" id="t0f-Tw-1pY">
+                                        <connections>
+                                            <action selector="addAllCheckBtnClick:" destination="yq3-iF-ow0" id="I0J-KF-ydg"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem title="Add All" id="piy-i4-mfg">
+                                        <connections>
+                                            <action selector="addAllClick:" destination="yq3-iF-ow0" id="uGY-gH-0e6"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="jtr-yo-QOX"/>
+                                    <barButtonItem title="Select" id="sBd-1t-dfF">
                                         <connections>
                                         <connections>
                                             <action selector="onSelectAllClick:" destination="yq3-iF-ow0" id="GWP-nd-VNf"/>
                                             <action selector="onSelectAllClick:" destination="yq3-iF-ow0" id="GWP-nd-VNf"/>
                                         </connections>
                                         </connections>
@@ -6273,6 +6297,8 @@ Email: redantsupport@united-us.net</string>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     </view>
                     <connections>
                     <connections>
+                        <outlet property="addAllBtn" destination="piy-i4-mfg" id="3bg-eW-IjM"/>
+                        <outlet property="addAllCheckBtn" destination="t0f-Tw-1pY" id="Iwh-BG-xnD"/>
                         <outlet property="addCartBtn" destination="gEd-lK-iv4" id="vGR-ea-IW5"/>
                         <outlet property="addCartBtn" destination="gEd-lK-iv4" id="vGR-ea-IW5"/>
                         <outlet property="addPortfolioBtn" destination="NFT-r9-yyN" id="yXG-JL-ce4"/>
                         <outlet property="addPortfolioBtn" destination="NFT-r9-yyN" id="yXG-JL-ce4"/>
                         <outlet property="addWishBtn" destination="w2X-RD-AQL" id="GxL-eU-dWF"/>
                         <outlet property="addWishBtn" destination="w2X-RD-AQL" id="GxL-eU-dWF"/>
@@ -6840,7 +6866,7 @@ Email: redantsupport@united-us.net</string>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Ebw-26-5Ud">
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Ebw-26-5Ud">
-                                <rect key="frame" x="0.0" y="22" width="768" height="44"/>
+                                <rect key="frame" x="0.0" y="86" width="768" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ebw-26-5Ud" id="gop-RV-8fg">
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Ebw-26-5Ud" id="gop-RV-8fg">
                                     <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
                                     <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
@@ -7298,20 +7324,31 @@ Email: redantsupport@united-us.net</string>
                                             <action selector="onAddWishlistClick:" destination="8sk-Kd-Mpm" id="jHS-1W-8Wf"/>
                                             <action selector="onAddWishlistClick:" destination="8sk-Kd-Mpm" id="jHS-1W-8Wf"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="wfm-9f-xP0"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="b2j-vZ-Xzy"/>
                                     <barButtonItem title="Add to Cart" id="a9w-6Q-6fB">
                                     <barButtonItem title="Add to Cart" id="a9w-6Q-6fB">
                                         <connections>
                                         <connections>
                                             <action selector="onAddCartClick:" destination="8sk-Kd-Mpm" id="0xJ-Dn-Hhq"/>
                                             <action selector="onAddCartClick:" destination="8sk-Kd-Mpm" id="0xJ-Dn-Hhq"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="S6P-lv-dPG"/>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="Qyl-sO-dQ4"/>
                                     <barButtonItem title="Add to Portfolio" id="GOL-aL-CNx">
                                     <barButtonItem title="Add to Portfolio" id="GOL-aL-CNx">
                                         <connections>
                                         <connections>
                                             <action selector="onAddPortfolioClick:" destination="8sk-Kd-Mpm" id="UhX-qe-sxJ"/>
                                             <action selector="onAddPortfolioClick:" destination="8sk-Kd-Mpm" id="UhX-qe-sxJ"/>
                                         </connections>
                                         </connections>
                                     </barButtonItem>
                                     </barButtonItem>
-                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="oaR-TE-cxS"/>
-                                    <barButtonItem title="Select all" id="0g1-t5-zls">
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="IWj-rI-Gbb"/>
+                                    <barButtonItem image="check_1_24" width="18" id="8UJ-F9-G1c">
+                                        <connections>
+                                            <action selector="addAllCheckBtnClick:" destination="8sk-Kd-Mpm" id="1ee-pB-ovf"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem title="Add All" id="G7d-IW-1IY">
+                                        <connections>
+                                            <action selector="addAllBtnClick:" destination="8sk-Kd-Mpm" id="hIX-B7-XXR"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem width="42" style="plain" systemItem="fixedSpace" id="q4H-eN-qNv"/>
+                                    <barButtonItem title="Select" id="0g1-t5-zls">
                                         <connections>
                                         <connections>
                                             <action selector="onSelectAllClick:" destination="8sk-Kd-Mpm" id="Aik-4l-cSA"/>
                                             <action selector="onSelectAllClick:" destination="8sk-Kd-Mpm" id="Aik-4l-cSA"/>
                                         </connections>
                                         </connections>
@@ -7340,6 +7377,8 @@ Email: redantsupport@united-us.net</string>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
                     </view>
                     <connections>
                     <connections>
+                        <outlet property="addAllBtn" destination="G7d-IW-1IY" id="4IY-N2-5Qv"/>
+                        <outlet property="addAllCheckBtn" destination="8UJ-F9-G1c" id="aYB-JG-0ys"/>
                         <outlet property="addCartBtn" destination="a9w-6Q-6fB" id="QLD-pr-s7e"/>
                         <outlet property="addCartBtn" destination="a9w-6Q-6fB" id="QLD-pr-s7e"/>
                         <outlet property="addPortfolioBtn" destination="GOL-aL-CNx" id="DwE-G4-AD3"/>
                         <outlet property="addPortfolioBtn" destination="GOL-aL-CNx" id="DwE-G4-AD3"/>
                         <outlet property="addWishBtn" destination="dZs-hS-NSR" id="k10-qQ-iDv"/>
                         <outlet property="addWishBtn" destination="dZs-hS-NSR" id="k10-qQ-iDv"/>