Skip to content
This repository has been archived by the owner on Dec 23, 2019. It is now read-only.

Commit

Permalink
fix(trunk): trunk packs simultaneous lines
Browse files Browse the repository at this point in the history
  • Loading branch information
Jérémy DE CESARE committed Apr 12, 2018
1 parent 3b750e5 commit c41af2b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 32 deletions.
13 changes: 5 additions & 8 deletions ...elephony/line/calls/simultaneousLines/telecom-telephony-line-calls-simultaneousLines.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,17 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
</div>

<div class="row mb-3" data-ng-if="LineSimultaneousLinesCtrl.showDoRemoveButtons">
<!-- TODO: Enable once Aapi endpoints updated-->
<!-- <div class="col-xs-12">
<div class="col-xs-12">
<telephony-bulk-action data-billing-account="{{ LineSimultaneousLinesCtrl.bulkDatas.billingAccount }}"
data-service-name="{{ LineSimultaneousLinesCtrl.bulkDatas.serviceName }}"
data-custom-class="link d-block pl-0 mb-3"
data-ng-disabled="LineSimultaneousLinesCtrl.isTrunk"
data-bulk-infos="LineSimultaneousLinesCtrl.bulkDatas.infos"
data-filter-services="LineSimultaneousLinesCtrl.filterServices"
data-get-bulk-params="LineSimultaneousLinesCtrl.getBulkParams"
data-on-success="LineSimultaneousLinesCtrl.onBulkSuccess"
data-on-error="LineSimultaneousLinesCtrl.onBulkError">
</telephony-bulk-action>
</div> -->
</div>
<div class="col-xs-6 col-md-3">
<button type="button"
role="button"
Expand Down Expand Up @@ -160,19 +158,18 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
</div>
</div>

<!-- TODO: Enable once Aapi endpoints updated-->
<!-- <div class="col-xs-12">
<div class="col-xs-12">
<telephony-bulk-action data-billing-account="{{ LineSimultaneousLinesCtrl.bulkDatas.billingAccount }}"
data-service-name="{{ LineSimultaneousLinesCtrl.bulkDatas.serviceName }}"
data-custom-class="link d-block pl-0 mb-3"
data-bulk-infos="LineSimultaneousLinesCtrl.bulkDatas.infos"
data-ng-disabled="!LineSimultaneousLinesCtrl.contractsAccepted || LineSimultaneousLinesCtrl.isTrunk"
data-ng-disabled="!LineSimultaneousLinesCtrl.contractsAccepted"
data-filter-services="LineSimultaneousLinesCtrl.filterServices"
data-get-bulk-params="LineSimultaneousLinesCtrl.getBulkParams"
data-on-success="LineSimultaneousLinesCtrl.onBulkSuccess"
data-on-error="LineSimultaneousLinesCtrl.onBulkError">
</telephony-bulk-action>
</div> -->
</div>

<div class="col-xs-12 mb-3"
data-ng-if="!LineSimultaneousLinesCtrl.orderUrl">
Expand Down
2 changes: 1 addition & 1 deletion client/app/telecom/telephony/line/calls/simultaneousLines/translations/Messages_fr_FR.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_price">Prix optimisé</translation>
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_minimum_bandwidth_recommended">Débit minimum recommandé</translation>
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_new_get_channels_error">Une erreur est survenue lors de la récupération des canaux</translation>
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_update_error">Une erreur est survenue lors de la commande des nouveaux canaux</translation>
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_update_error">Une erreur est survenue lors de la commande des nouveaux canaux. </translation>
<translation id="telephony_line_actions_line_calls_trunk_simultaneous_chart_channels_label">{{count}} canaux</translation>

