diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index 6ff3def..cc983c9 100644 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -672,8 +672,8 @@ class UserController extends Controller { $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+')); + // 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); } diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 83cad6c..8c6d07c 100644 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -97,15 +97,6 @@ class TeamStoreModel extends Model { function myCart($cartKey){ // echo $cartKey; if($cartKey != ""){ - - // $i = DB::table('cart_tmp')->select('cart_tmp.Id', 'cart_tmp.Order', 'cart_tmp.ProductId', 'cart_tmp.CartKey', 'cart_tmp.ProductURL', 'cart_tmp.TeamName', 'teams.Team', 'cart_tmp.Name', 'cart_tmp.Number', 'cart_tmp.Size', 'cart_tmp.Price', 'cart_tmp.Quantity', 'teamstore_products.ProductName', 'teamstore_products.ProductURL', 'teamstore_product_thumbnails.Image') - // ->leftjoin('teamstore_products', 'cart_tmp.ProductURL','=','teamstore_products.ProductURL') - // ->leftjoin('teams', 'cart_tmp.TeamName','=','teams.Team') - // ->leftjoin('teamstore_product_thumbnails', 'cart_tmp.ProductId','=','teamstore_product_thumbnails.ProductId') - // ->where('cart_tmp.CartKey','=',$cartKey) - // ->where('teamstore_product_thumbnails.ImageClass','=','active') - // ->orderby('cart_tmp.Id', 'DESC') - // ->get(); $i = DB::table('cart_tmp') ->where('CartKey', $cartKey) ->get(); diff --git a/config/filesystems.php b/config/filesystems.php index 44ff6dd..d8ec2b6 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -48,6 +48,11 @@ return [ 'root' => storage_path().'/app', ], + 'localdir' => [ + 'driver' => 'local', + 'root' => 'C:\\wamp\\www\\images\\', + ], + 's3' => [ 'driver' => 's3', 'key' => 'your-key', diff --git a/public/fonts/glyphicons-halflings-regular.eot b/public/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a495..0000000 Binary files a/public/fonts/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/public/fonts/glyphicons-halflings-regular.svg b/public/fonts/glyphicons-halflings-regular.svg deleted file mode 100644 index 94fb549..0000000 --- a/public/fonts/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc6..0000000 Binary files a/public/fonts/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/fonts/glyphicons-halflings-regular.woff deleted file mode 100644 index 9e61285..0000000 Binary files a/public/fonts/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/public/fonts/glyphicons-halflings-regular.woff2 b/public/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b5..0000000 Binary files a/public/fonts/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index c700d43..d74f891 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -1488,7 +1488,7 @@ if(templateFormat == 'svg'){ - console.log('asdasda'); + // console.log('asdasda'); loadTemplate(tempPath, objectId, gradientIds, gradientPrefix); } @@ -3429,7 +3429,7 @@ // console.log(border_stroke) - // document.getElementById(mainColorId).setAttribute("fill", onMoveColor); + document.getElementById(mainColorId).setAttribute("fill", onMoveColor); }catch(e){ }