diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php
index d41416f..804036e 100644
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -464,6 +464,38 @@ class TeamStoreController extends Controller {
 					'Quantity'		=> 1
 				);
 			}
+		}elseif($product_form == "jersey-and-shorts-quantity-form"){
+
+			$order_shorts_size =  $post['order_shorts_size'];
+			$order_jersey_size =  $post['order_jersey_size'];
+			$quantity = $post['quantity'];
+
+			foreach($order_jersey_size as $key => $val){
+				if($order_jersey_size[$key] != "none" || $order_shorts_size[$key] != "none"){
+					
+					if($order_jersey_size[$key] == "none" || $order_shorts_size[$key] == "none"){
+						$final_price = $ProductPrice / 2;
+					}else{
+						$final_price = $ProductPrice;
+					}
+
+					$items[] = array(
+						'ProductId'		=> $product_id,
+						'StoreURL'		=> $store_url,
+						'StoreId'		=> $store_id,
+						'FormUsed'		=> $product_form,
+						'CartKey' 	 	=> $cartKey,
+						'DesignCode'	=> $design_code,
+						'ProductURL' 	=> $ProductURL,
+						'ProductName' 	=> $product_name,
+						'JerseySize'    => $order_jersey_size[$key],
+						'ShortsSize'   	=> $order_shorts_size[$key],
+						'Price'			=> $final_price,
+						'Quantity'		=> $quantity[$key]
+					);
+				}
+				
+			}
 		}
 		
 		$i 	= 	$m->insertToCart($items);
