MT#5879 Well, now we delete, update and add templates almost in order.

lib/NGCP/Panel/Controller/Customer.pm

@@ -961,16 +961,17 @@ sub invoice_template :Chained('invoice_data') :PathPart('template') :Args {
         #at the end - we can figure out rather basic controller behaviour
         ($out->{tt_id},undef,$out->{tt_data}) = $backend->getCustomerInvoiceTemplate( %$in, result => \$tt_string_customer );
 
-        $out->{json} = {
-            tt_data => { 
-                tt_id => $out->{tt_data}->get_column('id'),
-            },
-        };
-        foreach(qw/name is_active/){
-            $out->{json}->{tt_data}->{$_} = $out->{tt_data}->get_column($_);
+        if($out->{tt_data}){
+            $out->{json} = {
+                tt_data => { 
+                    tt_id => $out->{tt_data}->get_column('id'),
+                },
+            };
+            foreach(qw/name is_active/){
+                $out->{json}->{tt_data}->{$_} = $out->{tt_data}->get_column($_);
+            }
         }
         
-        
     }
     
     #we need to get default to 1) sanitize (if in->tt_string) or 2)if not in->tt_string and no customer->tt_string

share/layout/body.tt

@@ -140,11 +140,16 @@ var mainWrapperInit = function () {
     -%]
     $('a').each(function() {
         var _text = $(this).text().trim();
+        var href = $(this).attr('href');
+        var javascriptLink = 0;
+        if(href && ( href.search(/^javascript:/i) > -1 ) ){
+            javascriptLink = 1;
+        }
         if(_text == "Back" ||
            $(this).hasClass('ngcp-error-button') ||
            $(this).hasClass('accordion-toggle') ||
            $(this).hasClass('ngcp-noback-link') ||
-           ( $(this).attr('href').search(/^javascript:/i) > -1) ||
+           javascriptLink ||
            $(this).parents('#footer').length ||
            $(this).parents('#topbar').length)  {
 
@@ -171,7 +176,7 @@ var mainWrapperInit = function () {
         $('#'+lastTab).addClass("in");
         $('#'+lastTab).parent().addClass("open");
     }
-    if($('.accordion-body').length) {
+    if($('.accordion-body').length && !$('#toggle-accordions').length) {
         $('#content').children('.container').prepend('<a href="#" id="toggle-accordions" class="btn btn-small btn-tertiary pull-right ngcp-accordion-closed"><i class="icon-resize-full"></i> [% c.loc('Expand Groups') %]</a>');
         $('#toggle-accordions').click(function() {
             if($('#toggle-accordions').hasClass('ngcp-accordion-closed')) {

share/static/js/libs/svg-edit/svg-editor.js

@@ -1889,7 +1889,7 @@ TO-DOS
 				if (!z_info) {return;}
 				var zoomlevel = z_info.zoom,
 					bb = z_info.bbox;
-
+                //alert('zoomlevel='+zoomlevel+'; bb.width='+bb.width+';bb.height='+bb.height);
 				if (zoomlevel < 0.001) {
 					changeZoom({value: 0.1});
 					return;
@@ -1912,7 +1912,9 @@ TO-DOS
 			};
 
 			changeZoom = function(ctl) {
+                
 				var zoomlevel = ctl.value / 100;
+                //alert('zoomLevel='+zoomlevel);
 				if (zoomlevel < 0.001) {
 					ctl.value = 0.1;
 					return;
@@ -1929,6 +1931,7 @@ TO-DOS
 					zoom: zoomlevel
 				}, true);
 			};
+            //changeZoom({value: 200});
 
 			$('#cur_context_panel').delegate('a', 'click', function() {
 				var link = $(this);
@@ -3185,7 +3188,7 @@ TO-DOS
 					$('#option_lists').append(list);
 				}
 				list.find('li').bind('mouseup', callback);
-
+                //alert('binded');
 				$(window).mouseup(function(evt) {
 					if (!on_button) {
 						button.removeClass('down');
@@ -3264,6 +3267,7 @@ TO-DOS
 			editor.addDropDown('#zoom_dropdown', function() {
 				var item = $(this);
 				var val = item.data('val');
+                //alert('zoom_dropdown.val='+val);
 				if (val) {
 					zoomChanged(window, val);
 				} else {
@@ -3387,11 +3391,12 @@ TO-DOS
 				multiplier = multiplier ? res.zoom * multiplier : 1;
 				// setResolution(res.w * multiplier, res.h * multiplier, true);
 				$('#zoom').val(multiplier * 100);
+                //alert('multiplier='+multiplier);
 				svgCanvas.setZoom(multiplier);
 				zoomDone();
 				updateCanvas(true);
 			};
-
+            
 			var dblclickZoom = function() {
 				if (toolButtonClick('#tool_zoom')) {
 					zoomImage();
@@ -3729,7 +3734,8 @@ TO-DOS
 				var saveChanges = function() {
 					svgCanvas.clearSelection();
 					hideSourceEditor();
-					zoomImage();
+					//zoomImage();
+                    zoomChanged('', 'canvas');
 					populateLayers();
 					updateTitle();
 					prepPaints();
@@ -5048,6 +5054,8 @@ TO-DOS
 					$('#tool_pos' + this.id.substr(10))[0].title = this.title;
 				});
 			};
+            //changeZoom({value: 200});
+            
 		};
 
 		editor.ready = function (cb) {
@@ -5107,6 +5115,8 @@ TO-DOS
 					}
 				});
 			});
+            //changeZoom({value: 200});
+            //zoomImage(2);
 		};
 
 		editor.loadFromDataURI = function(str) {
@@ -5132,5 +5142,5 @@ TO-DOS
 
 	// Run init once DOM is loaded
 	$(svgEditor.init);
-
+    //$(svgEditor.init.zoomImage)(2);
 }());

share/templates/customer/invoice.tt

@@ -49,7 +49,7 @@ var uriForAction = function( data, type ){
         break;
     case 'invoice_template_saved':
         //q_template = '[%- c.uri_for_action("/customer/invoice_template", ['contract_id','svg','parsed','saved','svg','tt_id']) -%]';
-        q_template = '[%- c.uri_for_action("/customer/invoice_template", ["contract_id"]) -%]'+'/svg/parsed/saved/svg/tt_id';
+        q_template = '[%- c.uri_for_action("/customer/invoice_template", ["contract_id"]) -%]'+'/svg/parsed/saved/tt_output_type/tt_id';
         break;
     case 'invoice_template_list':
         q_template = '[%- c.uri_for_action("/customer/invoice_template_list", ['contract_id']) -%]';
@@ -130,6 +130,8 @@ function fetchInvoiceTemplateData( data ){
         datatype: "json",
     //}).done( function( jsonres ){
     }).done( function( templatedata ){
+        //alert(templatedata);
+        //alert(templatedata.aaData);
         if(templatedata.aaData){
             if( templatedata.aaData.template ){
                 setSvgStringToEditor( templatedata.aaData.template.raw );
@@ -161,19 +163,18 @@ function saveTemplate( data ) {
     data.tt_sourcestate='saved';
     data.tt_output_type = 'json';
     var q = uriForAction( data, 'invoice_template_saved' ); 
-    //alert('saveTemplate: q='+q+';');
+    alert('saveTemplate: q='+q+';');
+    $.ajax( {
         url: q,
-        datatype: "json",
-
-    $.ajax( 
         type: "POST",
-        url: q,
-        dataType: 'json',
+        datatype: 'json',
         data: { template: svgString },
-    ).done( function( jsonResponse ) {
+    } ).done( function( jsonResponse ) {
+        alert('Form!');
         if(jsonResponse.aaData && jsonResponse.aaData.form){
             $('form[name=invoice_template]').loadJSON(jsonResponse.aaData.form);
         }
+        alert('Refresh!');
         refreshTemplateList( data.contract_id );
     });
 }