From 9a628ec6e4e41aace3b0d527bcd3b259889f79a7 Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Tue, 24 Feb 2015 15:44:10 -0800 Subject: [PATCH] UI-106: Group unknown number into a 'Unknown Carrier' request --- apps/common/i18n/en-US.json | 5 +---- apps/common/i18n/fr-FR.json | 7 ++----- apps/common/i18n/ru-RU.json | 4 ---- apps/common/submodules/port/port.js | 21 ++++++--------------- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/apps/common/i18n/en-US.json b/apps/common/i18n/en-US.json index 3effefe02..6000ecacc 100644 --- a/apps/common/i18n/en-US.json +++ b/apps/common/i18n/en-US.json @@ -201,6 +201,7 @@ "progressBarRight": "Confirm Order", "requiredConditions": "Please agree with all the conditions", "comingSoon": "Coming Soon!", + "unknownCarrier": "Unknown Carrier", "state": { "completed": "Completed", "rejected": "Rejected", @@ -327,10 +328,6 @@ }, "mimeTypes": "The following files are not in a supported format: ", "size": "The following files are too big: ", - "number": { - "single": "The number you entered is invalid !!!", - "multiple": "The numbers you entered are invalid !!!" - }, "submit": { "document": "Please upload the signed LOA and the bill corresponding to the numbers you want to port" } diff --git a/apps/common/i18n/fr-FR.json b/apps/common/i18n/fr-FR.json index 35a050ccf..2f70f1bc0 100644 --- a/apps/common/i18n/fr-FR.json +++ b/apps/common/i18n/fr-FR.json @@ -190,6 +190,7 @@ "progressBarRight":"Confirmer le transfert", "requiredConditions": "Veuillez accepter les condictions", "comingSoon": "Prochainement", + "unknownCarrier": "Opérateur inconnu", "state": { "completed": "Effectué", "rejected": "Refusé", @@ -323,11 +324,7 @@ "update": "La mise à jour de la demande de transfert à échoué" }, "mimeType": "Les fichiers suivants ne sont pas dans un format accepter: ", - "size": "Les fichiers suivants sont trop gros: ", - "number": { - "single": "Le numéro que vous avez saisi est invalide !!!", - "multiple": "Les numéros que vous avez saisi sont invalides !!!" - }, + "size": "Les fichiers suivants sont trop volumineux: ", "submit": { "document": "Veuillez joindre la lettre d'autorisation signée ainsi que la facture correspondant aux numéros que vous souhaitez transférer" } diff --git a/apps/common/i18n/ru-RU.json b/apps/common/i18n/ru-RU.json index 03abfe2c2..237d2f4dc 100644 --- a/apps/common/i18n/ru-RU.json +++ b/apps/common/i18n/ru-RU.json @@ -319,10 +319,6 @@ }, "mimeTypes": "Следующие файлы предоставлены в неподдерживаемом формате: ", "size": "Следующие файлы имеют слишком большой размер: ", - "number": { - "single": "Введенный номер не существует!!!", - "multiple": "Введённые номера не существуют !!!" - }, "submit": { "document": "Пожалуйста, предоставьте подписанную Доверенность и счёт для номеров, которые вы хотите перенести" } diff --git a/apps/common/submodules/port/port.js b/apps/common/submodules/port/port.js index 9f0cb21be..c3e80bfae 100644 --- a/apps/common/submodules/port/port.js +++ b/apps/common/submodules/port/port.js @@ -1016,19 +1016,17 @@ define(function(require){ data = data.data; var carriersList = [], - formattedData = { orders: [] }, - errorCount = 0; + formattedData = { orders: [] }; for (var number in data) { if (data[number].company == null || data[number].company == 'undefined' || data[number].company == "") { - errorCount++; - delete data[number]; - continue; + data[number].company = self.i18n.active().port.unknownCarrier; } - carriersList.push(data[number].company); - } - carriersList = _.uniq(carriersList); + if (carriersList.indexOf(data[number].company) === -1) { + carriersList.push(data[number].company); + } + } for (var carrier in carriersList) { var numbersArray = [], @@ -1046,13 +1044,6 @@ define(function(require){ formattedData.orders[carrier] = order; } - if (errorCount == 1) { - toastr.error(self.i18n.active().port.toastr.error.number.single, '', { timeOut: 5000 }); - } - else if (errorCount > 1) { - toastr.error(self.i18n.active().port.toastr.error.number.multiple, '', { timeOut: 5000 }); - } - callback(formattedData); } });