Merge branch 'local_dev' of github.com:franknstayn/crewsportswear

This commit is contained in:
franknstayn
2020-01-10 07:32:59 -06:00

View File

@@ -284,6 +284,15 @@
<canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:171px; margin-left:0xp;"></canvas> <canvas id="canvas_{{ $template->Type }}_{{ $template->Side }}" width="158px" height="174px" style="margin-top:171px; margin-left:0xp;"></canvas>
@endif @endif
<!-- Cake -->
@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>
@endif
@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>
@endif
</div> </div>
</div> </div>
</div> </div>
@@ -1027,7 +1036,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" ){ if(get_template_type != "Hoodie" && get_template_type != "Shirts" && get_template_type != "Cake" ){
addDefaultTeamText(); addDefaultTeamText();
addNameNumber(); addNameNumber();
} }