Merge branch 'master' of git.mgm.sipwise.com:ngcp-panel

lib/NGCP/Panel/Controller/Subscriber.pm

@@ -383,15 +383,16 @@ sub webfax_send :Chained('base') :PathPart('webfax/send') :Args(0) {
                 error => "failed to send fax: $e",
                 desc  => $c->loc('Internal error while sending fax'),
             );
-            NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for_action('/subscriber/webfax', $c->req->captures));
-            return;
         }
+        NGCP::Panel::Utils::Navigation::back_or($c, $c->uri_for_action('/subscriber/webfax', $c->req->captures));
+        return;
     }
 
     $c->stash(
         template => 'subscriber/webfax.tt',
         form => $form,
         create_flag => 1,
+        close_target => $c->uri_for_action('/subscriber/webfax', [$c->req->captures->[0]]),
     );
 }
 
@@ -399,8 +400,11 @@ sub webfax_ajax :Chained('base') :PathPart('webfax/ajax') :Args(0) {
     my ($self, $c) = @_;
 
     my $s = $c->stash->{subscriber}->provisioning_voip_subscriber;
+    my $kam_subscriber = $c->model('DB')->resultset('subscriber')->find({
+        uuid => $s->uuid
+    });
     my $fax_rs = $c->model('DB')->resultset('fax_journal')->search({
-        subscriber_id => $s->id,
+        subscriber_id => $kam_subscriber->id,
     });
 
     NGCP::Panel::Utils::Datatables::process($c, $fax_rs, $c->stash->{fax_dt_columns});

lib/NGCP/Panel/Utils/Contract.pm

@@ -51,8 +51,12 @@ sub create_contract_balance {
             });
         });
     } catch($e) {
-        $c->log->error("Creating contract balance failed: " . $e);
-        $e->rethrow;
+        if ($e =~ /Duplicate entry/) {
+            $c->log->warn("Creating contract balance failed: Duplicate entry. Ignoring!");
+        } else {
+            $c->log->error("Creating contract balance failed: " . $e);
+            $e->rethrow;
+        }
     }
 }
 

lib/NGCP/Panel/Utils/Hylafax.pm

@@ -26,7 +26,7 @@ sub send_fax {
         $number = $sender;
     }
     if($prov_subscriber->voip_fax_preference) {
-        $sender = $prov_subscriber->voip_fax_preference->name;
+        $sender = $prov_subscriber->voip_fax_preference->name // $sender;
         if($prov_subscriber->voip_fax_preference->password) {
             push @sendfax_args, '-o '.$number.':'.$prov_subscriber->voip_fax_preference->password;
         } else {

share/templates/subscriber/webfax.tt

@@ -1,10 +1,11 @@
-[% site_config.title = c.loc('Fax Journal for [_1]@[_2]', subscriber.username, subscriber.domain.domain) -%]
+[% site_config.title = c.loc('Received Fax Journal for [_1]@[_2]', subscriber.username, subscriber.domain.domain) -%]
 
 [%
     helper.name = c.loc('Fax');
     helper.dt_columns = fax_dt_columns;
     helper.column_sort = 'the_timestamp';
     helper.form_object = form;
+    helper.close_target = close_target;
     helper.create_flag = create_flag;
     helper.ajax_uri = c.uri_for_action('/subscriber/webfax_ajax', [c.req.captures.0]);
     helper.messages = messages;