added shipping fee

added new form for store item
update 3_14_2020
2020-05-12 20:52:21 +08:00 · 2020-03-19 22:37:08 +08:00 · 2020-03-14 01:17:24 -05:00 · 2020-02-28 21:07:05 +08:00 · 2020-02-28 07:02:30 -06:00 · 2020-02-28 06:58:41 -06:00
23 changed files with 776 additions and 445 deletions
--- a/.htaccess
+++ b/.htaccess
@@ -2,14 +2,13 @@
    <IfModule mod_negotiation.c>
        Options -MultiViews
    </IfModule>
-
    RewriteEngine On
-
    # Redirect Trailing Slashes...
    RewriteRule ^(.*)/$public /$1 [L,R=301]
-
+    RewriteCond %{SERVER_PORT} 80
+    #RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
    # Handle Front Controller...
    RewriteCond %{REQUEST_FILENAME} !-d
    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ index.php [L]
+    RewriteRule ^ index.php [L] 
 </IfModule>
--- a/app/Http/Controllers/paypal/PaypalController.php
+++ b/app/Http/Controllers/paypal/PaypalController.php
@@ -1,4 +1,6 @@
-<?php namespace App\Http\Controllers\paypal;
+<?php
+
+namespace App\Http\Controllers\paypal;

 use App\Http\Requests;
 use App\Http\Controllers\Controller;
@@ -13,96 +15,97 @@ use Session;
 use Redirect;
 use Mail;

