From 96187870b4ece40605430f0caaa4deb7e8489231 Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Tue, 12 May 2020 21:11:36 +0530 Subject: [PATCH 1/2] refactoe issues --- .../assets/js/components/base/BaseInput.vue | 13 ++++++- resources/assets/js/plugins/en.json | 3 ++ resources/assets/js/plugins/pt-br.json | 36 +++++++++++++++++-- resources/assets/js/views/estimates/Item.vue | 3 ++ resources/assets/js/views/invoices/Item.vue | 3 ++ .../js/views/settings/Customization.vue | 8 ++--- .../assets/js/views/settings/TaxTypes.vue | 2 +- .../sass/components/base/base-input.scss | 16 +++++++++ 8 files changed, 76 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/components/base/BaseInput.vue b/resources/assets/js/components/base/BaseInput.vue index bf1bfca99..7abd623a7 100644 --- a/resources/assets/js/components/base/BaseInput.vue +++ b/resources/assets/js/components/base/BaseInput.vue @@ -9,7 +9,7 @@ :readonly="readOnly" :name="name" :tabindex="tabIndex" - :class="[{'input-field-left-icon': icon && isAlignLeftIcon ,'input-field-right-icon': icon && !isAlignLeftIcon ,'invalid': isFieldValid, 'disabled': disabled, 'small-input': small}, inputClass]" + :class="[{ 'input-field-left-icon': icon && isAlignLeftIcon, 'input-field-right-icon': (icon && !isAlignLeftIcon) || isInputGroup, invalid: isFieldValid, disabled: disabled, 'small-input': small}, inputClass]" :placeholder="placeholder" :autocomplete="autocomplete" class="input-field" @@ -23,6 +23,9 @@ + + {{ inputGroupText }} + @@ -84,6 +87,14 @@ export default { showPassword: { type: Boolean, default: false + }, + isInputGroup: { + type: Boolean, + default: false, + }, + inputGroupText: { + type: String, + default: null, } }, data () { diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index b0ec3b997..00f99055f 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -678,6 +678,7 @@ "payment_setting_updated": "Payment Setting updated successfully", "payment_mode": "Payment Mode", "add_payment_mode": "Add Payment Mode", + "edit_payment_mode": "Edit Payment Mode", "mode_name": "Mode Name", "payment_mode_added": "Payment Mode Added", "payment_mode_updated": "Payment Mode Updated", @@ -690,6 +691,7 @@ "title": "Items", "units": "units", "add_item_unit": "Add Item Unit", + "edit_item_unit": "Edit Item Unit", "unit_name": "Unit Name", "item_unit_added": "Item Unit Added", "item_unit_updated": "Item Unit Updated", @@ -730,6 +732,7 @@ "tax_types": { "title": "Tax Types", "add_tax": "Add Tax", + "edit_tax": "Edit Tax", "description": "You can add or Remove Taxes as you please. Crater supports Taxes on Individual Items as well as on the invoice.", "add_new_tax": "Add New Tax", "tax_settings": "Tax Settings", diff --git a/resources/assets/js/plugins/pt-br.json b/resources/assets/js/plugins/pt-br.json index 6e8b05eee..ce0744103 100644 --- a/resources/assets/js/plugins/pt-br.json +++ b/resources/assets/js/plugins/pt-br.json @@ -17,11 +17,17 @@ "save": "Salvar", "cancel": "Cancelar", "update": "Atualizar", + "deselect": "Desmarcar", "download": "Baixar", "from_date": "A partir da Data", "to_date": "Até a Data", "from": "De", "to": "Para", + "sort_by": "Ordenar por", + "ascending": "Crescente", + "descending": "Descendente", + "subject": "Sujeita", + "message": "Mensagem", "go_back": "Voltar", "back_to_login": "Voltar ao Login", "home": "Home", @@ -180,7 +186,7 @@ "no_items": "Ainda não existe itens", "list_of_items": "Esta seção conterá a lista de itens.", "select_a_unit": "Seleciona unidade", - + "taxes": "Impostos", "item_attached_message": "Não é possível excluir um item que já está em uso.", "confirm_delete": "Você não poderá recuperar este item | Você não poderá recuperar esses itens", "created_message": "Item criado com sucesso", @@ -329,6 +335,9 @@ "no_matching_invoices": "Não há faturas correspondentes!", "mark_as_sent_successfully": "Fatura marcada como enviada com sucesso", "send_invoice_successfully": "Fatura enviada com sucesso", + "cloned_successfully": "Fatura clonada com sucesso", + "clone_invoice": "Clonar fatura", + "confirm_clone": "Esta fatura será clonada em uma nova fatura", "item": { "title": "Titulo do Item", "description": "Descrição", @@ -394,6 +403,7 @@ "edit_payment": "Editar Pagamento", "view_payment": "Ver Pagamento", "add_new_payment": "Adicionar novo Pagamento", + "send_payment_receipt": "Enviar recibo de pagamento", "save_payment": "Salvar Pagamento", "update_payment": "Atualizar Pagamento", "payment": "Pagamento | Pagamentos", @@ -659,7 +669,28 @@ "autogenerate_payment_number": "Gerar automaticamente número do Pagamento", "payment_setting_description": "Desative isso, se você não deseja gerar automaticamente números do Pagamento sempre que criar um novo.", "enter_payment_prefix": "Digite o Prefixo do Pagamento", - "payment_setting_updated": "Configurações de Pagamento atualizada com sucesso" + "payment_setting_updated": "Configurações de Pagamento atualizada com sucesso", + "payment_mode": "Modo de pagamento", + "add_payment_mode": "Adicionar modo de pagamento", + "edit_payment_mode": "Editar modo de pagamento", + "mode_name": "Nome do modo", + "payment_mode_added": "Modo de pagamento adicionado", + "payment_mode_updated": "Modo de pagamento atualizado", + "payment_mode_confirm_delete": "Você não poderá recuperar este modo de pagamento", + "already_in_use": "O modo de pagamento já está em uso", + "deleted_message": "Modo de pagamento excluído com sucesso" + }, + "items": { + "title": "Itens", + "units": "unidades", + "add_item_unit": "Adicionar unidade de item", + "edit_item_unit": "Editar unidade de item", + "unit_name": "Nome da unidade", + "item_unit_added": "Item Unit Added", + "item_unit_updated": "Item Unit Updated", + "item_unit_confirm_delete": "Você não poderá recuperar esta unidade de item", + "already_in_use": "A unidade do item já está em uso", + "deleted_message": "Unidade de item excluída com sucesso" } }, "account_settings": { @@ -694,6 +725,7 @@ "tax_types": { "title": "Tipos de Impostos", "add_tax": "Adicionar Imposto", + "edit_tax": "Editar imposto", "description": "Você pode adicionar ou remover impostos conforme desejar. O Crater suporta impostos sobre itens individuais e também na Fatura.", "add_new_tax": "Adicionar Novo Imposto", "tax_settings": "Configurações de Impostos", diff --git a/resources/assets/js/views/estimates/Item.vue b/resources/assets/js/views/estimates/Item.vue index 328b180a0..d34d47232 100644 --- a/resources/assets/js/views/estimates/Item.vue +++ b/resources/assets/js/views/estimates/Item.vue @@ -38,6 +38,8 @@ { diff --git a/resources/assets/js/views/invoices/Item.vue b/resources/assets/js/views/invoices/Item.vue index 8d45b6fa9..9f438c955 100644 --- a/resources/assets/js/views/invoices/Item.vue +++ b/resources/assets/js/views/invoices/Item.vue @@ -38,6 +38,8 @@ { diff --git a/resources/assets/js/views/settings/Customization.vue b/resources/assets/js/views/settings/Customization.vue index 443564a73..f70c8274f 100644 --- a/resources/assets/js/views/settings/Customization.vue +++ b/resources/assets/js/views/settings/Customization.vue @@ -403,14 +403,14 @@ export default { }, async addItemUnit () { this.openModal({ - 'title': 'Add Item Unit', + 'title': this.$t('settings.customization.items.add_item_unit'), 'componentName': 'ItemUnit' }) this.$refs.itemTable.refresh() }, async editItemUnit (data) { this.openModal({ - 'title': 'Edit Item Unit', + 'title': this.$t('settings.customization.items.edit_item_unit'), 'componentName': 'ItemUnit', 'id': data.id, 'data': data @@ -439,14 +439,14 @@ export default { }, async addPaymentMode () { this.openModal({ - 'title': 'Add Payment Mode', + 'title': this.$t('settings.customization.payments.add_payment_mode'), 'componentName': 'PaymentMode' }) this.$refs.table.refresh() }, async editPaymentMode (data) { this.openModal({ - 'title': 'Edit Payment Mode', + 'title': this.$t('settings.customization.payments.edit_payment_mode'), 'componentName': 'PaymentMode', 'id': data.id, 'data': data diff --git a/resources/assets/js/views/settings/TaxTypes.vue b/resources/assets/js/views/settings/TaxTypes.vue index 0a206946c..473e08bc5 100644 --- a/resources/assets/js/views/settings/TaxTypes.vue +++ b/resources/assets/js/views/settings/TaxTypes.vue @@ -183,7 +183,7 @@ export default { async EditTax (id) { let response = await this.fetchTaxType(id) this.openModal({ - 'title': 'Edit Tax', + 'title': this.$t('settings.tax_types.edit_tax'), 'componentName': 'TaxTypeModal', 'id': id, 'data': response.data.taxType diff --git a/resources/assets/sass/components/base/base-input.scss b/resources/assets/sass/components/base/base-input.scss index c24ba2ab1..9cb0dacc2 100644 --- a/resources/assets/sass/components/base/base-input.scss +++ b/resources/assets/sass/components/base/base-input.scss @@ -18,6 +18,22 @@ transform: translate(-50%,-50%); } + .right-input-group-text { + position: absolute; + width: 13px; + height: 18px; + min-width: 18px; + color: $ls-color-gray; + font-style: normal; + font-weight: 900; + font-size: 14px; + line-height: 16px; + top: 50%; + right: 0px; + z-index: 1; + transform: translate(-50%, -50%); + } + .right-icon { position: absolute; width: 13px; From 98d15143c2f1a0129bf687d7018e4b31eae1240d Mon Sep 17 00:00:00 2001 From: Jay Makwana Date: Wed, 13 May 2020 21:16:37 +0530 Subject: [PATCH 2/2] refactor language problem --- resources/assets/js/plugins/ar.json | 39 +++++++++++++++-- resources/assets/js/plugins/de.json | 6 +++ resources/assets/js/plugins/en.json | 2 + resources/assets/js/plugins/es.json | 43 +++++++++++++++++-- resources/assets/js/plugins/fr.json | 7 ++- resources/assets/js/plugins/it.json | 6 +++ resources/assets/js/plugins/pt-br.json | 4 ++ .../assets/js/views/estimates/ItemSelect.vue | 2 +- .../assets/js/views/invoices/ItemSelect.vue | 2 +- resources/assets/js/views/items/Create.vue | 2 +- resources/assets/js/views/payments/Create.vue | 2 +- .../js/views/settings/ExpenseCategory.vue | 4 +- 12 files changed, 105 insertions(+), 14 deletions(-) diff --git a/resources/assets/js/plugins/ar.json b/resources/assets/js/plugins/ar.json index 9307f192a..757fb59db 100644 --- a/resources/assets/js/plugins/ar.json +++ b/resources/assets/js/plugins/ar.json @@ -22,6 +22,11 @@ "to_date": "إلى تاريخ", "from": "من", "to": "إلى", + "sort_by": "ترتيب حسب", + "ascending": "تصاعدي", + "descending": "تنازلي", + "subject": "موضوع", + "message": "رسالة", "go_back": "إلى الخلف", "back_to_login": "العودة إلى تسجيل الدخول؟", "home": "الرئيسية", @@ -112,8 +117,8 @@ "tax_types": { "name": "الاسم", "description": "الوصف", - "percent": "Percent", - "compound_tax": "Compound Tax" + "percent": "نسبه مئويه", + "compound_tax": "الضريبة المركبة" }, "customers": { "title": "العملاء", @@ -329,6 +334,9 @@ "no_matching_invoices": "لا يوجد فواتير مطابقة!", "mark_as_sent_successfully": "تم تحديد الفاتورة كمرسلة بنجاح", "send_invoice_successfully": "تم إرسال الفاتورة بنجاح", + "cloned_successfully": "تم استنساخ الفاتورة بنجاح", + "clone_invoice": "استنساخ الفاتورة", + "confirm_clone": "سيتم استنساخ هذه الفاتورة في فاتورة جديدة", "item": { "title": "اسم الصنف", "description": "الوصف", @@ -660,7 +668,29 @@ "autogenerate_payment_number": "ترقيم آلي للمدفوعات", "payment_setting_description": "تعطيل الترقيم الآلي ، إذا كنت لا ترغب في إنشاء أرقام الدفعة تلقائيًا في كل مرة تقوم فيها بإنشاء دفعة جديدة.", "enter_payment_prefix": "أدخل بادئة رقم الدفعة", - "payment_setting_updated": "تم تحديث إعدادات الدفعة بنجاح" + "payment_setting_updated": "تم تحديث إعدادات الدفعة بنجاح", + "payment_mode": "طريقة الدفع", + "add_payment_mode": "أضف وضع الدفع", + "edit_payment_mode": "تحرير وضع الدفع", + "mode_name": "اسم الوضع", + "payment_mode_added": "تمت إضافة وضع الدفع", + "payment_mode_updated": "تم تحديث وضع الدفع", + "payment_mode_confirm_delete": "لن تتمكن من استعادة وضع الدفع هذا", + "already_in_use": "وضع الدفع قيد الاستخدام بالفعل", + "deleted_message": "تم حذف وضع الدفع بنجاح" + }, + + "items": { + "title": "العناصر", + "units": "الوحدات", + "add_item_unit": "إضافة وحدة عنصر", + "edit_item_unit": "تحرير وحدة العناصر", + "unit_name": "إسم الوحدة", + "item_unit_added": "تمت إضافة وحدة العنصر", + "item_unit_updated": "تم تحديث وحدة العنصر", + "item_unit_confirm_delete": "لن تتمكن من استرداد وحدة العنصر هذه", + "already_in_use": "وحدة العنصر قيد الاستخدام بالفعل", + "deleted_message": "تم حذف وحدة العنصر بنجاح" } }, "account_settings": { @@ -695,6 +725,7 @@ "tax_types": { "title": "أنواع الضرائب", "add_tax": "أضف ضريبة", + "edit_tax": "تحرير الضريبة", "description": "يمكنك إضافة أو إزالة الضرائب كما يحلو لك. النظام يدعم الضرائب على العناصر الفردية وكذلك على الفاتورة.", "add_new_tax": "إضافة ضريبة جديدة", "tax_settings": "إعدادات الضريبة", @@ -715,6 +746,8 @@ "action": "إجراء", "description": "الفئات مطلوبة لإضافة إدخالات النفقات. يمكنك إضافة أو إزالة هذه الفئات وفقًا لتفضيلاتك.", "add_new_category": "إضافة فئة جديدة", + "add_category": "إضافة فئة", + "edit_category": "تحرير الفئة", "category_name": "اسم الفئة", "category_description": "الوصف", "created_message": "تم إنشاء نوع النفقات بنجاح", diff --git a/resources/assets/js/plugins/de.json b/resources/assets/js/plugins/de.json index 8c972ff48..d3ff7ec47 100644 --- a/resources/assets/js/plugins/de.json +++ b/resources/assets/js/plugins/de.json @@ -423,6 +423,7 @@ "expenses_list": "Liste der Ausgaben", "expense_title": "Titel", "contact": "Kontakt", + "customer": "Kundin", "category": "Kategorie", "from_date": "Von Datum", "to_date": "bis Datum", @@ -667,6 +668,7 @@ "payment_setting_updated": "Zahlungseinstellung erfolgreich aktualisiert", "payment_mode": "Zahlungsmethode", "add_payment_mode": "Zahlungsmethode hinzufügen", + "edit_payment_mode": "Zahlungsmodus bearbeiten", "mode_name": "Methodenname", "payment_mode_added": "Zahlungsmethode hinzugefügt", "payment_mode_updated": "Zahlungsmethode aktualisiert", @@ -678,6 +680,7 @@ "title": "Artikel", "units": "Einheiten", "add_item_unit": "Artikeleinheit hinzufügen", + "edit_item_unit": "Elementeinheit bearbeiten", "unit_name": "Einheitname", "item_unit_added": "Artikeleinheit hinzugefügt", "item_unit_updated": "Artikeleinheit aktualisiert", @@ -718,6 +721,7 @@ "tax_types": { "title": "Steuersätze", "add_tax": "Steuersätze hinzufügen", + "edit_tax": "Steuer bearbeiten", "description": "Sie können Steuern nach Belieben hinzufügen oder entfernen. Crater unterstützt Steuern auf einzelne Artikel sowie auf die Rechnung.", "add_new_tax": "Neuen Steuersatz hinzufügen", "tax_settings": "Einstellungen Steuersatz", @@ -738,6 +742,8 @@ "action": "Aktion", "description": "Für das Hinzufügen von Ausgabeneinträgen sind Kategorien erforderlich. Sie können diese Kategorien nach Ihren Wünschen hinzufügen oder entfernen.", "add_new_category": "Neue Kategorie hinzufügen", + "add_category": "Kategorie hinzufügen", + "edit_category": "Kategorie bearbeiten", "category_name": "Kategorie Name", "category_description": "Beschreibung", "created_message": "Ausgabenkategorie erfolgreich erstellt", diff --git a/resources/assets/js/plugins/en.json b/resources/assets/js/plugins/en.json index 00f99055f..47066cae1 100644 --- a/resources/assets/js/plugins/en.json +++ b/resources/assets/js/plugins/en.json @@ -753,6 +753,8 @@ "action": "Action", "description": "Categories are required for adding expense entries. You can Add or Remove these categories according to your preference.", "add_new_category": "Add New Category", + "add_category": "Add Category", + "edit_category": "Edit Category", "category_name": "Category Name", "category_description": "Description", "created_message": "Expense Category created successfully", diff --git a/resources/assets/js/plugins/es.json b/resources/assets/js/plugins/es.json index 6cbf75a74..d51a9b455 100644 --- a/resources/assets/js/plugins/es.json +++ b/resources/assets/js/plugins/es.json @@ -22,6 +22,11 @@ "to_date": "Hasta la fecha", "from": "De", "to": "A", + "sort_by": "Ordenar por", + "ascending": "Ascendente", + "descending": "Descendente", + "subject": "Sujeta", + "message": "Mensaje", "go_back": "Volver", "back_to_login": "¿Volver al inicio de sesión?", "home": "Inicio", @@ -62,7 +67,8 @@ "four_zero_four": "404", "you_got_lost": "Whoops! ¡Te perdiste!", "go_home": "Volver al Inicio", - + "test_mail_conf": "Probar configuración de correo", + "send_mail_successfully": "El correo enviado con éxito", "setting_updated": "Configuración actualizada con éxito", "select_state": "Seleccionar estado", "select_country": "Seleccionar país", @@ -180,7 +186,7 @@ "no_items": "¡Aún no hay artículos!", "list_of_items": "Esta sección contendrá la lista de artículos.", "select_a_unit": "seleccionar unidad", - + "taxes": "Impuestos", "item_attached_message": "No se puede eliminar un elemento que ya está en uso.", "confirm_delete": "No podrá recuperar este artículo | No podrás recuperar estos elementos", "created_message": "Artículo creado con éxito", @@ -329,6 +335,9 @@ "no_matching_invoices": "¡No hay facturas coincidentes con la selección!", "mark_as_sent_successfully": "Factura marcada como enviada con éxito", "send_invoice_successfully": "Factura enviada exitosamente", + "cloned_successfully": "Factura clonada exitosamente", + "clone_invoice": "Factura de clonación", + "confirm_clone": "Esta factura se clonará en una nueva factura.", "item": { "title": "Título del artículo", "description": "Descripción", @@ -393,6 +402,7 @@ "edit_payment": "Editar pago", "view_payment": "Ver pago", "add_new_payment": "Agregar nuevo pago", + "send_payment_receipt": "Enviar recibo de pago", "save_payment": "Guardar pago", "update_payment": "Actualizar pago", "payment": "Pago | Pagos", @@ -653,13 +663,35 @@ }, "payments": { - "title": "Payments", + "title": "Pagos", "payment_prefix": "Prefijo de los pagos", "payment_settings": "Ajustes de pagos", "autogenerate_payment_number": "Autogenerar número de pago", "payment_setting_description": "Desactive esto, si no desea generar automáticamente números de pago cada vez que cree un nuevo pago.", "enter_payment_prefix": "Introduzca el prefijo de pago", - "payment_setting_updated": "Configuración de pagos actualizada correctamente" + "payment_setting_updated": "Configuración de pagos actualizada correctamente", + "payment_mode": "Modo de pago", + "add_payment_mode": "Agregar modo de pago", + "edit_payment_mode": "Editar modo de pago", + "mode_name": "Nombre del modo", + "payment_mode_added": "Modo de pago agregado", + "payment_mode_updated": "Modo de pago actualizado", + "payment_mode_confirm_delete": "No podrá recuperar este modo de pago", + "already_in_use": "El modo de pago ya está en uso", + "deleted_message": "Modo de pago eliminado correctamente" + }, + + "items": { + "title": "Artículos", + "units": "unidades", + "add_item_unit": "Agregar unidad de artículo", + "edit_item_unit": "Editar unidad de artículo", + "unit_name": "Nombre de la unidad", + "item_unit_added": "Unidad de artículo agregada", + "item_unit_updated": "Unidad de artículo actualizada", + "item_unit_confirm_delete": "No podrás recuperar esta unidad de artículo", + "already_in_use": "Unidad de artículo ya está en uso", + "deleted_message": "Unidad de elemento eliminada correctamente" } }, "account_settings": { @@ -694,6 +726,7 @@ "tax_types": { "title": "Tipos de impuestos", "add_tax": "Agregar impuesto", + "edit_tax": "Editar impuesto", "description": "Puede agregar o eliminar impuestos a su gusto. Crater admite impuestos sobre artículos individuales, así como sobre la factura.", "add_new_tax": "Agregar nuevo impuesto", "tax_settings": "Configuraciones de impuestos", @@ -714,6 +747,8 @@ "action": "Acción", "description": "Se requieren categorías para agregar entradas de gastos. Puede Agregar o Eliminar estas categorías según su preferencia.", "add_new_category": "Añadir nueva categoria", + "add_category": "Añadir categoría", + "edit_category": "Editar categoria", "category_name": "nombre de la categoría", "category_description": "Descripción", "created_message": "Categoría de gastos creada con éxito", diff --git a/resources/assets/js/plugins/fr.json b/resources/assets/js/plugins/fr.json index 210e8b0e9..bce098028 100644 --- a/resources/assets/js/plugins/fr.json +++ b/resources/assets/js/plugins/fr.json @@ -192,7 +192,7 @@ "no_items": "Aucun article pour le moment!", "list_of_items": "Cette section contiendra la liste des éléments.", "select_a_unit": "Sélectionnez l'unité", - + "taxes": "Les taxes", "item_attached_message": "Impossible de supprimer un élément déjà utilisé", "confirm_delete": "Vous ne pourrez pas récupérer cet article | Vous ne pourrez pas récupérer ces objets", "created_message": "Article créé avec succès", @@ -682,6 +682,7 @@ "payment_setting_updated": "Les paramètres de paiement ont bien été mis à jour", "payment_mode": "Mode de paiement", "add_payment_mode": "Ajouter un mode de paiement", + "edit_payment_mode": "Modifier le mode de paiement", "mode_name": "Nom", "payment_mode_added": "Mode de paiement ajouté", "payment_mode_updated": "Mode de paiement mis à jour", @@ -694,6 +695,7 @@ "title": "Articles", "units": "Unités", "add_item_unit": "Ajouter une unité", + "edit_item_unit": "Modifier l'unité d'élément", "unit_name": "Nom", "item_unit_added": "Unité ajouté", "item_unit_updated": "Unité mis à jour", @@ -736,6 +738,7 @@ "tax_types": { "title": "Types de taxe", "add_tax": "Ajouter une taxe", + "edit_tax": "Modifier la taxe", "description": "Vous pouvez ajouter ou supprimer des taxes à votre guise. Crater prend en charge les taxes sur les articles individuels ainsi que sur la facture.", "add_new_tax": "Ajouter une nouvelle taxe", "tax_settings": "Paramètres de taxe", @@ -756,6 +759,8 @@ "action": "action", "description": "Des catégories sont requises pour ajouter des entrées de dépenses. Vous pouvez ajouter ou supprimer ces catégories selon vos préférences.", "add_new_category": "Ajouter une nouvelle catégorie", + "add_category": "Adicionar categoria", + "edit_category": "Editar categoria", "category_name": "Nom de catégorie", "category_description": "Description", "created_message": "Catégorie de dépenses créée avec succès", diff --git a/resources/assets/js/plugins/it.json b/resources/assets/js/plugins/it.json index 8c288e514..3ffabcbde 100644 --- a/resources/assets/js/plugins/it.json +++ b/resources/assets/js/plugins/it.json @@ -430,6 +430,7 @@ "expense_title": "Titolo", "contact": "Contatto", "category": "Categoria", + "customer": "Cliente", "from_date": "Dalla Data", "to_date": "Alla Data", "expense_date": "Data", @@ -677,6 +678,7 @@ "payment_setting_updated": "Impostazioni di pagamento aggiornate con successo", "payment_mode": "Modalità di pagamento", "add_payment_mode": "Aggiungi modalità di pagamento", + "edit_payment_mode": "Modifica modalità di pagamento", "mode_name": "Nome modalità", "payment_mode_added": "Modalità di pagamento aggiunta", "payment_mode_updated": "Modalità di pagamento aggiornata", @@ -689,6 +691,7 @@ "title": "Items", "units": "unità", "add_item_unit": "Aggiungi Unità Item", + "edit_item_unit": "Modifica unità articolo", "unit_name": "Nome", "item_unit_added": "Unità aggiunta", "item_unit_updated": "Unità aggiornata", @@ -729,6 +732,7 @@ "tax_types": { "title": "Tipi di Imposta", "add_tax": "Aggiungi Imposta", + "edit_tax": "Modifica imposta", "description": "Puoi aggiongere e rimuovere imposte a piacimento. Vengono supportate Tasse differenti per prodotti/servizi specifici esattamento come per le fatture.", "add_new_tax": "Aggiungi nuova imposta", "tax_settings": "Impostazioni Imposte", @@ -749,6 +753,8 @@ "action": "Azione", "description": "Le categorie sono necessarie per aggiungere delle voci di spesa. Puoi aggiungere o eliminare queste categorie in base alle tue preferenze.", "add_new_category": "Aggiungi nuova categoria", + "add_category": "Aggiungi categoria", + "edit_category": "Modifica categoria", "category_name": "Nome Categoria", "category_description": "Descrizione", "created_message": "Categoria di spesa creata con successo", diff --git a/resources/assets/js/plugins/pt-br.json b/resources/assets/js/plugins/pt-br.json index ce0744103..620f9ecf5 100644 --- a/resources/assets/js/plugins/pt-br.json +++ b/resources/assets/js/plugins/pt-br.json @@ -68,6 +68,8 @@ "four_zero_four": "404", "you_got_lost": "Ops! Se perdeu!", "go_home": "Ir para Home", + "test_mail_conf": "Testar configuração de email", + "send_mail_successfully": "Correio enviado com sucesso", "setting_updated": "Configuração atualizada com sucesso", "select_state": "Selecione Estado", @@ -746,6 +748,8 @@ "action": "Ação", "description": "As Categorias são necessárias para adicionar entradas de Despesas. Você pode adicionar ou remover essas Categorias de acordo com sua preferência.", "add_new_category": "Adicionar Nova Categoria", + "add_category": "Adicionar categoria", + "edit_category": "Editar categoria", "category_name": "Nome da Categoria", "category_description": "Descrição", "created_message": "Categoria de Despesa criada com sucesso", diff --git a/resources/assets/js/views/estimates/ItemSelect.vue b/resources/assets/js/views/estimates/ItemSelect.vue index 596553d07..ae9fbc505 100644 --- a/resources/assets/js/views/estimates/ItemSelect.vue +++ b/resources/assets/js/views/estimates/ItemSelect.vue @@ -138,7 +138,7 @@ export default { openItemModal () { this.$emit('onSelectItem') this.openModal({ - 'title': 'Add Item', + 'title': this.$t('items.add_item'), 'componentName': 'ItemModal', 'data': {taxPerItem: this.taxPerItem, taxes: this.taxes} }) diff --git a/resources/assets/js/views/invoices/ItemSelect.vue b/resources/assets/js/views/invoices/ItemSelect.vue index 1f97677c1..3b866546c 100644 --- a/resources/assets/js/views/invoices/ItemSelect.vue +++ b/resources/assets/js/views/invoices/ItemSelect.vue @@ -127,7 +127,7 @@ export default { openItemModal () { this.$emit('onSelectItem') this.openModal({ - 'title': 'Add Item', + 'title': this.$t('items.add_item'), 'componentName': 'ItemModal', 'data': {taxPerItem: this.taxPerItem, taxes: this.taxes} }) diff --git a/resources/assets/js/views/items/Create.vue b/resources/assets/js/views/items/Create.vue index c0e98af8b..8acc873d7 100644 --- a/resources/assets/js/views/items/Create.vue +++ b/resources/assets/js/views/items/Create.vue @@ -266,7 +266,7 @@ export default { }, async addItemUnit () { this.openModal({ - 'title': 'Add Item Unit', + 'title': this.$t('settings.customization.items.add_item_unit'), 'componentName': 'ItemUnit' }) } diff --git a/resources/assets/js/views/payments/Create.vue b/resources/assets/js/views/payments/Create.vue index 591ef34c1..af11d4365 100644 --- a/resources/assets/js/views/payments/Create.vue +++ b/resources/assets/js/views/payments/Create.vue @@ -305,7 +305,7 @@ export default { }, async addPaymentMode () { this.openModal({ - 'title': 'Add Payment Mode', + 'title': this.$t('settings.customization.payments.add_payment_mode'), 'componentName': 'PaymentMode' }) }, diff --git a/resources/assets/js/views/settings/ExpenseCategory.vue b/resources/assets/js/views/settings/ExpenseCategory.vue index a6179c85c..08ca15764 100644 --- a/resources/assets/js/views/settings/ExpenseCategory.vue +++ b/resources/assets/js/views/settings/ExpenseCategory.vue @@ -121,7 +121,7 @@ export default { }, openCategoryModal () { this.openModal({ - 'title': 'Add Category', + 'title': this.$t('settings.expense_category.add_category'), 'componentName': 'CategoryModal' }) this.$refs.table.refresh() @@ -129,7 +129,7 @@ export default { async EditCategory (id) { let response = await this.fetchCategory(id) this.openModal({ - 'title': 'Edit Category', + 'title': this.$t('settings.expense_category.edit_category'), 'componentName': 'CategoryModal', 'id': id, 'data': response.data.category