webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
franknstayn
2020-07-11 02:57:12 -05:00
parent bca94e54cc
commit bb139cb0df
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/designer/design_preview.blade.php
View File

@@ -348,7 +348,12 @@
var gen_url; var gen_url;
if(template_format == "png"){ if(template_format == "png"){
gen_url = ip+":"+port+"/ap/{{ $client_design_array[0]->DesignCode }}"; if(port == 5952){
gen_url = ip+":"+port+"/ap/{{ $client_design_array[0]->DesignCode }}";
}else{
gen_url = ip+":"+port+"/mask/{{ $client_design_array[0]->DesignCode }}";
}
}else{ }else{
gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}";
} }

8
resources/views/designer/designer.blade.php
View File

@@ -289,9 +289,15 @@
@if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg") @if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="400px" height="400px" style="margin-top:60px; margin-left: -5px;"></canvas> <canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="400px" height="400px" style="margin-top:60px; margin-left: -5px;"></canvas>
@endif @endif
@if($template->Type == "Cake" && $template->Side == "Back" && $template->TemplateFormat == "svg") @if($template->Type == "Cake" && $template->Side == "Back" && $template->TemplateFormat == "svg")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="400px" height="400px" style="margin-top:60px; margin-left: -5px;"></canvas> <canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="400px" height="400px" style="margin-top:60px; margin-left: -5px;"></canvas>
@endif @endif
<!-- Mask All over Print -->
@if($template->Type == "Mask" && $template->Side == "Front" && $template->TemplateFormat == "png")
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="572px" height="502px" style="position:absolute; top: 50%; left: 50%;"></canvas>
@endif
</div> </div>
</div> </div>
@@ -1036,7 +1042,7 @@
var get_template_type = "{{ $template->Type }}"; var get_template_type = "{{ $template->Type }}";
// if((get_template_type != "Shirts") || (get_template_type != "Hoodie")){ // if((get_template_type != "Shirts") || (get_template_type != "Hoodie")){
if(get_template_type != "Hoodie" && get_template_type != "Shirts" && get_template_type != "Cake" ){ if(get_template_type != "Hoodie" && get_template_type != "Shirts" && get_template_type != "Cake" && get_template_type != "Mask" ){
addDefaultTeamText(); addDefaultTeamText();
addNameNumber(); addNameNumber();
} }

2
resources/views/teamstore-sublayouts/stores.blade.php
View File

@@ -59,7 +59,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-7 control-label hidden-xs">&nbsp;</label> <label class="col-sm-7 control-label hidden-xs">&nbsp;</label>
<div class="col-sm-5"> <div class="col-sm-5">
<label>Sory by:</label> <label>Sort by:</label>
<select class="form-control" name="s" id="select_sort_stores"> <select class="form-control" name="s" id="select_sort_stores">
<option @if($filter == "al-asc") selected @endif value="al-asc">Store Name A &rarr; Z</option> <option @if($filter == "al-asc") selected @endif value="al-asc">Store Name A &rarr; Z</option>
<option @if($filter == "al-desc") selected @endif value="al-desc">Store Name Z &rarr; A</option> <option @if($filter == "al-desc") selected @endif value="al-desc">Store Name Z &rarr; A</option>