@@ -488,6 +520,7 @@ class TeamStoreController extends Controller {
 		$items 	 		= $m->myCart($cartKey);
 		$getSubtotal 	= $m->getSubtotal($cartKey);
 		$items_group 	= $m->myCartGroup($cartKey);
+		var_dump($items_group);
 		$grouped_item 	= $m->selectTeamStoreGroupByCartKey($cartKey);
 		if($grouped_item){
 			$defId = $grouped_item[0]->StoreId;
diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php
index 18cec59..560dbaa 100644
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -474,7 +474,13 @@
                                                           <th>Size</th>
                                                           <th>Price</th>
                                                           <th>Quantity</th>
-                                                          <th></th>
+                                                      </tr>
+                                                      @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                      <tr>
+                                                          <th>Jersey Size</th>
+                                                          <th>Shorts Size</th>
+                                                          <th>Price</th>
+                                                          <th>Quantity</th>
                                                       </tr>
                                                     @else
 
@@ -545,6 +551,13 @@
                                                                 <td>{{ $sub_item->Price }}</td>
                                                                 <td>{{ $sub_item->Quantity }}</td>
                                                               </tr>
+                                                            @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                             <tr>
+                                                                <td>{{ $sub_item->JerseySize }}</td>
+                                                                <td>{{ $sub_item->ShortsSize }}</td>
+                                                                <td>{{ $sub_item->Price }}</td>
+                                                                <td>{{ $sub_item->Quantity }}</td>
+                                                              </tr>
                                                             @else
 
                                                             @endif
diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php
index 69f96be..cf77c4a 100644
--- a/resources/views/sublayouts/cart.blade.php
+++ b/resources/views/sublayouts/cart.blade.php
@@ -180,11 +180,18 @@
                                             <th>Quantity</th>
                                             <th></th>
                                         </tr>
+                                    @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                        <tr>
+                                            <th>Jersey Size</th>
+                                            <th>Shorts Size</th>
+                                            <th>Price</th>
+                                            <th>Quantity</th>
+                                            <th></th>
+                                        </tr>
                                     @else
 
                                     @endif
                                     
-
                                     @foreach($row as $sub_item)
                                         @if($sub_item->ProductId == $item->ProductId)
 
@@ -252,6 +259,15 @@
                                                     <td>{{ $sub_item->Quantity }}</td>
                                                     <td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
                                                 </tr>
+                                            @elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
+                                                <tr>
+                                                    <td>{{ $sub_item->JerseySize}}</td>
+                                                    <td>{{ $sub_item->ShortsSize}}</td>
+                                                    <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                                                    <td>{{ $sub_item->Quantity }}</td>
+                                                    <td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><span class="glyphicon glyphicon-remove"></span></a></td>
+                                                </tr>
+
                                             @else
 
                                             @endif
diff --git a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-quantity-form.blade.php b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-quantity-form.blade.php
new file mode 100644
index 0000000..989c8fb
--- /dev/null
+++ b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-quantity-form.blade.php
@@ -0,0 +1,47 @@
+<div class="panel-design-details" id="orderListPanel">
+    <table class="table" id="tableRow" style="font-size:12px;">
+        <thead>
+            <tr>
+                
+                <th class="col-md-4">Jersey Size</th>
+                <th class="col-md-4">Shorts Size</th>
+                <th class="col-md-4">Quantity</th>
+                <th class="text-center"></th>
+            </tr>
+        </thead>
+        <tbody id="orderTableBody">
+            <tr class="table-tr-0">
+                <td>
+                    <select class="form-control input-sm order-size roster-input" name="order_jersey_size[]" data-row-number="1">
+                        <option value="none">none</option>
+                        @foreach($sizes_array as $size)
+                            <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                        @endforeach
+                    </select>
+                </td>
+                <td>
+                    <select class="form-control input-sm order-size roster-input" name="order_shorts_size[]" data-row-number="1">
+                        <option value="none">none</option>
+                        @foreach($sizes_array as $size)
+                            <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                        @endforeach
+                    </select>
+                </td>
+                <td>
+                    <select class="form-control input-sm roster-input" name="quantity[]">
+                        @for($i = 1; $i <= 50; $i++)
+                            <option value="{{ $i }}">{{ $i }}</option>
+                        @endfor
+                    </select>
+                </td>
+                <td id="action-column" class="text-center" style="padding: 4px !important; border-top: none">
+                    <span class="tr-remove-btn">
+                        <button type="button" id="addNewRow" class="btn btn-success btn-sm btn-roster-action" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i></button>
+                    </span>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    <div id="addnew-btn-tbl-row">
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php
index 9287a25..8cbab71 100644
--- a/resources/views/user-layouts/add_item.blade.php
+++ b/resources/views/user-layouts/add_item.blade.php
@@ -100,6 +100,8 @@
                                                 <option value="name-number-size-form">Name, Number and Size Form</option>
                                                 <option value="number-form">Number Only Form</option>
                                                 <option value="name-size-form">Name and Size Form</option>
+                                                <option value="jersey-and-shorts-quantity-form">Jersey, Shorts and Quantity Form</option>
+
                                             </select>
                                         </div>
                                         <div class="form-group">
diff --git a/resources/views/user-layouts/view-store-item.blade.php b/resources/views/user-layouts/view-store-item.blade.php
index 48e2ba4..69c39d8 100644
--- a/resources/views/user-layouts/view-store-item.blade.php
+++ b/resources/views/user-layouts/view-store-item.blade.php
@@ -128,6 +128,8 @@
                                                 <option value="name-number-size-form" @if($product_array[0]->ProductForm == "name-number-size-form") selected  @endif>Name, Number and Size Form</option>
                                                 <option value="number-form" @if($product_array[0]->ProductForm == "number-form") selected  @endif>Number Only Form</option>
                                                 <option value="name-size-form" @if($product_array[0]->ProductForm == "name-size-form") selected  @endif>Name and Size Form</option>
+                                                <option value="jersey-and-shorts-quantity-form" @if($product_array[0]->ProductForm == "jersey-and-shorts-quantity-form") selected  @endif>Jersey, Shorts and Quantity Form</option>
+                                                
                                             </select>
                                         </div>
                                         <div class="form-group">