mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-27 11:41:09 -04:00
fix the conflict
This commit is contained in:
hastichavda
@ -18510,7 +18510,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
},
|
||||
openTaxModal: function openTaxModal() {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
});
|
||||
}
|
||||
@ -22607,7 +22607,7 @@ var _require = __webpack_require__(/*! vuelidate/lib/validators */ "./node_modul
|
||||
},
|
||||
openTemplateModal: function openTemplateModal() {
|
||||
this.openModal({
|
||||
'title': 'Choose a template',
|
||||
'title': this.$t('general.choose_template'),
|
||||
'componentName': 'EstimateTemplate',
|
||||
'data': this.estimateTemplates
|
||||
});
|
||||
@ -24523,7 +24523,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
},
|
||||
openTaxModal: function openTaxModal() {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
});
|
||||
}
|
||||
@ -26680,7 +26680,7 @@ var _require = __webpack_require__(/*! vuelidate/lib/validators */ "./node_modul
|
||||
},
|
||||
openTemplateModal: function openTemplateModal() {
|
||||
this.openModal({
|
||||
'title': 'Choose a template',
|
||||
'title': this.$t('general.choose_template'),
|
||||
'componentName': 'InvoiceTemplate',
|
||||
'data': this.invoiceTemplates
|
||||
});
|
||||
@ -28486,7 +28486,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
},
|
||||
openTaxModal: function openTaxModal() {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
});
|
||||
}
|
||||
@ -34365,13 +34365,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
break;
|
||||
}
|
||||
|
||||
window.toastr['success'](this.$t('settings.sales_taxes.deleted_message'));
|
||||
window.toastr['success'](this.$t('settings.tax_types.deleted_message'));
|
||||
this.id = null;
|
||||
this.$refs.table.refresh();
|
||||
return _context3.abrupt("return", true);
|
||||
|
||||
case 8:
|
||||
window.toastr['success'](this.$t('settings.sales_taxes.already_in_use'));
|
||||
window.toastr['success'](this.$t('settings.tax_types.already_in_use'));
|
||||
|
||||
case 9:
|
||||
case "end":
|
||||
@ -34389,7 +34389,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
||||
}(),
|
||||
openTaxModal: function openTaxModal() {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
});
|
||||
this.$refs.table.refresh();
|
||||
@ -119072,9 +119072,11 @@ var render = function() {
|
||||
options: _vm.currencies,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t(
|
||||
"customers.select_currency"
|
||||
),
|
||||
label: "name",
|
||||
"track-by": "id",
|
||||
placeholder: "select currency"
|
||||
"track-by": "id"
|
||||
},
|
||||
model: {
|
||||
value: _vm.currency,
|
||||
@ -119308,9 +119310,9 @@ var render = function() {
|
||||
_c("base-text-area", {
|
||||
staticClass: "mb-1",
|
||||
attrs: {
|
||||
placeholder: _vm.$t("general.street_1"),
|
||||
rows: "2",
|
||||
cols: "50",
|
||||
placeholder: "Street 1"
|
||||
cols: "50"
|
||||
},
|
||||
on: {
|
||||
input: function($event) {
|
||||
@ -119348,9 +119350,9 @@ var render = function() {
|
||||
_vm._v(" "),
|
||||
_c("base-text-area", {
|
||||
attrs: {
|
||||
placeholder: _vm.$t("general.street_2"),
|
||||
rows: "2",
|
||||
cols: "50",
|
||||
placeholder: "Street 2"
|
||||
cols: "50"
|
||||
},
|
||||
on: {
|
||||
input: function($event) {
|
||||
@ -119406,10 +119408,10 @@ var render = function() {
|
||||
options: _vm.countryList,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t("general.select_country"),
|
||||
"allow-empty": false,
|
||||
"track-by": "id",
|
||||
label: "name",
|
||||
placeholder: "select country"
|
||||
label: "name"
|
||||
},
|
||||
model: {
|
||||
value: _vm.billingCountry,
|
||||
@ -119440,10 +119442,10 @@ var render = function() {
|
||||
options: _vm.billingStates,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t("general.select_state"),
|
||||
disabled: _vm.isDisabledBillingState,
|
||||
"track-by": "id",
|
||||
label: "name",
|
||||
placeholder: "select state"
|
||||
label: "name"
|
||||
},
|
||||
model: {
|
||||
value: _vm.billingState,
|
||||
@ -119474,10 +119476,10 @@ var render = function() {
|
||||
options: _vm.billingCities,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t("general.select_city"),
|
||||
disabled: _vm.isDisabledBillingCity,
|
||||
"track-by": "id",
|
||||
label: "name",
|
||||
placeholder: "select city"
|
||||
label: "name"
|
||||
},
|
||||
model: {
|
||||
value: _vm.billingCity,
|
||||
@ -119800,10 +119802,10 @@ var render = function() {
|
||||
options: _vm.shippingStates,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t("general.select_state"),
|
||||
disabled: _vm.isDisabledShippingState,
|
||||
"track-by": "id",
|
||||
label: "name",
|
||||
placeholder: "select state"
|
||||
label: "name"
|
||||
},
|
||||
model: {
|
||||
value: _vm.shippingState,
|
||||
@ -119834,10 +119836,10 @@ var render = function() {
|
||||
options: _vm.shippingCities,
|
||||
searchable: true,
|
||||
"show-labels": false,
|
||||
placeholder: _vm.$t("general.select_city"),
|
||||
disabled: _vm.isDisabledShippingCity,
|
||||
"track-by": "id",
|
||||
label: "name",
|
||||
placeholder: "select city"
|
||||
label: "name"
|
||||
},
|
||||
model: {
|
||||
value: _vm.shippingCity,
|
||||
@ -120017,11 +120019,7 @@ var render = function() {
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
_vm._v(
|
||||
"\n " + _vm._s(_vm.$t("general.choose_template")) + "\n "
|
||||
)
|
||||
]
|
||||
[_vm._v("\n " + _vm._s(_vm.$t("general.choose")) + "\n ")]
|
||||
)
|
||||
],
|
||||
1
|
||||
@ -120117,11 +120115,7 @@ var render = function() {
|
||||
}
|
||||
}
|
||||
},
|
||||
[
|
||||
_vm._v(
|
||||
"\n " + _vm._s(_vm.$t("general.choose_template")) + "\n "
|
||||
)
|
||||
]
|
||||
[_vm._v("\n " + _vm._s(_vm.$t("general.choose")) + "\n ")]
|
||||
)
|
||||
],
|
||||
1
|
||||
@ -168326,7 +168320,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
all: 'All',
|
||||
select_all: 'Select All',
|
||||
choose_file: 'Click here to choose a file',
|
||||
choose_template: 'Choose',
|
||||
choose_template: 'Choose a template',
|
||||
choose: 'Choose',
|
||||
remove: 'Remove',
|
||||
powered_by: 'Powered by',
|
||||
bytefury: 'Bytefury',
|
||||
@ -168870,6 +168865,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Tax Types',
|
||||
add_tax: 'Add 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',
|
||||
@ -169021,16 +169017,15 @@ __webpack_require__.r(__webpack_exports__);
|
||||
price_greater_than_zero: 'Price must be greater than zero.',
|
||||
payment_greater_than_zero: 'Payment must be greater than zero.',
|
||||
payment_greater_than_due_amount: 'Entered Payment is more than due amount of this invoice.',
|
||||
quantity_maxlength: 'Quantity should not be greater than 10 characters.',
|
||||
price_maxlength: 'Price should not be greater than 10 characters.',
|
||||
price_minValue: 'Price should be greater than 0 digits',
|
||||
amount_maxlength: 'Amount should not be greater than 10 characters.',
|
||||
amount_minvalue: 'Amount should br greater than 0 digits',
|
||||
quantity_maxlength: 'Quantity should not be greater than 10 digits.',
|
||||
price_maxlength: 'Price should not be greater than 10 digits.',
|
||||
amount_maxlength: 'Amount should not be greater than 10 digits.',
|
||||
amount_minvalue: 'Amount should be greater than 0 digits',
|
||||
description_maxlength: 'Description should not be greater than 255 characters.',
|
||||
maximum_options_error: 'Maximum of {max} options selected. First remove a selected option to select another.',
|
||||
notes_maxlength: 'Notes should not be greater than 255 characters.',
|
||||
address_maxlength: 'Address should not be greater than 255 characters.',
|
||||
ref_number_maxlength: 'Ref Number should not be greater than 10 characters'
|
||||
ref_number_maxlength: 'Ref Number should not be greater than 10 digits'
|
||||
}
|
||||
});
|
||||
|
||||
@ -169096,7 +169091,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
all: 'Todas',
|
||||
select_all: 'Seleccionar todo',
|
||||
choose_file: 'Haga clic aquí para elegir un archivo.',
|
||||
choose_template: 'Escoger',
|
||||
choose_template: 'Elige una plantilla',
|
||||
choose: 'Escoger',
|
||||
remove: 'Eliminar',
|
||||
powered_by: 'Energizado por',
|
||||
bytefury: 'Bytefury',
|
||||
@ -169230,6 +169226,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
no_items: '¡Aún no hay artículos!',
|
||||
list_of_items: 'Esta sección contendrá la lista de artículos.',
|
||||
select_a_unit: 'seleccione unidad',
|
||||
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',
|
||||
updated_message: 'Artículo actualizado con éxito',
|
||||
@ -169269,6 +169266,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
estimate_template: 'Plantilla de estimación',
|
||||
convert_to_invoice: 'Convertir a factura',
|
||||
mark_as_sent: 'Marcar como enviado',
|
||||
send_estimate: 'Enviar presupuesto',
|
||||
record_payment: 'Registro de pago',
|
||||
add_estimate: 'Agregar presupuesto',
|
||||
save_estimate: 'Guardar estimación',
|
||||
@ -169374,6 +169372,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
select_an_item: 'Escriba o haga clic para seleccionar un elemento',
|
||||
type_item_description: 'Tipo Elemento Descripción (opcional)'
|
||||
},
|
||||
payment_attached_message: 'Una de las facturas seleccionadas ya tiene un pago adjunto. Asegúrese de eliminar primero los pagos adjuntos para continuar con la eliminación',
|
||||
confirm_delete: 'No podrá recuperar esta factura | No podrá recuperar estas facturas',
|
||||
created_message: 'Factura creada exitosamente',
|
||||
updated_message: 'Factura actualizada exitosamente',
|
||||
@ -169638,6 +169637,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Tipos de impuestos',
|
||||
add_tax: 'Agregar 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',
|
||||
@ -169739,14 +169739,14 @@ __webpack_require__.r(__webpack_exports__);
|
||||
price_greater_than_zero: 'El precio debe ser mayor que cero.',
|
||||
payment_greater_than_zero: 'El pago debe ser mayor que cero.',
|
||||
payment_greater_than_due_amount: 'El pago ingresado es mayor al monto adeudado de esta factura.',
|
||||
quantity_maxlength: 'La cantidad no debe ser mayor de 10 caracteres.',
|
||||
price_maxlength: 'El precio no debe tener más de 10 caracteres.',
|
||||
amount_maxlength: 'La cantidad no debe ser mayor de 10 caracteres.',
|
||||
quantity_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.',
|
||||
price_maxlength: 'El precio no debe ser mayor de 10 dígitos.',
|
||||
amount_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.',
|
||||
description_maxlength: 'La descripción no debe tener más de 255 caracteres.',
|
||||
maximum_options_error: 'Máximo de {max} opciones seleccionadas. Primero elimine una opción seleccionada para seleccionar otra.',
|
||||
notes_maxlength: 'Las notas no deben tener más de 255 caracteres.',
|
||||
address_maxlength: 'La dirección no debe tener más de 255 caracteres.',
|
||||
ref_number_maxlength: 'El número de referencia no debe tener más de 10 caracteres.'
|
||||
ref_number_maxlength: 'El número de referencia no debe tener más de 10 dígitos.'
|
||||
}
|
||||
});
|
||||
|
||||
@ -169812,7 +169812,8 @@ __webpack_require__.r(__webpack_exports__);
|
||||
all: 'Tout',
|
||||
select_all: 'Tout sélectionner',
|
||||
choose_file: 'Cliquez ici pour choisir un fichier',
|
||||
choose_template: 'Choisir',
|
||||
choose_template: 'Choisissez un modèle',
|
||||
choose: 'Choisir',
|
||||
remove: 'Retirer',
|
||||
powered_by: 'Alimenté par',
|
||||
bytefury: 'Bytefury',
|
||||
@ -169946,6 +169947,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
no_items: 'Aucun article pour le moment!',
|
||||
list_of_items: 'Cette section contiendra la liste des éléments.',
|
||||
select_a_unit: 'sélectionner lunité',
|
||||
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',
|
||||
updated_message: 'Élément mis à jour avec succès',
|
||||
@ -169985,6 +169987,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
estimate_template: 'Modèle destimation',
|
||||
convert_to_invoice: 'Convertir en facture',
|
||||
mark_as_sent: 'Marquer comme envoyé',
|
||||
send_estimate: 'Envoyer une estimation',
|
||||
record_payment: 'Record de paiement',
|
||||
add_estimate: 'Ajouter une estimation',
|
||||
save_estimate: 'Sauvegarder lestimation',
|
||||
@ -170090,6 +170093,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
select_an_item: 'Tapez ou cliquez pour sélectionner un élément',
|
||||
type_item_description: 'Type Item Description (optionnel)'
|
||||
},
|
||||
payment_attached_message: "Un paiement est déjà associé à l'une des factures sélectionnées. Assurez-vous d’effacer d’abord les paiements en pièce jointe afin de procéder à la suppression.",
|
||||
confirm_delete: 'Vous ne pourrez pas récupérer cette facture | Vous ne pourrez pas récupérer ces factures',
|
||||
created_message: 'Facture créée avec succès',
|
||||
updated_message: 'Facture mise à jour avec succès',
|
||||
@ -170354,6 +170358,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Types de taxe',
|
||||
add_tax: 'Ajouter une 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',
|
||||
@ -170446,7 +170451,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
not_yet: 'Pas encore? Envoyer à nouveau',
|
||||
password_min_length: 'Le mot de passe doit contenir {nombre} caractères',
|
||||
name_min_length: 'Le nom doit avoir au moins {count} lettres.',
|
||||
enter_valid_tax_rate: 'Enter valid tax rate',
|
||||
enter_valid_tax_rate: 'Entrez un taux de taxe valide',
|
||||
numbers_only: 'Chiffres uniquement.',
|
||||
characters_only: 'Caractères seulement.',
|
||||
password_incorrect: 'Les mots de passe doivent être identiques',
|
||||
@ -170455,14 +170460,14 @@ __webpack_require__.r(__webpack_exports__);
|
||||
price_greater_than_zero: 'Le prix doit être supérieur à zéro.',
|
||||
payment_greater_than_zero: 'Le paiement doit être supérieur à zéro.',
|
||||
payment_greater_than_due_amount: 'Le paiement entré est plus que le montant dû de cette facture.',
|
||||
quantity_maxlength: 'La quantité ne doit pas dépasser 10 caractères.',
|
||||
price_maxlength: 'Le prix ne doit pas dépasser 10 caractères.',
|
||||
amount_maxlength: 'Le montant ne doit pas dépasser 10 caractères.',
|
||||
quantity_maxlength: 'La quantité ne doit pas dépasser 10 chiffres.',
|
||||
price_maxlength: 'Le prix ne doit pas dépasser 10 chiffres.',
|
||||
amount_maxlength: 'Le montant ne doit pas dépasser 10 chiffres.',
|
||||
description_maxlength: 'La description ne doit pas dépasser 255 caractères.',
|
||||
maximum_options_error: 'Maximum de {max} options sélectionnées. Commencez par supprimer une option sélectionnée pour en sélectionner une autre.',
|
||||
notes_maxlength: 'Les notes ne doivent pas dépasser 255 caractères.',
|
||||
address_maxlength: "L'adresse ne doit pas dépasser 255 caractères.",
|
||||
ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 10 caractères'
|
||||
ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 10 chiffres.'
|
||||
}
|
||||
});
|
||||
|
||||
@ -170909,6 +170914,7 @@ __webpack_require__.r(__webpack_exports__);
|
||||
commit('company/' + _modules_company_mutation_types__WEBPACK_IMPORTED_MODULE_3__["BOOTSTRAP_COMPANIES"], response.data.companies);
|
||||
commit('taxType/' + _modules_tax_type_mutation_types__WEBPACK_IMPORTED_MODULE_5__["BOOTSTRAP_TAX_TYPES"], response.data.taxTypes);
|
||||
commit('preferences/' + _modules_settings_preferences_mutation_types__WEBPACK_IMPORTED_MODULE_4__["SET_MOMENT_DATE_FORMAT"], response.data.moment_date_format);
|
||||
commit('preferences/' + _modules_settings_preferences_mutation_types__WEBPACK_IMPORTED_MODULE_4__["SET_LANGUAGE_FORMAT"], response.data.default_language);
|
||||
commit(_mutation_types__WEBPACK_IMPORTED_MODULE_0__["UPDATE_APP_LOADING_STATUS"], true);
|
||||
resolve(response);
|
||||
})["catch"](function (err) {
|
||||
@ -175040,13 +175046,15 @@ var initialState = {
|
||||
/*!**********************************************************************************!*\
|
||||
!*** ./resources/assets/js/store/modules/settings/preferences/mutation-types.js ***!
|
||||
\**********************************************************************************/
|
||||
/*! exports provided: SET_MOMENT_DATE_FORMAT */
|
||||
/*! exports provided: SET_MOMENT_DATE_FORMAT, SET_LANGUAGE_FORMAT */
|
||||
/***/ (function(module, __webpack_exports__, __webpack_require__) {
|
||||
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SET_MOMENT_DATE_FORMAT", function() { return SET_MOMENT_DATE_FORMAT; });
|
||||
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SET_LANGUAGE_FORMAT", function() { return SET_LANGUAGE_FORMAT; });
|
||||
var SET_MOMENT_DATE_FORMAT = 'SET_MOMENT_DATE_FORMAT';
|
||||
var SET_LANGUAGE_FORMAT = 'SET_LANGUAGE_FORMAT';
|
||||
|
||||
/***/ }),
|
||||
|
||||
@ -175060,12 +175068,16 @@ var SET_MOMENT_DATE_FORMAT = 'SET_MOMENT_DATE_FORMAT';
|
||||
"use strict";
|
||||
__webpack_require__.r(__webpack_exports__);
|
||||
/* harmony import */ var _mutation_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./mutation-types */ "./resources/assets/js/store/modules/settings/preferences/mutation-types.js");
|
||||
var _types$SET_MOMENT_DAT;
|
||||
|
||||
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
||||
|
||||
|
||||
/* harmony default export */ __webpack_exports__["default"] = (_defineProperty({}, _mutation_types__WEBPACK_IMPORTED_MODULE_0__["SET_MOMENT_DATE_FORMAT"], function (state, data) {
|
||||
/* harmony default export */ __webpack_exports__["default"] = (_types$SET_MOMENT_DAT = {}, _defineProperty(_types$SET_MOMENT_DAT, _mutation_types__WEBPACK_IMPORTED_MODULE_0__["SET_MOMENT_DATE_FORMAT"], function (state, data) {
|
||||
state.momentDateFormat = data;
|
||||
}));
|
||||
}), _defineProperty(_types$SET_MOMENT_DAT, _mutation_types__WEBPACK_IMPORTED_MODULE_0__["SET_LANGUAGE_FORMAT"], function (state, data) {
|
||||
window.i18n.locale = data;
|
||||
}), _types$SET_MOMENT_DAT);
|
||||
|
||||
/***/ }),
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -56,9 +56,9 @@
|
||||
:options="currencies"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('customers.select_currency')"
|
||||
label="name"
|
||||
track-by="id"
|
||||
placeholder="select currency"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -130,9 +130,9 @@
|
||||
<div class="col-sm-7">
|
||||
<base-text-area
|
||||
v-model="billing.address_street_1"
|
||||
:placeholder="$t('general.street_1')"
|
||||
rows="2"
|
||||
cols="50"
|
||||
placeholder="Street 1"
|
||||
class="mb-1"
|
||||
@input="$v.billing.address_street_1.$touch()"
|
||||
/>
|
||||
@ -142,9 +142,9 @@
|
||||
|
||||
<base-text-area
|
||||
v-model="billing.address_street_2"
|
||||
:placeholder="$t('general.street_2')"
|
||||
rows="2"
|
||||
cols="50"
|
||||
placeholder="Street 2"
|
||||
@input="$v.billing.address_street_2.$touch()"
|
||||
/>
|
||||
|
||||
@ -162,10 +162,10 @@
|
||||
:options="countryList"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('general.select_country')"
|
||||
:allow-empty="false"
|
||||
track-by="id"
|
||||
label="name"
|
||||
placeholder="select country"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -178,10 +178,10 @@
|
||||
:options="billingStates"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('general.select_state')"
|
||||
:disabled="isDisabledBillingState"
|
||||
track-by="id"
|
||||
label="name"
|
||||
placeholder="select state"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -194,10 +194,10 @@
|
||||
:options="billingCities"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('general.select_city')"
|
||||
:disabled="isDisabledBillingCity"
|
||||
track-by="id"
|
||||
label="name"
|
||||
placeholder="select city"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -314,10 +314,10 @@
|
||||
:options="shippingStates"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('general.select_state')"
|
||||
:disabled="isDisabledShippingState"
|
||||
track-by="id"
|
||||
label="name"
|
||||
placeholder="select state"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -330,10 +330,10 @@
|
||||
:options="shippingCities"
|
||||
:searchable="true"
|
||||
:show-labels="false"
|
||||
:placeholder="$t('general.select_city')"
|
||||
:disabled="isDisabledShippingCity"
|
||||
track-by="id"
|
||||
label="name"
|
||||
placeholder="select city"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
color="theme"
|
||||
@click="chooseTemplate()"
|
||||
>
|
||||
{{ $t('general.choose_template') }}
|
||||
{{ $t('general.choose') }}
|
||||
</base-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
color="theme"
|
||||
@click="chooseTemplate()"
|
||||
>
|
||||
{{ $t('general.choose_template') }}
|
||||
{{ $t('general.choose') }}
|
||||
</base-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -76,7 +76,7 @@ export default {
|
||||
},
|
||||
openTaxModal () {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
})
|
||||
}
|
||||
|
||||
@ -49,7 +49,8 @@ export default {
|
||||
all: 'All',
|
||||
select_all: 'Select All',
|
||||
choose_file: 'Click here to choose a file',
|
||||
choose_template: 'Choose',
|
||||
choose_template: 'Choose a template',
|
||||
choose: 'Choose',
|
||||
remove: 'Remove',
|
||||
powered_by: 'Powered by',
|
||||
bytefury: 'Bytefury',
|
||||
@ -600,6 +601,7 @@ export default {
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Tax Types',
|
||||
add_tax: 'Add 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',
|
||||
@ -751,15 +753,14 @@ export default {
|
||||
price_greater_than_zero: 'Price must be greater than zero.',
|
||||
payment_greater_than_zero: 'Payment must be greater than zero.',
|
||||
payment_greater_than_due_amount: 'Entered Payment is more than due amount of this invoice.',
|
||||
quantity_maxlength: 'Quantity should not be greater than 10 characters.',
|
||||
price_maxlength: 'Price should not be greater than 10 characters.',
|
||||
price_minValue: 'Price should be greater than 0 digits',
|
||||
amount_maxlength: 'Amount should not be greater than 10 characters.',
|
||||
amount_minvalue: 'Amount should br greater than 0 digits',
|
||||
quantity_maxlength: 'Quantity should not be greater than 10 digits.',
|
||||
price_maxlength: 'Price should not be greater than 10 digits.',
|
||||
amount_maxlength: 'Amount should not be greater than 10 digits.',
|
||||
amount_minvalue: 'Amount should be greater than 0 digits',
|
||||
description_maxlength: 'Description should not be greater than 255 characters.',
|
||||
maximum_options_error: 'Maximum of {max} options selected. First remove a selected option to select another.',
|
||||
notes_maxlength: 'Notes should not be greater than 255 characters.',
|
||||
address_maxlength: 'Address should not be greater than 255 characters.',
|
||||
ref_number_maxlength: 'Ref Number should not be greater than 10 characters'
|
||||
ref_number_maxlength: 'Ref Number should not be greater than 10 digits'
|
||||
}
|
||||
}
|
||||
|
||||
@ -49,7 +49,8 @@ export default {
|
||||
all: 'Todas',
|
||||
select_all: 'Seleccionar todo',
|
||||
choose_file: 'Haga clic aquí para elegir un archivo.',
|
||||
choose_template: 'Escoger',
|
||||
choose_template: 'Elige una plantilla',
|
||||
choose: 'Escoger',
|
||||
remove: 'Eliminar',
|
||||
powered_by: 'Energizado por',
|
||||
bytefury: 'Bytefury',
|
||||
@ -186,6 +187,7 @@ export default {
|
||||
list_of_items: 'Esta sección contendrá la lista de artículos.',
|
||||
select_a_unit: 'seleccione unidad',
|
||||
|
||||
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',
|
||||
updated_message: 'Artículo actualizado con éxito',
|
||||
@ -225,6 +227,7 @@ export default {
|
||||
estimate_template: 'Plantilla de estimación',
|
||||
convert_to_invoice: 'Convertir a factura',
|
||||
mark_as_sent: 'Marcar como enviado',
|
||||
send_estimate: 'Enviar presupuesto',
|
||||
record_payment: 'Registro de pago',
|
||||
add_estimate: 'Agregar presupuesto',
|
||||
save_estimate: 'Guardar estimación',
|
||||
@ -331,6 +334,7 @@ export default {
|
||||
select_an_item: 'Escriba o haga clic para seleccionar un elemento',
|
||||
type_item_description: 'Tipo Elemento Descripción (opcional)'
|
||||
},
|
||||
payment_attached_message: 'Una de las facturas seleccionadas ya tiene un pago adjunto. Asegúrese de eliminar primero los pagos adjuntos para continuar con la eliminación',
|
||||
confirm_delete: 'No podrá recuperar esta factura | No podrá recuperar estas facturas',
|
||||
created_message: 'Factura creada exitosamente',
|
||||
updated_message: 'Factura actualizada exitosamente',
|
||||
@ -597,6 +601,7 @@ export default {
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Tipos de impuestos',
|
||||
add_tax: 'Agregar 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',
|
||||
@ -699,13 +704,13 @@ export default {
|
||||
price_greater_than_zero: 'El precio debe ser mayor que cero.',
|
||||
payment_greater_than_zero: 'El pago debe ser mayor que cero.',
|
||||
payment_greater_than_due_amount: 'El pago ingresado es mayor al monto adeudado de esta factura.',
|
||||
quantity_maxlength: 'La cantidad no debe ser mayor de 10 caracteres.',
|
||||
price_maxlength: 'El precio no debe tener más de 10 caracteres.',
|
||||
amount_maxlength: 'La cantidad no debe ser mayor de 10 caracteres.',
|
||||
quantity_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.',
|
||||
price_maxlength: 'El precio no debe ser mayor de 10 dígitos.',
|
||||
amount_maxlength: 'La cantidad no debe ser mayor de 10 dígitos.',
|
||||
description_maxlength: 'La descripción no debe tener más de 255 caracteres.',
|
||||
maximum_options_error: 'Máximo de {max} opciones seleccionadas. Primero elimine una opción seleccionada para seleccionar otra.',
|
||||
notes_maxlength: 'Las notas no deben tener más de 255 caracteres.',
|
||||
address_maxlength: 'La dirección no debe tener más de 255 caracteres.',
|
||||
ref_number_maxlength: 'El número de referencia no debe tener más de 10 caracteres.'
|
||||
ref_number_maxlength: 'El número de referencia no debe tener más de 10 dígitos.'
|
||||
}
|
||||
}
|
||||
|
||||
@ -49,7 +49,8 @@ export default {
|
||||
all: 'Tout',
|
||||
select_all: 'Tout sélectionner',
|
||||
choose_file: 'Cliquez ici pour choisir un fichier',
|
||||
choose_template: 'Choisir',
|
||||
choose_template: 'Choisissez un modèle',
|
||||
choose: 'Choisir',
|
||||
remove: 'Retirer',
|
||||
powered_by: 'Alimenté par',
|
||||
bytefury: 'Bytefury',
|
||||
@ -186,6 +187,7 @@ export default {
|
||||
list_of_items: 'Cette section contiendra la liste des éléments.',
|
||||
select_a_unit: 'sélectionner lunité',
|
||||
|
||||
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',
|
||||
updated_message: 'Élément mis à jour avec succès',
|
||||
@ -225,6 +227,7 @@ export default {
|
||||
estimate_template: 'Modèle destimation',
|
||||
convert_to_invoice: 'Convertir en facture',
|
||||
mark_as_sent: 'Marquer comme envoyé',
|
||||
send_estimate: 'Envoyer une estimation',
|
||||
record_payment: 'Record de paiement',
|
||||
add_estimate: 'Ajouter une estimation',
|
||||
save_estimate: 'Sauvegarder lestimation',
|
||||
@ -331,6 +334,7 @@ export default {
|
||||
select_an_item: 'Tapez ou cliquez pour sélectionner un élément',
|
||||
type_item_description: 'Type Item Description (optionnel)'
|
||||
},
|
||||
payment_attached_message: "Un paiement est déjà associé à l'une des factures sélectionnées. Assurez-vous d’effacer d’abord les paiements en pièce jointe afin de procéder à la suppression.",
|
||||
confirm_delete: 'Vous ne pourrez pas récupérer cette facture | Vous ne pourrez pas récupérer ces factures',
|
||||
created_message: 'Facture créée avec succès',
|
||||
updated_message: 'Facture mise à jour avec succès',
|
||||
@ -597,6 +601,7 @@ export default {
|
||||
},
|
||||
tax_types: {
|
||||
title: 'Types de taxe',
|
||||
add_tax: 'Ajouter une 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',
|
||||
@ -690,7 +695,7 @@ export default {
|
||||
not_yet: 'Pas encore? Envoyer à nouveau',
|
||||
password_min_length: 'Le mot de passe doit contenir {nombre} caractères',
|
||||
name_min_length: 'Le nom doit avoir au moins {count} lettres.',
|
||||
enter_valid_tax_rate: 'Enter valid tax rate',
|
||||
enter_valid_tax_rate: 'Entrez un taux de taxe valide',
|
||||
numbers_only: 'Chiffres uniquement.',
|
||||
characters_only: 'Caractères seulement.',
|
||||
password_incorrect: 'Les mots de passe doivent être identiques',
|
||||
@ -699,13 +704,13 @@ export default {
|
||||
price_greater_than_zero: 'Le prix doit être supérieur à zéro.',
|
||||
payment_greater_than_zero: 'Le paiement doit être supérieur à zéro.',
|
||||
payment_greater_than_due_amount: 'Le paiement entré est plus que le montant dû de cette facture.',
|
||||
quantity_maxlength: 'La quantité ne doit pas dépasser 10 caractères.',
|
||||
price_maxlength: 'Le prix ne doit pas dépasser 10 caractères.',
|
||||
amount_maxlength: 'Le montant ne doit pas dépasser 10 caractères.',
|
||||
quantity_maxlength: 'La quantité ne doit pas dépasser 10 chiffres.',
|
||||
price_maxlength: 'Le prix ne doit pas dépasser 10 chiffres.',
|
||||
amount_maxlength: 'Le montant ne doit pas dépasser 10 chiffres.',
|
||||
description_maxlength: 'La description ne doit pas dépasser 255 caractères.',
|
||||
maximum_options_error: 'Maximum de {max} options sélectionnées. Commencez par supprimer une option sélectionnée pour en sélectionner une autre.',
|
||||
notes_maxlength: 'Les notes ne doivent pas dépasser 255 caractères.',
|
||||
address_maxlength: "L'adresse ne doit pas dépasser 255 caractères.",
|
||||
ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 10 caractères'
|
||||
ref_number_maxlength: 'Le numéro de référence ne doit pas dépasser 10 chiffres.'
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,7 +15,7 @@ export default {
|
||||
commit('company/' + companyTypes.BOOTSTRAP_COMPANIES, response.data.companies)
|
||||
commit('taxType/' + taxTypeTypes.BOOTSTRAP_TAX_TYPES, response.data.taxTypes)
|
||||
commit('preferences/' + preferencesTypes.SET_MOMENT_DATE_FORMAT, response.data.moment_date_format)
|
||||
|
||||
commit('preferences/' + preferencesTypes.SET_LANGUAGE_FORMAT, response.data.default_language)
|
||||
commit(types.UPDATE_APP_LOADING_STATUS, true)
|
||||
resolve(response)
|
||||
}).catch((err) => {
|
||||
|
||||
@ -1 +1,2 @@
|
||||
export const SET_MOMENT_DATE_FORMAT = 'SET_MOMENT_DATE_FORMAT'
|
||||
export const SET_LANGUAGE_FORMAT = 'SET_LANGUAGE_FORMAT'
|
||||
|
||||
@ -3,5 +3,8 @@ import * as types from './mutation-types'
|
||||
export default {
|
||||
[types.SET_MOMENT_DATE_FORMAT] (state, data) {
|
||||
state.momentDateFormat = data
|
||||
},
|
||||
[types.SET_LANGUAGE_FORMAT] (state, data) {
|
||||
window.i18n.locale = data
|
||||
}
|
||||
}
|
||||
|
||||
@ -582,7 +582,7 @@ export default {
|
||||
},
|
||||
openTemplateModal () {
|
||||
this.openModal({
|
||||
'title': 'Choose a template',
|
||||
'title': this.$t('general.choose_template'),
|
||||
'componentName': 'EstimateTemplate',
|
||||
'data': this.estimateTemplates
|
||||
})
|
||||
|
||||
@ -159,7 +159,7 @@ export default {
|
||||
},
|
||||
openTaxModal () {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
})
|
||||
}
|
||||
|
||||
@ -591,7 +591,7 @@ export default {
|
||||
},
|
||||
openTemplateModal () {
|
||||
this.openModal({
|
||||
'title': 'Choose a template',
|
||||
'title': this.$t('general.choose_template'),
|
||||
'componentName': 'InvoiceTemplate',
|
||||
'data': this.invoiceTemplates
|
||||
})
|
||||
|
||||
@ -500,7 +500,7 @@ export default {
|
||||
},
|
||||
openTemplateModal () {
|
||||
this.openModal({
|
||||
'title': 'Choose a template',
|
||||
'title': this.$t('general.choose_template'),
|
||||
'componentName': 'InvoiceTemplate',
|
||||
'data': this.invoiceTemplates
|
||||
})
|
||||
|
||||
@ -156,7 +156,7 @@ export default {
|
||||
},
|
||||
openTaxModal () {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
})
|
||||
}
|
||||
|
||||
@ -161,15 +161,15 @@ export default {
|
||||
async removeTax (id, index) {
|
||||
let response = await this.deleteTaxType(id)
|
||||
if (response.data.success) {
|
||||
window.toastr['success'](this.$t('settings.sales_taxes.deleted_message'))
|
||||
window.toastr['success'](this.$t('settings.tax_types.deleted_message'))
|
||||
this.id = null
|
||||
this.$refs.table.refresh()
|
||||
return true
|
||||
}window.toastr['success'](this.$t('settings.sales_taxes.already_in_use'))
|
||||
}window.toastr['success'](this.$t('settings.tax_types.already_in_use'))
|
||||
},
|
||||
openTaxModal () {
|
||||
this.openModal({
|
||||
'title': 'Add Tax',
|
||||
'title': this.$t('settings.tax_types.add_tax'),
|
||||
'componentName': 'TaxTypeModal'
|
||||
})
|
||||
this.$refs.table.refresh()
|
||||
|
||||
Reference in New Issue
Block a user