<translation id="telephony_line_actions_line_calls_trunk_simultaneous_chart_legend_current">Actuelle</translation>
Expand Down
11 changes: 6 additions & 5 deletions ...imultaneousLines/trunk/telecom-telephony-line-trunk-calls-simultaneousLines.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@ angular.module("managerApp").controller("TelecomTelephonyLineTrunkSimultaneousLi
change: {
bandwidth: "--",
price: null,
packsRepartition: [{ quantity: 0 },
{ quantity: 0 },
{ quantity: 0 },
{ quantity: 0 }],
packsRepartition: [
{ quantity: 0 },
{ quantity: 0 },
{ quantity: 0 },
{ quantity: 0 }],
quantityWanted: null,
quantityOptimized: null
},
Expand Down Expand Up @@ -154,7 +155,7 @@ angular.module("managerApp").controller("TelecomTelephonyLineTrunkSimultaneousLi
}, { quantity: this.trunkRates.change.quantityOptimized }).$promise.then((packOrder) => {
this.trunkRates.order = packOrder;
}).catch((error) => {
this.Toast.error(this.$translate.instant("telephony_line_actions_line_calls_trunk_simultaneous_new_channels_update_error"));
this.Toast.error([this.$translate.instant("telephony_line_actions_line_calls_trunk_simultaneous_new_channels_update_error"), error.data.message].join(" "));
return error;
}).finally(() => {
this.trunkRates.loading = false;
Expand Down
22 changes: 5 additions & 17 deletions ...e/calls/simultaneousLines/trunk/telecom-telephony-line-trunk-calls-simultaneousLines.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
<div class="row">
<label class="control-label col-md-4"
data-translate="telephony_line_actions_line_calls_trunk_simultaneous_current_channels_price"></label>
<div class="col-md-3">
<div class="col-md-8">
<p class="form-control-static p-0 font-weight-bold"
data-ng-bind="TrunkRatesSimultaneousLinesCtrl.trunkRates.current.price"></p>
</div>
Expand All @@ -69,6 +69,8 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
</div>
</div>

<div class="row"
data-ng-if="TrunkRatesSimultaneousLinesCtrl.trunkRates.pending.price">
<label class="control-label col-md-4"
data-translate="telephony_line_actions_line_calls_trunk_simultaneous_pending_channels_price"></label>
<div class="col-md-8">
Expand Down Expand Up @@ -114,7 +116,7 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
<div class="row">
<label class="control-label col-md-4"
data-translate="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_price"></label>
<div class="col-md-3">
<div class="col-md-8">
<p class="form-control-static p-0 font-weight-bold"
data-ng-bind="TrunkRatesSimultaneousLinesCtrl.trunkRates.change.price"></p>
</div>
Expand All @@ -123,7 +125,7 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
<div class="row">
<label class="control-label col-md-4"
data-translate="telephony_line_actions_line_calls_trunk_simultaneous_new_channels_minimum_bandwidth_recommended"></label>
<div class="col-md-3">
<div class="col-md-8">
<p class="form-control-static p-0 font-weight-bold"
data-translate="telephony_line_actions_line_calls_trunk_simultaneous_channels_bandwidth_rate"
data-translate-values="{ bandwidth: TrunkRatesSimultaneousLinesCtrl.trunkRates.change.bandwidth }"></p>
Expand All @@ -140,20 +142,6 @@ <h1 data-translate="telephony_line_actions_line_calls_simultaneous_line_title"><
<span data-translate="submit"></span>
</button>
</div>

<div class="row my-4">
<div class="col-xs-12">
<button type="submit"
class="btn btn-primary float-right"
data-ng-disabled="!TrunkRatesSimultaneousLinesCtrl.canOrder() || TrunkRatesSimultaneousLinesCtrl.trunkRates.change.loading">
<oui-spinner class="mr-2"
data-ng-if="LineForwardCtrl.loading.save"
data-size="s">
</oui-spinner>
<span data-translate="submit"></span>
</button>
</div>
</div>
</section>
</div>

Expand Down
2 changes: 1 addition & 1 deletion ...ine/calls/simultaneousLines/trunk/telecom-telephony-line-trunk-calls.simultaneousLines.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ angular.module("managerApp").config(function ($stateProvider) {
$stateProvider.state("telecom.telephony.line.calls.simultaneousLinesTrunk", {
url: "/simultaneousLinesTrunk",
views: {
"@lineView": {
"lineView@telecom.telephony.line": {
templateUrl: "app/telecom/telephony/line/calls/simultaneousLines/trunk/telecom-telephony-line-trunk-calls-simultaneousLines.html",
controller: "TelecomTelephonyLineTrunkSimultaneousLines",
controllerAs: "TrunkRatesSimultaneousLinesCtrl"
Expand Down

0 comments on commit c41af2b

Please sign in to comment.