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/numberPrepend/numberPrepend.js b/apps/common/submodules/numberPrepend/numberPrepend.js index 6825ce7bc..6fcb42168 100644 --- a/apps/common/submodules/numberPrepend/numberPrepend.js +++ b/apps/common/submodules/numberPrepend/numberPrepend.js @@ -31,7 +31,7 @@ define(function(require){ var prependFormData = monster.ui.getFormData('number_prepend'); prependFormData.enabled = (prependFormData.name && prependFormData.name.length > 0) ? true : false; - _.extend(true, dataNumber, { prepend: prependFormData }); + $.extend(true, dataNumber, { prepend: prependFormData }); self.numberPrependUpdateNumber(dataNumber.id, dataNumber, function(data) { 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); } }); diff --git a/css/images/models/cisco301g.jpg b/css/images/models/cisco301g.jpg new file mode 100644 index 000000000..596126bf1 Binary files /dev/null and b/css/images/models/cisco301g.jpg differ diff --git a/css/images/models/cisco303.jpg b/css/images/models/cisco303.jpg deleted file mode 100644 index 50f0be3fb..000000000 Binary files a/css/images/models/cisco303.jpg and /dev/null differ diff --git a/css/images/models/cisco303g.jpg b/css/images/models/cisco303g.jpg new file mode 100644 index 000000000..869025511 Binary files /dev/null and b/css/images/models/cisco303g.jpg differ diff --git a/css/images/models/cisco508g.jpg b/css/images/models/cisco508g.jpg new file mode 100644 index 000000000..045da5da9 Binary files /dev/null and b/css/images/models/cisco508g.jpg differ diff --git a/css/images/models/cisco509g.jpg b/css/images/models/cisco509g.jpg new file mode 100644 index 000000000..9d5d94ac6 Binary files /dev/null and b/css/images/models/cisco509g.jpg differ diff --git a/css/images/models/cisco512g.jpg b/css/images/models/cisco512g.jpg new file mode 100644 index 000000000..2e72423e8 Binary files /dev/null and b/css/images/models/cisco512g.jpg differ diff --git a/css/images/models/cisco514g.jpg b/css/images/models/cisco514g.jpg new file mode 100644 index 000000000..7fff3458f Binary files /dev/null and b/css/images/models/cisco514g.jpg differ diff --git a/css/images/models/cisco525g.jpg b/css/images/models/cisco525g.jpg index 36fc461ca..d90b5854c 100644 Binary files a/css/images/models/cisco525g.jpg and b/css/images/models/cisco525g.jpg differ diff --git a/css/images/models/polycom301.jpg b/css/images/models/polycom301.jpg new file mode 100644 index 000000000..5759daf7e Binary files /dev/null and b/css/images/models/polycom301.jpg differ diff --git a/css/images/models/polycom320.jpg b/css/images/models/polycom320.jpg new file mode 100644 index 000000000..f845d8560 Binary files /dev/null and b/css/images/models/polycom320.jpg differ diff --git a/css/images/models/polycom330.jpg b/css/images/models/polycom330.jpg new file mode 100644 index 000000000..3fc6fc217 Binary files /dev/null and b/css/images/models/polycom330.jpg differ diff --git a/css/images/models/polycom4000.jpg b/css/images/models/polycom4000.jpg new file mode 100644 index 000000000..24b381d48 Binary files /dev/null and b/css/images/models/polycom4000.jpg differ diff --git a/css/images/models/polycom430.jpg b/css/images/models/polycom430.jpg new file mode 100644 index 000000000..006e19720 Binary files /dev/null and b/css/images/models/polycom430.jpg differ diff --git a/css/images/models/polycom501.jpg b/css/images/models/polycom501.jpg new file mode 100644 index 000000000..5b8cd6c1b Binary files /dev/null and b/css/images/models/polycom501.jpg differ diff --git a/css/images/models/polycom600.jpg b/css/images/models/polycom600.jpg new file mode 100644 index 000000000..6c150656c Binary files /dev/null and b/css/images/models/polycom600.jpg differ diff --git a/css/images/models/polycom601.jpg b/css/images/models/polycom601.jpg new file mode 100644 index 000000000..5f5d44b05 Binary files /dev/null and b/css/images/models/polycom601.jpg differ diff --git a/css/images/models/yealinkt21.jpg b/css/images/models/yealinkt21.jpg new file mode 100644 index 000000000..f87a9909c Binary files /dev/null and b/css/images/models/yealinkt21.jpg differ diff --git a/css/images/models/yealinkt23.jpg b/css/images/models/yealinkt23.jpg new file mode 100644 index 000000000..47460d628 Binary files /dev/null and b/css/images/models/yealinkt23.jpg differ diff --git a/css/main.css b/css/main.css index ef01e91de..1b29b0782 100644 --- a/css/main.css +++ b/css/main.css @@ -426,9 +426,16 @@ input[type="color"], .model-image.yealink-t20 { background: url('images/models/yealinkt20.jpg') center no-repeat; } +.model-image.yealink-t21 { + background: url('images/models/yealinkt21.jpg') center no-repeat; +} .model-image.yealink-t22 { background: url('images/models/yealinkt22.jpg') center no-repeat; } +.model-image.yealink-t23, +.model-image.yealink-t23g { + background: url('images/models/yealinkt23.jpg') center no-repeat; +} .model-image.yealink-t26 { background: url('images/models/yealinkt26.jpg') center no-repeat; } @@ -473,8 +480,11 @@ input[type="color"], .model-image.cisco-962 { background: url('images/models/cisco962.jpg') center no-repeat; } -.model-image.cisco-303 { - background: url('images/models/cisco303.jpg') center no-repeat; +.model-image.cisco-301g { + background: url('images/models/cisco301g.jpg') center no-repeat; +} +.model-image.cisco-303g { + background: url('images/models/cisco303g.jpg') center no-repeat; } .model-image.cisco-501g { background: url('images/models/cisco501g.jpg') center no-repeat; @@ -485,6 +495,18 @@ input[type="color"], .model-image.cisco-504g { background: url('images/models/cisco504g.jpg') center no-repeat; } +.model-image.cisco-508g { + background: url('images/models/cisco508g.jpg') center no-repeat; +} +.model-image.cisco-509g { + background: url('images/models/cisco509g.jpg') center no-repeat; +} +.model-image.cisco-512g { + background: url('images/models/cisco512g.jpg') center no-repeat; +} +.model-image.cisco-514g { + background: url('images/models/cisco514g.jpg') center no-repeat; +} .model-image.cisco-525g { background: url('images/models/cisco525g.jpg') center no-repeat; } @@ -496,21 +518,39 @@ input[type="color"], .model-image.polycom-1500 { background: url('images/models/polycom1500.jpg') center no-repeat; } +.model-image.polycom-301 { + background: url('images/models/polycom301.jpg') center no-repeat; +} +.model-image.polycom-320 { + background: url('images/models/polycom320.jpg') center no-repeat; +} .model-image.polycom-321 { background: url('images/models/polycom321.jpg') center no-repeat; } +.model-image.polycom-330 { + background: url('images/models/polycom330.jpg') center no-repeat; +} .model-image.polycom-331 { background: url('images/models/polycom331.jpg') center no-repeat; } .model-image.polycom-335 { background: url('images/models/polycom335.jpg') center no-repeat; } +.model-image.polycom-4000 { + background: url('images/models/polycom4000.jpg') center no-repeat; +} +.model-image.polycom-430 { + background: url('images/models/polycom430.jpg') center no-repeat; +} .model-image.polycom-450 { background: url('images/models/polycom450.jpg') center no-repeat; } .model-image.polycom-5000 { background: url('images/models/polycom5000.jpg') center no-repeat; } +.model-image.polycom-501 { + background: url('images/models/polycom501.jpg') center no-repeat; +} .model-image.polycom-550 { background: url('images/models/polycom550.jpg') center no-repeat; } @@ -520,6 +560,12 @@ input[type="color"], .model-image.polycom-6000 { background: url('images/models/polycom6000.jpg') center no-repeat; } +.model-image.polycom-600 { + background: url('images/models/polycom600.jpg') center no-repeat; +} +.model-image.polycom-601 { + background: url('images/models/polycom601.jpg') center no-repeat; +} .model-image.polycom-650 { background: url('images/models/polycom650.jpg') center no-repeat; }