20160307

RedAnt ERP Mobile/iSales-NPD/AppDelegate.h

@@ -64,11 +64,15 @@
 @property bool can_submit_order;
 @property bool can_set_tearsheet_price;
 @property bool can_update_contact_info;
+@property bool submit_order_logout;
+@property bool save_order_logout;
 
 @property(readonly) bool price_hidden;
 
 -(void) set_priceHidden:(bool)price_hidden;
 
+-(void) set_main_button_panel;
+
 //@property bool can_show_price;
 //@property bool can_show_price;
 //@property bool can_show_price;

RedAnt ERP Mobile/iSales-NPD/AppDelegate.m

@@ -32,6 +32,24 @@
     
     [avc showHidePrice];
 }
+-(void) set_main_button_panel
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if(self.main_vc==nil)
+            return;
+    MainViewController * main_vc= (MainViewController*)self.main_vc;
+    if(self.user_type==USER_ROLE_CUSTOMER)
+    {
+        main_vc.customer_bp.hidden=false;
+        main_vc.employee_bp.hidden = true;
+    }
+    else
+    {
+        main_vc.customer_bp.hidden=true;
+        main_vc.employee_bp.hidden = false;
+    }
+           });
+}
 -(void) update_count_mark
 {
     
@@ -42,21 +60,11 @@
         MainViewController * main_vc= (MainViewController*)self.main_vc;
         
         
-        
+        //cart
         if(self.user==nil||self.cart_count==0)
         {
             main_vc.label_ccount.hidden = true;
-//            NSString* title = [NSString stringWithFormat:@"Sign in"];
-//            [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
-//            
-//            main_vc.labelMode.text=nil;
-//            [main_vc.labelMode setTextColor:UIColorFromRGB(0x336699)];
-//            //        [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x996633) forState:UIControlStateNormal];
-//            //        main_vc.buttonUser.hidden=true;
-//            //        main_vc.buttonUser.hidden=false;
-//            //         [main_vc.headerView setNeedsDisplay];
-//            //        [main_vc.headerView setNeedsLayout];
-//            return;
+            main_vc.label_cccount.hidden=true;
         }
         else
         {
@@ -69,94 +77,77 @@
             
             main_vc.label_ccount.text = strcount;
             if(strcount.length==1)
-                main_vc.label_ccount.frame = CGRectMake(370, 15, 21, 21);
+                main_vc.label_ccount.frame = CGRectMake(128, 0, 21, 21);
             if(strcount.length==2)
-                main_vc.label_ccount.frame = CGRectMake(364, 15, 25, 21);
+                main_vc.label_ccount.frame = CGRectMake(122, 0, 25, 21);
             if(strcount.length==3)
-                main_vc.label_ccount.frame = CGRectMake(360, 15, 31, 21);
+                main_vc.label_ccount.frame = CGRectMake(118, 0, 31, 21);
             if(strcount.length==4)
-                main_vc.label_ccount.frame = CGRectMake(349, 15, 42, 21);
-           // [main_vc.label_ccount sizeToFit];
-           // main_vc.label_ccount.center = CGPointMake(360, 15);
+                main_vc.label_ccount.frame = CGRectMake(103, 0, 42, 21);
             
              main_vc.label_ccount.hidden = false;
+
+            
+            main_vc.label_cccount.text = strcount;
+            if(strcount.length==1)
+                main_vc.label_cccount.frame = CGRectMake(128, 0, 21, 21);
+            if(strcount.length==2)
+                main_vc.label_cccount.frame = CGRectMake(122, 0, 25, 21);
+            if(strcount.length==3)
+                main_vc.label_cccount.frame = CGRectMake(118, 0, 31, 21);
+            if(strcount.length==4)
+                main_vc.label_cccount.frame = CGRectMake(103, 0, 42, 21);
+            
+            main_vc.label_cccount.hidden = false;
+
+        
+        }
+        
+        //wishlist
+        if(self.user==nil||self.wish_count==0)
+        {
+            main_vc.label_wcount.hidden = true;
+            main_vc.label_cwcount.hidden = true;
+            
+        }
+        else
+        {
+            
+            NSString* strcount;
+            if(self.wish_count>999)
+                strcount=@"999+";
+            else
+                strcount=[NSString stringWithFormat:@"%ld",self.wish_count];
+            
+            main_vc.label_wcount.text = strcount;
+            if(strcount.length==1)
+                main_vc.label_wcount.frame = CGRectMake(433, 0, 21, 21);
+            if(strcount.length==2)
+                main_vc.label_wcount.frame = CGRectMake(433-6, 0, 25, 21);//-6
+            if(strcount.length==3)
+                main_vc.label_wcount.frame = CGRectMake(433-10, 0, 31, 21);//-10
+            if(strcount.length==4)
+                main_vc.label_wcount.frame = CGRectMake(433-21, 0, 42, 21);//-21
+
+            
+            main_vc.label_wcount.hidden = false;
+            
+            
+            
+            main_vc.label_cwcount.text = strcount;
+            if(strcount.length==1)
+                main_vc.label_cwcount.frame = CGRectMake(433-79, 0, 21, 21);
+            if(strcount.length==2)
+                main_vc.label_cwcount.frame = CGRectMake(433-6-79, 0, 25, 21);//-6
+            if(strcount.length==3)
+                main_vc.label_cwcount.frame = CGRectMake(433-10-79, 0, 31, 21);//-10
+            if(strcount.length==4)
+                main_vc.label_cwcount.frame = CGRectMake(433-21-79, 0, 42, 21);//-21
+            
+            
+            main_vc.label_cwcount.hidden = false;
             
             
-//            if(self.user_type==USER_ROLE_CUSTOMER)
-//            {
-//                NSString* title = [NSString stringWithFormat:@"%@",self.user];
-//                [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
-//                main_vc.labelMode.text=nil;
-//                [main_vc.labelMode setTextColor:UIColorFromRGB(0x336699)];
-//                
-//                //            [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x996633) forState:UIControlStateNormal];
-//                //            main_vc.buttonUser.hidden=true;
-//                //            main_vc.buttonUser.hidden=false;
-//                //             [main_vc.headerView setNeedsDisplay];
-//                //            [main_vc.headerView setNeedsLayout];
-//            }
-//            else
-//            {
-//                if([mode isEqualToString:@"Regualar Mode"])
-//                {
-//                    NSString* title = self.user;
-//                    [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
-//                    
-//                    main_vc.labelMode.text=@"RM";
-//                    [main_vc.labelMode setTextColor:UIColorFromRGB(0x336699)];
-//                    //                [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x996633) forState:UIControlStateNormal];
-//                    //                main_vc.buttonUser.hidden=true;
-//                    //                main_vc.buttonUser.hidden=false;
-//                    //                 [main_vc.headerView setNeedsDisplay];
-//                    //                [main_vc.headerView setNeedsLayout];
-//                }
-//                else
-//                {
-//                    NSString* title = self.user;
-//                    [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
-//                    
-//                    main_vc.labelMode.text=@"TM";
-//                    [main_vc.labelMode setTextColor:UIColorFromRGB(0x009966)];
-//                    //                [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x009966) forState:UIControlStateNormal];
-//                    //                main_vc.buttonUser.hidden=true;
-//                    //                main_vc.buttonUser.hidden=false;
-//                    //                 [main_vc.headerView setNeedsDisplay];
-//                    //                [main_vc.headerView setNeedsLayout];
-//                }
-//                
-//                NSString * contact =[self.customerInfo valueForKey:@"customer_contact"];
-//                NSString * customer=[self.customerInfo valueForKey:@"customer_name"];
-//                if(contact==nil||contact.length==0)
-//                {
-//                    contact=@"No Name";
-//                    [main_vc.btnContact setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
-//                }
-//                else
-//                {
-//                    
-//                    if(contact==nil||contact.length==0)
-//                    {
-//                        contact=@"No Name";
-//                        [main_vc.btnContact setTitleColor:[UIColor redColor] forState:UIControlStateNormal];
-//                    }
-//                    else
-//                    {
-//                        [main_vc.btnContact setTitleColor:UIColorFromRGB(0x009900) forState:UIControlStateNormal];
-//                    }
-//                }
-//                
-//                NSMutableArray* arr_contact = [[NSMutableArray alloc] init];
-//                if(contact.length>0)
-//                    [arr_contact addObject:contact];
-//                if(customer.length>0)
-//                    [arr_contact addObject:customer];
-//                
-//                NSString *contact_string = [arr_contact componentsJoinedByString:@" @"];
-//                
-//                
-//                [main_vc.btnContact setTitle:contact_string forState:UIControlStateNormal];
-//                
-//            }
         }
     });
     
