MT#8371 Additional changes for actual billing_mapping optimisation.

All billing_mappings for contract are linked now through
billing_mapping_actual view. Datatables configurations changed accordingly.
ipeshinskaya/InvoiceTemplate6
Irka 11 years ago
parent 65d38e283c
commit 6299743d63

@ -25,8 +25,8 @@ sub contract_list :Chained('/') :PathPart('contract') :CaptureArgs(0) {
{ name => "id", search => 1, title => $c->loc("#") },
{ name => "external_id", search => 1, title => $c->loc("External #") },
{ name => "contact.email", search => 1, title => $c->loc("Contact Email") },
{ name => "billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "billing_mappings_actual.billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "billing_mappings_actual.billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "status", search => 1, title => $c->loc("Status") },
]);
@ -393,7 +393,7 @@ sub reseller_ajax_contract_filter :Chained('reseller_list') :PathPart('ajax/cont
{ name => "id", search => 1, title => $c->loc("#") },
{ name => "external_id", search => 1, title => $c->loc("External #") },
{ name => "contact.email", search => 1, title => $c->loc("Contact Email") },
{ name => "billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "billing_mappings_actual.billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "status", search => 1, title => $c->loc("Status") },
]);
NGCP::Panel::Utils::Datatables::process($c, $rs, $contract_columns);

@ -49,8 +49,8 @@ sub list_customer :Chained('/') :PathPart('customer') :CaptureArgs(0) {
{ name => "external_id", search => 1, title => $c->loc("External #") },
{ name => "contact.reseller.name", search => 1, title => $c->loc("Reseller") },
{ name => "contact.email", search => 1, title => $c->loc("Contact Email") },
{ name => "billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "billing_mappings_actual.billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "billing_mappings_actual.billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "status", search => 1, title => $c->loc("Status") },
{ name => "max_subscribers", search => 1, title => $c->loc("Max Number of Subscribers") },
]);
@ -94,7 +94,7 @@ sub ajax_reseller_filter :Chained('list_customer') :PathPart('ajax/reseller') :A
my $reseller_customer_columns = NGCP::Panel::Utils::Datatables::set_columns($c, [
{ name => "id", search => 1, title => $c->loc("#") },
{ name => "external_id", search => 1, title => $c->loc("External #") },
{ name => "billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "billing_mappings_actual.billing_mappings.product.name", search => 1, title => $c->loc("Product") },
{ name => "contact.email", search => 1, title => $c->loc("Contact Email") },
{ name => "status", search => 1, title => $c->loc("Status") },
]);

@ -42,7 +42,7 @@ sub list_reseller :Chained('/') :PathPart('reseller') :CaptureArgs(0) {
{ name => "id", search => 1, title => $c->loc("#") },
{ name => "external_id", search => 1, title => $c->loc("External #") },
{ name => "contact.email", search => 1, title => $c->loc("Contact Email") },
{ name => "billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "billing_mappings_actual.billing_mappings.billing_profile.name", search => 1, title => $c->loc("Billing Profile") },
{ name => "status", search => 1, title => $c->loc("Status") },
]);
}
@ -145,7 +145,7 @@ sub base :Chained('list_reseller') :PathPart('') :CaptureArgs(1) {
$c->stash->{customer_dt_columns} = NGCP::Panel::Utils::Datatables::set_columns($c, [
{ name => "id", search => 1, title => $c->loc('#') },
{ name => "external_id", search => 1, title => $c->loc('External #') },
{ name => "billing_mappings.product.name", search => 1, title => $c->loc('Product') },
{ name => "billing_mappings_actual.billing_mappings.product.name", search => 1, title => $c->loc('Product') },
{ name => "contact.email", search => 1, title => $c->loc('Contact Email') },
{ name => "status", search => 1, title => $c->loc('Status') },
]);

Loading…
Cancel
Save