From e60bb3baf84ff53a3004b807e64031919b36f9b9 Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Thu, 11 Jul 2019 21:50:00 +0800 Subject: [PATCH] update 7_11_2019 --- app/Http/Controllers/MainController.php | 10 +- .../teamstore/TeamStoreController.php | 38 ++- app/Http/Controllers/user/UserController.php | 9 +- app/Models/teamstore/TeamStoreModel.php | 11 + config/laravel-analytics.php | 2 +- resources/views/designer/designer.blade.php | 288 +++++++++--------- resources/views/layout/main.blade.php | 22 +- resources/views/layout/navbar.blade.php | 4 +- resources/views/sublayouts/cart.blade.php | 2 +- resources/views/sublayouts/index.blade.php | 7 +- .../sublayouts/sports-category.blade.php | 6 +- .../views/sublayouts/sports-styles.blade.php | 25 +- .../teamstore-sublayouts/index.blade.php | 10 - .../teamstore-sublayouts/stores.blade.php | 54 ++-- .../views/user-layouts/add_item.blade.php | 14 +- .../views/user-layouts/sell_design.blade.php | 14 +- .../user-layouts/user_template.blade.php | 8 +- .../hardy-beach-228905-7755a62c7a35.p12 | Bin 0 -> 2479 bytes .../hardy-beach-228905-fab35080b667.p12 | Bin 2479 -> 0 bytes 19 files changed, 294 insertions(+), 230 deletions(-) create mode 100644 storage/laravel-analytics/hardy-beach-228905-7755a62c7a35.p12 delete mode 100644 storage/laravel-analytics/hardy-beach-228905-fab35080b667.p12 diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index 6a8e2ed..3f75084 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -17,8 +17,6 @@ class MainController extends Controller { */ public function index() { - $analyticsData = Analytics::getMostVisitedPages(365, 20); - var_dump($analyticsData); return view('sublayouts.index'); } @@ -70,9 +68,15 @@ class MainController extends Controller { { $m = new MainModel; $data = $m->selectTemplatesByCategory($url, $id); + $categoryids = array(); + + $categoryids[] = $id; + $array_category = $m->selectCategory($categoryids); + // var_dump($array_category); return view('sublayouts.sports-styles') ->with('cat', $url) - ->with('row', $data); + ->with('row', $data) + ->with('array_category', $array_category); // if(count($data) > 1){ // return view('sublayouts.sports-styles') // ->with('cat', $url) diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 27d52bf..04dbc6a 100644 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -8,6 +8,7 @@ use Auth; use App\Models\teamstore\TeamStoreModel; use App\Models\user\UserModel; use Mail; +use Analytics; class TeamStoreController extends Controller { @@ -79,7 +80,25 @@ class TeamStoreController extends Controller { public function storelist() { + // $analyticsData = Analytics::getMostVisitedPages(14, 50); + + // foreach($analyticsData as $key => $val){ + // if (strpos($val['url'], 'teamstore') !== false) { + // $teamstore[] = $val['url']; + // } + // } + + // 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; $stores_array = $m->selectAllTeamStore(); @@ -89,6 +108,7 @@ class TeamStoreController extends Controller { } + public function checkTeamStorePassword(Request $request) { $m = new TeamStoreModel; @@ -103,8 +123,6 @@ class TeamStoreController extends Controller { return redirect()->back()->with('errors', 'Invalid Password.'); } - - // return view('teamstore-sublayouts.index'); } private $teams_array; @@ -118,8 +136,21 @@ class TeamStoreController extends Controller { // var_dump($product_array); $thumbnails_array = $m->getThumbnails($product_array[0]->Id); $teams_array = $m->getTeams($product_array[0]->Id); - $sizes_array = $m->getSizes(); + // $sizes_array = $m->getSizes(); + + + $x = explode(",", $product_array[0]->AvailableSizes ); + foreach($x as $s){ + $h[] = $m->getSizesByBracket($s); + } + + foreach($h as $d){ + foreach($d as $g){ + $sizes_array[] = $g; + } + } + if($product_array[0]->ProductAvailableQty != null){ $soldQty = $m->getSoldQty($product_array[0]->Id); // var_dump($soldQty); @@ -170,7 +201,6 @@ class TeamStoreController extends Controller { $teams_array = array(); $teams_array = $m->getTeams($product_id); $sizes_array = $m->getSizes(); - // var_dump($teams_array); ?> diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index 1f665b3..632bd0e 100644 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -485,7 +485,7 @@ class UserController extends Controller { ->with('array_cat_name', $array_cat_name); } - + //save item from my design // public function saveNewStoreItem(Request $request){ $post = $request->all(); $UserModel = new UserModel; @@ -500,6 +500,7 @@ class UserController extends Controller { $itemForm = $post['itemForm']; $itemUrl = $post['itemUrl']; $itemPrivacy = $post['itemPrivacy']; + $available_size = implode(",", $_POST['available_size']); $check_product_url = array( 'ProductURL' => $itemUrl @@ -541,6 +542,7 @@ class UserController extends Controller { 'ProductDescription'=> $itemDescription, 'ProductURL' => $itemUrl, 'ProductForm' => $itemForm, + 'AvailableSizes' => $available_size, 'PrivacyStatus' => $itemPrivacy, 'TemplateCode' => $templateCode, 'DesignCode' => $designCode, @@ -590,6 +592,7 @@ class UserController extends Controller { return view('user-layouts.add_item')->with('store_array', $store_array); } + //manually uploading item function saveNewItem(Request $request){ $post = $request->all(); @@ -606,7 +609,10 @@ class UserController extends Controller { $itemForm = $post['itemForm']; $itemUrl = $post['itemUrl']; $itemPrivacy = $post['itemPrivacy']; + $available_size = implode(",", $_POST['available_size']); + + $check_product_url = array( 'ProductURL' => $itemUrl ); @@ -647,6 +653,7 @@ class UserController extends Controller { 'ProductDescription'=> $itemDescription, 'ProductURL' => $itemUrl, 'ProductForm' => $itemForm, + 'AvailableSizes' => $available_size, 'PrivacyStatus' => $itemPrivacy, 'TemplateCode' => $templateCode, 'DesignCode' => $designCode, diff --git a/app/Models/teamstore/TeamStoreModel.php b/app/Models/teamstore/TeamStoreModel.php index 8c6d07c..0579492 100644 --- a/app/Models/teamstore/TeamStoreModel.php +++ b/app/Models/teamstore/TeamStoreModel.php @@ -80,6 +80,17 @@ class TeamStoreModel extends Model { return $i; } + function getSizesByBracket($bracket){ + + $i = DB::table('sizes')->select('Size') + ->where('Bracket', $bracket) + ->where('IsActive', 'TRUE') + ->orderby('Ordering', 'ASC') + ->get(); + return $i; + } + + function insertToCart($data){ $i = DB::table('cart_tmp')->insert($data); diff --git a/config/laravel-analytics.php b/config/laravel-analytics.php index a204af1..fb85f54 100644 --- a/config/laravel-analytics.php +++ b/config/laravel-analytics.php @@ -31,7 +31,7 @@ return * You need to download a p12-certifciate from the Google API console * Be sure to store this file in a secure location. */ - 'certificatePath' => storage_path('laravel-analytics/hardy-beach-228905-fab35080b667.p12'), + 'certificatePath' => storage_path('laravel-analytics/hardy-beach-228905-7755a62c7a35.p12'), /* * The amount of minutes the Google API responses will be cached. diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index d74f891..9e412f8 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -213,7 +213,7 @@ @foreach($templatepaths_arrays as $k => $template)
  • - {{ $template->Side }} + {{ $template->Side }}
    • @endforeach @@ -851,7 +851,7 @@ $('#toTop').click(function() { $('body,html').animate({scrollTop:0},800); }); - // $('#grid_lines').bootstrapToggle('on'); + $('#grid_lines').change(function() { var SideAndPath = {!! json_encode($templatepaths_arrays) !!}; @@ -994,12 +994,13 @@ }, submitHandler: submitLoginForm }); + // calling functions - changeData(); colorPickerCustom(); templateColors('{{ $template_arrays[0]->TemplateCode }}'); loadClipartContent(); + // addDefaultTeamText(); // addNameNumber(); // onDeSelected(); @@ -1026,7 +1027,8 @@ }); - initCanvas(); + // initCanvas(); + // onSelected(canvas_Shirts_Front); }); // design saving @@ -1476,19 +1478,9 @@ if(templateFormat == 'png'){ var canvasName = "canvas_" + type + "_" + sideName; - // $('#'+objectId).html(''); - // window['canvas_' + type + '_' + sideName] = new fabric.Canvas(canvasName); - - // window['canvas_' + type + '_' + sideName].setOverlayImage(tempPath, window['canvas_' + type + '_' + sideName].renderAll.bind(canvas), { - // width: window['canvas_' + type + '_' + sideName].width, - // height: window['canvas_' + type + '_' + sideName].height - // }); - } if(templateFormat == 'svg'){ - - // console.log('asdasda'); loadTemplate(tempPath, objectId, gradientIds, gradientPrefix); } @@ -1642,15 +1634,13 @@ window['canvas_' + type + '_' + sideName] = new fabric.Canvas(canvasName); var templateFormat = SideAndPath[i]['TemplateFormat']; + initCanvas(window['canvas_' + type + '_' + sideName]); if(templateFormat == 'png'){ window['canvas_' + type + '_' + sideName].setOverlayImage(tempPath, window['canvas_' + type + '_' + sideName].renderAll.bind(window['canvas_' + type + '_' + sideName]), { width: window['canvas_' + type + '_' + sideName].width, height: window['canvas_' + type + '_' + sideName].height }); - } - - } /* ############################ */ @@ -1661,6 +1651,9 @@ initAligningGuidelines(canvas); canvas.selection = false; canvas.controlsAboveOverlay = true; + + + // canvas.dispose(); $('#side-controls a').click(function (e) { onDeSelected(); }); @@ -1670,7 +1663,7 @@ 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') @@ -1679,10 +1672,10 @@ // canvas.on('object:selected', onSelected); initCenteringGuidelines(canvas); initAligningGuidelines(canvas); + canvas.selection = false; canvas.controlsAboveOverlay = true; }); - //trigger enter ###################################################################### $(document).on('input keyup', '.rotateTextValue', function(e) { @@ -1770,7 +1763,7 @@ //End Trigger enter ###################################################################### - function initCanvas(){ + function initCanvas(canvas){ canvas.on('selection:cleared', onDeSelected); canvas.on('object:selected', onSelected); // canvas.on('object:scaling', onScaling); @@ -1938,147 +1931,152 @@ } function onSelected(){ + // console.log(canvas); + try{ + var obj = canvas.getActiveObject(); + // console.log("Height =", (obj.getScaleY() * obj.getHeight()).toFixed(2)); + // console.log("Width = ", (obj.getScaleX() * obj.getWidth()).toFixed(2)); + $('.remove').attr("disabled", false); + var getLockStatus = canvas.getActiveObject().get('lockStatus'); + // console.log(getLockStatus); + $('.btn-lock-object').attr("disabled", false); + if(getLockStatus == true){ + $('.btn-lock-object').html(''); + $('.btn-lock-object').attr('title', 'Unlock'); + $('.btn-lock-object').addClass('active'); + $('.btn-lock-object').data('status', 'lock'); + }else{ + $('.btn-lock-object').html(''); + $('.btn-lock-object').attr('title', 'Lock'); + $('.btn-lock-object').data('status', 'unlock'); + // $('.btn-lock-object').addClass('active'); + } + // console.log('left-', obj.left, 'top-', obj.top); + // console.log('font-', obj.fontSize); - var obj = canvas.getActiveObject(); - // console.log("Height =", (obj.getScaleY() * obj.getHeight()).toFixed(2)); - // console.log("Width = ", (obj.getScaleX() * obj.getWidth()).toFixed(2)); - $('.remove').attr("disabled", false); - var getLockStatus = canvas.getActiveObject().get('lockStatus'); - // console.log(getLockStatus); - $('.btn-lock-object').attr("disabled", false); - if(getLockStatus == true){ - $('.btn-lock-object').html(''); - $('.btn-lock-object').attr('title', 'Unlock'); - $('.btn-lock-object').addClass('active'); - $('.btn-lock-object').data('status', 'lock'); - }else{ - $('.btn-lock-object').html(''); - $('.btn-lock-object').attr('title', 'Lock'); - $('.btn-lock-object').data('status', 'unlock'); - // $('.btn-lock-object').addClass('active'); - } - // console.log('left-', obj.left, 'top-', obj.top); - // console.log('font-', obj.fontSize); + if(obj != null){ + + var objType = canvas.getActiveObject().get('type'); + var id = canvas.getActiveObject().get('idNumber'); + // console.log(obj.type); - if(obj != null){ - - var objType = canvas.getActiveObject().get('type'); - var id = canvas.getActiveObject().get('idNumber'); - // console.log(obj.type); - - if(objType == "curvedText"){ - if(obj.effect == "curved"){ - $('#teamname_text_shape').html('Text Shape:
    '); - }else if(obj.effect == "arc"){ - $('#teamname_text_shape').html('Text Shape:
    '); + if(objType == "curvedText"){ + if(obj.effect == "curved"){ + $('#teamname_text_shape').html('Text Shape:
    '); + }else if(obj.effect == "arc"){ + $('#teamname_text_shape').html('Text Shape:
    '); + }else{ + $('#teamname_text_shape').html('Add text Shape'); + } }else{ $('#teamname_text_shape').html('Add text Shape'); } - }else{ - $('#teamname_text_shape').html('Add text Shape'); - } - if(objType == "i-text" || objType == "curvedText" || objType == "text"){ + if(objType == "i-text" || objType == "curvedText" || objType == "text"){ - if(id){ - $("#numberProperties").css({ "display" : "block" }); - $('#tab-add-number1').tab('show'); + if(id){ + $("#numberProperties").css({ "display" : "block" }); + $('#tab-add-number1').tab('show'); - $("#addNumberId").css({ "display" : "block" }); - $("#enterNumberId").css({ "display" : "none" }); + $("#addNumberId").css({ "display" : "block" }); + $("#enterNumberId").css({ "display" : "none" }); - $('#editedNumberInput').val(obj.getText()); - }else{ + $('#editedNumberInput').val(obj.getText()); + }else{ - $("#textProperties").css({ "display" : "block" }); - $('#tab-add-text1').tab('show'); + $("#textProperties").css({ "display" : "block" }); + $('#tab-add-text1').tab('show'); - $("#addNewTextId").css({ "display" : "block" }); - $("#enterTextId").css({ "display" : "none" }); + $("#addNewTextId").css({ "display" : "block" }); + $("#enterTextId").css({ "display" : "none" }); - $('#editedTextInput').val(obj.getText()); + $('#editedTextInput').val(obj.getText()); + } + + var fontprop = getFontDisplay(obj.fontFamily); + console.log(fontprop) + $('.btn-show-fonts').html(fontprop.fontNameDisplay); + $('.btn-show-fonts').css('font-family', obj.fontFamily); + $('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize); + $(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2)); + + // $('#reverse').prop('checked', obj.get('reverse')); + // $('#radius').val(obj.get('radius')); + // $('#spacing').val(obj.get('spacing')); + //$('#fill').val(obj.getFill()); + //$('#effect').val(obj.getEffect()); + + $(".fontColor").spectrum("set", obj.getFill()); + $(".strokeColor").spectrum("set", obj.getStroke()); + $(".outlineThickness").val(obj.getStrokeWidth()); + $('#font_size').val(obj.getFontSize() + " in"); + $('.rotateTextSlider, .rotateTextValue').val(Math.round(obj.getAngle())); + $('.spacingTextSlider, .spacingTextValue').val(obj.getCharSpacing() / 2); + $('.opacityTextSlider, .opacityTextValue').val(obj.getOpacity() * 10); + + /* if($('#strokeColor').val() == ""){ + console.log("null"); + }else{ + console.log($('#strokeColor').val()); + } */ } - var fontprop = getFontDisplay(obj.fontFamily); - console.log(fontprop) - $('.btn-show-fonts').html(fontprop.fontNameDisplay); - $('.btn-show-fonts').css('font-family', obj.fontFamily); - $('.btn-show-fonts').attr('data-font-size', fontprop.additionalSize); - $(".text-font-size").val((obj.fontSize / $(".btn-show-fonts").attr('data-font-size')).toFixed(2)); - - // $('#reverse').prop('checked', obj.get('reverse')); - // $('#radius').val(obj.get('radius')); - // $('#spacing').val(obj.get('spacing')); - //$('#fill').val(obj.getFill()); - //$('#effect').val(obj.getEffect()); - - $(".fontColor").spectrum("set", obj.getFill()); - $(".strokeColor").spectrum("set", obj.getStroke()); - $(".outlineThickness").val(obj.getStrokeWidth()); - $('#font_size').val(obj.getFontSize() + " in"); - $('.rotateTextSlider, .rotateTextValue').val(Math.round(obj.getAngle())); - $('.spacingTextSlider, .spacingTextValue').val(obj.getCharSpacing() / 2); - $('.opacityTextSlider, .opacityTextValue').val(obj.getOpacity() * 10); - - /* if($('#strokeColor').val() == ""){ - console.log("null"); - }else{ - console.log($('#strokeColor').val()); - } */ - } - - if(objType == "image"){ - $('#tab-upload-image1').tab('show'); - $('.rotateTextSlider, .rotateTextValue').val(Math.round(obj.getAngle())); - $('.opacityTextSlider, .opacityTextValue').val(obj.getOpacity() * 10); - - $("#img-remove-btn").css({ "display" : "block" }); - $("#image-properties").css({ "display" : "block" }); - } - - if(objType == "path-group"){ - - $('.clipartColor').blur(); - var obj = ""; - var arrayPathId = []; - var k = 0; - - $('#tab-clipart1').tab('show'); - obj = canvas.getActiveObject(); - $('#clipartProperties').html(''); - var randomNumbers = Math.random(); - for (var j in obj.paths) { - k = k + 1; - var id = obj.paths[j].get('id'); - var fill = obj.paths[j].get('fill'); - // console.log(id); - arrayPathId.push({ - 'id' : id, - 'fill' : fill, - 'ran_num' : randomNumbers - }); - } - - setTimeout(function() { - // event.preventDefault(); - getClipartProperties(arrayPathId, randomNumbers); - }, 500); - - setTimeout(function() { + if(objType == "image"){ + $('#tab-upload-image1').tab('show'); $('.rotateTextSlider, .rotateTextValue').val(Math.round(obj.getAngle())); $('.opacityTextSlider, .opacityTextValue').val(obj.getOpacity() * 10); - }, 1000); - - return false; - } - try{ - document.getElementById(canvasID.split("_")[2] + "_" +canvasID.split("_")[1] + "_Border").setAttribute("display", ""); - }catch(e){ + $("#img-remove-btn").css({ "display" : "block" }); + $("#image-properties").css({ "display" : "block" }); + } + if(objType == "path-group"){ + + $('.clipartColor').blur(); + var obj = ""; + var arrayPathId = []; + var k = 0; + + $('#tab-clipart1').tab('show'); + obj = canvas.getActiveObject(); + $('#clipartProperties').html(''); + var randomNumbers = Math.random(); + for (var j in obj.paths) { + k = k + 1; + var id = obj.paths[j].get('id'); + var fill = obj.paths[j].get('fill'); + // console.log(id); + arrayPathId.push({ + 'id' : id, + 'fill' : fill, + 'ran_num' : randomNumbers + }); + } + + setTimeout(function() { + // event.preventDefault(); + getClipartProperties(arrayPathId, randomNumbers); + }, 500); + + setTimeout(function() { + $('.rotateTextSlider, .rotateTextValue').val(Math.round(obj.getAngle())); + $('.opacityTextSlider, .opacityTextValue').val(obj.getOpacity() * 10); + }, 1000); + + return false; + } + + try{ + document.getElementById(canvasID.split("_")[2] + "_" +canvasID.split("_")[1] + "_Border").setAttribute("display", ""); + }catch(e){ + + } + } - + }catch(e){ + } + } function onDeSelected(){ @@ -3410,8 +3408,7 @@ var y = 0.2126*color._r + 0.7152*color._g + 0.0722*color._b; // var c = y < 128 ? 'white' : 'black'; - - + document.getElementById(mainColorId).setAttribute("fill", onMoveColor); try{ if(y < 128){ document.getElementById(sideName+'_Grid_Lines_Path').setAttribute("stroke", "white"); @@ -3419,8 +3416,6 @@ var border_stroke = document.getElementById(sideName + '_' + type + '_Border'); $(border_stroke).children("path").attr("fill", "yellow"); - - }else{ document.getElementById(sideName+'_Grid_Lines_Path').setAttribute("stroke", "black"); var border_stroke = document.getElementById(sideName + '_' + type + '_Border'); @@ -3429,10 +3424,11 @@ // console.log(border_stroke) - document.getElementById(mainColorId).setAttribute("fill", onMoveColor); + }catch(e){ } + } diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index 1b5e050..b518363 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -54,21 +54,23 @@ - - - + .col-margin-bottom{ + padding-bottom: 25px; + } + + .breadcrumb{ + text-transform: uppercase; + } + diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php index 0a8be2d..28642b7 100644 --- a/resources/views/layout/navbar.blade.php +++ b/resources/views/layout/navbar.blade.php @@ -15,12 +15,12 @@