diff --git a/resources/views/admin_pages/download_pages/tshirt.blade.php b/resources/views/admin_pages/download_pages/tshirt.blade.php index 04e1e27..4f3f2a1 100644 --- a/resources/views/admin_pages/download_pages/tshirt.blade.php +++ b/resources/views/admin_pages/download_pages/tshirt.blade.php @@ -81,10 +81,10 @@ // var tmp_leftCanvas = JSON.parse(leftContentRaw.replace(/"/g,'"')); // var tmp_rightCanvas = JSON.parse(rightContentRaw.replace(/"/g,'"')); // console.log(frontCanvas) - loadDesigns(frontCanvas, tmp_frontCanvas); - loadDesigns(backCanvas, tmp_backCanvas); - loadDesigns(leftCanvas, tmp_leftCanvas); - loadDesigns(rightCanvas, tmp_rightCanvas); + loadDesigns(frontCanvas, (tmp_frontCanvas) ? tmp_frontCanvas : {}); + loadDesigns(backCanvas, (tmp_backCanvas) ? tmp_backCanvas : {}); + loadDesigns(leftCanvas, (tmp_leftCanvas) ? tmp_leftCanvas : {}); + loadDesigns(rightCanvas, (tmp_rightCanvas) ? tmp_rightCanvas : {} ); } catch (error) { console.log(error) @@ -99,11 +99,14 @@ Object.entries(canvas_json.objects).forEach(([key, item]) => { if(item.type == 'image') { toDataURL(item.src, function(src) { - const images = ada = {...item, src } + const images = {...item, src } objects.push(images) }) + }else { + objects.push(item) } + }); var final_json = "";