diff --git a/resources/views/admin_pages/download_pages/shorts.blade.php b/resources/views/admin_pages/download_pages/shorts.blade.php index f02da8d..1e13ec2 100644 --- a/resources/views/admin_pages/download_pages/shorts.blade.php +++ b/resources/views/admin_pages/download_pages/shorts.blade.php @@ -14,19 +14,20 @@ - - - +
+
+
-

Please wait... Click here to go back

+

Please wait... Click here to go back

+

updated

- - + + - +

@@ -143,8 +144,8 @@ setTimeout(function() { loadTemplateDesign(); - frontContent(rb_height, rb_width, rb_x, rb_y); - backContent(lb_height, lb_width, lb_x, lb_y); + frontContent(rb_height, rb_width, rb_x, rb_y); // right + backContent(lb_height, lb_width, lb_x, lb_y); // left setTimeout(function(){ sendSVG(); @@ -340,8 +341,11 @@ try{ var p_number = '{{ $order_item_array[0]->Number }}'; for (var j in objects) { + console.log(objects[j]); var id = objects[j].get('idNumber'); - if(id == "NumberFront"){ + console.log("idnumber", id); + + if(id == "NumberLeftShorts"){ objects[j].setText(p_number.toString()); objects[j].centerH(); objects[j].setCoords(); @@ -427,6 +431,7 @@ } var contents = JSON.stringify(consolidatedContents1); + console.log("front content", contents) var con = jQuery.parseJSON(contents); var countContents = con.length; @@ -434,7 +439,7 @@ var jContent = $.map(con, function(value) { return(value); }); - $("#Left_Border").html(jContent.join("")); + $("#Right_Border").html(jContent.join("")); } } catch (error) { console.log(error) @@ -452,7 +457,7 @@ var p_number = '{{ $order_item_array[0]->Number }}'; for (var j in objects) { var id = objects[j].get('idNumber'); - if(id == "NumberBack"){ + if(id == "NumberRightShorts"){ objects[j].setText(p_number.toString()); objects[j].centerH(); objects[j].setCoords(); @@ -498,6 +503,7 @@ try { var content = backCanvas.toSVG(); + document.getElementById('svgBackContent').innerHTML = content; var el_id = document.getElementById('svgBackContent'); @@ -544,6 +550,7 @@ } var contents = JSON.stringify(consolidatedContents); + console.log("back content", contents) var con = jQuery.parseJSON(contents); var countContents = con.length; @@ -551,7 +558,7 @@ var jContent = $.map(con, function(value) { return(value); }); - $("#Right_Border").html(jContent.join("")); + $("#Left_Border").html(jContent.join("")); } } catch (error) { console.log(error) @@ -571,8 +578,8 @@ } if(side == "Right" || side == "Left"){ - var SCALE_FACTOR_X = actualSizeX / 96; - var SCALE_FACTOR_Y = actualSizeY / 112; + var SCALE_FACTOR_X = actualSizeX / 158; + var SCALE_FACTOR_Y = actualSizeY / 316; } canvasScale = canvasScale * SCALE_FACTOR; @@ -636,9 +643,9 @@ document.body.appendChild(form); form.submit(); alert("Print file is successfully generated!"); - setTimeout(function(){ - window.location = "{{ url('admin/orders/view') }}" + "/" + "{{ $order_item_array[0]->CartKey }}" - },2000); + // setTimeout(function(){ + // window.location = "{{ url('admin/orders/view') }}" + "/" + "{{ $order_item_array[0]->CartKey }}" + // },2000); } function loadGradientTemplate(gradientFor, gradientIds, gradientColor1, gradientColor2, gradientColorOffset1, gradientColorOffset2, trimCount){