MT#5879 Commented out client list frm invoices list interface.

lib/NGCP/Panel/Controller/Invoice.pm

@@ -353,7 +353,7 @@ sub invoice_generate :Chained('base') :PathPart('generate') :Args(0) {
     my $in_validated = $validator->fif;
     if($posted){
         $c->forward('parse_invoice_period',[$in]);
-        $c->log->debug("stime=".$in->{stime}.";etime=".$in->{etime}.";");
+        #$c->log->debug("stime=".$in->{stime}.";etime=".$in->{etime}.";");
         $c->log->debug("validated=".$validator->validated.";");
         if($validator->validated) {
             $c->forward('generate_invoice',[$in, $out]);
@@ -513,14 +513,14 @@ sub invoice_send :Chained('base') :PathPart('send') :Args(0) {
             
             try {
                 $c->flash(messages => [{type => 'success', text => $c->loc(
-                    'Invoice generated'
+                    'Invoice sent'
                 ) }]);
             } catch($e) {
                 NGCP::Panel::Utils::Message->error(
                     c => $c,
                     error => $e,
                     desc  => $c->loc(
-                        'Failed to generate invoice.'
+                        'Failed to send invoice.'
                     ),
                 );
             }

share/templates/helpers/modal.tt

@@ -60,13 +60,13 @@
                 if( status == 'error' ){
                     modalFormScript();
                 }
-                [%IF m.ajax_list_refresh%]
                 if( status != 'error' ){
                     //form object is necessary to compose uri for refresh
+                [%IF m.ajax_list_refresh%]
                     refreshAjaxList( '[%m.ajax_list_refresh%]', form.serializeObject() );
+                [%END%]
                     $('#mod_edit').parent('div').html('');
                 }
-                [%END%]
                 [%m.ajax_callback%]
             });
             [%END%]   

share/templates/invoice/list.tt

@@ -24,6 +24,11 @@
     <span>
         <a class="btn btn-primary btn-large" href="[% c.uri_for_action('invoice/template', [provider.id]) %]">[% c.loc('Invoice Template')%] <i class="icon-edit"></i></a>
     </span>
+    <span>
+    <a class="btn btn-primary btn-large" onclick="javascript:$(this).css('outline', 'none');generateInvoiceForm();void(0);">[% c.loc('Generate invoice')%] <i class="icon-edit"></i></a>
+</span>
+
+    
 </div>
 
 [% IF reseller.first.status != "active" -%]
@@ -66,7 +71,9 @@ function generateInvoiceForm(contract_id, contact_id){
     fetch_into(
         'invoice_generate_form', 
         '[%c.uri_for_action("/invoice/invoice_generate", [ provider.id])%]',
-        'item=invoice_generate&client_contract_id='+contract_id,
+        'item=invoice_generate'
+            +(contract_id?'&client_contract_id='+contract_id:'')
+            +(contact_id?'&client_contact_id='+contact_id:''),
         function(){modalFormScript();}
     );
 }
@@ -96,7 +103,7 @@ function deleteInvoice(invoice_id,table_name){
 [% back_created = 1 -%]
 
 <div class="accordion" id="invoice">
-<div class="accordion-group">
+<!--div class="accordion-group">
     <div class="accordion-heading">
         <a class="accordion-toggle" data-toggle="collapse" data-parent="#invoice" href="#collapse_client_list">[% c.loc('Clients') %]</a>
     </div>
@@ -144,7 +151,7 @@ function deleteInvoice(invoice_id,table_name){
 [%#PROCESS 'invoice/invoice_list.tt' %]
     </div>
     </div>
-    </div>
+    </div-->
 
     
     <div class="accordion-group">