added shipping fee

Conflicts:
	app/Http/Controllers/paypal/PaypalController.php

.htaccess

@@ -2,12 +2,11 @@
     <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

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,18 +15,17 @@ use Session;
 use Redirect;
 use Mail;
 
-
-
-class PaypalController extends Controller {
+class PaypalController extends Controller
+{
 
 	private $_apiContext;
 
-
 	public function __construct()
 	{
-        $this->_apiContext = PayPal::ApiContext(
+		$this->_apiContext = Paypal::ApiContext(
 			config('services.paypal.client_id'),
-            config('services.paypal.secret'));
+			config('services.paypal.secret')
+		);
 
 
 		$this->_apiContext->setConfig(array(
@@ -80,7 +81,7 @@ class PaypalController extends Controller {
 		$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) {
@@ -103,6 +104,8 @@ class PaypalController extends Controller {
 					);
 				}
 			}
+
+			$shipping_charges += $item->ShippingFee * $item->Quantity;
 		}
 
 		$order_items = array();
@@ -112,7 +115,7 @@ 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 {
 			$tax_value = 0.10;
@@ -131,19 +134,20 @@ 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);
@@ -229,6 +233,13 @@ class PaypalController extends Controller {
 		$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;
@@ -263,7 +274,6 @@ class PaypalController extends Controller {
 		$getSubtotal 	= $m->getSubtotal($cartKey);
 
 		$payment_details = array(
-
 			'UserId'		=> $userId,
 			'CartKey'		=> $cartKey,
 			'PaymentId' 	=> $id,
@@ -277,8 +287,9 @@ class PaypalController extends Controller {
 			'Payer_Email'	 	=> $email,
 			'Payer_Firstname'	=> $first_name,
 			'Payer_Lastname'	=> $last_name,
-								'PaymentMethod' 	=>$payment_method
-
+			'PaymentMethod' 	=> $payment_method,
+			'ShippingCost'	=> $shipping_cost,
+			'TransactionId'	=> $saleId,
 		);
 
 		$p_id 	= 	$paypal_model->insertToPaypalDetails($payment_details);
@@ -330,7 +341,8 @@ class PaypalController extends Controller {
 			$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,
@@ -347,8 +359,9 @@ class PaypalController extends Controller {
 			$message->bcc($data['email_cc'], 'Orders From CREW Sportswear');
 			$message->to($data['receiver'])->subject($data['subject']);
 		});
-		// end email sending
 		
+		// end email sending
+		$m->delete_cartTmp("CartKey", $cartKey);
 		$request->session()->forget('cartkey'); // clear session for cartkey
 
 		// redirect to thank you page.
@@ -389,5 +402,4 @@ class PaypalController extends Controller {
 
 		return redirect()->route('cart');
 	}
-
 }

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,7 +13,8 @@ use Mail;
 use Analytics;
 
 
-class TeamStoreController extends Controller {
+class TeamStoreController extends Controller
+{
 
 	public function index(Request $request, $teamStoreURL)
 	{
@@ -42,7 +45,6 @@ class TeamStoreController extends Controller {
 						return redirect()->back();
 					}
 				}
-				
 			}
 		}
 
@@ -70,7 +72,6 @@ class TeamStoreController extends Controller {
 					'thumb'	     =>  $displayThumbnails
 
 				);
-
 			} else {
 				$thumbnails[] = array(
 					'folder' 	=>	$store_array[0]->ImageFolder,
@@ -135,7 +136,6 @@ class TeamStoreController extends Controller {
 				// sort only
 				$stores_array 	= $m->selectTeamstoreFilter($field, $sort_value);
 			}
-
 		} else {
 			$field = "StoreName";
 			$sort_value = "ASC";
@@ -158,11 +158,9 @@ class TeamStoreController extends Controller {
 		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.');
 		}
-		
 	}
 
 	private $teams_array;
@@ -185,7 +183,6 @@ class TeamStoreController extends Controller {
 				'ImageClass' => 'active'
 			);
 
-
 			$thumbnails_array[] = $data;
 		}
 
@@ -217,7 +214,6 @@ class TeamStoreController extends Controller {
 			->with('teams_array', $teams_array)
 			->with('sizes_array', $sizes_array)
 			->with('available_qty', $availableQty);
-															
 	}
 
 	public function login(Request $request)
@@ -263,8 +259,6 @@ class TeamStoreController extends Controller {
 			->render();
 
 		return $handle_form;
-
-		
 	}
 
 	public function addToCart(Request $request)
@@ -288,6 +282,7 @@ class TeamStoreController extends Controller {
 		$product_form 	= $product_array[0]->ProductForm;
 		$design_code 	= $product_array[0]->DesignCode;
 		$product_name 	= $product_array[0]->ProductName;
+		$shipping_fee 	= $product_array[0]->ShippingFee;
 
 		$teamstore_array 	= $m->selectTeamStore('Id', $TeamStoreId);
 
@@ -322,7 +317,8 @@ 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") {
@@ -338,7 +334,8 @@ 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") {
 
@@ -352,10 +349,9 @@ 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") {
 
 			$order_names =  $post['order_names'];
@@ -374,7 +370,8 @@ 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") {
@@ -397,10 +394,10 @@ 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") {
 
 			$order_number =  $post['order_number'];
@@ -417,7 +414,8 @@ 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") {
@@ -440,7 +438,8 @@ 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") {
@@ -461,7 +460,71 @@ 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
 				);
 			}
 		}
@@ -481,13 +544,15 @@ class TeamStoreController extends Controller {
 		));
 	}
 