-
-
-class PaypalController extends Controller {
+class PaypalController extends Controller
+{

 	private $_apiContext;

-
-    public function __construct()
-    {
-        $this->_apiContext = PayPal::ApiContext(
-            config('services.paypal.client_id'),
-            config('services.paypal.secret'));
+	public function __construct()
+	{
+		$this->_apiContext = Paypal::ApiContext(
+			config('services.paypal.client_id'),
+			config('services.paypal.secret')
+		);


-       $this->_apiContext->setConfig(array(
-            'mode' => 'sandbox',
-            'service.EndPoint' => 'https://api.sandbox.paypal.com',
-            'http.ConnectionTimeOut' => 30,
-            'log.LogEnabled' => true,
-            'log.FileName' => storage_path('logs/paypal.log'),
-            'log.LogLevel' => 'FINE'
-		)); 
-		
-	// live 
-	// $this->_apiContext->setConfig(array(
-	// 	'mode' => 'live',
-	// 	'service.EndPoint' => 'https://api.paypal.com',
-	// 	'http.ConnectionTimeOut' => 30,
-	// 	'log.LogEnabled' => true,
-	// 	'log.FileName' => storage_path('logs/paypal.log'),
-	// 	'log.LogLevel' => 'FINE'
-	// ));
-    }
+		$this->_apiContext->setConfig(array(
+			'mode' => 'sandbox',
+			'service.EndPoint' => 'https://api.sandbox.paypal.com',
+			'http.ConnectionTimeOut' => 30,
+			'log.LogEnabled' => true,
+			'log.FileName' => storage_path('logs/paypal.log'),
+			'log.LogLevel' => 'FINE'
+		));
+
+		// live 
+		// $this->_apiContext->setConfig(array(
+		// 	'mode' => 'live',
+		// 	'service.EndPoint' => 'https://api.paypal.com',
+		// 	'http.ConnectionTimeOut' => 30,
+		// 	'log.LogEnabled' => true,
+		// 	'log.FileName' => storage_path('logs/paypal.log'),
+		// 	'log.LogLevel' => 'FINE'
+		// ));
+	}


-    public function payPremium()
-    {
-    	return view('payPremium');
-    }
+	public function payPremium()
+	{
+		return view('payPremium');
+	}


-    public function getCheckout(Request $request)
+	public function getCheckout(Request $request)
 	{

-		if(Auth::guest()){
+		if (Auth::guest()) {

-			$message = 'Please <a href="'. url('auth/login'). '">Sign in</a> to your account to proceed.';
+			$message = 'Please <a href="' . url('auth/login') . '">Sign in</a> to your account to proceed.';
 			Session::flash('msg', $message);
 			return Redirect::back();
 		}

-	    $payer = PayPal::Payer();
-	    $payer->setPaymentMethod('paypal');
+		$payer = PayPal::Payer();
+		$payer->setPaymentMethod('paypal');
+

-		

 		$m		 		= new TeamStoreModel;
 		$paypal_model	= new PayPalModel;
 		$last_id 		= $paypal_model->getLastIdPaymentDetails();
-		$invoice_num 	= str_pad($last_id[0]->Id, 4,'0',STR_PAD_LEFT);
+		$invoice_num 	= str_pad($last_id[0]->Id, 4, '0', STR_PAD_LEFT);
 		$cartKey 		= $request->session()->get('cartkey');
-		
+
 		$items 	 		= $m->myCart($cartKey);
-		
+
 		$getSubtotal 	= $m->getSubtotal($cartKey);
 		$grouped_item 	= $m->selectTeamStoreGroupByCartKey($cartKey);
 		$store_array 	= $m->selectTeamStore('Id', $grouped_item[0]->StoreId);
+		$shipping_charges = 0;

-		
-		foreach($items as $item){
-			if($item->VoucherId != null){
+		foreach ($items as $item) {
+			if ($item->VoucherId != null) {
 				$voucherIds[] = $item->VoucherId;
 				$voucher 	= $m->selectVoucherWhereIn($voucherIds);
 				$item_id = $item->Id;
 				$totalValue = $voucher[0]->VoucherValue;
-				if($voucher[0]->VoucherType == "Percentage"){
+				if ($voucher[0]->VoucherType == "Percentage") {
 					$getPercentageValue = $totalValue / 100;
 					$getDiscountValue = ($getSubtotal[0]->Subtotal * $getPercentageValue);
 					$data = array(
-						'Price' => round($getDiscountValue * -1, 2) 
+						'Price' => round($getDiscountValue * -1, 2)
 					);

 					$m->updateVoucherValueInCart($data, $item_id);
-				}else{
+				} else {
 					$voucherData = array(
-						'totalValue'=> $totalValue,
-						'type'=>'Flat'
+						'totalValue' => $totalValue,
+						'type' => 'Flat'
 					);
 				}
 			}
+
+			$shipping_charges += $item->ShippingFee * $item->Quantity;
 		}

 		$order_items = array();
@@ -111,19 +114,19 @@ class PaypalController extends Controller {

 		// $order_subtotal = 	$updated_getSubtotal[0]->Subtotal;
 		$order_grandtotal = $updated_getSubtotal[0]->Subtotal;
-		
-		if($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78){
+
+		if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141) {
 			$tax_value = 0;
-		}else{
+		} else {
 			$tax_value = 0.10;
 		}
-	
+
 		$tax = $order_grandtotal * $tax_value;

-		foreach($updated_items as $key => $item){
+		foreach ($updated_items as $key => $item) {

 			// $descriptions = "Name: " . $item->Name . " Number: " . $item->Number . " Size: " . $item->Size;"?"
- 
+
 			$order_items[$key] = PayPal::Item();
 			$order_items[$key]->setName($item->ProductName);
 			$order_items[$key]->setCurrency($store_array[0]->StoreCurrency);
@@ -131,44 +134,45 @@ class PaypalController extends Controller {
 			// $order_items[$key]->setDescription($descriptions);
 			// $order_items[$key]->setTax(10);
 			$order_items[$key]->setPrice($item->Price);
-			
 		}
-		
+
 		$item_list = PayPal::ItemList();
 		$item_list->setItems($order_items);
+
 		$amount_details = PayPal::Details();
 		$amount_details->setSubtotal($order_grandtotal);
 		$amount_details->setTax($tax);
+		$amount_details->setShipping($shipping_charges);

 		$amount = PayPal::Amount();
 		$amount->setCurrency($store_array[0]->StoreCurrency);
 		$amount->setDetails($amount_details);
-		$amount->setTotal($order_grandtotal + $tax);
-		
+		$amount->setTotal($order_grandtotal + $tax + $shipping_charges);
+
 		$transaction = PayPal::Transaction();
 		$transaction->setAmount($amount);
 		$transaction->setItemList($item_list);
-		
+
 		// $transaction->setDescription('Your transaction description');
 		$transaction->setInvoiceNumber(date('Ymd') . '-' . $invoice_num);
-		
-	    $redirectUrls = PayPal:: RedirectUrls();
-	    $redirectUrls->setReturnUrl(route('getDone'));
-	    $redirectUrls->setCancelUrl(route('getCancel'));
+
+		$redirectUrls = PayPal::RedirectUrls();
+		$redirectUrls->setReturnUrl(route('getDone'));
+		$redirectUrls->setCancelUrl(route('getCancel'));


-	    $payment = PayPal::Payment();
-	    $payment->setIntent('sale');
-	    $payment->setPayer($payer);
-	    $payment->setRedirectUrls($redirectUrls);
-	    $payment->setTransactions(array($transaction));
+		$payment = PayPal::Payment();
+		$payment->setIntent('sale');
+		$payment->setPayer($payer);
+		$payment->setRedirectUrls($redirectUrls);
+		$payment->setTransactions(array($transaction));


-	    $response = $payment->create($this->_apiContext);
-	    $redirectUrl = $response->links[1]->href;
+		$response = $payment->create($this->_apiContext);
+		$redirectUrl = $response->links[1]->href;


-	    return redirect()->to( $redirectUrl );
+		return redirect()->to($redirectUrl);
 	}

 	public function getDoneTest()
@@ -193,42 +197,49 @@ class PaypalController extends Controller {
 		// 	echo $ex;
 		// }

-		
+
 	}

 	public function getDone(Request $request)
 	{
-	    $id = $request->get('paymentId');
-	    $token = $request->get('token');
-	    $payer_id = $request->get('PayerID');
+		$id = $request->get('paymentId');
+		$token = $request->get('token');
+		$payer_id = $request->get('PayerID');


-	    $payment = PayPal::getById($id, $this->_apiContext);
+		$payment = PayPal::getById($id, $this->_apiContext);

 		$paymentExecution = PayPal::PaymentExecution();

-	    $paymentExecution->setPayerId($payer_id);
-	    $executePayment = $payment->execute($paymentExecution, $this->_apiContext);
+		$paymentExecution->setPayerId($payer_id);
+		$executePayment = $payment->execute($paymentExecution, $this->_apiContext);

 		// print_r($executePayment);
 		// if ($executePayment->getState() == 'approved') { 
-            
-        //     /** it's all right **/
-        //     /** Here Write your database logic like that insert record or value in database if you want **/

-        //     // \Session::put('success','Payment success');
+		//     /** it's all right **/
+		//     /** Here Write your database logic like that insert record or value in database if you want **/
+
+		//     // \Session::put('success','Payment success');
 		// 	// return Redirect::route('paywithpaypal');
 		// 	echo 'Payment success';
 		// }
 		$obj = json_decode($executePayment);

-	
+
 		$line2 = null;
-		
+
 		//details
 		$total = $obj->transactions[0]->amount->total;
 		$sub_total = $obj->transactions[0]->amount->details->subtotal;
 		$tax = $obj->transactions[0]->amount->details->tax;
+		$shipping_cost = $obj->transactions[0]->amount->details->shipping;
+
+		$relatedResources = $obj->transactions[0]->related_resources[0];
+		$saleId = $relatedResources->sale->id; // transaction_id
+		// 
+		// $sale = $relatedResources[0]->getSale();
+		// echo $saleId = $sale->getId();

 		$currency = $obj->transactions[0]->amount->currency;
 		$invoice_number  = $obj->transactions[0]->invoice_number;
@@ -236,7 +247,7 @@ class PaypalController extends Controller {
 		//shipping address details
 		$recipient_name = $obj->transactions[0]->item_list->shipping_address->recipient_name;
 		$line1 	= $obj->transactions[0]->item_list->shipping_address->line1;
-		if(isset($obj->transactions[0]->item_list->shipping_address->line2)){
+		if (isset($obj->transactions[0]->item_list->shipping_address->line2)) {
 			$line2 	= $obj->transactions[0]->item_list->shipping_address->line2;
 		}
 		$city 	= $obj->transactions[0]->item_list->shipping_address->city;
@@ -250,7 +261,7 @@ class PaypalController extends Controller {
 		$first_name = $obj->payer->payer_info->first_name;
 		$last_name = $obj->payer->payer_info->last_name;
 		$_payer_id = $obj->payer->payer_info->payer_id;
-			
+
 		/// end paypal codes

 		$paypal_model		 = new PayPalModel;
@@ -263,23 +274,23 @@ class PaypalController extends Controller {
 		$getSubtotal 	= $m->getSubtotal($cartKey);

 		$payment_details = array(
-
-								'UserId'		=> $userId,
-								'CartKey'		=> $cartKey,
-								'PaymentId' 	=> $id,
-								'Token' 		=> $token,
-								'PayerId'	 	=> $payer_id,
-								'InvoiceNumber'	=> $invoice_number,
-								'Currency'	 	=> $currency,
-								'Total'	 		=> $total,
-								'SubTotal'	 	=> $sub_total,
-								'Tax'	 		=> $tax,
-								'Payer_Email'	 	=> $email,
-								'Payer_Firstname'	=> $first_name,
-								'Payer_Lastname'	=> $last_name,
-								'PaymentMethod' 	=>$payment_method
-
-							);
+			'UserId'		=> $userId,
+			'CartKey'		=> $cartKey,
+			'PaymentId' 	=> $id,
+			'Token' 		=> $token,
+			'PayerId'	 	=> $payer_id,
+			'InvoiceNumber'	=> $invoice_number,
+			'Currency'	 	=> $currency,
+			'Total'	 		=> $total,
+			'SubTotal'	 	=> $sub_total,
+			'Tax'	 		=> $tax,
+			'Payer_Email'	 	=> $email,
+			'Payer_Firstname'	=> $first_name,
+			'Payer_Lastname'	=> $last_name,
+			'PaymentMethod' 	=> $payment_method,
+			'ShippingCost'	=> $shipping_cost,
+			'TransactionId'	=> $saleId,
+		);

 		$p_id 	= 	$paypal_model->insertToPaypalDetails($payment_details);

@@ -295,7 +306,7 @@ class PaypalController extends Controller {
 		);
 		// iinsert shipping address 
 		$paypal_model->insertShippingAddress($shipping_address);
-	
+
 		// insert order from cart_tmp to orders table
 		$l = $paypal_model->insertToOrders($cartKey); // insert to orders table

@@ -306,31 +317,32 @@ class PaypalController extends Controller {
 		$item_thumbs 			= $newUserModel->selectDisplayItemThumb();
 		$array_payment_details 	= $newUserModel->selectPaymentDetails('CartKey', $cartKey);
 		$array_storename 		= $newUserModel->selectTeamStoreName($cartKey); // email subject
-		
-		
-		foreach($array_storename as $storname){
-			
+
+
+		foreach ($array_storename as $storname) {
+
 			$sName[] = $storname->StoreName;
 			$sid[] = $storname->Id;
 		}
-		$sName = implode (", ", $sName);
+		$sName = implode(", ", $sName);


 		$user_loginsArray 		= $newUserModel->selectUserLoginsWhereIn($sid);

-		foreach($user_loginsArray as $userdata){
-		
+		foreach ($user_loginsArray as $userdata) {
+
 			$other_email[] = $userdata->other_email;
 		}

-		if($other_email[0] != null){
-			$other_email = implode (", ", $other_email);
+		if ($other_email[0] != null) {
+			$other_email = implode(", ", $other_email);
 			$email_cc = "orders@crewsportswear.com" . "," . $other_email;
-		}else{
+		} else {
 			$email_cc = "orders@crewsportswear.com";
 		}
-	
-		$explode_other_email = explode(",", $email_cc);
+
+		// $explode_other_email = explode(",", $email_cc);
+		$explode_other_email = "orders@crewsportswear.com"; // test_email

 		$data = array(
 			'order_item_array' => $order_item_array,
@@ -341,16 +353,17 @@ class PaypalController extends Controller {
 			'email_cc' => $explode_other_email,
 			'subject' => $sName . ' ORDERS',
 		);
-		
+
 		Mail::send('emails.orders', $data, function($message) use ($data) {
 			$message->from('no-reply@crewsportswear.com', 'CREW Sportswear');
 			$message->bcc($data['email_cc'], 'Orders From CREW Sportswear');
 			$message->to($data['receiver'])->subject($data['subject']);
 		});
-		// end email sending
-
-		$request->session()->forget('cartkey'); // clear session for cartkey
 		
+		// end email sending
+		$m->delete_cartTmp("CartKey", $cartKey);
+		$request->session()->forget('cartkey'); // clear session for cartkey
+
 		// redirect to thank you page.
 		return view('paypal.get_done')
 								->with('currency', $currency)
@@ -363,31 +376,30 @@ class PaypalController extends Controller {
 	{
 		$m		 		= new TeamStoreModel;
 		$cartKey 		= $request->session()->get('cartkey');
-		
+
 		$items 	 		= $m->myCart($cartKey);
 		$getSubtotal 	= $m->getSubtotal($cartKey);

-		foreach($items as $item){
-			if($item->VoucherId != null){
+		foreach ($items as $item) {
+			if ($item->VoucherId != null) {
 				$voucherIds[] = $item->VoucherId;
 				$voucher 	= $m->selectVoucherWhereIn($voucherIds);
 				$item_id = $item->Id;
 				$totalValue = $voucher[0]->VoucherValue;
-				if($voucher[0]->VoucherType == "Percentage"){
+				if ($voucher[0]->VoucherType == "Percentage") {
 					$data = array(
 						'Price' => '00.00'
 					);
 					$m->updateVoucherValueInCart($data, $item_id);
-				}else{
+				} else {
 					$voucherData = array(
-						'totalValue'=> $totalValue,
-						'type'=>'Flat'
+						'totalValue' => $totalValue,
+						'type' => 'Flat'
 					);
 				}
 			}
 		}

-	    return redirect()->route('cart');
+		return redirect()->route('cart');
 	}
-
 }
--- a/app/Http/Controllers/teamstore/TeamStoreController.php
+++ b/app/Http/Controllers/teamstore/TeamStoreController.php
@@ -1,4 +1,6 @@
-<?php namespace App\Http\Controllers\teamstore;
+<?php
+
+namespace App\Http\Controllers\teamstore;

 use App\Http\Requests;
 use App\Http\Controllers\Controller;
@@ -11,8 +13,9 @@ use Mail;
 use Analytics;


-class TeamStoreController extends Controller {
-	
+class TeamStoreController extends Controller
+{
+
 	public function index(Request $request, $teamStoreURL)
 	{
 		// var_dump($teamStoreURL);
@@ -20,71 +23,69 @@ class TeamStoreController extends Controller {
 		$store_array 	= $m->selectTeamStore('StoreUrl', $teamStoreURL);
 		$product_array 	= $m->selectTeamStoreProducts('TeamStoreId', $store_array[0]->Id);
 		$user_role = '';
-		
-		if (Auth::check()){
+
+		if (Auth::check()) {
 			$user_role = Auth::user()->role;
 			$store_id = Auth::user()->store_id;
-		}else{
+		} else {
 			$user_role = null;
 			$store_id = null;
 		}
-		

-		if($store_array[0]->Password != null){
-			if($request->session()->get('teamstore_data_array') == null){
-				if($store_id !=  $store_array[0]->Id){
+
+		if ($store_array[0]->Password != null) {
+			if ($request->session()->get('teamstore_data_array') == null) {
+				if ($store_id !=  $store_array[0]->Id) {
 					return redirect('teamstore');
 				}
-			}else{
-	
-				if($user_role != "store_owner"){
-					if($request->session()->get('teamstore_data_array')[0]->StoreUrl != $store_array[0]->StoreUrl){
-						return redirect()->back(); 
+			} else {
+
+				if ($user_role != "store_owner") {
+					if ($request->session()->get('teamstore_data_array')[0]->StoreUrl != $store_array[0]->StoreUrl) {
+						return redirect()->back();
 					}
 				}
-				
 			}
 		}
-		
-		
+
+
 		foreach ($product_array as $p => $pr_arr) {

 			$thumbnails_array 			= 	$m->getProductThumbnails($pr_arr->Id);
-			if(!empty($thumbnails_array)){
+			if (!empty($thumbnails_array)) {
 				foreach ($thumbnails_array as $t => $thumb) {
-					
-					if($thumb->ImageClass == 'custom'){
+
+					if ($thumb->ImageClass == 'custom') {
 						$displayThumbnails = $thumb->Image;
 						break;
 					}

-					if($thumb->ImageClass == 'active'){
+					if ($thumb->ImageClass == 'active') {
 						$displayThumbnails = $thumb->Image;
 						break;
-					}	
+					}
 				}

 				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  $displayThumbnails
-				
-				);
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  $displayThumbnails

-			}else{
+				);
+			} else {
 				$thumbnails[] = array(
-									'folder' 	=>	$store_array[0]->ImageFolder,
-									'product_id' =>  $pr_arr->Id,
-									'thumb'	     =>  "product-image-placeholder.png"
+					'folder' 	=>	$store_array[0]->ImageFolder,
+					'product_id' =>  $pr_arr->Id,
+					'thumb'	     =>  "product-image-placeholder.png"
 				);
 			}
 		}

 		// var_dump($thumbnails);	
 		return view('teamstore-sublayouts.index')
-												->with('store_array', $store_array)
-												->with('product_array', $product_array)
-												->with('thumbnails', $thumbnails);
+			->with('store_array', $store_array)
+			->with('product_array', $product_array)
+			->with('thumbnails', $thumbnails);
 	}

 	public function storelist(Request $request)
@@ -99,54 +100,53 @@ class TeamStoreController extends Controller {

 		// foreach($teamstore as $t){
 		// 	$sad = explode('/', $t);
-			
+
 		// 	if(count($sad) == 4){
 		// 		$arr_teamstore[] = explode('?', $sad['3'])['0'];
-	
+
 		// 	}
 		// }
-		
+
 		// var_dump(array_unique($arr_teamstore));

 		$m 		= new TeamStoreModel;
 		$q 		= $request->input('q');
 		$sort 	= $request->input('s');
-      
-        if(isset($q) && isset($sort)){
-           
-			if($sort == "latest"){
+
+		if (isset($q) && isset($sort)) {
+
+			if ($sort == "latest") {
 				$field = "Id";
-                $sort_value = "DESC";
-            }elseif($sort == "al-desc"){
-                $field = "StoreName";
 				$sort_value = "DESC";
-			}elseif($sort == "oldest"){
+			} elseif ($sort == "al-desc") {
+				$field = "StoreName";
+				$sort_value = "DESC";
+			} elseif ($sort == "oldest") {
 				$field = "Id";
-                $sort_value = "ASC";
-            }else{
+				$sort_value = "ASC";
+			} else {
 				$field = "StoreName";
 				$sort_value = "ASC";
-            }
-			
-            if($q != ""){
-                // keyword and sort
-                $stores_array 	= $m->selectTeamstoreSearch($field, $sort_value, $q);
-            }else{
-                // sort only
-                $stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
-            }
+			}

-        }else{
+			if ($q != "") {
+				// keyword and sort
+				$stores_array 	= $m->selectTeamstoreSearch($field, $sort_value, $q);
+			} else {
+				// sort only
+				$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
+			}
+		} else {
 			$field = "StoreName";
 			$sort_value = "ASC";
 			$sort = "al-asc";
 			$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
 		}
-		
+
 		return view('teamstore-sublayouts.stores')
-												->with('stores_array', $stores_array)
-												->with('keyword', $q)
-                                            	->with('filter', $sort);
+			->with('stores_array', $stores_array)
+			->with('keyword', $q)
+			->with('filter', $sort);
 	}

 	public function checkTeamStorePassword(Request $request)
@@ -155,82 +155,78 @@ class TeamStoreController extends Controller {
 		$post 	=	$request->all();
 		$store_array 	= $m->selectTeamStore('Password', $post['password']);

-		if($store_array){
+		if ($store_array) {
 			$request->session()->put('teamstore_data_array', $store_array);
-			return redirect('teamstore/'. $store_array[0]->StoreUrl);
-
-		}else{
-			return redirect()->back()->with('errors', 'Invalid Password.'); 
+			return redirect('teamstore/' . $store_array[0]->StoreUrl);
+		} else {
+			return redirect()->back()->with('errors', 'Invalid Password.');
 		}
-		
 	}

 	private $teams_array;

 	public function productDetails($teamStoreURL, $productURL)
-	{	
+	{
 		$m 		= new TeamStoreModel;
 		$teams_array = array();
 		$store_array 	= $m->selectTeamStore('StoreUrl', $teamStoreURL);
 		$product_array 	= $m->selectTeamStoreProducts('ProductURL', $productURL);
-		
+
 		$thumbnails_array 	= $m->getThumbnails($product_array[0]->Id);
 		$teams_array 	= $m->getTeams($product_array[0]->Id);
 		// $sizes_array 	= $m->getSizes();
-		
-		if(empty($thumbnails_array)){
+
+		if (empty($thumbnails_array)) {

 			$data = (object)  array(
 				'Image' => 'product-image-placeholder.png',
 				'ImageClass' => 'active'
 			);

-
 			$thumbnails_array[] = $data;
 		}
-		

-		$x = explode(",", $product_array[0]->AvailableSizes );
-		foreach($x as $s){
+
+		$x = explode(",", $product_array[0]->AvailableSizes);
+		foreach ($x as $s) {
 			$h[] 	= $m->getSizesByBracket($s);
 		}

-		foreach($h as $d){
-			foreach($d as $g){
+		foreach ($h as $d) {
+			foreach ($d as $g) {
 				$sizes_array[] = $g;
 			}
 		}

-		if($product_array[0]->ProductAvailableQty != null){
+		if ($product_array[0]->ProductAvailableQty != null) {
 			$soldQty 	= $m->getSoldQty($product_array[0]->Id);
 			$availableQty = $product_array[0]->ProductAvailableQty - $soldQty[0]->SoldQty;
-		}else{
+		} else {
 			// echo 'no qty';
 			$availableQty = null;
 		}
 		// $product_array[0]->ProductAvailableQty
-		
+
 		return view('teamstore-sublayouts.product-details')
-													->with('store_array', $store_array)
-													->with('product_array', $product_array)
-													->with('thumbnails_array', $thumbnails_array)
-													->with('teams_array', $teams_array)
-													->with('sizes_array', $sizes_array)
-													->with('available_qty', $availableQty);
-															
+			->with('store_array', $store_array)
+			->with('product_array', $product_array)
+			->with('thumbnails_array', $thumbnails_array)
+			->with('teams_array', $teams_array)
+			->with('sizes_array', $sizes_array)
+			->with('available_qty', $availableQty);
 	}
-	
+
 	public function login(Request $request)
-	{	
+	{
 		return view('teamstore-sublayouts.login');
 	}

 	public function clearSession(Request $request)
-	{	
+	{
 		$request->session()->forget('teamstore_data_array');
 		return redirect("{{ url('/') }}");
 	}
-	
+
 	public function addNewRow(Request $request)
 	{
 		$post 	=	$request->all();
@@ -239,47 +235,45 @@ class TeamStoreController extends Controller {
 		$item 	= $TeamStoreModel->selectTeamStoreProductByIdHash($post['p_id']);
 		$x = explode(",", $item[0]->AvailableSizes);

-		foreach($x as $s){
+		foreach ($x as $s) {
 			$h[] 	= $TeamStoreModel->getSizesByBracket($s);
 		}

-		foreach($h as $d){
-			foreach($d as $g){
+		foreach ($h as $d) {
+			foreach ($d as $g) {
 				$sizes_array[] = $g;
 			}
 		}

-		if($item[0]->ProductAvailableQty != null){
+		if ($item[0]->ProductAvailableQty != null) {
 			$soldQty 	= $m->getSoldQty($product_array[0]->Id);
 			$availableQty = $item[0]->ProductAvailableQty - $soldQty[0]->SoldQty;
-		}else{
+		} else {
 			// echo 'no qty';
 			$availableQty = null;
 		}

-		$handle_form = view('teamstore-sublayouts.forms.' .  $item[0]->ProductForm )
-						->with('sizes_array', $sizes_array)
-						->with('availableQty', $availableQty)
-						->render();
+		$handle_form = view('teamstore-sublayouts.forms.' .  $item[0]->ProductForm)
+			->with('sizes_array', $sizes_array)
+			->with('availableQty', $availableQty)
+			->render();

 		return $handle_form;
-
-		
 	}
-	
+
 	public function addToCart(Request $request)
 	{
 		$post 	=	$request->all();
 		$m 		= new TeamStoreModel;
 		$hash_product_id =  $post['p_id'];
-		
-		if($request->session()->has('cartkey')){
+
+		if ($request->session()->has('cartkey')) {
 			$cartKey = $request->session()->get('cartkey');
-		}else{
+		} else {
 			$request->session()->put('cartkey', sha1(time() . str_random(6)));
 			$cartKey = $cartKey = $request->session()->get('cartkey');
 		}
-		
+
 		$product_array 	= $m->selectTeamStoreProductByIdHash($hash_product_id);
 		$product_id 		= $product_array[0]->Id;
 		$TeamStoreId 	= $product_array[0]->TeamStoreId;
@@ -287,27 +281,28 @@ class TeamStoreController extends Controller {
 		$ProductURL 	= $product_array[0]->ProductURL;
 		$product_form 	= $product_array[0]->ProductForm;
 		$design_code 	= $product_array[0]->DesignCode;
-		$product_name 	= $product_array[0]->ProductName;	
+		$product_name 	= $product_array[0]->ProductName;
+		$shipping_fee 	= $product_array[0]->ShippingFee;

 		$teamstore_array 	= $m->selectTeamStore('Id', $TeamStoreId);
-		
+
 		$store_url 		=  $teamstore_array[0]->StoreUrl;
 		$store_id 		=  $teamstore_array[0]->Id;

-		if($product_form == "jersey-and-shorts-form"){
+		if ($product_form == "jersey-and-shorts-form") {
 			$order_names =  $post['order_names'];
 			$order_number =  $post['order_number'];
 			$order_jersey_size =  $post['order_jersey_size'];
 			$order_shorts_size =  $post['order_shorts_size'];

-			foreach($order_names as $key => $val){
-				
-				if($order_jersey_size[$key] == "none" || $order_shorts_size[$key] == "none"){
+			foreach ($order_names as $key => $val) {
+
+				if ($order_jersey_size[$key] == "none" || $order_shorts_size[$key] == "none") {
 					$final_price = $ProductPrice / 2;
-				}else{
+				} else {
 					$final_price = $ProductPrice;
 				}
-	
+
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -322,10 +317,11 @@ class TeamStoreController extends Controller {
 					'JerseySize'    => $order_jersey_size[$key],
 					'ShortsSize'   	=> $order_shorts_size[$key],
 					'Price'			=> $final_price,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
-		}elseif($product_form == "tshirt-form"){
+		} elseif ($product_form == "tshirt-form") {

 			$items[] = array(
 				'ProductId'		=> $product_id,
@@ -338,9 +334,10 @@ class TeamStoreController extends Controller {
 				'ProductName' 	=> $product_name,
 				'Size' 		 	=> $post['uniformSize'],
 				'Price'			=> $ProductPrice,
-				'Quantity'		=> $post['quantity']
+				'Quantity'		=> $post['quantity'],
+				'ShippingFee' => $shipping_fee
 			);
-		}elseif($product_form == "quantity-form"){
+		} elseif ($product_form == "quantity-form") {

 			$items[] = array(
 				'ProductId'		=> $product_id,
@@ -352,16 +349,15 @@ class TeamStoreController extends Controller {
 				'ProductURL' 	=> $ProductURL,
 				'ProductName' 	=> $product_name,
 				'Price'			=> $ProductPrice,
-				'Quantity'		=> $post['quantity']
+				'Quantity'		=> $post['quantity'],
+				'ShippingFee' => $shipping_fee
 			);
-		
-		
-		}elseif($product_form == "name-number-form"){
+		} elseif ($product_form == "name-number-form") {

 			$order_names =  $post['order_names'];
 			$order_number =  $post['order_number'];

-			foreach($order_names as $key => $val){
+			foreach ($order_names as $key => $val) {
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -374,16 +370,17 @@ class TeamStoreController extends Controller {
 					'Name' 		 	=> $order_names[$key],
 					'Number'     	=> $order_number[$key],
 					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
-		}elseif($product_form == "name-number-size-form"){
+		} elseif ($product_form == "name-number-size-form") {

 			$order_names =  $post['order_names'];
 			$order_number =  $post['order_number'];
 			$order_size =  $post['order_size'];

-			foreach($order_names as $key => $val){
+			foreach ($order_names as $key => $val) {
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -397,15 +394,15 @@ class TeamStoreController extends Controller {
 					'Size' 		 	=> $order_size[$key],
 					'Number'     	=> $order_number[$key],
 					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
-
-		}elseif($product_form == "number-form"){
+		} elseif ($product_form == "number-form") {

 			$order_number =  $post['order_number'];

-			foreach($order_number as $key => $val){
+			foreach ($order_number as $key => $val) {
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -417,16 +414,17 @@ class TeamStoreController extends Controller {
 					'ProductName' 	=> $product_name,
 					'Number'     	=> $order_number[$key],
 					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
-		}elseif($product_form == "name-name2-size-form"){
+		} elseif ($product_form == "name-name2-size-form") {

 			$order_names =  $post['order_names'];
 			$order_names2 =  $post['order_names2'];
 			$order_size =  $post['order_size'];

-			foreach($order_names as $key => $val){
+			foreach ($order_names as $key => $val) {
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -440,15 +438,16 @@ class TeamStoreController extends Controller {
 					'Name2'     	=> $order_names2[$key],
 					'Size' 		 	=> $order_size[$key],
 					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
-		}elseif($product_form == "name-size-form"){
+		} elseif ($product_form == "name-size-form") {

 			$order_names =  $post['order_names'];
 			$order_size =  $post['order_size'];

-			foreach($order_names as $key => $val){
+			foreach ($order_names as $key => $val) {
 				$items[] = array(
 					'ProductId'		=> $product_id,
 					'StoreURL'		=> $store_url,
@@ -461,14 +460,78 @@ class TeamStoreController extends Controller {
 					'Name' 		 	=> $order_names[$key],
 					'Size'     		=> $order_size[$key],
 					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
+				);
+			}
+		} 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],
+						'ShippingFee' => $shipping_fee
+					);
+				}
+			}
+		} elseif ($product_form == "number-jersey-shorts-form") {
+
+			$order_number =  $post['order_number'];
+			$order_jersey_size =  $post['order_jersey_size'];
+			$order_shorts_size =  $post['order_shorts_size'];
+
+			foreach ($order_number as $key => $val) {
+
+				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,
+					'Number'     	=> $order_number[$key],
+					'JerseySize'    => $order_jersey_size[$key],
+					'ShortsSize'   	=> $order_shorts_size[$key],
+					'Price'			=> $final_price,
+					'Quantity'		=> 1,
+					'ShippingFee' => $shipping_fee
 				);
 			}
 		}
-		
+
 		$i 	= 	$m->insertToCart($items);
-		
-		if($i['i']){
+
+		if ($i['i']) {
 			return response()->json(array(
 				'success' => true
 			));
@@ -478,102 +541,108 @@ class TeamStoreController extends Controller {
 		return response()->json(array(
 			'success' => false,
 			'message' => "Something went wrong. Please refresh the page."
-		));	
+		));
 	}

-	public function cart(Request $request){
-		
+	public function cart(Request $request)
+	{
+
 		$m		 		= new TeamStoreModel;
 		$cartKey 		= $request->session()->get('cartkey');
 		$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){
+		if ($grouped_item) {
 			$defId = $grouped_item[0]->StoreId;
-		}else{
+		} else {
 			$defId = 0;
 		}
-	
-		$item_thumbs 	= $m->selectDisplayCartThumb();	
-		$store_array 	= $m->selectTeamStore('Id', $defId);
-		

-		if($items){
+		$item_thumbs 	= $m->selectDisplayCartThumb();
+		$store_array 	= $m->selectTeamStore('Id', $defId);
+		$shipping_cost = 0;
+
+		if ($items) {
 			$voucherIds = array();
-			foreach($items as $item){
-				if($item->VoucherId != null){
+			foreach ($items as $item) {
+				if ($item->VoucherId != null) {
 					$voucherIds[] = $item->VoucherId;
 				}
+			
+				$shipping_cost += $item->ShippingFee * $item->Quantity;
 			}
-			$vouchers 	= $m->selectVoucherWhereIn($voucherIds);		
+			$vouchers 	= $m->selectVoucherWhereIn($voucherIds);
 		}
-				
+
 		$totalValue = 0;
-		if(!empty($vouchers)){
-			foreach($vouchers as $voucher){
+		if (!empty($vouchers)) {
+			foreach ($vouchers as $voucher) {
 				$totalValue = $totalValue + $voucher->VoucherValue;
-				if($voucher->VoucherType == "Percentage"){
+				if ($voucher->VoucherType == "Percentage") {
 					$voucherData = array(
-						'totalValue'=> $totalValue,
-						'type'=>'Percentage'
+						'totalValue' => $totalValue,
+						'type' => 'Percentage'
 					);
-				}else{
+				} else {
 					$voucherData = array(
-						'totalValue'=> $totalValue,
-						'type'=>'Flat'
+						'totalValue' => $totalValue,
+						'type' => 'Flat'
 					);
 				}
 			}
-			
-			if($voucherData['type'] == "Percentage"){
+
+			if ($voucherData['type'] == "Percentage") {
 				$getPercentageValue = $voucherData['totalValue'] / 100;
 				$getDiscountValue = ($getSubtotal[0]->Subtotal * $getPercentageValue);
 				$finalSubTotal = $getSubtotal[0]->Subtotal - $getDiscountValue;
-			}else{
+			} else {
 				//Flat voucher computation here..
 			}
-		}else{
+		} else {
 			$finalSubTotal =  $getSubtotal[0]->Subtotal;
 		}
-		
+
 		return view('sublayouts.cart')
-								->with('item_group', $items_group)
-								->with('row', $items)
-								->with('img_thumb', $item_thumbs)
-								->with('getSubtotal', $finalSubTotal)
-								->with('store_array', $store_array);
+			->with('item_group', $items_group)
+			->with('row', $items)
+			->with('img_thumb', $item_thumbs)
+			->with('getSubtotal', $finalSubTotal)
+			->with('store_array', $store_array)
+			->with('shipping_cost', $shipping_cost);
 	}

-	public function addVoucher(Request $request){
+	public function addVoucher(Request $request)
+	{
 		$cartKey 		= $request->session()->get('cartkey');

-		if($cartKey == ""){
+		if ($cartKey == "") {
 			return false;
 		}

 		$TeamStoreModel		= new TeamStoreModel;
 		$post 	=	$request->all();
-		
+
 		$grouped_item 	= $TeamStoreModel->selectTeamStoreGroupByCartKey($cartKey);
 		$store_id = $grouped_item[0]->StoreId;
 		$vocher = $post['voucher'];
 		$store_array 	= $TeamStoreModel->selectTeamStore('Id', $grouped_item[0]->StoreId);
 		$getSubtotal 	= $TeamStoreModel->getSubtotal($cartKey);
-		
+
 		$data = array(
 			'store_id' => $store_id,
 			'voucher' => $vocher
 		);

 		$getVoucher 	= $TeamStoreModel->selectVoucher($data);
-		
-		if($getVoucher){
+
+		if ($getVoucher) {
 			$items 	 		= $TeamStoreModel->myCart($cartKey);

 			// check if if voucher is already in used;
-			foreach($items  as $item){
-				if($getVoucher[0]->Id == $item->VoucherId){
+			foreach ($items  as $item) {
+				if ($getVoucher[0]->Id == $item->VoucherId) {
 					return response()->json(array(
 						'success' => false,
 						'message' => 'This voucher is already in used.'
@@ -598,73 +667,69 @@ class TeamStoreController extends Controller {

 			//get all voucher used.
 			$updated_items 	 		= $TeamStoreModel->myCart($cartKey);
-			foreach($updated_items as $item){
-				if($item->VoucherId != null){
+			foreach ($updated_items as $item) {
+				if ($item->VoucherId != null) {
 					$voucherIds[] = $item->VoucherId;
 				}
-			
 			}
-	
-			$vouchers 	= $TeamStoreModel->selectVoucherWhereIn($voucherIds);		
-			
+
+			$vouchers 	= $TeamStoreModel->selectVoucherWhereIn($voucherIds);
+
 			$totalValue = 0;
-			if(!empty($vouchers)){
-				foreach($vouchers as $voucher){
+			if (!empty($vouchers)) {
+				foreach ($vouchers as $voucher) {
 					$totalValue = $totalValue + $voucher->VoucherValue;
-					if($voucher->VoucherType == "Percentage"){
+					if ($voucher->VoucherType == "Percentage") {
 						$voucherData = array(
-							'totalValue'=> $totalValue,
-							'type'=>'Percentage'
+							'totalValue' => $totalValue,
+							'type' => 'Percentage'
 						);
-					}else{
+					} else {
 						$voucherData = array(
-							'totalValue'=> $totalValue,
-							'type'=>'Flat'
+							'totalValue' => $totalValue,
+							'type' => 'Flat'
 						);
 					}
 				}
-				
-				if($voucherData['type'] == "Percentage"){
+
+				if ($voucherData['type'] == "Percentage") {
 					$getPercentageValue = $voucherData['totalValue'] / 100;
 					$getDiscountValue = ($getSubtotal[0]->Subtotal * $getPercentageValue);
 					$finalSubTotal = $getSubtotal[0]->Subtotal - $getDiscountValue;
-				}else{
+				} else {
 					//Flat voucher computation here..
 				}
-			}else{
+			} else {
 				$finalSubTotal =  $getSubtotal[0]->Subtotal;
 			}

-			if($getVoucher[0]->VoucherType == "Percentage"){
+			if ($getVoucher[0]->VoucherType == "Percentage") {
 				$offData = $getVoucher[0]->VoucherValue . '%';
-			}else{
+			} else {
 				$offData = $getVoucher[0]->VoucherValue . ' ' . $store_array[0]->StoreCurrency;
 			}
-			
-			
+
+

 			$message = '<div class="btn-group">
-							<button type="button" class="btn btn-default btn-xs">'.$getVoucher[0]->VoucherCode. ' ' .$offData. ' OFF</button>
+							<button type="button" class="btn btn-default btn-xs">' . $getVoucher[0]->VoucherCode . ' ' . $offData . ' OFF</button>
 							<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 								<span class="caret"></span>
 								<span class="sr-only"></span>
 							</button>
 							<ul class="dropdown-menu">
-								<li><a href="'.$removeItemURL.'"><i class="fa fa-times"></i> Remove</a></li>
+								<li><a href="' . $removeItemURL . '"><i class="fa fa-times"></i> Remove</a></li>
 							</ul>
 						</div>';
-			
+
 			// return success
 			return response()->json(array(
 				'success' => true,
 				'message' => $message,
-				'subtotal' =>$finalSubTotal
+				'subtotal' => $finalSubTotal
 			));
+		} else {

-			
-
-		}else{
-			
 			return response()->json(array(
 				'success' => false,
 				'message' => "Sorry, the voucher code is invalid. Please try again."
@@ -676,10 +741,10 @@ class TeamStoreController extends Controller {
 	{
 		$m						= new TeamStoreModel;
 		$cartKey 				= $request->session()->get('cartkey');
-		
+
 		$usermodel 				= new UserModel;
 		$userId 				= Auth::user()->id;
-		
+
 		$array_address_book		= 	$usermodel->selectAddresBook('UserId', $userId);

 		// var_dump($array_address_book);
@@ -689,10 +754,9 @@ class TeamStoreController extends Controller {
 		$getSubtotal 	= $m->getSubtotal($cartKey);

 		return view('sublayouts.checkout')
-									->with('row', $items)
-									->with('getSubtotal', $getSubtotal)
-									->with('array_address_book', $array_address_book);
-		
+			->with('row', $items)
+			->with('getSubtotal', $getSubtotal)
+			->with('array_address_book', $array_address_book);
 	}

 	public function mail()
@@ -708,13 +772,10 @@ class TeamStoreController extends Controller {


 		// dd('Mail Send Successfully');
-		Mail::raw('Text to e-mail', function($message)
-		{
+		Mail::raw('Text to e-mail', function ($message) {
 			$message->from('us@example.com', 'Laravel');

 			$message->to('frank.begornia@yahoo.com')->subject('sample email');
 		});
-	}	
-
-	
+	}
 }
--- a/app/Http/Controllers/user/UserController.php
+++ b/app/Http/Controllers/user/UserController.php
@@ -731,8 +731,8 @@ class UserController extends Controller {
 			
 			$u = $UserModel->insertNewProductThumbnails($thumbs);
 			// var_dump($thumbs);
-			// Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); live
-			Storage::disk('localdir')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+'));
+			Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); //live
+			//Storage::disk('localdir')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+'));
 			// var_dump($s);
 		}

@@ -777,8 +777,8 @@ class UserController extends Controller {
 			);
 			
 			$u = $UserModel->insertNewProductThumbnails($thumbs);
-			// Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); live
-			Storage::disk('localdir')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+'));
+			Storage::disk('sftp')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+')); //live
+			//Storage::disk('localdir')->put($thumbnail, fopen($request->file('upload_images')[$i], 'r+'));
 	
 		}

@@ -795,7 +795,7 @@ class UserController extends Controller {
 		$id	  =  $request->thumb_id;
 		$UserModel		= new UserModel;

-		$storagePath  = Storage::disk('localdir')->getDriver()->getAdapter()->getPathPrefix();
+		$storagePath  = Storage::disk('sftp')->getDriver()->getAdapter()->getPathPrefix();
 		if(file_exists($storagePath.$file)) {
 			unlink($storagePath.$file);
 		}
--- a/app/Models/teamstore/TeamStoreModel.php
+++ b/app/Models/teamstore/TeamStoreModel.php
@@ -100,7 +100,7 @@ class TeamStoreModel extends Model {

 	function getSizesByBracket($bracket){

-		$i = DB::table('sizes')->select('Size')
+		$i = DB::table('sizes')->select('Size', 'SizeDisplay')
 							->where('Bracket', $bracket)
 							->where('IsActive', 'TRUE')
 							->orderby('Ordering', 'ASC')
@@ -219,4 +219,10 @@ class TeamStoreModel extends Model {
 		return $i;
 	}
 	
+	function delete_cartTmp($field, $cartKey){
+		$i = DB::table('cart_tmp')
+										->where($field, $cartKey)
+										->delete();
+		return $i;
+	}
 }
--- a/composer.lock
+++ b/composer.lock
@@ -909,33 +909,28 @@
        },
        {
            "name": "league/flysystem-sftp",
-            "version": "1.0.14",
+            "version": "1.0.22",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/flysystem-sftp.git",
-                "reference": "f28d742a3e81258417293fd9a179a350154ab8f7"
+                "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/f28d742a3e81258417293fd9a179a350154ab8f7",
-                "reference": "f28d742a3e81258417293fd9a179a350154ab8f7",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/cab59dd2277e02fe46f5f23195672a02ed49774d",
+                "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d",
                "shasum": ""
            },
            "require": {
                "league/flysystem": "~1.0",
-                "php": ">=5.4.0",
+                "php": ">=5.6.0",
                "phpseclib/phpseclib": "~2.0"
            },
            "require-dev": {
                "mockery/mockery": "0.9.*",
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^5.7.25"
            },
            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
            "autoload": {
                "psr-4": {
                    "League\\Flysystem\\Sftp\\": "src/"
@@ -952,7 +947,7 @@
                }
            ],
            "description": "Flysystem adapter for SFTP",
-            "time": "2017-07-11T12:29:45+00:00"
+            "time": "2019-10-16T20:05:49+00:00"
        },
        {
            "name": "monolog/monolog",
@@ -2786,22 +2781,22 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.2.2",
+            "version": "3.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157"
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157",
-                "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.3.0",
+                "php": "^5.6 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
                "webmozart/assert": "^1.0"
            },
            "require-dev": {
@@ -2827,20 +2822,20 @@
                }
            ],
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-08-08T06:39:58+00:00"
+            "time": "2017-11-10T14:09:06+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "0.3.0",
+            "version": "0.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773"
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773",
-                "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
                "shasum": ""
            },
            "require": {
@@ -2874,7 +2869,7 @@
                    "email": "me@mikevanriel.com"
                }
            ],
-            "time": "2017-06-03T08:32:36+00:00"
+            "time": "2017-07-14T14:27:02+00:00"
        },
        {
            "name": "phpspec/php-diff",
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -50,7 +50,7 @@ return [

 		'localdir' => [
 			'driver' => 'local',
-			'root'   => 'C:\\wamp\\www\\images\\',
+			'root'   => '/var/www/html/uploads/images',
 		],

 		's3' => [
@@ -77,14 +77,14 @@ return [
 			'port'       => 22,
 			'username'   => 'root',
 			'password'   => '',
-			'privateKey' => 'C:\\Users\\user\\Documents\\#keys\\instance2\\root.ppk',
+			'privateKey' => '/var/www/html/_key/instance2/root.ppk',
 			'root'       => '/var/www/html/images',
 			'timeout'    => 10
 		],

 		'uploads' => [
 			'driver' => 'local',
-			'root'   => 'C:\\wamp\\www\\uploads\\images\\',
+			'root'   => '/var/www/html/uploads/images',
 		],
 	],

--- a/config/services.php
+++ b/config/services.php
@@ -35,15 +35,15 @@ return [
 	],

 	// sandbox
-	'paypal' => [
-        'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB',
-		'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz'
+	 'paypal' => [
+    'client_id' => 'AR1FObcz7lD_p53BJpOw1Frf0hIJ1-VOArYoDnsNJXVvoxjYv6mOKBBvdvZBzQcpBPfB_AJnofdalO0t',
+		'secret' => 'EK0CB8Re802HTxLQawwjAYzOu-SxrFOwuVG7qZ_nSovwgkp77wVs6k4XelXj2v5Il5llCFzsWs_Eb4o-'
 	],
 	
 	// live
 	// 'paypal' => [
-    //     'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq',
-	// 	'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_'
+  //        'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq',
+	//  	'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_'
 	// ],

 ];
--- a/config/site_config.php
+++ b/config/site_config.php
@@ -16,7 +16,8 @@ return [
    // 'company_name' => env('COMPANY_NAME','Acme Inc'),
    // 'company_email' => env('COMPANY_email','contact@acme.inc'),

-    'prod_private_server_ip' => env('http://localhost', 'http://localhost'),
-    'uploads' => env('http://localhost/uploads/images/', 'http://localhost/uploads/images/'), // local
+    'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'),
+    'uploads' => env('https://crewsportswear.com/uploads/images/', 'https://crewsportswear.com/uploads/images/'), // local
+
    
 ];
--- a/resources/views/designer/designer.blade.php
+++ b/resources/views/designer/designer.blade.php
@@ -550,37 +550,37 @@

                                    </div>
                                    <div class="tab-pane fade" id="tab-add-text">
-										<div id="addNewTextId">
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<!-- <button type="button" class="btn btn-danger pull-right btn-sm remove addMarginLeft" title="Remove object"><i class="fa fa-trash" aria-hidden="true"></i></button> -->
-													<button type="button" onclick="addNewText();" class="btn btn-primary pull-right btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> New Text</button>
-												</div>
-											</div>
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<label>Enter team name here</label>
-													<textarea name="editedTextInput" id="editedTextInput" class="form-control" placeholder="Enter team name here"></textarea>
+																			<div id="addNewTextId">
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<!-- <button type="button" class="btn btn-danger pull-right btn-sm remove addMarginLeft" title="Remove object"><i class="fa fa-trash" aria-hidden="true"></i></button> -->
+																						<button type="button" onclick="addNewText();" class="btn btn-primary pull-right btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> New Text</button>
+																					</div>
+																				</div>
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<label>Enter team name here</label>
+																						<textarea name="editedTextInput" id="editedTextInput" class="form-control" placeholder="Enter team name here"></textarea>

-												</div>
-											</div>
-										</div>
-										<div id="enterTextId">
-											<div class="row">
-												<div class="form-group col-sm-12">
-													<label>Enter team name here</label>
-													<textarea name="textInput" id="textInput" class="form-control" placeholder="Enter team name here"></textarea>
-													<!--span id="errfirstName" style="color: #dd4b39"></span> !-->
-												</div>
+																					</div>
+																				</div>
+																			</div>
+																			<div id="enterTextId">
+																				<div class="row">
+																					<div class="form-group col-sm-12">
+																						<label>Enter team name here</label>
+																						<textarea name="textInput" id="textInput" class="form-control" placeholder="Enter team name here"></textarea>
+																						<!--span id="errfirstName" style="color: #dd4b39"></span> !-->
+																					</div>

-												<div class="form-group col-sm-12">
-													<button type="button" id="okBtn" onclick="addText();" class="btn btn-primary btn-block btn-sm">OK</button>
-												</div>
-											</div>
-										</div>
-                                        <div id="textProperties">
-                                            @include('designer.text_properties')
-                                        </div>
+																					<div class="form-group col-sm-12">
+																						<button type="button" id="okBtn" onclick="addText();" class="btn btn-primary btn-block btn-sm">OK</button>
+																					</div>
+																				</div>
+																			</div>
+																			<div id="textProperties">
+																					@include('designer.text_properties')
+																			</div>
                                    </div>

                                    <div class="tab-pane fade" id="tab-add-number">
@@ -613,9 +613,9 @@
                                    </div>

                                    <div class="tab-pane fade" id="tab-clipart">
-										<div id="tab-clipart-content">
-										</div>
-									</div>
+																			<div id="tab-clipart-content">
+																			</div>
+																		</div>

                                    <div class="tab-pane fade" id="tab-upload-image">
 										<!-- <div class="row">
--- a/resources/views/emails/orders.blade.php
+++ b/resources/views/emails/orders.blade.php
@@ -387,6 +387,10 @@
                              <td class="col-md-3">Tax</td>
                              <td>{{ $array_payment_details[0]->Tax . ' ' . $array_payment_details[0]->Currency }}</td>
                            </tr>
+                            <tr>
+                              <td class="col-md-3">Shipping Fee</td>
+                              <td>{{ $array_payment_details[0]->ShippingCost . ' ' . $array_payment_details[0]->Currency }}</td>
+                            </tr>
                            <tr>
                              <td class="col-md-3">Total</td>
                              <td>{{ $array_payment_details[0]->Total . ' ' . $array_payment_details[0]->Currency  }}</td>
@@ -474,7 +478,21 @@
                                                          <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>
+                                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                      <tr>
+                                                          <td><b>Number</b></td>
+                                                          <td><b>Jersey Size</b></td>
+                                                          <td><b>Shorts Size</b></td>
+                                                          <td><b>Price</b></td>
+                                                          <td><b>Quantity</b></td>
                                                      </tr>
                                                    @else

@@ -545,6 +563,21 @@
                                                                <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>
+                                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                              <tr>
+                                                                  <td>{{ $sub_item->Number }}</td>
+                                                                  <td>{{ $sub_item->JerseySize }}</td>
+                                                                  <td>{{ $sub_item->ShortsSize }}</td>
+                                                                  <td>{{ $sub_item->Price }}</td>
+                                                                  <td>{{ $sub_item->Quantity }}</td>
+                                                              </tr>
                                                            @else

                                                            @endif
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -9,6 +9,7 @@
            </button>
            <a class="navbar-brand" href="{{ url('/') }}">
                <img src="{{asset('public/images/logo.png')}}" />
+                {{-- <small>JAC Printing & Graphics Co.</small> --}}
            </a>
        </div>
        <div id="navbar" class="navbar-collapse collapse">
@@ -254,8 +255,15 @@
                <button type="button" class="close" data-dismiss="modal">&times;</button>
                <h4 class="modal-title">Contact Us</h4>
            </div>
-            <div class="modal-body">
-                <p>Coming soon.</p>
+            <div class="modal-body text-center">
+                <h1>Contact Us</h1>
+                <hr>
+                <h3>Email Address: <small><a href="#">customer-service@crewsportswear.com</a></small></h3>
+                <h3>Address: <small><a href="#">1281 Humbracht Circle
+                    Suite J
+                    Bartlett, Illinois
+                    60103</a></small>
+                </h3>
            </div>
            <div class="modal-footer">
                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
--- a/resources/views/sublayouts/cart.blade.php
+++ b/resources/views/sublayouts/cart.blade.php
@@ -46,14 +46,37 @@
        </div>
        
        <div style="border: 1px solid #e2e2e2; padding: 10px; border-bottom: none;">
-            <h3>Subtotal: <span id="my_subtotal">{{  round($getSubtotal, 2)  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</small></h3>
+            {{-- <h3>Subtotal: <span id="my_subtotal">{{  round($getSubtotal, 2)  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</small></h3> --}}
+            <div class="alert alert-info">
+                <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                <p>Free Shipping on orders with subtotal over 150.00 {{ $store_array[0]->StoreCurrency }}</p>
+            </div> 
+
+            <table class="table table-bordered">
+                <tr>
+                    <th>Subtotal</th>
+                    <td>{{  round($getSubtotal, 2)  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</td>
+                </tr>
+                <tr>
+                    <th>Tax</th>
+                    <td>{{  round($getSubtotal, 2) * 0.10  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</td>
+                </tr>
+                <tr>
+                    <th>Shipping Fee</th>
+                    <td>{{  round($shipping_cost, 2)  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</td>
+                </tr>
+                <tr>
+                    <th><h5>Total<h5></th>
+                    <td><h5>{{  round($getSubtotal + $shipping_cost + ($getSubtotal * 0.10), 2)  }}</span> <small>{{ $store_array[0]->StoreCurrency }}</h5></td>
+                </tr>
+            </table>
            <hr>
            <div class="form-group" id="voucher_list">
                @foreach($row as $item)
                    @if($item->VoucherId != null)
                        <div class="btn-group">
                            @if($item->VoucherType == "Percentage")
-                                <button type="button" class="btn btn-default btn-xs">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}   OFF</button>
+                                <button type="button" class="btn btn-default btn-xs">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }} OFF</button>
                            @else
                                <button type="button" class="btn btn-default btn-xs">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }} OFF</button>
                            @endif
@@ -180,11 +203,27 @@
                                            <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>
+                                    @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                        <tr>
+                                            <th>Number</th>
+                                            <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 +291,23 @@
                                                    <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>
+                                            @elseif($item->FormUsed=="number-jersey-shorts-form")
+                                                <tr>
+                                                    <td>{{ $sub_item->Number }}</td>
+                                                    <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
--- a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php
@@ -2,7 +2,7 @@
    <table class="table" id="tableRow" style="font-size:12px;">
        <thead>
            <tr>
-                <th class="col-md-4">Name</th>
+                <th class="col-md-4">Name on Jersey</th>
                <th class="col-md-2">Number</th>
                <th class="col-md-3">Jersey Size</th>
                <th class="col-md-3">Shorts Size</th>
@@ -12,7 +12,7 @@
        <tbody id="orderTableBody">
            <tr class="table-tr-0">
                <td>
-                    <input type="text" name="order_names[]" class="form-control input-sm inputName roster-input" placeholder="Name">
+                    <input type="text" name="order_names[]" class="form-control input-sm inputName roster-input" placeholder="Name on Jersey">
                </td>
                <td>
                    <select class="form-control input-sm roster-input" name="order_number[]">
@@ -27,7 +27,7 @@
                    <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>
+                            <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                        @endforeach
                    </select>
                </td>
@@ -35,7 +35,7 @@
                    <select class="form-control input-sm order-size roster-input" name="order_shorts_size[]" style="border-right: 1px solid #ccc;"  data-row-number="1">
                        <option value="none">none</option>
                        @foreach($sizes_array as $size)
-                                <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                                <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                        @endforeach
                    </select>
                </td>
--- 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
@@ -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->SizeDisplay }}</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->SizeDisplay }}</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>
--- a/resources/views/teamstore-sublayouts/forms/name-name2-size-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/name-name2-size-form.blade.php
@@ -20,7 +20,7 @@
                <td>
                    <select class="form-control input-sm order-size roster-input" name="order_size[]" style="border-right: 1px solid #ccc;" >
                        @foreach($sizes_array as $size)
-                            <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                            <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                        @endforeach
                    </select>
                </td>
--- a/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php
@@ -27,7 +27,7 @@
                <td>
                    <select class="form-control input-sm order-size roster-input" name="order_size[]" style="border-right: 1px solid #ccc;"  data-row-number="1">
                        @foreach($sizes_array as $size)
-                            <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                            <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                        @endforeach
                    </select>
                </td>
--- a/resources/views/teamstore-sublayouts/forms/name-size-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/name-size-form.blade.php
@@ -16,7 +16,7 @@
                <td>
                    <select class="form-control input-sm order-size roster-input" style="border-right: 1px solid #ccc;" name="order_size[]" data-row-number="1">
                        @foreach($sizes_array as $size)
-                            <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                            <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                        @endforeach
                    </select>
                </td>
--- a/resources/views/teamstore-sublayouts/forms/number-jersey-shorts-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/number-jersey-shorts-form.blade.php
@@ -0,0 +1,48 @@
+<div class="panel-design-details" id="orderListPanel">
+    <table class="table" id="tableRow" style="font-size:12px;">
+        <thead>
+            <tr>
+                <th class="col-md-3">Number</th>
+                <th class="col-md-4">Jersey Size</th>
+                <th class="col-md-4">Shorts Size</th>
+                <th class="text-center"></th>
+            </tr>
+        </thead>
+        <tbody id="orderTableBody">
+            <tr class="table-tr-0">
+                <td>
+                    <select class="form-control input-sm roster-input" name="order_number[]">
+                        <option value="none">none</option>
+                        @for($i = 0; $i <= 99; $i++)
+                            <option value="{{ $i }}">{{ $i }}</option>
+                        @endfor
+                        <option value="00">00</option>
+                    </select>
+                </td>
+                <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->SizeDisplay }}</option>
+                        @endforeach
+                    </select>
+                </td>
+                <td>
+                    <select class="form-control input-sm order-size roster-input" name="order_shorts_size[]" style="border-right: 1px solid #ccc;"  data-row-number="1">
+                        <option value="none">none</option>
+                        @foreach($sizes_array as $size)
+                                <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
+                        @endforeach
+                    </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>
--- a/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php
+++ b/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php
@@ -6,7 +6,7 @@
        <select class="form-control input-sm cls-uniformSize" name="uniformSize" data-error="#err-uniformSize" required >
            <option value="">Select Size</option>
            @foreach($sizes_array as $size)
-                <option value="{{ $size->Size }}">{{ $size->Size }}</option>
+                <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
            @endforeach
        </select>
        <span id="err-uniformSize" style="color: #dd4b39"></span>
--- 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>
+                                                <option value="number-jersey-shorts-form">Number, Jersey and Shorts Form</option>
                                            </select>
                                        </div>
                                        <div class="form-group">
--- a/resources/views/user-layouts/order-details-body.blade.php
+++ b/resources/views/user-layouts/order-details-body.blade.php
@@ -84,6 +84,36 @@
                        <th>Price</th>
                        <th>Quantity</th>
                    </tr>
+                @elseif($array_item[0]->FormUsed=="name-name2-size-form")
+                    <tr>
+                        <th>Gamer Tag</th>
+                        <th>Name</th>
+                        <th>Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="name-size-form")
+                    <tr>
+                        <th>Name</th>
+                        <th>Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="jersey-and-shorts-quantity-form")
+                    <tr>
+                        <th>Jersey Size</th>
+                        <th>Shorts Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="number-jersey-shorts-form")
+                    <tr>
+                        <th>Number</th>
+                        <th>Jersey Size</th>
+                        <th>Shorts Size</th>
+                        <th>Price</th>
+                        <th>Quantity</th>
+                    </tr>
                @else

                @endif
@@ -134,6 +164,37 @@
                        <td>{{ $array_item[0]->Price }}</td>
                        <td>{{ $array_item[0]->Quantity }}</td>
                    </tr>
+                    
+                @elseif($array_item[0]->FormUsed=="name-name2-size-form")
+                    <tr>
+                        <td>{{ $array_item[0]->Name }}</td>
+                        <td>{{ $array_item[0]->Name2 }}</td>
+                        <td>{{ $array_item[0]->Size }}</td>
+                        <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="name-size-form")
+                    <tr>
+                        <td>{{ $array_item[0]->Name }}</td>
+                        <td>{{ $array_item[0]->Size }}</td>
+                        <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="jersey-and-shorts-quantity-form")
+                    <tr>
+                        <td>{{ $array_item[0]->JerseySize}}</td>
+                        <td>{{ $array_item[0]->ShortsSize}}</td>
+                        <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
+                @elseif($array_item[0]->FormUsed=="number-jersey-shorts-form")
+                    <tr>
+                        <td>{{ $array_item[0]->Number }}</td>
+                        <td>{{ $array_item[0]->JerseySize }}</td>
+                        <td>{{ $array_item[0]->ShortsSize }}</td>
+                        <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
+                        <td>{{ $array_item[0]->Quantity }}</td>
+                    </tr>
                @else

                @endif
--- 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>
+                                                <option value="number-jersey-shorts-form" @if($product_array[0]->ProductForm == "number-jersey-shorts-form") selected  @endif>Number, Jersey and Shorts Form</option>
                                            </select>
                                        </div>
                                        <div class="form-group">
Author	SHA1	Message	Date
franknstayn	a2cddafa5f	added shipping fee	2020-05-12 20:52:21 +08:00
franknstayn	bca94e54cc	added new form for store item	2020-03-19 22:37:08 +08:00
franknstayn	e57209bc64	update 3_14_2020	2020-03-14 01:17:24 -05:00
franknstayn	5eeefa5587	fix tax exemption	2020-02-28 21:07:05 +08:00
franknstayn	80094cfdf0	Merge branch 'master' of github.com:franknstayn/crewsportswear Conflicts: app/Http/Controllers/paypal/PaypalController.php	2020-02-28 07:02:30 -06:00
franknstayn	587819be9a	exempt jjed phl intax	2020-02-28 06:58:41 -06:00
franknstayn	67b52fcc1a	Merge branch 'master' of https://github.com/franknstayn/crewsportswear	2020-02-28 20:54:33 +08:00
franknstayn	f7b402fe7a	exempt nlp in tax	2020-02-28 20:53:29 +08:00
franknstayn	8408695473	uncomment RewriteRule	2020-02-25 12:29:23 +08:00
franknstayn	99f89a968b	removed JAC	2020-02-25 12:21:10 +08:00
franknstayn	3f96f82090	add jac	2020-02-25 12:06:28 +08:00
franknstayn	942af1f0a8	added contact us page	2020-02-25 11:53:26 +08:00
franknstayn	4610fb526b	changed sizes display	2020-02-08 20:37:02 +08:00
franknstayn	c29936f6b9	Merge pull request #9 from franknstayn/additional_form Additional form	2020-02-08 16:40:18 +08:00
franknstayn	7c12b0e2bf	add form in user page	2020-02-07 01:14:27 +08:00
franknstayn	a5dab36a14	additional forms	2020-02-07 01:10:31 +08:00
franknstayn	55f135f66c	Merge pull request #8 from franknstayn/local_dev added delete function on store item	2020-01-25 20:12:43 +08:00
franknstayn	6631690f93	Merge branch 'master' of github.com:franknstayn/crewsportswear	2020-01-25 04:47:06 -06:00
franknstayn	dd26b1dd4b	added user for tax exemption	2020-01-25 04:45:58 -06:00
franknstayn	155bc2ce53	Merge pull request #7 from franknstayn/local_dev Local dev	2020-01-25 18:43:25 +08:00
franknstayn	ef81f0bf25	Merge branch 'local_dev' of github.com:franknstayn/crewsportswear	2020-01-10 07:32:59 -06:00
franknstayn	bf078c82bf	Merge pull request #6 from franknstayn/local_dev rename number to name	2019-12-04 18:49:08 +08:00
franknstayn	2e29677b90	Merge pull request #5 from franknstayn/local_dev Local dev	2019-12-04 18:44:41 +08:00
franknstayn	03ea4e84a2	Merge pull request #4 from franknstayn/local_dev added "size" column on download report in csv and excel	2019-11-15 21:05:31 +08:00
franknstayn	3f8c116293	Merge pull request #3 from franknstayn/local_dev Local dev	2019-11-14 19:45:29 +08:00
franknstayn	9bf1a888a6	Merge branch 'master' of github.com:franknstayn/crewsportswear	2019-11-11 04:44:45 -06:00
franknstayn	542f2c64e0	update from live 11_11_2019	2019-11-11 04:44:08 -06:00
franknstayn	1d4c9a5445	Merge pull request #2 from franknstayn/local_dev added column in store order reports in store owner	2019-11-11 18:42:11 +08:00
franknstayn	3698312664	fixed broken link on cart page.	2019-11-06 07:26:02 -06:00
franknstayn	a9145ea484	Merge pull request #1 from franknstayn/local_dev Local dev by frank	2019-11-06 20:29:09 +08:00