@@ -230,7 +221,7 @@
                 NSString* title = self.user;
                 [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
                 
-                main_vc.labelMode.text=@"RM";
+                main_vc.labelMode.text=self.mode;
                 [main_vc.labelMode setTextColor:UIColorFromRGB(0x336699)];
 //                [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x996633) forState:UIControlStateNormal];
 //                main_vc.buttonUser.hidden=true;
@@ -241,11 +232,11 @@
             else
             {
                 
-                self.mode=@"Tradeshow Mode";
+                self.mode=@"Trade Show Mode";
                 NSString* title = self.user;
                 [main_vc.buttonUser setTitle:title forState:UIControlStateNormal];
                 
-                main_vc.labelMode.text=@"TM";
+                main_vc.labelMode.text=self.mode;
                 [main_vc.labelMode setTextColor:UIColorFromRGB(0x009966)];
 //                [main_vc.buttonUser setTitleColor:UIColorFromRGB(0x009966) forState:UIControlStateNormal];
 //                main_vc.buttonUser.hidden=true;

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

@@ -50,6 +50,19 @@
                                                     <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="MmJ-aK-UGJ"/>
                                                 </connections>
                                             </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1R3-At-QFU">
+                                                <rect key="frame" x="95" y="0.0" width="21" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <nil key="highlightedColor"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="5"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="04b-vI-vkz" userLabel="order button">
                                                 <rect key="frame" x="158" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
@@ -90,6 +103,19 @@
                                                     <action selector="switchToWishlist:" destination="BYZ-38-t0r" eventType="touchUpInside" id="gdE-vI-w3i"/>
                                                 </connections>
                                             </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="e64-zo-Edm">
+                                                <rect key="frame" x="408" y="0.0" width="21" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <nil key="highlightedColor"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="5"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="nIa-ra-HBo" userLabel="scan button">
                                                 <rect key="frame" x="467" y="0.0" width="72" height="72"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -105,21 +131,109 @@
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1R3-At-QFU">
-                                        <rect key="frame" x="340" y="15" width="21" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                        <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        <nil key="highlightedColor"/>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                <integer key="value" value="5"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                    </label>
+                                    <view hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" id="Udz-7n-3ZO">
+                                        <rect key="frame" x="246" y="20" width="381" height="72"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="dB4-yd-OKw" userLabel="category button">
+                                                <rect key="frame" x="0.0" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" image="category">
+                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="showCategoryMenu:" destination="BYZ-38-t0r" eventType="touchUpInside" id="GxO-wH-K20"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6Xo-MD-4L0" userLabel="cart button">
+                                                <rect key="frame" x="79" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" image="cart_empty">
+                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="switchToCart:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4pZ-iU-9mA"/>
+                                                </connections>
+                                            </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="x7d-bu-zNO">
+                                                <rect key="frame" x="95" y="0.0" width="21" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <nil key="highlightedColor"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="5"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </label>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" id="GTI-Wn-UP4" userLabel="order button">
+                                                <rect key="frame" x="158" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" image="order">
+                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="switchToOrder:" destination="BYZ-38-t0r" eventType="touchUpInside" id="qMf-pm-hYx"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="taE-ut-WBx" userLabel="search button">
+                                                <rect key="frame" x="230" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" image="search">
+                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="switchToSearch:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Z5m-Tu-eRu"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="hkn-sR-Oh1" userLabel="wishlist button">
+                                                <rect key="frame" x="309" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <state key="normal" image="wishlist"/>
+                                                <connections>
+                                                    <action selector="switchToWishlist:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bbq-OL-tIH"/>
+                                                </connections>
+                                            </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ULj-92-aZY">
+                                                <rect key="frame" x="329" y="0.0" width="21" height="21"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
+                                                <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                                <nil key="highlightedColor"/>
+                                                <userDefinedRuntimeAttributes>
+                                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                                        <integer key="value" value="5"/>
+                                                    </userDefinedRuntimeAttribute>
+                                                </userDefinedRuntimeAttributes>
+                                            </label>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0dP-o2-4Xj" userLabel="scan button">
+                                                <rect key="frame" x="388" y="0.0" width="72" height="72"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                <state key="normal" image="scan">
+                                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="onScanClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="AYO-6T-huA"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                    </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="W7z-q5-hQg" userLabel="npd_logo">
-                                        <rect key="frame" x="49" y="21" width="187" height="50"/>
+                                        <rect key="frame" x="49" y="21" width="69" height="50"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <state key="normal" image="npd_logo">
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -146,10 +260,10 @@
                                             <action selector="onUserButtonClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="AFH-Ci-hyg"/>
                                         </connections>
                                     </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zoc-d5-pNq" userLabel="mode">
-                                        <rect key="frame" x="15" y="75" width="30" height="21"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zoc-d5-pNq" userLabel="mode">
+                                        <rect key="frame" x="126" y="20" width="110" height="50"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
@@ -217,7 +331,7 @@
                                                 <rect key="frame" x="0.0" y="49.5" width="290" height="44"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3MW-qC-tOm" id="1li-xE-7Vx">
-                                                    <rect key="frame" x="0.0" y="0.0" width="290" height="43.5"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="290" height="44"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pki-xD-OOT">
@@ -299,11 +413,16 @@
                         <outlet property="btnLogin" destination="M7a-qh-Dgr" id="0do-TO-1FM"/>
                         <outlet property="buttonUser" destination="0eT-W5-bga" id="F4r-LC-G5r"/>
                         <outlet property="container" destination="Knj-5z-t35" id="xY9-0x-HET"/>
+                        <outlet property="customer_bp" destination="Udz-7n-3ZO" id="SmC-uT-b7z"/>
+                        <outlet property="employee_bp" destination="hTL-PV-pUp" id="Kih-X9-mJg"/>
                         <outlet property="headerView" destination="NhN-BH-vsu" id="CXR-0b-ERw"/>
                         <outlet property="labelMode" destination="zoc-d5-pNq" id="7Cb-3e-Hxa"/>
                         <outlet property="labelSo" destination="A6K-Xr-CN6" id="5WI-2k-wyU"/>
                         <outlet property="labelVer" destination="MTI-0q-XWj" id="aGz-th-8qe"/>
+                        <outlet property="label_cccount" destination="x7d-bu-zNO" id="1xD-49-btv"/>
                         <outlet property="label_ccount" destination="1R3-At-QFU" id="lGc-YZ-9hq"/>
+                        <outlet property="label_cwcount" destination="ULj-92-aZY" id="XgQ-US-DBM"/>
+                        <outlet property="label_wcount" destination="e64-zo-Edm" id="xQh-lL-loa"/>
                         <outlet property="menuButton" destination="z6K-Ge-vfg" id="9iM-Kq-gAy"/>
                         <outlet property="openMenuButton" destination="Kx0-AQ-Y5o" id="bai-7G-ELP"/>
                         <outlet property="searchDisplayController" destination="IrS-fV-gIA" id="dFP-e6-41X"/>
@@ -394,14 +513,14 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name aaaaaaaaaaaaa aaaaaaaaaa BBBBB  CCCCC" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="H2E-H1-CLA" userLabel="description">
-                                                    <rect key="frame" x="125" y="10" width="360" height="100"/>
+                                                    <rect key="frame" x="125" y="10" width="440" height="100"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="22"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="pUy-h6-w0Y">
                                                     <rect key="frame" x="736" y="48" width="24" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                             </subviews>
                                         </tableViewCellContentView>
@@ -499,7 +618,7 @@
                                                 </label>
                                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="9RV-Vv-aXh">
                                                     <rect key="frame" x="736" y="48" width="24" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Price ($)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7MG-YL-eTq">
                                                     <rect key="frame" x="555" y="21" width="168" height="21"/>
@@ -1321,7 +1440,7 @@
                                         </connections>
                                     </button>
                                     <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 Items" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QqV-TN-4Yp">
-                                        <rect key="frame" x="466" y="12" width="150" height="21"/>
+                                        <rect key="frame" x="376" y="12" width="150" height="21"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -1362,6 +1481,15 @@
                                             <action selector="onChangeDisplay:" destination="O3B-N1-SIn" eventType="touchUpInside" id="ggo-82-EUw"/>
                                         </connections>
                                     </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Mj6-3T-a0a">
+                                        <rect key="frame" x="534" y="6" width="32" height="32"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <state key="normal" backgroundImage="filter"/>
+                                        <connections>
+                                            <action selector="onFilterClicked:" destination="8sk-Kd-Mpm" eventType="touchUpInside" id="NH1-bD-vdv"/>
+                                            <action selector="onFilterClicked:" destination="O3B-N1-SIn" eventType="touchUpInside" id="s2f-GX-ZFa"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                                 <color key="backgroundColor" red="0.94901960780000005" green="0.93333333330000001" blue="0.91764705879999997" alpha="1" colorSpace="calibratedRGB"/>
                             </view>
@@ -1430,7 +1558,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="UYX-dF-kPk" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-2754" y="2030"/>
+            <point key="canvasLocation" x="-2740" y="2030"/>
         </scene>
         <!--Home View Controller-->
         <scene sceneID="ooR-wa-PJg">
@@ -1724,10 +1852,10 @@
             </objects>
             <point key="canvasLocation" x="2844" y="-4325"/>
         </scene>
-        <!--SignatureViewController-->
+        <!--Signature panel-->
         <scene sceneID="BHv-9C-P4P">
             <objects>
-                <viewController storyboardIdentifier="SignatureViewController" title="SignatureViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="kD1-kK-ZNF" customClass="SignatureViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SignatureViewController" title="Signature panel" useStoryboardIdentifierAsRestorationIdentifier="YES" id="kD1-kK-ZNF" customClass="SignatureViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="sA4-wJ-poC">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -1981,93 +2109,6 @@
             </objects>
             <point key="canvasLocation" x="1403" y="-3017"/>
         </scene>
-        <!--Search Filter View Controller-->
-        <scene sceneID="pox-5i-Pw2">
-            <objects>
-                <viewController storyboardIdentifier="SearchFilterViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="21j-6H-fDQ" customClass="SearchFilterViewController" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="xMF-18-eWD">
-                        <rect key="frame" x="0.0" y="0.0" width="540" height="620"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="b7s-wd-Q3y">
-                                <rect key="frame" x="0.0" y="44" width="540" height="576"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="FilterCellValue" id="rOE-kO-fLh" customClass="FilterCellValue">
-                                        <rect key="frame" x="0.0" y="49.5" width="540" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rOE-kO-fLh" id="9Nm-gv-cBd">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="XFz-aK-Cez">
-                                                    <rect key="frame" x="468" y="7" width="38" height="30"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                                    <state key="normal" title="Delete">
-                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </state>
-                                                    <connections>
-                                                        <action selector="OnDeleteValue:" destination="21j-6H-fDQ" eventType="touchUpInside" id="rxG-52-iJ3"/>
-                                                    </connections>
-                                                </button>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="nEZ-a5-eQE">
-                                                    <rect key="frame" x="17" y="11" width="459" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="buttonDelete" destination="XFz-aK-Cez" id="dWA-pD-xz7"/>
-                                            <outlet property="labelTitle" destination="nEZ-a5-eQE" id="eoN-Oo-zL1"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="FilterCellCadedate" id="cSM-VG-HNq" customClass="FilterCellCadedate">
-                                        <rect key="frame" x="0.0" y="93.5" width="540" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="cSM-VG-HNq" id="HPP-aG-ehx">
-                                            <rect key="frame" x="0.0" y="0.0" width="540" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check_1_24" id="4HB-Aw-UVM">
-                                                    <rect key="frame" x="508" y="10" width="24" height="24"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="img_checkmark" destination="4HB-Aw-UVM" id="vOE-SR-PPz"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </prototypes>
-                                <connections>
-                                    <outlet property="dataSource" destination="21j-6H-fDQ" id="5tS-JS-Hsh"/>
-                                    <outlet property="delegate" destination="21j-6H-fDQ" id="9Hh-lE-8CP"/>
-                                </connections>
-                            </tableView>
-                            <navigationBar contentMode="scaleToFill" id="3NS-T6-xaE">
-                                <rect key="frame" x="0.0" y="0.0" width="540" height="44"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <items>
-                                    <navigationItem title="Filter" id="kTH-OC-F98"/>
-                                </items>
-                            </navigationBar>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </view>
-                    <modalFormSheetSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-                    <connections>
-                        <outlet property="navi_item" destination="kTH-OC-F98" id="tw8-Zi-1bq"/>
-                        <outlet property="tableView" destination="b7s-wd-Q3y" id="1Ph-VZ-xrM"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="RmJ-Fv-hXf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="2152" y="-3017"/>
-        </scene>
         <!--Photo Stack View Controller-->
         <scene sceneID="0dt-0W-Nvz">
             <objects>
@@ -2317,7 +2358,14 @@
                                                             <rect key="frame" x="20" y="117" width="733" height="21"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Such Model" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="p4k-9j-uT5">
+                                                            <rect key="frame" x="45" y="45" width="337" height="42"/>
+                                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="35"/>
+                                                            <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
@@ -2330,6 +2378,7 @@
                                                     <outlet property="labelDescription" destination="S98-fV-nsC" id="3cx-Ee-3zi"/>
                                                     <outlet property="labelDiscount" destination="eye-i2-TEC" id="7ZC-tD-pNg"/>
                                                     <outlet property="labelMasterpack" destination="qsG-i3-KAv" id="Kaj-AC-zHb"/>
+                                                    <outlet property="labelNoSuchModel" destination="p4k-9j-uT5" id="IQh-js-Ilm"/>
                                                     <outlet property="labelNotes" destination="zW2-ik-YQf" id="fnZ-k0-td3"/>
                                                     <outlet property="labelOldPrice" destination="og5-S3-rHz" id="iYR-6P-8Ix"/>
                                                     <outlet property="labelPrice" destination="Cxh-Hh-Y8F" id="XKJ-Ql-8i9"/>
@@ -2408,14 +2457,6 @@
                                             <action selector="onPlaceOrder:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="oox-kf-LJE"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="TuC-Bk-vSP">
-                                        <rect key="frame" x="15" y="7" width="170" height="30"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <state key="normal" title="Remove all from order"/>
-                                        <connections>
-                                            <action selector="onSelectAll:" destination="Cwo-Rn-ZMW" eventType="touchUpInside" id="Ab4-tx-Bth"/>
-                                        </connections>
-                                    </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" id="R1S-km-dYZ">
                                         <rect key="frame" x="15" y="45" width="170" height="30"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -2452,7 +2493,7 @@
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total  Items:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gqc-UY-CbE">
                                         <rect key="frame" x="502" y="36" width="117" height="20"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="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="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -2480,14 +2521,14 @@
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hbx-ZC-6uS">
                                         <rect key="frame" x="627" y="35" width="124" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="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="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="a8v-V0-Le7">
                                         <rect key="frame" x="627" y="10" width="117" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMinX="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="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -2538,7 +2579,6 @@
                         <outlet property="btn_addwish" destination="Lpc-ux-UXx" id="ASy-V3-nj3"/>
                         <outlet property="btn_delete" destination="SsF-JY-rqj" id="qm9-XF-CQc"/>
                         <outlet property="btn_edit_select" destination="Qyh-x9-Q29" id="SW6-IF-mo5"/>
-                        <outlet property="btnselect" destination="TuC-Bk-vSP" id="3ZL-bS-7YX"/>
                         <outlet property="cartItemView" destination="APc-j8-ZhR" id="aua-Qg-MgJ"/>
                         <outlet property="itemListTable" destination="r3H-Zh-AQ4" id="RxD-ZP-Gbh"/>
                         <outlet property="labelTotal" destination="Rak-uF-hDd" id="zd4-Ey-hCG"/>
@@ -4908,7 +4948,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="COL-0S-8Z3" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4604" y="-429"/>
+            <point key="canvasLocation" x="4594" y="-442"/>
         </scene>
         <!--About-->
         <scene sceneID="iwb-VR-0Vz">
@@ -5440,7 +5480,7 @@ redantsupport@united-us.net</string>
                                                     <rect key="frame" x="15" y="161" width="738" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
@@ -7418,6 +7458,112 @@ redantsupport@united-us.net</string>
             </objects>
             <point key="canvasLocation" x="2561" y="-1176"/>
         </scene>
+        <!--Category Filter-->
+        <scene sceneID="twN-f6-9wH">
+            <objects>
+                <viewController storyboardIdentifier="CategorySearchFilterViewController" title="Category Filter" useStoryboardIdentifierAsRestorationIdentifier="YES" id="bth-pb-gyc" customClass="CategorySearchFilterViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="ozV-F3-H6C">
+                        <rect key="frame" x="0.0" y="0.0" width="540" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="ihu-vW-d0a">
+                                <rect key="frame" x="370" y="189" width="150" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <state key="normal" title="OK">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="15"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="onSearchClick:" destination="bth-pb-gyc" eventType="touchUpInside" id="PJP-ih-yXm"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="EEc-ga-lhk">
+                                <rect key="frame" x="20" y="189" width="100" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                <state key="normal" title="Reset">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="15"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="onResetClick:" destination="bth-pb-gyc" eventType="touchUpInside" id="b13-bg-HQm"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Alert:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xZN-jn-WjS">
+                                <rect key="frame" x="20" y="117" width="42" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Availability:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="PQa-Cd-uZk">
+                                <rect key="frame" x="20" y="84" width="85" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="KUP-cb-29A">
+                                <rect key="frame" x="127" y="151" width="393" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Click to select">
+                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="onQTYClick:" destination="bth-pb-gyc" eventType="touchUpInside" id="WV8-OV-BRe"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sold by QTY:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Feg-2h-dDJ">
+                                <rect key="frame" x="20" y="155" width="99" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Qir-qH-TY6">
+                                <rect key="frame" x="132" y="113" width="388" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Click to select">
+                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="onAlertClick:" destination="bth-pb-gyc" eventType="touchUpInside" id="7d1-lP-wnz"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="Oi4-ns-KUr">
+                                <rect key="frame" x="127" y="75" width="393" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Click to select">
+                                    <color key="titleColor" red="0.59999999999999998" green="0.40000000000000002" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="onAvailabilityClick:" destination="bth-pb-gyc" eventType="touchUpInside" id="Gy2-L1-kap"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" red="0.94901960780000005" green="0.93333333330000001" blue="0.91764705879999997" alpha="1" colorSpace="calibratedRGB"/>
+                    </view>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="540" height="320"/>
+                    <connections>
+                        <outlet property="buttonAlert" destination="Qir-qH-TY6" id="v2y-hR-vCf"/>
+                        <outlet property="buttonAvailability" destination="Oi4-ns-KUr" id="Zge-pK-h4Q"/>
+                        <outlet property="buttonQTY" destination="KUP-cb-29A" id="AhH-X6-BVo"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pFM-jV-tJo" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5223" y="-442"/>
+        </scene>
     </scenes>
     <resources>
         <image name="about" width="96" height="96"/>
@@ -7444,7 +7590,7 @@ redantsupport@united-us.net</string>
         <image name="menu_open" width="36" height="36"/>
         <image name="newcustomer" width="32" height="32"/>
         <image name="neworder" width="40" height="40"/>
-        <image name="npd_logo" width="187" height="49"/>
+        <image name="npd_logo" width="69" height="50"/>
         <image name="order" width="72" height="72"/>
         <image name="pick_bg" width="280" height="280"/>
         <image name="profle" width="64" height="64"/>

RedAnt ERP Mobile/iSales-NPD/config.h

@@ -280,9 +280,13 @@
 //#define  URL_ERR_LOG  @"https://www.newpacificdirect.com/isales/er_log.htm"
 //
 //#define  URL_UPLOAD_IMG  @"https://www.newpacificdirect.com/isales/uploadImg.htm"
-
-
-
+//
+//#define URL_COPY_ORDER @"https://www.newpacificdirect.com/isales/copyOrder.htm"
+//#define URL_SIGN_ORDER @"https://www.newpacificdirect.com/isales/updateOrderSign.htm"
+//#define  URL_CUSTOMER_UPDATE  @"https://www.newpacificdirect.com/isales/updateCustomer.htm"
+//#define  URL_CART_GENERAL_NOTES  @"https://www.newpacificdirect.com/isales/updateGeneralNote.htm"
+//#define  URL_CART_ITEM_NOTES  @"https://www.newpacificdirect.com/isales/setItemNotes.htm"
+//#define  URL_EDIT_CUSTOMER  @"https://www.newpacificdirect.com/isales/getUpdateCustomerInfoByContact.htm"
 
 
 #endif

RedAnt ERP Mobile/iSales-NPD/debug_category_filter.json

@@ -0,0 +1,61 @@
+{
+
+        "count": 3,
+        "alert": {
+            "count": 4,
+            "val_1": {
+                "value": "QS",
+                "value_id": "QS"
+            },
+            "val_0": {
+                "value": "",
+                "value_id": ""
+            },
+            "val_3": {
+                "value": "SP",
+                "value_id": "SP"
+            },
+            "val_2": {
+                "value": "ST",
+                "value_id": "ST"
+            }
+        },
+        "qty": {
+            "count": 4,
+            "val_1": {
+                "value": "1",
+                "value_id": "1"
+            },
+            "val_0": {
+                "value": "2",
+                "value_id": "2"
+            },
+            "val_3": {
+                "value": "3",
+                "value_id": "3"
+            },
+            "val_2": {
+                "value": "4",
+                "value_id": "4"
+            }
+        },
+        "availability": {
+            "count": 4,
+            "val_1": {
+                "value": "10",
+                "value_id": "10"
+            },
+            "val_0": {
+                "value": "",
+                "value_id": ""
+            },
+            "val_3": {
+                "value": "20",
+                "value_id": "20"
+            },
+            "val_2": {
+                "value": "30",
+                "value_id": "30"
+            }
+        }
+    }