-	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) {
 			$defId = $grouped_item[0]->StoreId;
@@ -497,7 +562,7 @@ class TeamStoreController extends Controller {
 
 		$item_thumbs 	= $m->selectDisplayCartThumb();
 		$store_array 	= $m->selectTeamStore('Id', $defId);
-		
+		$shipping_cost = 0;
 
 		if ($items) {
 			$voucherIds = array();
@@ -505,6 +570,8 @@ class TeamStoreController extends Controller {
 				if ($item->VoucherId != null) {
 					$voucherIds[] = $item->VoucherId;
 				}
+			
+				$shipping_cost += $item->ShippingFee * $item->Quantity;
 			}
 			$vouchers 	= $m->selectVoucherWhereIn($voucherIds);
 		}
@@ -542,10 +609,12 @@ class TeamStoreController extends Controller {
 			->with('row', $items)
 			->with('img_thumb', $item_thumbs)
 			->with('getSubtotal', $finalSubTotal)
-								->with('store_array', $store_array);
+			->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 == "") {
@@ -602,7 +671,6 @@ class TeamStoreController extends Controller {
 				if ($item->VoucherId != null) {
 					$voucherIds[] = $item->VoucherId;
 				}
-			
 			}
 
 			$vouchers 	= $TeamStoreModel->selectVoucherWhereIn($voucherIds);
@@ -660,9 +728,6 @@ class TeamStoreController extends Controller {
 				'message' => $message,
 				'subtotal' => $finalSubTotal
 			));
-
-			
-
 		} else {
 
 			return response()->json(array(
@@ -692,7 +757,6 @@ class TeamStoreController extends Controller {
 			->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');
 		});
 	}
-
-	
 }

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);
 		}

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;
+	}
 }

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",

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',
 		],
 	],
 

config/services.php

@@ -36,8 +36,8 @@ return [
 
 	// sandbox
 	 'paypal' => [
-        'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB',
-		'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz'
+    'client_id' => 'AR1FObcz7lD_p53BJpOw1Frf0hIJ1-VOArYoDnsNJXVvoxjYv6mOKBBvdvZBzQcpBPfB_AJnofdalO0t',
+		'secret' => 'EK0CB8Re802HTxLQawwjAYzOu-SxrFOwuVG7qZ_nSovwgkp77wVs6k4XelXj2v5Il5llCFzsWs_Eb4o-'
 	],
 	
 	// live

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
+
     
 ];

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

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>

resources/views/sublayouts/cart.blade.php

@@ -46,7 +46,30 @@
         </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)
@@ -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

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>

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>

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>

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>

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>

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>

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>

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">

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

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">