From bb139cb0df07b561b3db4edf18d7dd86f1a7a67d Mon Sep 17 00:00:00 2001 From: franknstayn Date: Sat, 11 Jul 2020 02:57:12 -0500 Subject: [PATCH] updated --- resources/views/designer/design_preview.blade.php | 7 ++++++- resources/views/designer/designer.blade.php | 8 +++++++- resources/views/teamstore-sublayouts/stores.blade.php | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/resources/views/designer/design_preview.blade.php b/resources/views/designer/design_preview.blade.php index 0ca14c1..5cdcd7a 100644 --- a/resources/views/designer/design_preview.blade.php +++ b/resources/views/designer/design_preview.blade.php @@ -348,7 +348,12 @@ var gen_url; 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{ gen_url = ip+":"+port+"/tb/{{ $client_design_array[0]->DesignCode }}"; } diff --git a/resources/views/designer/designer.blade.php b/resources/views/designer/designer.blade.php index 6fdde52..1c52eb5 100644 --- a/resources/views/designer/designer.blade.php +++ b/resources/views/designer/designer.blade.php @@ -289,9 +289,15 @@ @if($template->Type == "Cake" && $template->Side == "Front" && $template->TemplateFormat == "svg") @endif + @if($template->Type == "Cake" && $template->Side == "Back" && $template->TemplateFormat == "svg") @endif + + + @if($template->Type == "Mask" && $template->Side == "Front" && $template->TemplateFormat == "png") + + @endif @@ -1036,7 +1042,7 @@ var get_template_type = "{{ $template->Type }}"; // 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(); addNameNumber(); } diff --git a/resources/views/teamstore-sublayouts/stores.blade.php b/resources/views/teamstore-sublayouts/stores.blade.php index ec1ed5d..a296aa1 100644 --- a/resources/views/teamstore-sublayouts/stores.blade.php +++ b/resources/views/teamstore-sublayouts/stores.blade.php @@ -59,7 +59,7 @@
- +