diff --git a/app/Http/Controllers/designer/DesignerController.php b/app/Http/Controllers/designer/DesignerController.php index 5942494..802d153 100644 --- a/app/Http/Controllers/designer/DesignerController.php +++ b/app/Http/Controllers/designer/DesignerController.php @@ -443,7 +443,7 @@ class DesignerController extends Controller { --> - + diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 26ad1c8..e38c16c 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -284,7 +284,13 @@ class PaypalController extends Controller { $item_goup_array = $newUserModel->itemGroup($cartKey); $item_thumbs = $newUserModel->selectDisplayItemThumb(); $array_payment_details = $newUserModel->selectPaymentDetails('CartKey', $cartKey); - + $array_storename = $newUserModel->selectTeamStoreName($cartKey); // email subject + + foreach($array_storename as $storname){ + + $sName[] = $storname->StoreName; + } + $sName = implode (", ", $sName); $data = array( 'order_item_array' => $order_item_array, @@ -292,14 +298,13 @@ class PaypalController extends Controller { 'img_thumb' => $item_thumbs, 'array_payment_details' => $array_payment_details, 'receiver' => $user_email, - 'subject' => 'Order Details', + 'subject' => $sName . ' ORDERS', ); Mail::send('emails.orders', $data, function($message) use ($data) { - $message->from('no-reply@crewsportswear.com', 'CREW Sportswear'); $message->cc('orders@crewsportswear.com', 'Orders From CREW Sportswear'); - $message->to($data['receiver'])->subject('Order Details'); + $message->to($data['receiver'])->subject($data['subject']); }); // end email sending diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index 5ceaea6..6ff3def 100644 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -13,6 +13,8 @@ use Paypal; use View; use Mail; use Validator; +use Illuminate\Support\Facades\Storage; + class UserController extends Controller { @@ -568,6 +570,7 @@ class UserController extends Controller { } + $prod_code = array('ProductCode' => $getYear . '-' .str_pad($id, 10,'0', STR_PAD_LEFT)); $i = $UserModel->updateProductCode($prod_code, $id); @@ -576,5 +579,137 @@ class UserController extends Controller { )); } + + function addStoreItem(){ + $newTeamStoreModel = new TeamStoreModel; + + $user_role = Auth::user()->role; + $store_id = Auth::user()->store_id; + + $store_array = $newTeamStoreModel->selectTeamStore('Id', $store_id); + return view('user-layouts.add_item')->with('store_array', $store_array); + } + function saveNewItem(Request $request){ + + $post = $request->all(); + // var_dump($post['imgupload']); + $UserModel = new UserModel; + $getYear = date('y'); + + $store_id = Auth::user()->store_id; + $templateCode = null; + $designCode = null; + $itemName = $post['itemName']; + $itemDescription = $post['itemDescription']; + $itemPrice = $post['itemPrice']; + $itemForm = $post['itemForm']; + $itemUrl = $post['itemUrl']; + $itemPrivacy = $post['itemPrivacy']; + + $check_product_url = array( + 'ProductURL' => $itemUrl + ); + + $validator = Validator::make($check_product_url, [ + 'ProductURL' => 'unique:teamstore_products' + ], + [ + 'ProductURL.unique' => 'The Item URL has already been taken.', + ]); + + + if ($validator->fails()) + { + $errors = ""; + // var_dump(($validator->errors()->all())); + foreach($validator->errors()->all() as $error){ + $errors .= "
  • ".$error."
    • "; + } + + $message = ' +
    + +

    ERROR:

    + '.$errors. + '
    '; + + return response()->json(array( + 'success' => false, + 'message' => $message + )); + } + + $data = array( + 'TeamStoreId' => $store_id, + 'ProductName' => $itemName, + 'ProductPrice' => str_replace('$ ', '', $itemPrice), + 'ProductDescription'=> $itemDescription, + 'ProductURL' => $itemUrl, + 'ProductForm' => $itemForm, + 'PrivacyStatus' => $itemPrivacy, + 'TemplateCode' => $templateCode, + 'DesignCode' => $designCode, + ); + + $id = $UserModel->insertNewProduct($data); // product item id + // echo $id; + + for($i = 0; $i < count($post['imgupload']); $i++){ + $rawName = date('Ymd') . "-" . time().'-'.$request->file('imgupload')[$i]->getClientOriginalName(); + $imageExt = $request->file('imgupload')[$i]->getClientOriginalExtension(); + + $custom_file_name = str_replace(' ','-',strtolower($rawName)); + $custom_file_name = preg_replace("/\.[^.\s]{3,4}$/", "", $custom_file_name); + $NewImageName = $custom_file_name.'.'.$imageExt; + $thumbnail = $NewImageName; + + $thumbs = $data = array( + 'ProductId' => $id, + 'Image' => $thumbnail, + 'ImageClass' =>null + ); + + $u = $UserModel->insertNewProductThumbnails($thumbs); + // var_dump($thumbs); + // Storage::disk('sftp')->put($thumbnail, $request->file('imgupload')[$i]); + Storage::disk('sftp')->put($thumbnail, fopen($request->file('imgupload')[$i], 'r+')); + // var_dump($s); + } + + $prod_code = array('ProductCode' => $getYear . '-' .str_pad($id, 10,'0', STR_PAD_LEFT)); + $i = $UserModel->updateProductCode($prod_code, $id); + + + return response()->json(array( + 'success' => true, + 'message' => 'success' + )); + + } + + + function updateActiveThumbnail(Request $request){ + $post = $request->all(); + $UserModel = new UserModel; + $i = $UserModel->updateActiveThumb($post['id'], $post['product_id']); + var_dump($i); + + } + + function saveThumbnailOrdering(Request $request){ + $post = $request->all(); + $arrayItems = $post['item']; + $order = 1; + $UserModel = new UserModel; + foreach ($arrayItems as $item) { + $i = $UserModel->updateThumbnailOrdering($order, $item); + $order++; + } + + return response()->json(array( + 'success' => true, + 'message' => 'success' + )); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index f2f57e8..199e22a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -119,7 +119,11 @@ Route::group(['middleware' => 'normaluser'], function () { Route::get('user/email-verify', 'user\UserController@emailVerify'); Route::post('user/post/resend-verification', 'user\UserController@resendVericationCode'); Route::post('user/post/verify-code', 'user\UserController@verifyCode'); - + Route::get('user/store-items/add-item', 'user\UserController@addStoreItem'); + Route::post('user/store-items/save-new-item', 'user\UserController@saveNewItem'); + Route::post('user/update-active-thumbnail', 'user\UserController@updateActiveThumbnail'); + Route::post('user/post/save-thumbnail-ordering', 'user\UserController@saveThumbnailOrdering'); + Route::get('user/my-designs/sell-design/{designCode}', 'user\UserController@sellDesign'); Route::post('user/my-designs/addstoreitem', 'user\UserController@saveNewStoreItem'); }); diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 126d594..83cad6c 100644 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -32,7 +32,10 @@ class TeamStoreModel extends Model { function getProductThumbnails($productId){ - $i = DB::table('teamstore_product_thumbnails')->where('ProductId', $productId)->get(); + $i = DB::table('teamstore_product_thumbnails') + ->where('ProductId', $productId) + ->orderby('Ordering', 'ASC') + ->get(); return $i; } @@ -55,7 +58,10 @@ class TeamStoreModel extends Model { function getThumbnails($productId){ - $i = DB::table('teamstore_product_thumbnails')->where('ProductId', $productId)->get(); + $i = DB::table('teamstore_product_thumbnails') + ->where('ProductId', $productId) + ->orderby('Ordering', 'ASC') + ->get(); return $i; } diff --git a/app/Models/user/UserModel.php b/app/Models/user/UserModel.php index 49abb0f..2f43a63 100644 --- a/app/Models/user/UserModel.php +++ b/app/Models/user/UserModel.php @@ -175,6 +175,7 @@ class UserModel extends Model { $i = DB::table('teamstore_product_thumbnails') ->where('ImageClass', 'active') + ->orderby('Ordering', 'ASC') ->get(); return $i; } @@ -216,4 +217,24 @@ class UserModel extends Model { return $i; } + + function selectTeamStoreName($ck){ + $pdo = DB::connection()->getPdo(); + $query = $pdo->prepare("SELECT t.StoreName FROM orders AS o INNER JOIN teamstores AS t ON t.Id = o.StoreId WHERE o.CartKey = :ck GROUP BY o.StoreId ORDER BY t.StoreName ASC"); + $query->execute(array(':ck'=>$ck)); + $row = $query->fetchAll(\PDO::FETCH_OBJ); + return $row; + } + + function updateActiveThumb($id, $product_id){ + DB::table('teamstore_product_thumbnails')->where('ProductId', $product_id) + ->update(['ImageClass' => null]); + $i = DB::table('teamstore_product_thumbnails')->where('Id', $id) + ->update(['ImageClass' => 'active']); + } + + function updateThumbnailOrdering($order, $id){ + $i = DB::table('teamstore_product_thumbnails')->where('Id', $id) + ->update(['Ordering' => $order]); + } } \ No newline at end of file diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 2e1556c..7b059a1 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -1,6 +1,9 @@ ', $value); }); + + Storage::extend('sftp', function ($app, $config) { + return new Filesystem(new SftpAdapter($config)); + }); } /** diff --git a/composer.json b/composer.json index 1320f5c..f3fff5b 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,8 @@ "netshell/paypal": "dev-master", "guzzlehttp/guzzle": "~5.0", "google/recaptcha": "~1.1", - "spatie/laravel-analytics": "^1.4" + "spatie/laravel-analytics": "^1.4", + "league/flysystem-sftp": "^1.0" }, "require-dev": { "phpunit/phpunit": "~4.0", diff --git a/composer.lock b/composer.lock index e373fe7..aa5016a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "a6aecb41f379bcff36b6bca5a100f7a1", + "content-hash": "9ad9cbf7c7c319c392284bef379f0004", "packages": [ { "name": "classpreloader/classpreloader", @@ -862,6 +862,53 @@ ], "time": "2019-03-30T13:22:34+00:00" }, + { + "name": "league/flysystem-sftp", + "version": "1.0.14", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/flysystem-sftp.git", + "reference": "f28d742a3e81258417293fd9a179a350154ab8f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/f28d742a3e81258417293fd9a179a350154ab8f7", + "reference": "f28d742a3e81258417293fd9a179a350154ab8f7", + "shasum": "" + }, + "require": { + "league/flysystem": "~1.0", + "php": ">=5.4.0", + "phpseclib/phpseclib": "~2.0" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Flysystem\\Sftp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Frank de Jonge", + "email": "info@frenky.net" + } + ], + "description": "Flysystem adapter for SFTP", + "time": "2017-07-11T12:29:45+00:00" + }, { "name": "monolog/monolog", "version": "1.24.0", @@ -1226,6 +1273,98 @@ ], "time": "2016-01-20T17:45:52+00:00" }, + { + "name": "phpseclib/phpseclib", + "version": "2.0.15", + "source": { + "type": "git", + "url": "https://github.com/phpseclib/phpseclib.git", + "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0", + "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phing/phing": "~2.7", + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "sami/sami": "~2.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "suggest": { + "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", + "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", + "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + }, + "type": "library", + "autoload": { + "files": [ + "phpseclib/bootstrap.php" + ], + "psr-4": { + "phpseclib\\": "phpseclib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jim Wigginton", + "email": "terrafrost@php.net", + "role": "Lead Developer" + }, + { + "name": "Patrick Monnerat", + "email": "pm@datasphere.ch", + "role": "Developer" + }, + { + "name": "Andreas Fischer", + "email": "bantu@phpbb.com", + "role": "Developer" + }, + { + "name": "Hans-Jürgen Petrich", + "email": "petrich@tronic-media.com", + "role": "Developer" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "role": "Developer" + } + ], + "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", + "homepage": "http://phpseclib.sourceforge.net", + "keywords": [ + "BigInteger", + "aes", + "asn.1", + "asn1", + "blowfish", + "crypto", + "cryptography", + "encryption", + "rsa", + "security", + "sftp", + "signature", + "signing", + "ssh", + "twofish", + "x.509", + "x509" + ], + "time": "2019-03-10T16:53:45+00:00" + }, { "name": "psr/log", "version": "1.1.0", diff --git a/config/filesystems.php b/config/filesystems.php index 0221fa7..44ff6dd 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -66,6 +66,17 @@ return [ 'url_type' => 'publicURL' ], + 'sftp' => [ + 'driver' => 'sftp', + 'host' => '35.232.234.8', + 'port' => 22, + 'username' => 'root', + 'password' => '', + 'privateKey' => 'C:\\Users\\user\\Documents\\#keys\\instance2\\root.ppk', + 'root' => '/var/www/html/images', + 'timeout' => 10 + ], + ], ]; diff --git a/config/site_config.php b/config/site_config.php index ca92a70..0c917e8 100644 --- a/config/site_config.php +++ b/config/site_config.php @@ -16,8 +16,8 @@ return [ // 'company_name' => env('COMPANY_NAME','Acme Inc'), // 'company_email' => env('COMPANY_email','contact@acme.inc'), - // 'prod_private_server_ip' => env('35.232.234.8', '35.232.234.8'), - 'prod_private_server_ip' => env('http://192.168.2.238', 'http://192.168.2.238'), // local + // 'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'), + 'prod_private_server_ip' => env('http://localhost', 'http://localhost'), // local 'designer_location' => env('http://localhost/plain-tshirt/', 'http://localhost/plain-tshirt/'), diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index 1601718..6e4d8be 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -229,19 +229,19 @@ @if(($template->Type == "Jersey" || $template->Type == "Shirts") && $template->Side == "Front") - + @endif @if(($template->Type == "Jersey" || $template->Type == "Shirts") && $template->Side == "Back") - + @endif @if($template->Type == "Shorts" && $template->Side == "Right") - + @endif @if($template->Type == "Shorts" && $template->Side == "Left") - + @endif @if($template->Type == "Shirts" && $template->Side == "Right") @@ -1489,7 +1489,13 @@ canvas = window[$(this).attr('data-canvas-id')]; canvasID = $(this).attr('data-canvas-id'); canvas.calcOffset(); - // initCanvas(); + initCanvas(); + canvas.on('object:moving', function(options) { + + console.log('asdasd') + }); + // canvas.on('selection:cleared', onDeSelected); + // canvas.on('object:selected', onSelected); }); //trigger enter ###################################################################### @@ -1592,13 +1598,12 @@ options.target.set({ left: canvas.width / 2 - options.target.getWidth() / 2, }).setCoords(); - - // console.log(canvasID.split("_")[2] + "_" +canvasID.split("_")[1] + "_Border") - + // $("#"+canvasID.split("_")[2] + "_" +canvasID.split("_")[1] + "_Border").css({ "display" : "" }); document.getElementById(canvasID.split("_")[2] + "_" +canvasID.split("_")[1] + "_Border").setAttribute("display", ""); } + console.log('asdasd') }); canvas.on('object:rotating', onRotating); @@ -1707,7 +1712,7 @@ // console.log("Height =", (obj.getScaleY() * obj.getHeight()).toFixed(2)); // console.log("Width = ", (obj.getScaleX() * obj.getWidth()).toFixed(2)); - // console.log('left-', obj.left, 'top-', obj.top); + console.log('left-', obj.left, 'top-', obj.top); // console.log('font-', obj.fontSize); if(obj != null){ @@ -1942,6 +1947,13 @@ window.addEventListener("keydown", processKeys, false); // end arrow keys navigations + // window.addEventListener("mousemove", myFunction, false); + + + // function myFunction(){ + // console.log('asda') + // } + //remove object $(document).on('button click', '.remove', function() { var object = canvas.getActiveObject(); @@ -2651,7 +2663,7 @@ var defNameShortLeft = new fabric.Text(defaultNumber, { idNumber:"NumberLeftShorts", - top: 278.35, + top: 235.35, fontSize: 62.50, // 71.25 for default font size. equivalent 2.5" //height: fabric.util.parseUnit('1in'), fill: '#000000', @@ -2673,7 +2685,7 @@ var defNameShortRight = new fabric.Text(defaultNumber, { idNumber:"NumberRightShorts", - top: 278.35, + top: 235.35, fontSize: 62.50, // 71.25 for default font size. equivalent 2.5" //height: fabric.util.parseUnit('1in'), fill: '#000000', @@ -3013,7 +3025,7 @@ } function getClipartProperties(arrayPathId, randomNumbers) { - console.log(arrayPathId); + // console.log(arrayPathId); $.ajax({ //create an ajax request to load_page.php type: "POST", @@ -3044,7 +3056,7 @@ // END 4TH TAB // 5TH TAB - // for upload image + // for upload image document.getElementById('upload-images').onchange = function handleImage(e) { console.log(event); var reader = new FileReader(); @@ -3913,8 +3925,8 @@ ] }); } - //################### E N D C O L O R P A L E T T E S #######################// + function myCart(){ $.ajax({ //create an ajax request to load_page.php diff --git a/resources/views/designer/palette.json b/resources/views/designer/palette.json index 1bf8b0b..0d2a720 100644 --- a/resources/views/designer/palette.json +++ b/resources/views/designer/palette.json @@ -1,50 +1,38 @@ -[ - [ - "rgb(0, 0, 0)", - "rgb(67, 67, 67)", - "rgb(102, 102, 102)", - "rgb(204, 204, 204)", - "rgb(217, 217, 217)", - "rgb(255, 255, 255)" +[ + [ + "rgb(38, 38, 38)", + "rgb(102, 102, 102)", + "rgb(68, 69, 79)", + "rgb(255, 255, 255)" ], - [ - "rgb(152, 0, 0)", - "rgb(255, 0, 0)", - "rgb(255, 153, 0)", - "rgb(255, 255, 0)", - "rgb(0, 255, 0)", - "rgb(0, 255, 255)" + [ + "rgb(77, 20, 8)", + "rgb(0, 75, 43)", + "rgb(0, 135, 81)", + "rgb(0, 111, 175)" ], - [ - "rgb(74, 134, 232)", - "rgb(0, 0, 255)", - "rgb(153, 0, 255)", - "rgb(255, 0, 255)", - "rgb(230, 184, 175)", - "rgb(244, 204, 204)" + [ + "rgb(0, 95, 111)", + "rgb(16, 34, 64)", + "rgb(66, 128, 206)", + "rgb(17, 43, 155)" ], - [ - "rgb(252, 229, 205)", - "rgb(255, 242, 204)", - "rgb(217, 234, 211)", - "rgb(208, 224, 227)", - "rgb(201, 218, 248)", - "rgb(207, 226, 243)" + [ + "rgb(64, 18, 129)", + "rgb(116, 0, 36)", + "rgb(169, 30, 54)", + "rgb(221, 117, 174)" ], - [ - "rgb(217, 210, 233)", - "rgb(234, 209, 220)", - "rgb(221, 126, 107)", - "rgb(234, 153, 153)", - "rgb(249, 203, 156)", - "rgb(255, 229, 153)" + [ + "rgb(214, 0, 2)", + "rgb(51, 0, 0)", + "rgb(255, 224, 27)", + "rgb(255, 186, 0)" ], - [ - "rgb(182, 215, 168)", - "rgb(162, 196, 201)", - "rgb(164, 194, 244)", - "rgb(159, 197, 232)", - "rgb(180, 167, 214)", - "rgb(213, 166, 189)" + [ + "rgb(211, 198, 120)", + "rgb(158, 64, 0)", + "rgb(255, 64, 0)", + "rgb(255, 112, 10)" ] -] \ No newline at end of file + ] \ No newline at end of file diff --git a/resources/views/emails/orders.blade.php b/resources/views/emails/orders.blade.php index 4eb7e02..3397456 100644 --- a/resources/views/emails/orders.blade.php +++ b/resources/views/emails/orders.blade.php @@ -54,9 +54,9 @@ display: block; margin: 0 auto !important; /* makes it centered */ - max-width: 580px; + max-width: 680px; padding: 10px; - width: 580px; + width: 680px; } /* This should also be a block element, so that it will fill 100% of the .container */ @@ -64,7 +64,7 @@ box-sizing: border-box; display: block; margin: 0 auto; - max-width: 580px; + max-width: 680px; padding: 10px; } @@ -352,7 +352,7 @@

    Order Details

    - +
    @@ -392,10 +392,10 @@

    Item Order(s):

    @foreach($item_goup_array as $item)
    -
    Payer Information
    +
    -
    + @foreach($img_thumb as $img) @if($img->ProductId == $item->ProductId) @@ -405,7 +405,7 @@
    {{ $item->ProductName }}
    Total Price: ${{ $item->total_price }} • Row(s): {{ $item->qty }} - +
    @if($item->FormUsed=="jersey-and-shorts-form") @@ -420,9 +420,7 @@ - - @elseif($item->FormUsed=="quantity-form") diff --git a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php index 0f9e6ff..8df73d2 100644 --- a/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/jersey-and-shorts-form.blade.php @@ -80,7 +80,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php b/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php index 4a0b2a4..a1764ea 100644 --- a/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/name-number-form.blade.php @@ -63,7 +63,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php b/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php index 73a5955..fcc7093 100644 --- a/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/name-number-size-form.blade.php @@ -72,7 +72,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/name-size.blade.php b/resources/views/teamstore-sublayouts/forms/name-size.blade.php index 73a5955..fcc7093 100644 --- a/resources/views/teamstore-sublayouts/forms/name-size.blade.php +++ b/resources/views/teamstore-sublayouts/forms/name-size.blade.php @@ -72,7 +72,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/number-form.blade.php b/resources/views/teamstore-sublayouts/forms/number-form.blade.php index 4e86c79..4e88204 100644 --- a/resources/views/teamstore-sublayouts/forms/number-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/number-form.blade.php @@ -59,7 +59,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php b/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php index be08932..341e095 100644 --- a/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/quantity-form.blade.php @@ -59,7 +59,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php b/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php index fdcc2a0..6c7e675 100644 --- a/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/tshirt-form.blade.php @@ -64,7 +64,9 @@

    - + @if($product_array[0]->ProductPrice > 0) + + @endif diff --git a/resources/views/user-layouts/add_item.blade.php b/resources/views/user-layouts/add_item.blade.php new file mode 100644 index 0000000..be2645c --- /dev/null +++ b/resources/views/user-layouts/add_item.blade.php @@ -0,0 +1,132 @@ +@extends('user-layouts.user_template') +@section('content') + +
    + +
    +

    + Add Store Item +

    +
      +
    1. Home
      2. +
    2. Store Items
      3. +
    3. Add new Item
      4. +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +

    + Item Details +

    +
    +
    +
    +
    + +
    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + {{ url() . "/teamstore/" . $store_array[0]->StoreUrl . '/'}} + +
    + +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    + +
    +@endsection diff --git a/resources/views/user-layouts/sell_design.blade.php b/resources/views/user-layouts/sell_design.blade.php index ba3307f..83b7a21 100644 --- a/resources/views/user-layouts/sell_design.blade.php +++ b/resources/views/user-layouts/sell_design.blade.php @@ -92,7 +92,7 @@

    - Design Details + Item Details

    diff --git a/resources/views/user-layouts/store_items.blade.php b/resources/views/user-layouts/store_items.blade.php index 8521c92..6a0f821 100644 --- a/resources/views/user-layouts/store_items.blade.php +++ b/resources/views/user-layouts/store_items.blade.php @@ -35,6 +35,24 @@

    Item List

    +
    + + + Add new Item + + +
    diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php index 0787d2a..f92ea21 100644 --- a/resources/views/user-layouts/user_template.blade.php +++ b/resources/views/user-layouts/user_template.blade.php @@ -357,7 +357,116 @@ .thumbnail>img { height: 187px; - } + } + + .funkyradio div { + clear: both; + overflow: hidden; + } + + .funkyradio label { + width: 100%; + border-radius: 3px; + border: 1px solid #D1D3D4; + font-weight: normal; + } + + .funkyradio input[type="radio"]:empty, + .funkyradio input[type="checkbox"]:empty { + display: none; + } + + .funkyradio input[type="radio"]:empty ~ label, + .funkyradio input[type="checkbox"]:empty ~ label { + position: relative; + line-height: 2.5em; + text-indent: 3.25em; + margin-top: 2em; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + + .funkyradio input[type="radio"]:empty ~ label:before, + .funkyradio input[type="checkbox"]:empty ~ label:before { + position: absolute; + display: block; + top: 0; + bottom: 0; + left: 0; + content: ''; + width: 2.5em; + background: #D1D3D4; + border-radius: 0 0 0 3px; + } + + .funkyradio input[type="radio"]:hover:not(:checked) ~ label, + .funkyradio input[type="checkbox"]:hover:not(:checked) ~ label { + color: #888; + } + + .funkyradio input[type="radio"]:hover:not(:checked) ~ label:before, + .funkyradio input[type="checkbox"]:hover:not(:checked) ~ label:before { + content: '\2714'; + text-indent: .9em; + color: #C2C2C2; + } + + .funkyradio input[type="radio"]:checked ~ label, + .funkyradio input[type="checkbox"]:checked ~ label { + color: #777; + } + + .funkyradio input[type="radio"]:checked ~ label:before, + .funkyradio input[type="checkbox"]:checked ~ label:before { + content: '\2714'; + text-indent: .9em; + color: #333; + background-color: #ccc; + } + + .funkyradio input[type="radio"]:focus ~ label:before, + .funkyradio input[type="checkbox"]:focus ~ label:before { + box-shadow: 0 0 0 3px #999; + } + + .funkyradio-default input[type="radio"]:checked ~ label:before, + .funkyradio-default input[type="checkbox"]:checked ~ label:before { + color: #333; + background-color: #ccc; + } + + .funkyradio-primary input[type="radio"]:checked ~ label:before, + .funkyradio-primary input[type="checkbox"]:checked ~ label:before { + color: #fff; + background-color: #337ab7; + } + + .funkyradio-success input[type="radio"]:checked ~ label:before, + .funkyradio-success input[type="checkbox"]:checked ~ label:before { + color: #fff; + background-color: #5cb85c; + } + + .funkyradio-danger input[type="radio"]:checked ~ label:before, + .funkyradio-danger input[type="checkbox"]:checked ~ label:before { + color: #fff; + background-color: #d9534f; + } + + .funkyradio-warning input[type="radio"]:checked ~ label:before, + .funkyradio-warning input[type="checkbox"]:checked ~ label:before { + color: #fff; + background-color: #f0ad4e; + } + + .funkyradio-info input[type="radio"]:checked ~ label:before, + .funkyradio-info input[type="checkbox"]:checked ~ label:before { + color: #fff; + background-color: #5bc0de; + } @@ -410,8 +519,112 @@ + + +
    NameSize Price Quantity
    Price