+
+
+
-
+
CALL myTicketGet(#ticket)
+
diff --git a/forms/ecomerce/invoices/locale/ca.json b/forms/ecomerce/invoices/locale/ca.json
deleted file mode 100644
index d469ff83..00000000
--- a/forms/ecomerce/invoices/locale/ca.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Invoices": "Factures"
-
- ,"Show invoices from": "Mostra factures desde"
-
- ,"Serial": "Sèrie"
- ,"Date": "Data"
- ,"Import": "Import"
- ,"Donwload PDF": "Descarregar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/ca.yml b/forms/ecomerce/invoices/locale/ca.yml
new file mode 100644
index 00000000..25a01c0a
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/ca.yml
@@ -0,0 +1,5 @@
+Invoices: Factures
+Serial: Sèrie
+Date: Data
+Import: Import
+Donwload PDF: Descarregar PDF
diff --git a/forms/ecomerce/invoices/locale/en.json b/forms/ecomerce/invoices/locale/en.json
deleted file mode 100644
index 971aa18e..00000000
--- a/forms/ecomerce/invoices/locale/en.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Invoices": "Invoices"
-
- ,"Show invoices from": "Show invoices from"
-
- ,"Serial": "Serial"
- ,"Date": "Date"
- ,"Import": "Import"
- ,"Download PDF": "Download PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/en.yml b/forms/ecomerce/invoices/locale/en.yml
new file mode 100644
index 00000000..a5e68780
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/en.yml
@@ -0,0 +1,5 @@
+Invoices: Invoices
+Serial: Serial
+Date: Date
+Import: Import
+Download PDF: Download PDF
diff --git a/forms/ecomerce/invoices/locale/es.json b/forms/ecomerce/invoices/locale/es.json
deleted file mode 100644
index 405056a2..00000000
--- a/forms/ecomerce/invoices/locale/es.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Invoices": "Facturas"
-
- ,"Show invoices from": "Mostrar facturas desde"
-
- ,"Serial": "Serie"
- ,"Date": "Fecha"
- ,"Import": "Importe"
- ,"Download PDF": "Descargar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/es.yml b/forms/ecomerce/invoices/locale/es.yml
new file mode 100644
index 00000000..9dd52f37
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/es.yml
@@ -0,0 +1,5 @@
+Invoices: Facturas
+Serial: Serie
+Date: Fecha
+Import: Importe
+Download PDF: Descargar PDF
diff --git a/forms/ecomerce/invoices/locale/fr.json b/forms/ecomerce/invoices/locale/fr.json
deleted file mode 100644
index 033cf4bd..00000000
--- a/forms/ecomerce/invoices/locale/fr.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Invoices": "Factures"
-
- ,"Show invoices from": "Afficher les factures de"
-
- ,"Serial": "Série"
- ,"Date": "Date"
- ,"Import": "Montant"
- ,"Donwload PDF": "Télécharger le PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/fr.yml b/forms/ecomerce/invoices/locale/fr.yml
new file mode 100644
index 00000000..4797e19b
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/fr.yml
@@ -0,0 +1,5 @@
+Invoices: Factures
+Serial: Série
+Date: Date
+Import: Montant
+Donwload PDF: Télécharger le PDF
diff --git a/forms/ecomerce/invoices/locale/pt.json b/forms/ecomerce/invoices/locale/pt.json
deleted file mode 100644
index 627f96ee..00000000
--- a/forms/ecomerce/invoices/locale/pt.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Invoices": "Factura"
-
- ,"Show invoices from": "Mostrar facturas de"
-
- ,"Serial": "Serie"
- ,"Date": "Data"
- ,"Import": "Importe"
- ,"Download PDF": "Baixar PDF"
-}
diff --git a/forms/ecomerce/invoices/locale/pt.yml b/forms/ecomerce/invoices/locale/pt.yml
new file mode 100644
index 00000000..97d610c3
--- /dev/null
+++ b/forms/ecomerce/invoices/locale/pt.yml
@@ -0,0 +1,5 @@
+Invoices: Factura
+Serial: Serie
+Date: Data
+Import: Importe
+Download PDF: Baixar PDF
diff --git a/forms/ecomerce/orders/locale/ca.json b/forms/ecomerce/orders/locale/ca.json
deleted file mode 100644
index ff5452e5..00000000
--- a/forms/ecomerce/orders/locale/ca.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Comandes obertes"
-
- ,"StartOrder": "Començar encàrrec"
- ,"ContinueOrder": "Continuar encàrrec"
- ,"OrderNumber": "N encàrrec"
- ,"DateMake": "Data de creació"
- ,"DateExit": "Data d'eixida"
- ,"SendMethod": "Forma d'enviament"
-
- ,"LastOrders": "Últimes comandes"
-
- ,"Show orders from": "Mostra comandes desde"
- ,"Balance:": "Saldo:"
- ,"PaymentInfo": "La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia d'avui, no té en compte comandes del futur. Perquè la teva comanda sigui enviat, aquesta quantitat ha de ser igual o més gran que 0. Si vols fer un lliurament a compte, prem el botó de pagament, esborra la quantitat suggerida e introdueix la quantitat que vulguis."
- ,"MakePayment": "Realitzar pagament"
- ,"Company": "Empresa"
- ,"Pending": "Pendent"
- ,"Pay": "Pagar"
- ,"Basket": "Cistella"
- ,"ShoppingBasket": "Cistella de la compra"
-
- ,"SeeOrder": "Mostrar detall de l'encàrrec"
- ,"Delivery": "Lliurament"
- ,"TicketNumber": "N ticket"
- ,"SentAddress": "Adreça d'enviament"
- ,"Consignee": "Consignatari"
- ,"Boxes": "Caixes"
- ,"TotalWithVAT": "Total amb IVA"
- ,"PayOrder": "Pagar encàrrec"
-
- ,"An error has been in the payment": "Sembla que hi ha hagut un error en el pagament"
- ,"Retry": "Reintenta"
- ,"Accept": "Acceptar"
-}
diff --git a/forms/ecomerce/orders/locale/ca.yml b/forms/ecomerce/orders/locale/ca.yml
new file mode 100644
index 00000000..c93f4817
--- /dev/null
+++ b/forms/ecomerce/orders/locale/ca.yml
@@ -0,0 +1,36 @@
+OpenOrders: Comandes obertes
+StartOrder: Començar encàrrec
+ContinueOrder: Continuar encàrrec
+OrderNumber: N encàrrec
+DateMake: Data de creació
+DateExit: Data d'eixida
+SendMethod: Forma d'enviament
+LastOrders: Últimes comandes
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+ La quantitat mostrada és el teu saldo pendent (negatiu) o favorable a dia
+ d'avui, no té en compte comandes del futur. Perquè la teva comanda sigui
+ enviat, aquesta quantitat ha de ser igual o més gran que 0. Si vols fer un
+ lliurament a compte, prem el botó de pagament, esborra la quantitat suggerida
+ e introdueix la quantitat que vulguis.
+MakePayment: Realitzar pagament
+Company: Empresa
+Pending: Pendent
+Pay: Pagar
+Basket: Cistella
+ShoppingBasket: Cistella de la compra
+SeeOrder: Mostrar detall de l'encàrrec
+Delivery: Lliurament
+TicketNumber: N ticket
+SentAddress: Adreça d'enviament
+Consignee: Consignatari
+Boxes: Caixes
+TotalWithVAT: Total amb IVA
+PayOrder: Pagar encàrrec
+'AmountToPay:': 'Quantitat a pagar (€):'
+AmountError: >-
+ La quantitat ha de ser un nombre positiu i inferior o igual a l'import pendent
+PayError: Error al realitzar el pagament
+An error has been in the payment: Sembla que hi ha hagut un error en el pagament
+Retry: Reintenta
+Accept: Acceptar
diff --git a/forms/ecomerce/orders/locale/en.json b/forms/ecomerce/orders/locale/en.json
deleted file mode 100644
index a5241d45..00000000
--- a/forms/ecomerce/orders/locale/en.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Open orders"
-
- ,"StartOrder": "Start order"
- ,"ContinueOrder": "Continue order"
- ,"OrderNumber": "Order number"
- ,"DateMake": "Creation date"
- ,"DateExit": "Shipping date"
- ,"SendMethod": "Delivery method"
-
- ,"LastOrders": "Last orders"
-
- ,"Show orders from": "Show orders from"
- ,"Balance:": "Balance:"
- ,"PaymentInfo": "The amount shown is your slope (negative) or favorable balance today, it disregards future orders. For get your order shipped, this amount must be equal to or greater than 0. If you want to make a down payment, click the payment button, delete the suggested amount and enter the amount you want."
- ,"MakePayment": "Make payment"
- ,"Company": "Company"
- ,"Pending": "Pending"
- ,"Pay": "Pay"
- ,"Basket": "Basket"
- ,"ShoppingBasket": "Shopping basket"
-
- ,"SeeOrder": "Show details of the order"
- ,"Delivery": "Delivery"
- ,"TicketNumber": "Ticket number"
- ,"SentAddress": "Delivery address"
- ,"Consignee": "Consignee"
- ,"Boxes": "Bundles"
- ,"TotalWithVAT": "Total with VAT"
- ,"PayOrder": "Pay order"
-
- ,"An error has been in the payment": "It seems that there has been an error in the payment"
- ,"Retry": "Retry"
- ,"Accept": "Accept"
-}
diff --git a/forms/ecomerce/orders/locale/en.yml b/forms/ecomerce/orders/locale/en.yml
new file mode 100644
index 00000000..4bb08ce7
--- /dev/null
+++ b/forms/ecomerce/orders/locale/en.yml
@@ -0,0 +1,37 @@
+OpenOrders: Open orders
+StartOrder: Start order
+ContinueOrder: Continue order
+OrderNumber: Order number
+DateMake: Creation date
+DateExit: Shipping date
+SendMethod: Delivery method
+LastOrders: Last orders
+'Balance:': 'Balance:'
+PaymentInfo: >-
+ The amount shown is your slope (negative) or favorable balance today, it
+ disregards future orders. For get your order shipped, this amount must be
+ equal to or greater than 0. If you want to make a down payment, click the
+ payment button, delete the suggested amount and enter the amount you want.
+MakePayment: Make payment
+Company: Company
+Pending: Pending
+Pay: Pay
+Basket: Basket
+ShoppingBasket: Shopping basket
+SeeOrder: Show details of the order
+Delivery: Delivery
+TicketNumber: Ticket number
+SentAddress: Delivery address
+Consignee: Consignee
+Boxes: Bundles
+TotalWithVAT: Total with VAT
+PayOrder: Pay order
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: >-
+ The amount must be a positive number less than or equal to the outstanding
+ amount
+PayError: Failed to make the payment
+An error has been in the payment: >-
+ It seems that there has been an error in the payment
+Retry: Retry
+Accept: Accept
diff --git a/forms/ecomerce/orders/locale/es.json b/forms/ecomerce/orders/locale/es.json
deleted file mode 100644
index 8366f53b..00000000
--- a/forms/ecomerce/orders/locale/es.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Pedidos abiertos"
-
- ,"StartOrder": "Empezar pedido"
- ,"ContinueOrder": "Continuar pedido"
- ,"OrderNumber": "Nº pedido"
- ,"DateMake": "Fecha de creación"
- ,"DateExit": "Fecha de salida"
- ,"SendMethod": "Forma de envío"
-
- ,"LastOrders": "Últimos pedidos"
-
- ,"Show orders from": "Mostrar pedidos desde"
- ,"Balance:": "Saldo:"
- ,"PaymentInfo": "La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de hoy, no tiene en cuenta pedidos del futuro. Para que tu pedido sea enviado, esta cantidad debe ser igual o mayor que 0. Si quieres realizar una entrega a cuenta, pulsa el botón de pago, borra la cantidad sugerida e introduce la cantidad que desees."
- ,"MakePayment": "Realizar pago"
- ,"Company": "Empresa"
- ,"Pending": "Pendiente"
- ,"Pay": "Pagar"
- ,"Basket": "Cesta"
- ,"ShoppingBasket": "Cesta de la compra"
-
- ,"SeeOrder": "Mostrar detalle del pedido"
- ,"Delivery": "Entrega"
- ,"TicketNumber": "Nº ticket"
- ,"SentAddress": "Dirección de envío"
- ,"Consignee": "Consignatario"
- ,"Boxes": "Bultos"
- ,"TotalWithVAT": "Total con IVA"
- ,"PayOrder": "Pagar pedido"
-
- ,"An error has been in the payment": "Parece que ha habido un error en el pago"
- ,"Retry": "Reintentar"
- ,"Accept": "Aceptar"
-}
diff --git a/forms/ecomerce/orders/locale/es.yml b/forms/ecomerce/orders/locale/es.yml
new file mode 100644
index 00000000..b649cddf
--- /dev/null
+++ b/forms/ecomerce/orders/locale/es.yml
@@ -0,0 +1,37 @@
+OpenOrders: Pedidos abiertos
+StartOrder: Empezar pedido
+ContinueOrder: Continuar pedido
+OrderNumber: Nº pedido
+DateMake: Fecha de creación
+DateExit: Fecha de salida
+SendMethod: Forma de envío
+LastOrders: Últimos pedidos
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+ La cantidad mostrada es tu saldo pendiente (negativa) o favorable a día de
+ hoy, no tiene en cuenta pedidos del futuro. Para que tu pedido sea enviado,
+ esta cantidad debe ser igual o mayor que 0. Si quieres realizar una entrega a
+ cuenta, pulsa el botón de pago, borra la cantidad sugerida e introduce la
+ cantidad que desees.
+MakePayment: Realizar pago
+Company: Empresa
+Pending: Pendiente
+Pay: Pagar
+Basket: Cesta
+ShoppingBasket: Cesta de la compra
+SeeOrder: Mostrar detalle del pedido
+Delivery: Entrega
+TicketNumber: Nº ticket
+SentAddress: Dirección de envío
+Consignee: Consignatario
+Boxes: Bultos
+TotalWithVAT: Total con IVA
+PayOrder: Pagar pedido
+'AmountToPay:': 'Cantidad a pagar (€):'
+AmountError: >-
+ La cantidad debe ser un número positivo e inferior o igual al importe
+ pendiente
+PayError: Error al realizar el pago
+An error has been in the payment: Parece que ha habido un error en el pago
+Retry: Reintentar
+Accept: Aceptar
diff --git a/forms/ecomerce/orders/locale/fr.json b/forms/ecomerce/orders/locale/fr.json
deleted file mode 100644
index a4d08f66..00000000
--- a/forms/ecomerce/orders/locale/fr.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Les commandes ouvertes"
-
- ,"StartOrder": "Acheter"
- ,"ContinueOrder": "Continuer la commande"
- ,"OrderNumber": "Numéro de commande"
- ,"DateMake": "Date de creation"
- ,"DateExit": "Date de sortie"
- ,"SendMethod": "Typo"
-
- ,"LastOrders": "Les dernières commandes"
-
- ,"Show orders from": "Afficher les commandes de"
- ,"Balance:": "Balance:"
- ,"PaymentInfo": "Le montant indiqué est votre pente (négative) ou balance favorable aujourd'hui, ne tient pas compte pour les commandes futures. Obtenir votre commande est expédiée, ce montant doit être égal ou supérieur à 0. Si vous voulez faire un versement, le montant suggéré effacé et entrez le montant que vous souhaitez."
- ,"MakePayment": "Effectuer un paiement"
- ,"Company": "Entreprise"
- ,"Pending": "Pente"
- ,"Pay": "Payer"
- ,"Basket": "Panier"
- ,"ShoppingBasket": "Panier"
-
- ,"SeeOrder": "Votre panier"
- ,"Delivery": "Livraison"
- ,"TicketNumber": "Numéro ticket"
- ,"SentAddress": "Adresse de livraison"
- ,"Consignee": "Destinataire"
- ,"Boxes": "Colis"
- ,"TotalWithVAT": "Total avec TVA"
- ,"PayOrder": "Payer la commande"
-
- ,"An error has been in the payment": "Il semble qu'il ya eu une erreur dans le paiement"
- ,"Retry": "Réessayez"
- ,"Accept": "Accepter"
-}
diff --git a/forms/ecomerce/orders/locale/fr.yml b/forms/ecomerce/orders/locale/fr.yml
new file mode 100644
index 00000000..e10b5d7c
--- /dev/null
+++ b/forms/ecomerce/orders/locale/fr.yml
@@ -0,0 +1,38 @@
+OpenOrders: Les commandes ouvertes
+StartOrder: Acheter
+ContinueOrder: Continuer la commande
+OrderNumber: Numéro de commande
+DateMake: Date de creation
+DateExit: Date de sortie
+SendMethod: Typo
+LastOrders: Les dernières commandes
+'Balance:': 'Balance:'
+PaymentInfo: >-
+ Le montant indiqué est votre pente (négative) ou balance favorable
+ aujourd'hui, ne tient pas compte pour les commandes futures. Obtenir votre
+ commande est expédiée, ce montant doit être égal ou supérieur à 0. Si vous
+ voulez faire un versement, le montant suggéré effacé et entrez le montant que
+ vous souhaitez.
+MakePayment: Effectuer un paiement
+Company: Entreprise
+Pending: Pente
+Pay: Payer
+Basket: Panier
+ShoppingBasket: Panier
+SeeOrder: Votre panier
+Delivery: Livraison
+TicketNumber: Numéro ticket
+SentAddress: Adresse de livraison
+Consignee: Destinataire
+Boxes: Colis
+TotalWithVAT: Total avec TVA
+PayOrder: Payer la commande
+'AmountToPay:': 'Montant à payer (€):'
+AmountError: >-
+ La quantité doit être un neméro positif et inférieur ou égal à la somme
+ restant à payer
+PayError: Impossible d'effectuer le paiement
+An error has been in the payment: >-
+ Il semble qu'il ya eu une erreur dans le paiement
+Retry: Réessayez
+Accept: Accepter
diff --git a/forms/ecomerce/orders/locale/mn.json b/forms/ecomerce/orders/locale/mn.json
deleted file mode 100644
index 4648b67e..00000000
--- a/forms/ecomerce/orders/locale/mn.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Open orders"
-
- ,"StartOrder": "Start order"
- ,"ContinueOrder": "Continue order"
- ,"OrderNumber": "Order number"
- ,"DateMake": "Creation date"
- ,"DateExit": "Shipping date"
- ,"SendMethod": "Delivery method"
-
- ,"LastOrders": "Last orders"
-
- ,"Show orders from": "-Аас харуулах захиалга"
- ,"Balance:": "Balance:"
- ,"PaymentInfo": "Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл тааламжтай тэнцвэр нь өнөөдөр юм. Хэрэв та дүн арилгаж гэж хэлж байсан нь доош нь төлбөр хийж, өөрийн хүссэн хэмжээгээр орж хүсэж байгаа бол таны захиалга ирдэг бол авах, энэ хэмжээ тэнцүү буюу 0-ээс их байх ёстой."
- ,"MakePayment": "Make payment"
- ,"Company": "Company"
- ,"Pending": "Pending"
- ,"Pay": "Pay"
- ,"Basket": "Basket"
- ,"ShoppingBasket": "Shopping basket"
-
- ,"SeeOrder": "Show details of the order"
- ,"Delivery": "Delivery"
- ,"TicketNumber": "Ticket number"
- ,"SentAddress": "Delivery address"
- ,"Consignee": "Consignee"
- ,"Boxes": "Bundles"
- ,"TotalWithVAT": "Total with VAT"
- ,"PayOrder": "Pay order"
-
- ,"An error has been in the payment": "It seems that there has been an error in the payment"
- ,"Retry": "Retry"
- ,"Accept": "Accept"
-}
diff --git a/forms/ecomerce/orders/locale/mn.yml b/forms/ecomerce/orders/locale/mn.yml
new file mode 100644
index 00000000..207a0dac
--- /dev/null
+++ b/forms/ecomerce/orders/locale/mn.yml
@@ -0,0 +1,37 @@
+OpenOrders: Open orders
+StartOrder: Start order
+ContinueOrder: Continue order
+OrderNumber: Order number
+DateMake: Creation date
+DateExit: Shipping date
+SendMethod: Delivery method
+LastOrders: Last orders
+'Balance:': 'Balance:'
+PaymentInfo: >-
+ Үзүүлсэн хэмжээ цаашид захиалга эзэлж биш, таны налуу (сөрөг), эсвэл
+ тааламжтай тэнцвэр нь өнөөдөр юм. Хэрэв та дүн арилгаж гэж хэлж байсан нь доош
+ нь төлбөр хийж, өөрийн хүссэн хэмжээгээр орж хүсэж байгаа бол таны захиалга
+ ирдэг бол авах, энэ хэмжээ тэнцүү буюу 0-ээс их байх ёстой.
+MakePayment: Make payment
+Company: Company
+Pending: Pending
+Pay: Pay
+Basket: Basket
+ShoppingBasket: Shopping basket
+SeeOrder: Show details of the order
+Delivery: Delivery
+TicketNumber: Ticket number
+SentAddress: Delivery address
+Consignee: Consignee
+Boxes: Bundles
+TotalWithVAT: Total with VAT
+PayOrder: Pay order
+'AmountToPay:': 'Amount to pay (€):'
+AmountError: >-
+ The amount must be a positive number less than or equal to the outstanding
+ amount
+PayError: Failed to make the payment
+An error has been in the payment: >-
+ It seems that there has been an error in the payment
+Retry: Retry
+Accept: Accept
diff --git a/forms/ecomerce/orders/locale/pt.json b/forms/ecomerce/orders/locale/pt.json
deleted file mode 100644
index e13d7fa2..00000000
--- a/forms/ecomerce/orders/locale/pt.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "OpenOrders": "Abrir encomendas"
-
- ,"StartOrder": "Iniciar encomenda"
- ,"ContinueOrder": "Continuar encomenda"
- ,"OrderNumber": "Nº pedido"
- ,"DateMake": "Data de criação"
- ,"DateExit": "Data de saída"
- ,"SendMethod": "Forma de envío"
-
- ,"LastOrders": "Últimas encomendas"
-
- ,"Show orders from": "Mostrar ordens de"
- ,"Balance:": "Saldo:"
- ,"PaymentInfo": "A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à conta, clique no botão de pagamento, apague a quantidade sugerida e introduza a quantidade que deseje."
- ,"MakePayment": "Realizar pagamento"
- ,"Company": "Empresa"
- ,"Pending": "Pendente"
- ,"Pay": "Pagar"
- ,"Basket": "Cesta"
- ,"ShoppingBasket": "Cesta da compra"
-
- ,"SeeOrder": "Ver encomenda"
- ,"Delivery": "Entrega"
- ,"TicketNumber": "Nº encomenda"
- ,"SentAddress": "Endereço de envío"
- ,"Consignee": "Consignatario"
- ,"Boxes": "Bultos"
- ,"TotalWithVAT": "Total com IVA"
- ,"PayOrder": "Pagar encomenda"
-
- ,"An error has been in the payment": "Parece que houve um erro no pagamento"
- ,"Retry": "Tentar novamente"
- ,"Accept": "Aceitar"
-}
diff --git a/forms/ecomerce/orders/locale/pt.yml b/forms/ecomerce/orders/locale/pt.yml
new file mode 100644
index 00000000..ff127648
--- /dev/null
+++ b/forms/ecomerce/orders/locale/pt.yml
@@ -0,0 +1,37 @@
+OpenOrders: Abrir encomendas
+StartOrder: Iniciar encomenda
+ContinueOrder: Continuar encomenda
+OrderNumber: Nº pedido
+DateMake: Data de criação
+DateExit: Data de saída
+SendMethod: Forma de envío
+LastOrders: Últimas encomendas
+'Balance:': 'Saldo:'
+PaymentInfo: >-
+ A quantidade mostrada é seu saldo pendente (negativo) ou favorável a dia de
+ hoje, não se vincula a pedidos futuros. Para que seu pedido seja enviado, esta
+ quantidade deve ser igual ou superior a 0. Se queres realizar um depósito à
+ conta, clique no botão de pagamento, apague a quantidade sugerida e introduza
+ a quantidade que deseje.
+MakePayment: Realizar pagamento
+Company: Empresa
+Pending: Pendente
+Pay: Pagar
+Basket: Cesta
+ShoppingBasket: Cesta da compra
+SeeOrder: Ver encomenda
+Delivery: Entrega
+TicketNumber: Nº encomenda
+SentAddress: Endereço de envío
+Consignee: Consignatario
+Boxes: Bultos
+TotalWithVAT: Total com IVA
+PayOrder: Pagar encomenda
+'AmountToPay:': 'Quantidade a pagar (€):'
+AmountError: >-
+ A quantidade deve ser um número positivo e inferior ou igual ao importe
+ pendiente
+PayError: Erro ao realizar o pagamento
+An error has been in the payment: Parece que houve um erro no pagamento
+Retry: Tentar novamente
+Accept: Aceitar
diff --git a/forms/ecomerce/ticket/locale/ca.yml b/forms/ecomerce/ticket/locale/ca.yml
new file mode 100644
index 00000000..a58dc38e
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/ca.yml
@@ -0,0 +1,19 @@
+OrderDetail: Detall de l'encarrec
+Print delivery note: Imprimir albarà
+Agency: Agència
+Warehouse: Magatzem
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base imposable
+VAT: IVA
+ItemNumber: N article
+Amount: Quant
+Item: Article
+Category: Categoria
+S1: Mes
+Stems: Tijes
+Color: Color
+Origin: Orige
+Price: Preu
+Disc: Desc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/en.yml b/forms/ecomerce/ticket/locale/en.yml
new file mode 100644
index 00000000..1df0727f
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/en.yml
@@ -0,0 +1,19 @@
+OrderDetail: Order detail
+Print delivery note: Print delivery note
+Agency: Agency
+Warehouse: Store
+Total: Total
+Total + tax: Total + tax
+Tax base: Tax base
+VAT: VAT
+ItemNumber: Item number
+Amount: Amount
+Item: Item
+Category: Category
+S1: Siz
+Stems: Stems
+Color: Color
+Origin: Origin
+Price: Price
+Disc: Disc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/es.yml b/forms/ecomerce/ticket/locale/es.yml
new file mode 100644
index 00000000..b6696cd5
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/es.yml
@@ -0,0 +1,19 @@
+OrderDetail: Detalle del pedido
+Print delivery note: Imprimir albarán
+Agency: Agencia
+Warehouse: Almacén
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base imponible
+VAT: IVA
+ItemNumber: Nº artículo
+Amount: Cant
+Item: Artículo
+Category: Categoría
+S1: Med
+Stems: Tallos
+Color: Color
+Origin: Origen
+Price: Precio
+Disc: Desc
+Subtotal: Subtotal
diff --git a/forms/ecomerce/ticket/locale/fr.yml b/forms/ecomerce/ticket/locale/fr.yml
new file mode 100644
index 00000000..d766ae19
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/fr.yml
@@ -0,0 +1,19 @@
+OrderDetail: Détails de la commande
+Print delivery note: Imprimer bulletin de livraison
+Agency: Agence
+Warehouse: Entrepôt
+Total: Total
+Total + tax: Total + impôt
+Tax base: Imposable
+VAT: TVA
+ItemNumber: Num article
+Amount: Quant
+Item: Article
+Category: catégorie
+S1: Mes
+Stems: Tiges
+Color: Couleur
+Origin: Origine
+Price: Prix
+Disc: Remise
+Subtotal: Sous-total
diff --git a/forms/ecomerce/ticket/locale/pt.yml b/forms/ecomerce/ticket/locale/pt.yml
new file mode 100644
index 00000000..8c3409e1
--- /dev/null
+++ b/forms/ecomerce/ticket/locale/pt.yml
@@ -0,0 +1,19 @@
+OrderDetail: Detalhes da encomenda
+Print delivery note: Imprimir nota de entrega
+Agency: Agência
+Warehouse: Armazém
+Total: Total
+Total + tax: Total + IVA
+Tax base: Base tributável
+VAT: IVA
+ItemNumber: Nº Ítem
+Amount: Qtde
+Item: Ítem
+Category: Categoría
+S1: Med
+Stems: Pés
+Color: Cor
+Origin: Orígem
+Price: Preço
+Disc: Desc
+Subtotal: Sub-total
diff --git a/forms/ecomerce/ticket/style.css b/forms/ecomerce/ticket/style.css
index 306c69aa..aa99623b 100644
--- a/forms/ecomerce/ticket/style.css
+++ b/forms/ecomerce/ticket/style.css
@@ -8,6 +8,11 @@
border-bottom: 1px solid #DDD;
margin-bottom: 1em;
}
+.ticket .address,
+.ticket .total
+{
+ margin-top: .8em;
+}
.ticket .head > div
{
padding-bottom: .8em;
diff --git a/forms/ecomerce/ticket/ticket.js b/forms/ecomerce/ticket/ticket.js
index ca10d271..78076651 100644
--- a/forms/ecomerce/ticket/ticket.js
+++ b/forms/ecomerce/ticket/ticket.js
@@ -12,6 +12,14 @@ Hedera.Ticket = new Class
this.conn.execQuery ('CALL myTicketLogAccess (#ticket)', params);
}
+ ,onTicketReady: function (form)
+ {
+ if (form.get ('method') != 'PICKUP')
+ Vn.Node.setText (this.$('method'), _('Agency'));
+ else
+ Vn.Node.setText (this.$('method'), _('Warehouse'));
+ }
+
,onPrintClick: function ()
{
var params = {ticket: this.hash.get ('ticket')};
diff --git a/forms/ecomerce/ticket/ui.xml b/forms/ecomerce/ticket/ui.xml
index 2b1f23f4..f76a1a20 100644
--- a/forms/ecomerce/ticket/ui.xml
+++ b/forms/ecomerce/ticket/ui.xml
@@ -2,7 +2,7 @@
+
+
+ DeliveryOrPickupQuestion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/forms/ecomerce/confirm/locale/ca.json b/forms/ecomerce/confirm/locale/ca.json
deleted file mode 100644
index 23040006..00000000
--- a/forms/ecomerce/confirm/locale/ca.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "Checkout": "Finalitzar comanda"
-
- ,"Order summary": "Resum de la comanda"
- ,"Delivery at": "Lliurament el"
- ,"Agency": "Agència"
- ,"Warehouse": "Magatzem"
-
- ,"Previous balance": "Saldo anterior"
- ,"Order total": "Total comanda"
- ,"Order VAT": "IVA comanda"
- ,"Total debt": "Total deute"
- ,"Credit": "Crèdit"
- ,"Exceeded credit": "Crèdit excedit"
-
- ,"Amount to pay": "Quantitat a pagar"
- ,"Pay method": "Mètode de pagament"
-
- ,"Use my balance": "Utilitzar el meu saldo"
- ,"You have a favorable balance.": "No necessites pagar res, tens un saldo favorable."
- ,"Use my credit": "Utilitzar el meu crèdit"
- ,"You have a favorable credit.": "No necessites pagar res, tens crèdit favorable."
- ,"Credit card": "Targeta de crèdit"
- ,"You will be redirected to the payment.": "En confirmar la comanda seràs redirigit a la plataforma de pagament."
- ,"Bank Transfer": "Transferència bancària"
- ,"Make a transfer to one account.": "Fer una transferecia a una de les següents comptes i envia el justificant al teu comercial."
- ,"Pay later": "Pagar més tard"
-
- ,"Modify": "Modificar"
- ,"Confirm": "Confirmar"
-
- ,"Order confirmed successfully": "La teva comanda ha estat realitzat amb èxit"
- ,"Accept": "D'acord"
-
- ,"You have exceeded your credit.": "Has excedit el teu crèdit, si us plau realitza el pagament perquè puguem preparar la teva comanda."
-}
-
diff --git a/forms/ecomerce/confirm/locale/ca.yml b/forms/ecomerce/confirm/locale/ca.yml
new file mode 100644
index 00000000..969c8d00
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/ca.yml
@@ -0,0 +1,31 @@
+Checkout: Finalitzar comanda
+Order summary: Resum de la comanda
+Delivery at: Lliurament el
+Agency: Agència
+Warehouse: Magatzem
+Previous balance: Saldo anterior
+Order total: Total comanda
+Order VAT: IVA comanda
+Total debt: Total deute
+Credit: Crèdit
+Exceeded credit: Crèdit excedit
+Amount to pay: Quantitat a pagar
+Pay method: Mètode de pagament
+Use my balance: Utilitzar el meu saldo
+You have a favorable balance.: 'No necessites pagar res, tens un saldo favorable.'
+Use my credit: Utilitzar el meu crèdit
+You have a favorable credit.: 'No necessites pagar res, tens crèdit favorable.'
+Credit card: Targeta de crèdit
+You will be redirected to the payment.: En confirmar la comanda seràs redirigit a la plataforma de pagament.
+Bank Transfer: Transferència bancària
+Make a transfer to one account.: >-
+ Fer una transferecia a una de les següents comptes i envia el justificant al
+ teu comercial.
+Pay later: Pagar més tard
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: La teva comanda ha estat realitzat amb èxit
+Accept: D'acord
+You have exceeded your credit.: >-
+ Has excedit el teu crèdit, si us plau realitza el pagament perquè puguem
+ preparar la teva comanda.
diff --git a/forms/ecomerce/confirm/locale/en.json b/forms/ecomerce/confirm/locale/en.json
deleted file mode 100644
index 3348d945..00000000
--- a/forms/ecomerce/confirm/locale/en.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "Checkout": "Checkout"
-
- ,"Order summary": "Order summary"
- ,"Delivery at": "Delivery at"
- ,"Agency": "Agency"
- ,"Warehouse": "Store"
-
- ,"Previous balance": "Previous balance"
- ,"Order total": "Order total"
- ,"Order VAT": "Order VAT"
- ,"Total debt": "Total debt"
- ,"Credit": "Credit"
- ,"Exceeded credit": "Exceeded credit"
-
- ,"Amount to pay": "Amount to pay"
- ,"Pay method": "Pay method"
-
- ,"Use my balance": "Use my balance"
- ,"You have a favorable balance.": "You do not need to perform any payment, you have a favorable balance."
- ,"Use my credit": "Use my credit"
- ,"You have a favorable credit.": "You do not need to pay now, you have a favorable credit."
- ,"Credit card": "Credit card"
- ,"You will be redirected to the payment.": "By confirming the order you will be redirected to the payment platform."
- ,"Bank Transfer": "Bank Transfer"
- ,"Make a transfer to one account.": "Make a transfer to one of the following accounts and send the receipt to your salesperson."
- ,"Pay later": "Pay later"
-
- ,"Modify": "Modify"
- ,"Confirm": "Confirm"
-
- ,"Order confirmed successfully": "Your order has been confirmed successfully"
- ,"Accept": "Accept"
-
- ,"You have exceeded your credit.": "You have exceeded your credit, in order to prepare your order please pay your debt."
-}
diff --git a/forms/ecomerce/confirm/locale/en.yml b/forms/ecomerce/confirm/locale/en.yml
new file mode 100644
index 00000000..e2b32f07
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/en.yml
@@ -0,0 +1,31 @@
+Checkout: Checkout
+Order summary: Order summary
+Delivery at: Delivery at
+Agency: Agency
+Warehouse: Store
+Previous balance: Previous balance
+Order total: Order total
+Order VAT: Order VAT
+Total debt: Total debt
+Credit: Credit
+Exceeded credit: Exceeded credit
+Amount to pay: Amount to pay
+Pay method: Pay method
+Use my balance: Use my balance
+You have a favorable balance.: 'You do not need to perform any payment, you have a favorable balance.'
+Use my credit: Use my credit
+You have a favorable credit.: 'You do not need to pay now, you have a favorable credit.'
+Credit card: Credit card
+You will be redirected to the payment.: By confirming the order you will be redirected to the payment platform.
+Bank Transfer: Bank Transfer
+Make a transfer to one account.: >-
+ Make a transfer to one of the following accounts and send the receipt to your
+ salesperson.
+Pay later: Pay later
+Modify: Modify
+Confirm: Confirm
+Order confirmed successfully: Your order has been confirmed successfully
+Accept: Accept
+You have exceeded your credit.: >-
+ You have exceeded your credit, in order to prepare your order please pay your
+ debt.
diff --git a/forms/ecomerce/confirm/locale/es.json b/forms/ecomerce/confirm/locale/es.json
deleted file mode 100644
index 5fac0a00..00000000
--- a/forms/ecomerce/confirm/locale/es.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "Checkout": "Finalizar pedido"
-
- ,"Order summary": "Resumen del pedido"
- ,"Delivery at": "Entrega el"
- ,"Agency": "Agencia"
- ,"Warehouse": "Almacén"
-
- ,"Previous balance": "Saldo anterior"
- ,"Order total": "Total pedido"
- ,"Order VAT": "IVA pedido"
- ,"Total debt": "Total deuda"
- ,"Credit": "Crédito"
- ,"Exceeded credit": "Crédito excedido"
-
- ,"Amount to pay": "Cantidad a pagar"
- ,"Pay method": "Método de pago"
-
- ,"Use my balance": "Usar mi saldo"
- ,"You have a favorable balance.": "No necesitas pagar nada, tienes un saldo favorable."
- ,"Use my credit": "Usar mi crédito"
- ,"You have a favorable credit.": "No necesitas pagar nada, tienes crédito favorable."
- ,"Credit card": "Tarjeta de crédito"
- ,"You will be redirected to the payment.": "Al confirmar el pedido serás redirigido a la plataforma de pago."
- ,"Bank Transfer": "Transferencia bancaria"
- ,"Make a transfer to one account.": "Haz una transferecia a una de las siguientes cuentas y envía el justificante a tu comercial."
- ,"Pay later": "Pagar más tarde"
-
- ,"Modify": "Modificar"
- ,"Confirm": "Confirmar"
-
- ,"Order confirmed successfully": "Tu pedido ha sido realizado con éxito"
- ,"Accept": "Aceptar"
-
- ,"You have exceeded your credit.": "Has excedido tu crédito, por favor realiza el pago para que podamos preparar tu pedido."
-}
diff --git a/forms/ecomerce/confirm/locale/es.yml b/forms/ecomerce/confirm/locale/es.yml
new file mode 100644
index 00000000..e344c094
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/es.yml
@@ -0,0 +1,31 @@
+Checkout: Finalizar pedido
+Order summary: Resumen del pedido
+Delivery at: Entrega el
+Agency: Agencia
+Warehouse: Almacén
+Previous balance: Saldo anterior
+Order total: Total pedido
+Order VAT: IVA pedido
+Total debt: Total deuda
+Credit: Crédito
+Exceeded credit: Crédito excedido
+Amount to pay: Cantidad a pagar
+Pay method: Método de pago
+Use my balance: Usar mi saldo
+You have a favorable balance.: 'No necesitas pagar nada, tienes un saldo favorable.'
+Use my credit: Usar mi crédito
+You have a favorable credit.: 'No necesitas pagar nada, tienes crédito favorable.'
+Credit card: Tarjeta de crédito
+You will be redirected to the payment.: Al confirmar el pedido serás redirigido a la plataforma de pago.
+Bank Transfer: Transferencia bancaria
+Make a transfer to one account.: >-
+ Haz una transferecia a una de las siguientes cuentas y envía el justificante a
+ tu comercial.
+Pay later: Pagar más tarde
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: Tu pedido ha sido realizado con éxito
+Accept: Aceptar
+You have exceeded your credit.: >-
+ Has excedido tu crédito, por favor realiza el pago para que podamos preparar
+ tu pedido.
diff --git a/forms/ecomerce/confirm/locale/fr.json b/forms/ecomerce/confirm/locale/fr.json
deleted file mode 100644
index 31c202f1..00000000
--- a/forms/ecomerce/confirm/locale/fr.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "Checkout": "Finir la commande"
-
- ,"Order summary": "Résumé de la commande"
- ,"Delivery at": "Livraison à"
- ,"Agency": "Agence"
- ,"Warehouse": "Entrepôt"
-
- ,"Previous balance": "Solde précédent"
- ,"Order total": "Total de la commande"
- ,"Order VAT": "TVA de la commande"
- ,"Total debt": "Total de la dette"
- ,"Credit": "Crédit"
- ,"Exceeded credit": "Crédit dépassée"
-
- ,"Amount to pay": "Montant à payer"
- ,"Pay method": "Mode de paiement"
-
- ,"Use my balance": "Utiliser mon équilibre"
- ,"You have a favorable balance.": "Pas besoin de payer quoi que ce soit, vous avez un solde favorable."
- ,"Use my credit": "Utiliser mon crédit"
- ,"You have a favorable credit.": "Pas besoin de payer quoi que ce soit, vous favorable crédit."
- ,"Credit card": "Carte de crédit"
- ,"You will be redirected to the payment.": "En confirmant la commande, vous serez redirigé vers la plateforme de paiement."
- ,"Bank Transfer": "Virement bancaire"
- ,"Make a transfer to one account.": "Faire Transféré à l'un des comptes suivants et envoyer le coupon à votre entreprise."
- ,"Pay later": "Payer plus tard"
-
- ,"Modify": "Modifier"
- ,"Confirm": "Confirmer"
-
- ,"Order confirmed successfully": "Votre commande a été complété avec succès"
- ,"Accept": "OK"
-
- ,"You have exceeded your credit.": "Vous avez dépassé votre crédit, s'il vous plaît effectuer le paiement afin que nous puissions préparer votre commande."
-}
diff --git a/forms/ecomerce/confirm/locale/fr.yml b/forms/ecomerce/confirm/locale/fr.yml
new file mode 100644
index 00000000..743b0222
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/fr.yml
@@ -0,0 +1,31 @@
+Checkout: Finir la commande
+Order summary: Résumé de la commande
+Delivery at: Livraison à
+Agency: Agence
+Warehouse: Entrepôt
+Previous balance: Solde précédent
+Order total: Total de la commande
+Order VAT: TVA de la commande
+Total debt: Total de la dette
+Credit: Crédit
+Exceeded credit: Crédit dépassée
+Amount to pay: Montant à payer
+Pay method: Mode de paiement
+Use my balance: Utiliser mon équilibre
+You have a favorable balance.: 'Pas besoin de payer quoi que ce soit, vous avez un solde favorable.'
+Use my credit: Utiliser mon crédit
+You have a favorable credit.: 'Pas besoin de payer quoi que ce soit, vous favorable crédit.'
+Credit card: Carte de crédit
+You will be redirected to the payment.: 'En confirmant la commande, vous serez redirigé vers la plateforme de paiement.'
+Bank Transfer: Virement bancaire
+Make a transfer to one account.: >-
+ Faire Transféré à l'un des comptes suivants et envoyer le coupon à votre
+ entreprise.
+Pay later: Payer plus tard
+Modify: Modifier
+Confirm: Confirmer
+Order confirmed successfully: Votre commande a été complété avec succès
+Accept: OK
+You have exceeded your credit.: >-
+ Vous avez dépassé votre crédit, s'il vous plaît effectuer le paiement afin que
+ nous puissions préparer votre commande.
diff --git a/forms/ecomerce/confirm/locale/pt.json b/forms/ecomerce/confirm/locale/pt.json
deleted file mode 100644
index 0e70a85a..00000000
--- a/forms/ecomerce/confirm/locale/pt.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "Checkout": "Finalizar encomenda"
-
- ,"Order summary": "Resumo da encomenda"
- ,"Delivery at": "Entrega na"
- ,"Agency": "Agência"
- ,"Warehouse": "Armazém"
-
- ,"Previous balance": "Saldo anterior"
- ,"Order total": "Total pedido"
- ,"Order VAT": "IVA"
- ,"Total debt": "Total dívida"
- ,"Credit": "Crédito"
- ,"Exceeded credit": "Crédito excedido"
-
- ,"Amount to pay": "Valor a pagar"
- ,"Pay method": "Método de pagamento"
-
- ,"Use my balance": "Usar meu saldo"
- ,"You have a favorable balance.": "Não há necessidade de pagar, tens um crédito a seu favor."
- ,"Use my credit": "Usar meu crédito"
- ,"You have a favorable credit.": "Não há necessidade de pagar, tens um crédito à favor."
- ,"Credit card": "Cartão de crédito/debito"
- ,"You will be redirected to the payment.": "Ao confirmar a encomenda, serás re-direcionado à plataforma de pagamento."
- ,"Bank Transfer": "Transferência bancária"
- ,"Make a transfer to one account.": "Faça a transferencia para uma das seguintes contas e envie o comprovativo para seu comercial."
- ,"Pay later": "Pagar mais tarde"
-
- ,"Modify": "Modificar"
- ,"Confirm": "Confirmar"
-
- ,"Order confirmed successfully": "Seu pedido foi realizado com êxito"
- ,"Accept": "Aceitar"
-
- ,"You have exceeded your credit.": "Ultrapassastes seu crédito, por favor, faça o pagamento para que possamos preparar sua encomenda."
-}
diff --git a/forms/ecomerce/confirm/locale/pt.yml b/forms/ecomerce/confirm/locale/pt.yml
new file mode 100644
index 00000000..efc04b53
--- /dev/null
+++ b/forms/ecomerce/confirm/locale/pt.yml
@@ -0,0 +1,31 @@
+Checkout: Finalizar encomenda
+Order summary: Resumo da encomenda
+Delivery at: Entrega na
+Agency: Agência
+Warehouse: Armazém
+Previous balance: Saldo anterior
+Order total: Total pedido
+Order VAT: IVA
+Total debt: Total dívida
+Credit: Crédito
+Exceeded credit: Crédito excedido
+Amount to pay: Valor a pagar
+Pay method: Método de pagamento
+Use my balance: Usar meu saldo
+You have a favorable balance.: 'Não há necessidade de pagar, tens um crédito a seu favor.'
+Use my credit: Usar meu crédito
+You have a favorable credit.: 'Não há necessidade de pagar, tens um crédito à favor.'
+Credit card: Cartão de crédito/debito
+You will be redirected to the payment.: 'Ao confirmar a encomenda, serás re-direcionado à plataforma de pagamento.'
+Bank Transfer: Transferência bancária
+Make a transfer to one account.: >-
+ Faça a transferencia para uma das seguintes contas e envie o comprovativo para
+ seu comercial.
+Pay later: Pagar mais tarde
+Modify: Modificar
+Confirm: Confirmar
+Order confirmed successfully: Seu pedido foi realizado com êxito
+Accept: Aceitar
+You have exceeded your credit.: >-
+ Ultrapassastes seu crédito, por favor, faça o pagamento para que possamos
+ preparar sua encomenda.
diff --git a/forms/ecomerce/confirm/ui.xml b/forms/ecomerce/confirm/ui.xml
index 78b4a248..53024131 100644
--- a/forms/ecomerce/confirm/ui.xml
+++ b/forms/ecomerce/confirm/ui.xml
@@ -6,13 +6,13 @@
CALL basketGetTax;
SELECT o.id, o.date_send, o.note, o.company_id,
ag.description agency, v.code method,
- ad.consignee, ad.zip_code, ad.city, ad.name address,
+ ad.nickname, ad.postalCode, ad.city, ad.street,
t.*, c.credit, myClientGetDebt(NULL) debt
FROM basket o
- JOIN vn2008.Agencias ag ON ag.Id_Agencia = o.agency_id
- LEFT JOIN address_view ad ON ad.id = o.address_id
- JOIN vn2008.Vistas v ON v.vista_id = o.delivery_method_id
- JOIN customer_view c
+ JOIN vn.agencyMode ag ON ag.id = o.agency_id
+ LEFT JOIN myAddress ad ON ad.id = o.address_id
+ JOIN vn.deliveryMethod v ON v.id = o.delivery_method_id
+ JOIN myClient c
JOIN (
SELECT
IFNULL(SUM(taxBase), 0) taxBase,
@@ -43,13 +43,13 @@
+
+
+
+ SELECT a.id, a.nickname, p.name province, a.city, a.street, a.isActive, c.country
+ FROM myAddress a
+ LEFT JOIN vn.province p ON p.id = a.provinceFk
+ JOIN vn.country c ON c.id = p.countryFk
+ WHERE a.isActive
+
+
+
+
+
+>>>>>>> master
+
+
+
+
_AddressQuestion
@@ -114,6 +200,46 @@ show-field="description" on-changed="onFieldChange" model="agencies"/> +======= +
+
+
+ ConfirmToAccessCatalog
+
+
+
+
+
+
+
+
ConfirmToAccessCatalog
+
+
+>>>>>>> master
+
+
+
- {{order.consignee}} + {{order.nickname}}
- {{order.address}} + {{order.street}}
- {{order.zipCode}}, {{order.city}} + {{order.postalCode}}, {{order.city}}
@@ -16,7 +16,7 @@
-
-
+
CALL myTicketGet(#ticket)
@@ -11,23 +11,27 @@
diff --git a/reports/recover-password/locale/en.json b/reports/recover-password/locale/en.json
deleted file mode 100644
index fe974be8..00000000
--- a/reports/recover-password/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Recover password": "Recover password"
- ,"Press on the following link to change your password.":
- "Press on the following link to change your password."
-}
diff --git a/reports/recover-password/locale/en.yml b/reports/recover-password/locale/en.yml
new file mode 100644
index 00000000..80bb6f88
--- /dev/null
+++ b/reports/recover-password/locale/en.yml
@@ -0,0 +1,2 @@
+Recover password: Recover password
+Press on the following link to change your password.: Press on the following link to change your password.
diff --git a/reports/recover-password/locale/es.json b/reports/recover-password/locale/es.json
deleted file mode 100644
index eda30383..00000000
--- a/reports/recover-password/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Recover password": "Restaurar contraseña"
- ,"Press on the following link to change your password.":
- "Presiona en el siguiente link para cambiar tu contraseña."
-}
diff --git a/reports/recover-password/locale/es.yml b/reports/recover-password/locale/es.yml
new file mode 100644
index 00000000..8bd79bc5
--- /dev/null
+++ b/reports/recover-password/locale/es.yml
@@ -0,0 +1,2 @@
+Recover password: Restaurar contraseña
+Press on the following link to change your password.: Presiona en el siguiente link para cambiar tu contraseña.
diff --git a/reports/recover-password/locale/pt.json b/reports/recover-password/locale/pt.json
deleted file mode 100644
index 55ae36e6..00000000
--- a/reports/recover-password/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Recover password": "Recuperar palavra-passe"
- ,"Press on the following link to change your password.":
- "Pressione o botão para modificar sua palavra-passe."
-}
diff --git a/reports/recover-password/locale/pt.yml b/reports/recover-password/locale/pt.yml
new file mode 100644
index 00000000..3c48c01a
--- /dev/null
+++ b/reports/recover-password/locale/pt.yml
@@ -0,0 +1,2 @@
+Recover password: Recuperar palavra-passe
+Press on the following link to change your password.: Pressione o botão para modificar sua palavra-passe.
diff --git a/reports/shelves-report/locale/en.json b/reports/shelves-report/locale/en.json
deleted file mode 100644
index 101d29fc..00000000
--- a/reports/shelves-report/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Start": "Start"
- ,"End": "End"
- ,"Pallet": "Pallet"
-}
diff --git a/reports/shelves-report/locale/en.yml b/reports/shelves-report/locale/en.yml
new file mode 100644
index 00000000..b01366dd
--- /dev/null
+++ b/reports/shelves-report/locale/en.yml
@@ -0,0 +1,3 @@
+Start: Start
+End: End
+Pallet: Pallet
diff --git a/reports/shelves-report/locale/es.json b/reports/shelves-report/locale/es.json
deleted file mode 100644
index f3416e67..00000000
--- a/reports/shelves-report/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Start": "Inicio"
- ,"End": "Fin"
- ,"Pallet": "Palé"
-}
diff --git a/reports/shelves-report/locale/es.yml b/reports/shelves-report/locale/es.yml
new file mode 100644
index 00000000..a821a9ff
--- /dev/null
+++ b/reports/shelves-report/locale/es.yml
@@ -0,0 +1,3 @@
+Start: Inicio
+End: Fin
+Pallet: Palé
diff --git a/reports/shelves-report/locale/pt.json b/reports/shelves-report/locale/pt.json
deleted file mode 100644
index 88d8b0bf..00000000
--- a/reports/shelves-report/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Start": "Inicio"
- ,"End": "Final"
- ,"Pallet": "Palete"
-}
diff --git a/reports/shelves-report/locale/pt.yml b/reports/shelves-report/locale/pt.yml
new file mode 100644
index 00000000..422c7252
--- /dev/null
+++ b/reports/shelves-report/locale/pt.yml
@@ -0,0 +1,3 @@
+Start: Inicio
+End: Final
+Pallet: Palete
diff --git a/rest/core/locale/ca.json b/rest/core/locale/ca.json
deleted file mode 100644
index 3bc546a6..00000000
--- a/rest/core/locale/ca.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "InvalidAction": "Acció invàlida"
-
- ,"EmptyQuery": "Consulta buida"
-}
diff --git a/rest/core/locale/ca.yml b/rest/core/locale/ca.yml
new file mode 100644
index 00000000..fd0c7306
--- /dev/null
+++ b/rest/core/locale/ca.yml
@@ -0,0 +1,2 @@
+InvalidAction: Acció invàlida
+EmptyQuery: Consulta buida
diff --git a/rest/core/locale/en.json b/rest/core/locale/en.json
deleted file mode 100644
index 75f9e384..00000000
--- a/rest/core/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "InvalidAction": "Invalid action"
-
- ,"EmptyQuery": "Empty query"
-}
diff --git a/rest/core/locale/en.yml b/rest/core/locale/en.yml
new file mode 100644
index 00000000..9418df77
--- /dev/null
+++ b/rest/core/locale/en.yml
@@ -0,0 +1,2 @@
+InvalidAction: Invalid action
+EmptyQuery: Empty query
diff --git a/rest/core/locale/es.json b/rest/core/locale/es.json
deleted file mode 100644
index f33bd628..00000000
--- a/rest/core/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "InvalidAction": "Acción inválida"
- ,"EmptyQuery": "Consulta vacía"
- ,"Invalid password": "Contraseña inválida"
- ,"Password does not meet requirements":
- "La nueva contraseña no reune los requisitos de seguridad necesarios"
-}
diff --git a/rest/core/locale/es.yml b/rest/core/locale/es.yml
new file mode 100644
index 00000000..ad0f69fc
--- /dev/null
+++ b/rest/core/locale/es.yml
@@ -0,0 +1,4 @@
+InvalidAction: Acción inválida
+EmptyQuery: Consulta vacía
+Invalid password: Contraseña inválida
+Password does not meet requirements: La nueva contraseña no reune los requisitos de seguridad necesarios
diff --git a/rest/core/locale/fr.json b/rest/core/locale/fr.json
deleted file mode 100644
index a9a18625..00000000
--- a/rest/core/locale/fr.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "InvalidAction": "Action non valide"
-
- ,"EmptyQuery": "Requête vide"
-}
diff --git a/rest/core/locale/fr.yml b/rest/core/locale/fr.yml
new file mode 100644
index 00000000..d34f2b44
--- /dev/null
+++ b/rest/core/locale/fr.yml
@@ -0,0 +1,2 @@
+InvalidAction: Action non valide
+EmptyQuery: Requête vide
diff --git a/rest/core/locale/mn.json b/rest/core/locale/mn.json
deleted file mode 100644
index 75f9e384..00000000
--- a/rest/core/locale/mn.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "InvalidAction": "Invalid action"
-
- ,"EmptyQuery": "Empty query"
-}
diff --git a/rest/core/locale/mn.yml b/rest/core/locale/mn.yml
new file mode 100644
index 00000000..9418df77
--- /dev/null
+++ b/rest/core/locale/mn.yml
@@ -0,0 +1,2 @@
+InvalidAction: Invalid action
+EmptyQuery: Empty query
diff --git a/rest/core/locale/pt.json b/rest/core/locale/pt.json
deleted file mode 100644
index 90823f48..00000000
--- a/rest/core/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "InvalidAction": "Ação Inválida"
-
- ,"EmptyQuery": "Consulta vazía"
-}
diff --git a/rest/core/locale/pt.yml b/rest/core/locale/pt.yml
new file mode 100644
index 00000000..e1e7d8a5
--- /dev/null
+++ b/rest/core/locale/pt.yml
@@ -0,0 +1,2 @@
+InvalidAction: Ação Inválida
+EmptyQuery: Consulta vazía
diff --git a/rest/image/locale/en.json b/rest/image/locale/en.json
deleted file mode 100644
index 1fa3c051..00000000
--- a/rest/image/locale/en.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "Cant lock cache": "The cache could not be blocked"
- ,"Bad file format": "Unrecognized file format"
- ,"File not choosed": "You have not selected any file"
- ,"Permission denied": "You are not allowed to upload the file"
- ,"File upload error": "Failed to upload the file, check that size is not too large"
- ,"File save error": "Failed to save the file: %s"
- ,"File size error": "The file must be no longer than %.2f MB"
- ,"Bad file name": "The file name must contain only lowercase letters, digits or the '_' character"
- ,"Bad schema name": "Invalid schema name"
- ,"Schema not exists": "Schema does not exist"
- ,"Unreferenced file": "The file is not referenced by the database"
- ,"Com error": "Error communicating with the server"
- ,"Image open error": "Error opening the image file"
- ,"Operation disabled": "Operation disabled for security"
- ,"Image added": "Image added correctly"
-
- ,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
- ,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
- ,"ErrPartial": "File was partially uploaded"
- ,"ErrNoFile": "No file was uploaded"
- ,"ErrNoTmpDir": "Missing a temporary folder"
- ,"ErrCantWrite": "Failed to write file to disk"
- ,"ErrExtension": "File upload stopped by extension"
- ,"ErrDefault": "Unknown upload error"
-
- ,"Sync complete": "Synchronization complete"
-}
diff --git a/rest/image/locale/en.yml b/rest/image/locale/en.yml
new file mode 100644
index 00000000..daf21d30
--- /dev/null
+++ b/rest/image/locale/en.yml
@@ -0,0 +1,24 @@
+Cant lock cache: The cache could not be blocked
+Bad file format: Unrecognized file format
+File not choosed: You have not selected any file
+Permission denied: You are not allowed to upload the file
+File upload error: 'Failed to upload the file, check that size is not too large'
+File save error: 'Failed to save the file: %s'
+File size error: The file must be no longer than %.2f MB
+Bad file name: 'The file name must contain only lowercase letters, digits or the ''_'' character'
+Bad schema name: Invalid schema name
+Schema not exists: Schema does not exist
+Unreferenced file: The file is not referenced by the database
+Com error: Error communicating with the server
+Image open error: Error opening the image file
+Operation disabled: Operation disabled for security
+Image added: Image added correctly
+ErrIniSize: File exceeds the upload_max_filesize directive in php.ini
+ErrFormSize: File exceeds the MAX_FILE_SIZE specified in the HTML form
+ErrPartial: File was partially uploaded
+ErrNoFile: No file was uploaded
+ErrNoTmpDir: Missing a temporary folder
+ErrCantWrite: Failed to write file to disk
+ErrExtension: File upload stopped by extension
+ErrDefault: Unknown upload error
+Sync complete: Synchronization complete
diff --git a/rest/image/locale/es.json b/rest/image/locale/es.json
deleted file mode 100644
index 3d51f42e..00000000
--- a/rest/image/locale/es.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "Cant lock cache": "La caché no pudo ser bloqueada"
- ,"Bad file format": "Formato de archivo no reconocido"
- ,"File not choosed": "No has seleccionado ningún archivo"
- ,"Permission denied": "No tienes permiso para subir el fichero"
- ,"File upload error": "Error al subir el fichero, comprueba que su tamaño no sea demasiado grande"
- ,"File save error": "Error al guardar el fichero: %s"
- ,"File size error": "El fichero no debe ocupar más de %.2f MB"
- ,"Bad file name": "El nombre del archivo solo debe contener letras minúsculas, dígitos o el carácter '_'"
- ,"Bad schema name": "Nombre de esquema no válido"
- ,"Schema not exists": "El esquema no existe"
- ,"Unreferenced file": "El archivo no está referenciado por la base de datos"
- ,"Com error": "Error en la comunicación con el servidor"
- ,"Image open error": "Error al abrir el archivo de imagen"
- ,"Operation disabled": "Operación deshabilitada por seguridad"
- ,"Image added": "Imagen añadida correctamente"
-
- ,"ErrIniSize": "File exceeds the upload_max_filesize directive in php.ini"
- ,"ErrFormSize": "File exceeds the MAX_FILE_SIZE specified in the HTML form"
- ,"ErrPartial": "File was partially uploaded"
- ,"ErrNoFile": "No file was uploaded"
- ,"ErrNoTmpDir": "Missing a temporary folder"
- ,"ErrCantWrite": "Failed to write file to disk"
- ,"ErrExtension": "File upload stopped by extension"
- ,"ErrDefault": "Unknown upload error"
-
- ,"Sync complete": "Sincronización completada"
-}
diff --git a/rest/image/locale/es.yml b/rest/image/locale/es.yml
new file mode 100644
index 00000000..16a4e4a5
--- /dev/null
+++ b/rest/image/locale/es.yml
@@ -0,0 +1,26 @@
+Cant lock cache: La caché no pudo ser bloqueada
+Bad file format: Formato de archivo no reconocido
+File not choosed: No has seleccionado ningún archivo
+Permission denied: No tienes permiso para subir el fichero
+File upload error: 'Error al subir el fichero, comprueba que su tamaño no sea demasiado grande'
+File save error: 'Error al guardar el fichero: %s'
+File size error: El fichero no debe ocupar más de %.2f MB
+Bad file name: >-
+ El nombre del archivo solo debe contener letras minúsculas, dígitos o el
+ carácter '_'
+Bad schema name: Nombre de esquema no válido
+Schema not exists: El esquema no existe
+Unreferenced file: El archivo no está referenciado por la base de datos
+Com error: Error en la comunicación con el servidor
+Image open error: Error al abrir el archivo de imagen
+Operation disabled: Operación deshabilitada por seguridad
+Image added: Imagen añadida correctamente
+ErrIniSize: File exceeds the upload_max_filesize directive in php.ini
+ErrFormSize: File exceeds the MAX_FILE_SIZE specified in the HTML form
+ErrPartial: File was partially uploaded
+ErrNoFile: No file was uploaded
+ErrNoTmpDir: Missing a temporary folder
+ErrCantWrite: Failed to write file to disk
+ErrExtension: File upload stopped by extension
+ErrDefault: Unknown upload error
+Sync complete: Sincronización completada
diff --git a/rest/image/locale/pt.json b/rest/image/locale/pt.json
deleted file mode 100644
index 796bd48c..00000000
--- a/rest/image/locale/pt.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "Cant lock cache": "O cache não pôde ser bloqueado"
- ,"Bad file format": "Formato de arquivo inválido"
- ,"File not choosed": "Não selecionastes nenhum arquivo"
- ,"Permission denied": "Não estas autorizado a subir o arquivo"
- ,"File upload error": "Erro ao subir o arquivo, verifique o tamanho"
- ,"File save error": "Erro ao salvar o arquivo: %s"
- ,"File size error": "O arquivo não deve ser maior que: %.2f MB"
- ,"Bad file name": "O nome do arquivo deve conter somente letras minusculas, numeros ou '_' "
- ,"Bad schema name": "Nome de esquema inválido"
- ,"Schema not exists": "Esquema não existe"
- ,"Unreferenced file": "O arquivo não é referenciado pelo banco de dados"
- ,"Com error": "Erro de comunicação com o servidor"
- ,"Image open error": "Erro ao abrir a imagem"
- ,"Operation disabled": "Operação desativada por segurança"
- ,"Image added": "Imagem adicionada corretamente"
-
- ,"ErrIniSize": "Arquivo supera o tamanho maximo de protocolo em php.ini"
- ,"ErrFormSize": "Arquivo supera o tamanho maximo de protocolo em HTML form"
- ,"ErrPartial": "Arquivo subido parcialmente"
- ,"ErrNoFile": "Nenhum arquivo subido"
- ,"ErrNoTmpDir": "Falta a pasta de arquivo temporal"
- ,"ErrCantWrite": "Erro ao gravar arquivo no disco"
- ,"ErrExtension": "Erro de extensão do arquivo"
- ,"ErrDefault": "Erro desconhecido ao subir arquivo"
-
- ,"Sync complete": "Sincronização completa"
-}
diff --git a/rest/image/locale/pt.yml b/rest/image/locale/pt.yml
new file mode 100644
index 00000000..3f072b4d
--- /dev/null
+++ b/rest/image/locale/pt.yml
@@ -0,0 +1,24 @@
+Cant lock cache: O cache não pôde ser bloqueado
+Bad file format: Formato de arquivo inválido
+File not choosed: Não selecionastes nenhum arquivo
+Permission denied: Não estas autorizado a subir o arquivo
+File upload error: 'Erro ao subir o arquivo, verifique o tamanho'
+File save error: 'Erro ao salvar o arquivo: %s'
+File size error: 'O arquivo não deve ser maior que: %.2f MB'
+Bad file name: 'O nome do arquivo deve conter somente letras minusculas, numeros ou ''_'' '
+Bad schema name: Nome de esquema inválido
+Schema not exists: Esquema não existe
+Unreferenced file: O arquivo não é referenciado pelo banco de dados
+Com error: Erro de comunicação com o servidor
+Image open error: Erro ao abrir a imagem
+Operation disabled: Operação desativada por segurança
+Image added: Imagem adicionada corretamente
+ErrIniSize: Arquivo supera o tamanho maximo de protocolo em php.ini
+ErrFormSize: Arquivo supera o tamanho maximo de protocolo em HTML form
+ErrPartial: Arquivo subido parcialmente
+ErrNoFile: Nenhum arquivo subido
+ErrNoTmpDir: Falta a pasta de arquivo temporal
+ErrCantWrite: Erro ao gravar arquivo no disco
+ErrExtension: Erro de extensão do arquivo
+ErrDefault: Erro desconhecido ao subir arquivo
+Sync complete: Sincronização completa
diff --git a/rest/misc/production.php b/rest/misc/production.php
index 62ee72b4..91f7e0b6 100644
--- a/rest/misc/production.php
+++ b/rest/misc/production.php
@@ -6,14 +6,15 @@ class Production extends Vn\Web\JsonRequest
function run ($db)
{
- $row = $db->getObject (
- 'SELECT displayText FROM vn.routeGate WHERE deviceId = #',
- [$_REQUEST['deviceId']]
- );
+ $row = $db->getObject (
+ 'SELECT displayText, status
+ FROM vn.routeGate WHERE deviceId = #',
+ [$_REQUEST['deviceId']]
+ );
- if (!isset($row))
- throw new Vn\Lib\UserException ('Device not found');
+ if (!isset($row))
+ throw new Vn\Lib\UserException ('Device not found');
- return $row->displayText;
+ return $row;
}
}
diff --git a/utils/deploy b/utils/deploy
new file mode 100755
index 00000000..a6526e28
--- /dev/null
+++ b/utils/deploy
@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e
+
+baseDir=$(dirname "$0")
+gitDir="$baseDir/.."
+projectName=$(basename "$(realpath "$gitDir")")
+buildDir="/tmp/git-deploy/$projectName"
+srcDir="$buildDir/src"
+repreproDir="/var/cache/reprepro"
+codename="stable"
+logFile="$buildDir/deploy.log"
+
+echo "Building source code."
+echo " * Directory $buildDir"
+
+rm -f "$logFile"
+
+mkdir -p "$srcDir"
+git --work-tree="$srcDir" --git-dir="$gitDir" checkout -f
+
+if [ -f "$srcDir/package.json" ]
+then
+ echo "Installing Node dependencies."
+ (cd "$srcDir" && npm --silent install >> "$logFile")
+fi
+
+if [ -f "$srcDir/debian/changelog" ]
+then
+ echo "Cleaning last build."
+ rm -f "$buildDir/*.deb"
+ rm -f "$buildDir/*.changes"
+ rm -f "$buildDir/*.build"
+ (cd "$srcDir" && debian/rules clean >> "$logFile")
+
+ echo "Building Debian packages."
+ (cd "$srcDir" && debuild -uc -us -b >> "$logFile")
+
+ echo "Adding packages to repository."
+ packages=""
+
+ cut -d" " -f1 "$srcDir/debian/files" |
+ while read debFile
+ do
+ if [[ ! "$debFile" =~ .*\.deb$ ]]
+ then
+ continue
+ fi
+
+ packageName=$(echo $debFile | cut -d"_" -f1)
+ packages="$packages $packageName"
+
+ echo " * Adding $debFile"
+ reprepro -b "$repreproDir" includedeb $codename "$buildDir/$debFile" >> "$logFile"
+ done
+fi
diff --git a/utils/extract-locale.js b/utils/extract-locale.js
old mode 100644
new mode 100755
index 620f900b..e83f86ee
--- a/utils/extract-locale.js
+++ b/utils/extract-locale.js
@@ -1,3 +1,5 @@
+#!/usr/bin/node
+
var glob = require('glob');
var fs = require('fs-extra');
var path = require('path');
@@ -15,35 +17,34 @@ if (lang == null)
let nTasks;
let projectDir;
-fs.remove(lang, () => {
- fs.realpath(`${__dirname}/..`, (err, realPath) => {
- projectDir = realPath;
- let len = projectDir.length + 1;
-
- glob(`${projectDir}/**/locale/`, (err, localeDirs) => {
- for (let localeDir of localeDirs) {
- localeDir = localeDir.substr(len)
+(async () => {
+ await fs.remove(lang);
+ projectDir = await fs.realpath(`${__dirname}/..`);
- if (/^node_modules\//.test (localeDir))
- continue;
+ projectDir = realPath;
+ let len = projectDir.length + 1;
+
+ glob(`${projectDir}/**/locale/`, async (err, localeDirs) => {
+ if (err) throw err;
- exportLocale(localeDir);
- }
+ for (let localeDir of localeDirs) {
+ localeDir = localeDir.substr(len)
- nTasks = localeDirs.length;
- });
+ if (/^node_modules\//.test (localeDir))
+ continue;
+
+ await exportLocale(localeDir);
+ }
+
+ nTasks = localeDirs.length;
});
-});
+})();
-function exportLocale (localeDir) {
+async function exportLocale (localeDir) {
let dstDir = `${lang}/${localeDir}`;
- fs.mkdirp(dstDir, err => {
- if (err) {
- console.log(err);
- onTaskEnd();
- return;
- }
+ try {
+ await fs.mkdirp(dstDir);
let src, dst;
@@ -56,21 +57,21 @@ function exportLocale (localeDir) {
fs.copy(src, dst, onTaskEnd);
nTasks += 2;
- onTaskEnd();
- });
-}
+ }
+ catch (e) {
+ console.log(err);
+ }
-let output;
-let archive;
-
-function onTaskEnd() {
nTasks--;
if (nTasks > 0) return;
- output = fs.createWriteStream(`${lang}.zip`);
- output.on ('close', onArchiveClose);
+ let output = fs.createWriteStream(`${lang}.zip`);
+ output.on ('close', () =>{
+ fs.remove(lang);
+ console.log ('Export finalized!');
+ });
- archive = archiver('zip', {
+ let archive = archiver('zip', {
zlib: { level: 9 }
});
archive.on ('error', err => {
@@ -80,8 +81,3 @@ function onTaskEnd() {
archive.directory(lang);
archive.finalize();
}
-
-function onArchiveClose() {
- fs.remove(lang);
- console.log ('Export finalized!');
-}
diff --git a/utils/parse-yaml.js b/utils/parse-yaml.js
new file mode 100755
index 00000000..83b89cf0
--- /dev/null
+++ b/utils/parse-yaml.js
@@ -0,0 +1,28 @@
+#!/usr/bin/node
+
+var glob = require('glob');
+var fs = require('fs-extra');
+var yaml = require('js-yaml');
+
+(async () => {
+ let projectDir = await fs.realpath(`${__dirname}/..`);
+
+ glob(`${projectDir}/**/locale/*.json`, async (err, localeFiles) => {
+ if (err) throw err;
+
+ for (let localeFile of localeFiles) {
+ if (/node_modules/.test (localeFile))
+ continue;
+
+ let dstFile = localeFile.replace(/\.json$/, '.yml');
+ let ymlString = yaml.safeDump(require(localeFile));
+ await fs.writeFile(dstFile, ymlString, 'utf8');
+ await fs.unlink(localeFile);
+
+ console.log('->', localeFile);
+ console.log(' ', dstFile);
+ }
+
+ console.log('Total %d files dumped.', localeFiles.length);
+ });
+})();
\ No newline at end of file
diff --git a/utils/upgrade b/utils/upgrade
new file mode 100755
index 00000000..07bbbef9
--- /dev/null
+++ b/utils/upgrade
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+packages=$1
+hosts="www1.static.verdnatura.es www2.static.verdnatura.es"
+
+if [ -z "$packages" ]
+then
+ echo "Usage: $(basename $0) package_name..."
+ exit 1
+fi
+
+# FIXME: Packages are not upgraded when config files are changed
+
+echo "Upgrading servers."
+
+for host in $hosts
+do
+ echo " * Upgrading $host"
+ ssh root@$host "update-repo vn && apt-get install $packages >> /dev/null"
+done
diff --git a/web/locale/en.json b/web/locale/en.json
deleted file mode 100644
index 77ef30c8..00000000
--- a/web/locale/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Something went wrong": "Something went wrong"
- ,"You don't have enough privileges": "You don't have enough privileges"
- ,"Missing parameters": "Missing parameters"
-}
diff --git a/web/locale/en.yml b/web/locale/en.yml
new file mode 100644
index 00000000..440d2a1d
--- /dev/null
+++ b/web/locale/en.yml
@@ -0,0 +1,3 @@
+Something went wrong: Something went wrong
+You don't have enough privileges: You don't have enough privileges
+Missing parameters: Missing parameters
diff --git a/web/locale/es.json b/web/locale/es.json
deleted file mode 100644
index ff5f8aaa..00000000
--- a/web/locale/es.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Something went wrong": "Algo salió mal"
- ,"You don't have enough privileges": "No tienes suficientes privilegios"
- ,"Missing parameters": "Faltan parámetros"
-}
diff --git a/web/locale/es.yml b/web/locale/es.yml
new file mode 100644
index 00000000..93605262
--- /dev/null
+++ b/web/locale/es.yml
@@ -0,0 +1,3 @@
+Something went wrong: Algo salió mal
+You don't have enough privileges: No tienes suficientes privilegios
+Missing parameters: Faltan parámetros
diff --git a/web/locale/pt.json b/web/locale/pt.json
deleted file mode 100644
index 9cc71037..00000000
--- a/web/locale/pt.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "Something went wrong": "Algo deu errado"
- ,"You don't have enough privileges": "Não tens previlegios suficientes"
- ,"Missing parameters": "Faltam parametros"
-}
diff --git a/web/locale/pt.yml b/web/locale/pt.yml
new file mode 100644
index 00000000..110cfeac
--- /dev/null
+++ b/web/locale/pt.yml
@@ -0,0 +1,3 @@
+Something went wrong: Algo deu errado
+You don't have enough privileges: Não tens previlegios suficientes
+Missing parameters: Faltam parametros
diff --git a/webpack.config.js b/webpack.config.js
index a4f28b87..1713a8dc 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,6 +17,7 @@ var baseConfig = {
module: {
rules: [
{ test: /\.css$/, loader: 'style-loader!css-loader' },
+ { test: /\.yml$/, loader: 'json-loader!yaml-loader' },
{ test: /\.xml$/, loader: 'raw-loader' },
{ test: /\.ttf$/, loader: 'file-loader' }
]
diff --git a/webpack.config.json b/webpack.config.json
index 1e418dfa..f775e578 100644
--- a/webpack.config.json
+++ b/webpack.config.json
@@ -3,6 +3,6 @@
"devServerPort": 9000,
"entry": {
"main": "./app.js",
- "vendor": "mootools"
+ "vendor": ["mootools", "js-yaml"]
}
}
\ No newline at end of file
+
-
+
-
CALL myTicketGetRows(#ticket)
diff --git a/forms/news/new/locale/ca.json b/forms/news/new/locale/ca.json
deleted file mode 100644
index 4c85c5b0..00000000
--- a/forms/news/new/locale/ca.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "AddEditNew": "Afegir o editar notícia"
-
- ,"Title": "Títol"
- ,"NewBody": "Cos"
- ,"Tag": "Etiqueta"
- ,"Priority": "Prioritat"
-
- ,"Return": "Tornar"
- ,"Accept": "Acceptar"
-
- ,"NewChangedSuccessfully": "Notícia modificada correctament"
-}
diff --git a/forms/news/new/locale/ca.yml b/forms/news/new/locale/ca.yml
new file mode 100644
index 00000000..405c0281
--- /dev/null
+++ b/forms/news/new/locale/ca.yml
@@ -0,0 +1,8 @@
+AddEditNew: Afegir o editar notícia
+Title: Títol
+NewBody: Cos
+Tag: Etiqueta
+Priority: Prioritat
+Return: Tornar
+Accept: Acceptar
+NewChangedSuccessfully: Notícia modificada correctament
diff --git a/forms/news/new/locale/en.json b/forms/news/new/locale/en.json
deleted file mode 100644
index c6c807b0..00000000
--- a/forms/news/new/locale/en.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "AddEditNew": "Add or edit new"
-
- ,"Title": "Title"
- ,"NewBody": "New body"
- ,"Tag": "Tag"
- ,"Priority": "Priority"
-
- ,"Return": "Return"
- ,"Accept": "Accept"
-
- ,"NewChangedSuccessfully": "New changed successfully"
-}
diff --git a/forms/news/new/locale/en.yml b/forms/news/new/locale/en.yml
new file mode 100644
index 00000000..329071c1
--- /dev/null
+++ b/forms/news/new/locale/en.yml
@@ -0,0 +1,8 @@
+AddEditNew: Add or edit new
+Title: Title
+NewBody: New body
+Tag: Tag
+Priority: Priority
+Return: Return
+Accept: Accept
+NewChangedSuccessfully: New changed successfully
diff --git a/forms/news/new/locale/es.json b/forms/news/new/locale/es.json
deleted file mode 100644
index 2b9b2ca4..00000000
--- a/forms/news/new/locale/es.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "AddEditNew": "Añadir o editar noticia"
-
- ,"Title": "Título"
- ,"NewBody": "Cuerpo"
- ,"Tag": "Etiqueta"
- ,"Priority": "Prioridad"
-
- ,"Return": "Volver"
- ,"Accept": "Aceptar"
-
- ,"NewChangedSuccessfully": "Noticia modificada correctamente"
-}
diff --git a/forms/news/new/locale/es.yml b/forms/news/new/locale/es.yml
new file mode 100644
index 00000000..6e53ffa3
--- /dev/null
+++ b/forms/news/new/locale/es.yml
@@ -0,0 +1,8 @@
+AddEditNew: Añadir o editar noticia
+Title: Título
+NewBody: Cuerpo
+Tag: Etiqueta
+Priority: Prioridad
+Return: Volver
+Accept: Aceptar
+NewChangedSuccessfully: Noticia modificada correctamente
diff --git a/forms/news/new/locale/fr.json b/forms/news/new/locale/fr.json
deleted file mode 100644
index a178493f..00000000
--- a/forms/news/new/locale/fr.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "AddEditNew": "Ajouter ou editer nouvelles"
-
- ,"Title": "Titre"
- ,"NewBody": "Corps"
- ,"Tag": "Tag"
- ,"Priority": "Priorité"
-
- ,"Return": "Reviens"
- ,"Accept": "Accepter"
-
- ,"NewChangedSuccessfully": "Nouvelles modifié avec succès"
-}
diff --git a/forms/news/new/locale/fr.yml b/forms/news/new/locale/fr.yml
new file mode 100644
index 00000000..06e6291d
--- /dev/null
+++ b/forms/news/new/locale/fr.yml
@@ -0,0 +1,8 @@
+AddEditNew: Ajouter ou editer nouvelles
+Title: Titre
+NewBody: Corps
+Tag: Tag
+Priority: Priorité
+Return: Reviens
+Accept: Accepter
+NewChangedSuccessfully: Nouvelles modifié avec succès
diff --git a/forms/news/new/locale/pt.json b/forms/news/new/locale/pt.json
deleted file mode 100644
index e35497ff..00000000
--- a/forms/news/new/locale/pt.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "AddEditNew": "Adicionar ou editar notícia"
-
- ,"Title": "Título"
- ,"NewBody": "Corpo"
- ,"Tag": "Etiqueta"
- ,"Priority": "Prioridade"
-
- ,"Return": "Voltar"
- ,"Accept": "Aceitar"
-
- ,"NewChangedSuccessfully": "Noticia modificada corretamente"
-}
diff --git a/forms/news/new/locale/pt.yml b/forms/news/new/locale/pt.yml
new file mode 100644
index 00000000..c789b2e7
--- /dev/null
+++ b/forms/news/new/locale/pt.yml
@@ -0,0 +1,8 @@
+AddEditNew: Adicionar ou editar notícia
+Title: Título
+NewBody: Corpo
+Tag: Etiqueta
+Priority: Prioridade
+Return: Voltar
+Accept: Aceitar
+NewChangedSuccessfully: Noticia modificada corretamente
diff --git a/forms/news/news/locale/ca.json b/forms/news/news/locale/ca.json
deleted file mode 100644
index 00f6b71a..00000000
--- a/forms/news/news/locale/ca.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "NewsManagement": "Gestió de noticies"
-
- ,"AddNew": "Afegir noticia"
- ,"EditNew": "Edita notícia"
-
- ,"NewNum": "N notícia"
- ,"Date": "Data"
- ,"Author": "Autor"
- ,"Title": "Títol"
- ,"Priority": "Prioritat"
-}
diff --git a/forms/news/news/locale/ca.yml b/forms/news/news/locale/ca.yml
new file mode 100644
index 00000000..53773038
--- /dev/null
+++ b/forms/news/news/locale/ca.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestió de noticies
+AddNew: Afegir noticia
+EditNew: Edita notícia
+NewNum: N notícia
+Date: Data
+Author: Autor
+Title: Títol
+Priority: Prioritat
diff --git a/forms/news/news/locale/en.json b/forms/news/news/locale/en.json
deleted file mode 100644
index b263c5d0..00000000
--- a/forms/news/news/locale/en.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "NewsManagement": "News management"
-
- ,"AddNew": "Add new"
- ,"EditNew": "Edit new"
-
- ,"NewNum": "New number"
- ,"Date": "Date"
- ,"Author": "Author"
- ,"Title": "Title"
- ,"Priority": "Priority"
-}
diff --git a/forms/news/news/locale/en.yml b/forms/news/news/locale/en.yml
new file mode 100644
index 00000000..3b49fc93
--- /dev/null
+++ b/forms/news/news/locale/en.yml
@@ -0,0 +1,8 @@
+NewsManagement: News management
+AddNew: Add new
+EditNew: Edit new
+NewNum: New number
+Date: Date
+Author: Author
+Title: Title
+Priority: Priority
diff --git a/forms/news/news/locale/es.json b/forms/news/news/locale/es.json
deleted file mode 100644
index 89bb2d28..00000000
--- a/forms/news/news/locale/es.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "NewsManagement": "Gestión de noticias"
-
- ,"AddNew": "Añadir noticia"
- ,"EditNew": "Editar noticia"
-
- ,"NewNum": "Nº noticia"
- ,"Date": "Fecha"
- ,"Author": "Autor"
- ,"Title": "Título"
- ,"Priority": "Prioridad"
-}
diff --git a/forms/news/news/locale/es.yml b/forms/news/news/locale/es.yml
new file mode 100644
index 00000000..17d42a6e
--- /dev/null
+++ b/forms/news/news/locale/es.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestión de noticias
+AddNew: Añadir noticia
+EditNew: Editar noticia
+NewNum: Nº noticia
+Date: Fecha
+Author: Autor
+Title: Título
+Priority: Prioridad
diff --git a/forms/news/news/locale/fr.json b/forms/news/news/locale/fr.json
deleted file mode 100644
index acd4ebf4..00000000
--- a/forms/news/news/locale/fr.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "NewsManagement": "Gestion des nouvelles"
-
- ,"AddNew": "Ajouter nouvelles"
- ,"EditNew": "Modifier nouvelles"
-
- ,"NewNum": "Nº nouvelles"
- ,"Date": "Date"
- ,"Author": "Auteur"
- ,"Title": "Titre"
- ,"Priority": "Priorité"
-}
diff --git a/forms/news/news/locale/fr.yml b/forms/news/news/locale/fr.yml
new file mode 100644
index 00000000..7df649c1
--- /dev/null
+++ b/forms/news/news/locale/fr.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestion des nouvelles
+AddNew: Ajouter nouvelles
+EditNew: Modifier nouvelles
+NewNum: Nº nouvelles
+Date: Date
+Author: Auteur
+Title: Titre
+Priority: Priorité
diff --git a/forms/news/news/locale/pt.json b/forms/news/news/locale/pt.json
deleted file mode 100644
index 4f7c611a..00000000
--- a/forms/news/news/locale/pt.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "NewsManagement": "Gestão de noticias"
-
- ,"AddNew": "Adicionar noticia"
- ,"EditNew": "Editar noticia"
-
- ,"NewNum": "Nº noticia"
- ,"Date": "Data"
- ,"Author": "Autor"
- ,"Title": "Título"
- ,"Priority": "Prioridade"
-}
diff --git a/forms/news/news/locale/pt.yml b/forms/news/news/locale/pt.yml
new file mode 100644
index 00000000..9503aac0
--- /dev/null
+++ b/forms/news/news/locale/pt.yml
@@ -0,0 +1,8 @@
+NewsManagement: Gestão de noticias
+AddNew: Adicionar noticia
+EditNew: Editar noticia
+NewNum: Nº noticia
+Date: Data
+Author: Autor
+Title: Título
+Priority: Prioridade
diff --git a/forms/reports/items-form/locale/en.json b/forms/reports/items-form/locale/en.json
deleted file mode 100644
index 53a2579c..00000000
--- a/forms/reports/items-form/locale/en.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Item list": "Item list"
-
- ,"Store": "Store"
- ,"Realm": "Realm"
- ,"Rate": "Rate"
-
- ,"Preview": "Preview"
-}
diff --git a/forms/reports/items-form/locale/en.yml b/forms/reports/items-form/locale/en.yml
new file mode 100644
index 00000000..3ef8e761
--- /dev/null
+++ b/forms/reports/items-form/locale/en.yml
@@ -0,0 +1,5 @@
+Item list: Item list
+Store: Store
+Realm: Realm
+Rate: Rate
+Preview: Preview
diff --git a/forms/reports/items-form/locale/es.json b/forms/reports/items-form/locale/es.json
deleted file mode 100644
index 68eee4ef..00000000
--- a/forms/reports/items-form/locale/es.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Item list": "Listado de artículos"
-
- ,"Store": "Almacén"
- ,"Realm": "Reino"
- ,"Rate": "Tarifa"
-
- ,"Preview": "Mostrar"
-}
diff --git a/forms/reports/items-form/locale/es.yml b/forms/reports/items-form/locale/es.yml
new file mode 100644
index 00000000..816be9c0
--- /dev/null
+++ b/forms/reports/items-form/locale/es.yml
@@ -0,0 +1,5 @@
+Item list: Listado de artículos
+Store: Almacén
+Realm: Reino
+Rate: Tarifa
+Preview: Mostrar
diff --git a/forms/reports/items-form/locale/pt.json b/forms/reports/items-form/locale/pt.json
deleted file mode 100644
index 8bf6f7f2..00000000
--- a/forms/reports/items-form/locale/pt.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Item list": "Lista de Ítens"
-
- ,"Store": "Armazém"
- ,"Realm": "Reino"
- ,"Rate": "Tarifa"
-
- ,"Preview": "Mostrar"
-}
diff --git a/forms/reports/items-form/locale/pt.yml b/forms/reports/items-form/locale/pt.yml
new file mode 100644
index 00000000..f38a6b34
--- /dev/null
+++ b/forms/reports/items-form/locale/pt.yml
@@ -0,0 +1,5 @@
+Item list: Lista de Ítens
+Store: Armazém
+Realm: Reino
+Rate: Tarifa
+Preview: Mostrar
diff --git a/forms/cms/training/locale/pt.json b/forms/reports/shelves/locale/ca.yml
similarity index 100%
rename from forms/cms/training/locale/pt.json
rename to forms/reports/shelves/locale/ca.yml
diff --git a/forms/reports/shelves/locale/en.yml b/forms/reports/shelves/locale/en.yml
new file mode 100644
index 00000000..67838b82
--- /dev/null
+++ b/forms/reports/shelves/locale/en.yml
@@ -0,0 +1,15 @@
+Configuration: Configuration
+Select config: Select config
+Reign: Reign
+Family: Family
+Store: Store
+Date: Date
+Shelf: Shelf
+Name prefix: Name prefix
+Limit amount per item: Limit amount per item
+Title: Title
+Show packing: Show packing
+Stack different items: Stack different items
+Preview: Preview
+Pallets: Pallets
+'No items found, check that all fields are correct': 'No items found, check that all fields are correct'
diff --git a/forms/reports/shelves/locale/es.json b/forms/reports/shelves/locale/es.json
deleted file mode 100644
index 74dc9a12..00000000
--- a/forms/reports/shelves/locale/es.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "Configuration": "Configuración"
- ,"Select config": "Selecciona configuración"
- ,"Reign": "Reino"
- ,"Family": "Familia"
- ,"Store": "Almacén"
- ,"Date": "Fecha"
- ,"Shelf": "Estantería"
- ,"Name prefix": "Prefijo del nombre"
- ,"Limit amount per item": "Límite de cantidad por artículo"
- ,"Title": "Título"
- ,"Show packing": "Mostrar unidades por caja"
- ,"Stack different items": "Apilar artículos distintos"
- ,"Use ids instead of names": "Usar ids en vez de nombres"
-
- ,"Show": "Mostrar"
-
- ,"Pallets": "Palets"
-
- ,"No items found, check that all fields are correct":
- "No se han encontrado artículos, comprueba que todos los campos son correctos"
-}
diff --git a/forms/reports/shelves/locale/es.yml b/forms/reports/shelves/locale/es.yml
new file mode 100644
index 00000000..955788d2
--- /dev/null
+++ b/forms/reports/shelves/locale/es.yml
@@ -0,0 +1,15 @@
+Configuration: Configuración
+Select config: Selecciona configuración
+Reign: Reino
+Family: Familia
+Store: Almacén
+Date: Fecha
+Shelf: Estantería
+Name prefix: Prefijo del nombre
+Limit amount per item: Límite de cantidad por artículo
+Title: Título
+Show packing: Mostrar unidades por caja
+Stack different items: Apilar artículos distintos
+Preview: Mostrar
+Pallets: Palets
+'No items found, check that all fields are correct': 'No se han encontrado artículos, comprueba que todos los campos son correctos'
diff --git a/forms/reports/shelves/locale/fr.json b/forms/reports/shelves/locale/fr.json
deleted file mode 100644
index 0e6a7389..00000000
--- a/forms/reports/shelves/locale/fr.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "Configuration": "Configuration"
- ,"Select config": "Select config"
- ,"Reign": "Reign"
- ,"Family": "Family"
- ,"Store": "Store"
- ,"Date": "Date"
- ,"Shelf": "Shelf"
- ,"Name prefix": "Name prefix"
- ,"Limit amount per item": "Limit amount per item"
- ,"Title": "Title"
- ,"Show packing": "Show packing"
- ,"Stack different items": "Stack different items"
- ,"Use ids instead of names": "Use ids instead of names"
-
- ,"Show": "Show"
-
- ,"Pallets": "Pallets"
-
- ,"No items found, check that all fields are correct":
- "No items found, check that all fields are correct"
-}
diff --git a/forms/reports/shelves/locale/ca.json b/forms/reports/shelves/locale/fr.yml
similarity index 100%
rename from forms/reports/shelves/locale/ca.json
rename to forms/reports/shelves/locale/fr.yml
diff --git a/forms/reports/shelves/locale/pt.json b/forms/reports/shelves/locale/pt.json
deleted file mode 100644
index 58e062c4..00000000
--- a/forms/reports/shelves/locale/pt.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "Configuration": "Configuração"
- ,"Select config": "Selecione a configuração"
- ,"Reign": "Reino"
- ,"Family": "Familia"
- ,"Store": "Armazém"
- ,"Date": "Data"
- ,"Shelf": "Pratilheira"
- ,"Name prefix": "Prefixo do nome"
- ,"Limit amount per item": "Limíte de quantidade por ítem"
- ,"Title": "Título"
- ,"Show packing": "Mostrar unidades por caixa"
- ,"Stack different items": "Empilhar ítens diferentes"
- ,"Use ids instead of names": "Usar ids en vez de nombres"
-
- ,"Show": "Mostrar"
-
- ,"Pallets": "Palets"
-
- ,"No items found, check that all fields are correct":
- "Nenhum ítem encontrado, comprove que todos os campos estão corretos"
-}
diff --git a/forms/reports/shelves/locale/pt.yml b/forms/reports/shelves/locale/pt.yml
new file mode 100644
index 00000000..3a02ba9d
--- /dev/null
+++ b/forms/reports/shelves/locale/pt.yml
@@ -0,0 +1,15 @@
+Configuration: Configuração
+Select config: Selecione a configuração
+Reign: Reino
+Family: Familia
+Store: Armazém
+Date: Data
+Shelf: Pratilheira
+Name prefix: Prefixo do nome
+Limit amount per item: Limíte de quantidade por ítem
+Title: Título
+Show packing: Mostrar unidades por caixa
+Stack different items: Empilhar ítens diferentes
+Preview: Mostrar
+Pallets: Palets
+'No items found, check that all fields are correct': 'Nenhum ítem encontrado, comprove que todos os campos estão corretos'
diff --git a/hedera-web.php b/hedera-web.php
index 90d013e9..64b37b43 100755
--- a/hedera-web.php
+++ b/hedera-web.php
@@ -6,4 +6,3 @@ require_once 'vn-autoload.php';
$cliApp = new Vn\Lib\CliApp ('hedera-web', __DIR__.'/rest');
$cliApp->run ();
-
diff --git a/js/db/locale/ca.json b/js/db/locale/ca.json
deleted file mode 100644
index 64e50adf..00000000
--- a/js/db/locale/ca.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ConnError": "Error en la conexió"
- ,"BadServerReply": "Resposta del servidor incorrecta"
- ,"ModelNotUpdatable": "Aquest model no és actualitzable"
- ,"RowNotExists": "El registre no existeix o ha sigut esborrat"
- ,"ColNotExists": "La columna no existeix"
-}
diff --git a/js/db/locale/ca.yml b/js/db/locale/ca.yml
new file mode 100644
index 00000000..8ab1a7b3
--- /dev/null
+++ b/js/db/locale/ca.yml
@@ -0,0 +1,5 @@
+ConnError: Error en la conexió
+BadServerReply: Resposta del servidor incorrecta
+ModelNotUpdatable: Aquest model no és actualitzable
+RowNotExists: El registre no existeix o ha sigut esborrat
+ColNotExists: La columna no existeix
diff --git a/js/db/locale/en.json b/js/db/locale/en.json
deleted file mode 100644
index 0ea58851..00000000
--- a/js/db/locale/en.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ConnError": "Connection failed"
- ,"BadServerReply": "Bad server reply"
- ,"ModelNotUpdatable": "Model not updatable"
- ,"RowNotExists": "The record does not exist or has been deleted"
- ,"ColNotExists": "The column does not exist"
-}
diff --git a/js/db/locale/en.yml b/js/db/locale/en.yml
new file mode 100644
index 00000000..576730a6
--- /dev/null
+++ b/js/db/locale/en.yml
@@ -0,0 +1,5 @@
+ConnError: Connection failed
+BadServerReply: Bad server reply
+ModelNotUpdatable: Model not updatable
+RowNotExists: The record does not exist or has been deleted
+ColNotExists: The column does not exist
diff --git a/js/db/locale/es.json b/js/db/locale/es.json
deleted file mode 100644
index 91143f97..00000000
--- a/js/db/locale/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ConnError": "Error en la conexión"
- ,"BadServerReply": "Respuesta del servidor incorrecta"
- ,"ModelNotUpdatable": "Este modelo no es actualizable"
- ,"RowNotExists": "El registro no existe o a sido borrado"
- ,"ColNotExists": "La columna no existe"
-}
diff --git a/js/db/locale/es.yml b/js/db/locale/es.yml
new file mode 100644
index 00000000..24919c17
--- /dev/null
+++ b/js/db/locale/es.yml
@@ -0,0 +1,5 @@
+ConnError: Error en la conexión
+BadServerReply: Respuesta del servidor incorrecta
+ModelNotUpdatable: Este modelo no es actualizable
+RowNotExists: El registro no existe o a sido borrado
+ColNotExists: La columna no existe
diff --git a/js/db/locale/fr.json b/js/db/locale/fr.json
deleted file mode 100644
index 5a72cce1..00000000
--- a/js/db/locale/fr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ConnError": "Échec de la connexion"
- ,"BadServerReply": "Réponse du serveur incorrecte"
- ,"ModelNotUpdatable": "Ce modèle n'est pas modifiable"
- ,"RowNotExists": "Le dossier n'existe pas ou a été supprimée"
- ,"ColNotExists": "N'existe pas la colonne"
-}
diff --git a/js/db/locale/fr.yml b/js/db/locale/fr.yml
new file mode 100644
index 00000000..61a6b792
--- /dev/null
+++ b/js/db/locale/fr.yml
@@ -0,0 +1,5 @@
+ConnError: Échec de la connexion
+BadServerReply: Réponse du serveur incorrecte
+ModelNotUpdatable: Ce modèle n'est pas modifiable
+RowNotExists: Le dossier n'existe pas ou a été supprimée
+ColNotExists: N'existe pas la colonne
diff --git a/js/db/locale/pt.json b/js/db/locale/pt.json
deleted file mode 100644
index 61a926dc..00000000
--- a/js/db/locale/pt.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "ConnError": "Erro de conexão"
- ,"BadServerReply": "Má Resposta do servidor"
- ,"ModelNotUpdatable": "Este modelo não está actualizado"
- ,"RowNotExists": "O Registro não existe ou foi apagado"
- ,"ColNotExists": "A Coluna não existe"
-}
diff --git a/js/db/locale/pt.yml b/js/db/locale/pt.yml
new file mode 100644
index 00000000..1fff629c
--- /dev/null
+++ b/js/db/locale/pt.yml
@@ -0,0 +1,5 @@
+ConnError: Erro de conexão
+BadServerReply: Má Resposta do servidor
+ModelNotUpdatable: Este modelo não está actualizado
+RowNotExists: O Registro não existe ou foi apagado
+ColNotExists: A Coluna não existe
diff --git a/js/hedera/gui.css b/js/hedera/gui.css
index 32e4f3b1..04cb1b37 100644
--- a/js/hedera/gui.css
+++ b/js/hedera/gui.css
@@ -192,9 +192,8 @@
.hedera-gui ._test-link
{
- display: block;
- margin: 1em auto;
- max-width: 70%;
+ display: none;
+ margin: .5em;
background-color: #3f51b5;
color: white;
padding: 0 1em;
@@ -206,6 +205,24 @@
{
background-color: #4f61c5;
}
+.vn-gui .dev-info
+{
+ display: none;
+ padding: .3em .5em;
+ color: white;
+ background-color: #3f51b5;
+ font-size: .9em;
+ margin: .5em;
+ border-radius: .1em;
+}
+.vn-gui .dev-info > p
+{
+ margin: .2em 0;
+}
+.vn-gui .dev-info > .mode
+{
+ color: #BBF;
+}
/* Menu */
diff --git a/js/hedera/gui.js b/js/hedera/gui.js
index 60cb45ff..d88df940 100644
--- a/js/hedera/gui.js
+++ b/js/hedera/gui.js
@@ -144,18 +144,30 @@ module.exports = new Class
Object.assign (Vn.Config, resultSet.fetchRow ());
Vn.Config.imageUrl = resultSet.fetchValue ();
+ // Retrieving configuration parameters
+
+ var isTesting = !resultSet.fetchValue ();
+
+ if (isTesting)
+ {
+ this.$.devInfo.style.display = 'block';
+ this.$.version.textContent = Vn.Cookie.get ('vnVersion');
+ }
+
+ // Retrieving configuration parameters
+
var row = resultSet.fetchRow ();
if (row && row.test_domain)
{
if (location.host != row.production_domain)
{
- var linkText = 'ReturnToOldWebsite';
+ var linkText = 'Old website';
var linkField = 'production_domain';
}
else
{
- var linkText = 'TestTheNewWebsite';
+ var linkText = 'Test the new website';
var linkField = 'test_domain';
}
@@ -163,6 +175,7 @@ module.exports = new Class
text: _(linkText),
link: '//'+ row[linkField]
});
+ this.$.testLink.style.display = 'block';
}
else
Vn.Node.hide (this.$.testLink);
diff --git a/js/hedera/gui.xml b/js/hedera/gui.xml
index eb4d93a6..ce9126e1 100644
--- a/js/hedera/gui.xml
+++ b/js/hedera/gui.xml
@@ -6,6 +6,7 @@
SELECT default_form FROM config;
SELECT url FROM imageConfig;
+ SELECT dbproduccion FROM vn2008.tblContadores;
SELECT production_domain, test_domain FROM config;
+ @{{ticket.id}} @@ -24,11 +24,11 @@
- _Delivery {{ticket.agency}} + {{ticket.agency}}
+{{ticket.nickname}}
@@ -39,7 +39,7 @@ {{ticket.postalCode}} {{ticket.city}} ({{ticket.province}})
+
-
+
_Total
@@ -34,6 +35,10 @@
+
{{newVersion.text}}
diff --git a/js/hedera/locale/ca.json b/js/hedera/locale/ca.json
deleted file mode 100644
index 74d4d783..00000000
--- a/js/hedera/locale/ca.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "Usuari"
- ,"Password": "Contrasenya"
- ,"Beta": "Beta"
- ,"Do not sign out": "No tancar sessió"
- ,"Log in as guest": "Accedir com a convidat"
- ,"Enter": "Entrar"
- ,"Login mail": "clientes@verdnatura.es"
- ,"Login phone": "+34 607 562 391"
- ,"Password forgotten? Push here": "¿Has oblidat la teva contrasenya?"
- ,"Yet you are not a customer?": "Encara no ets client?"
- ,"Sign up": "Registrarme"
-
- ,"You've been too idle": "Has estat massa temps inactiu i la sessió ha expirat"
- ,"Invalid login": "Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula i minúscula"
- ,"Please write your user name": "Si us plau introdueix el teu nom d'usuari"
- ,"A mail has been sent wich you can recover your password": "T'hem enviat un correu on podràs recuperar la teva contrasenya"
-
- ,"Menu": "Menú"
- ,"Exit": "Sortir"
- ,"Test the new website": "Prova la nova web!"
- ,"Old website": "Web antiga"
- ,"Recent changes": "Canvis recents"
-
- ,"Print": "Imprimir"
- ,"Please unlock popups and try again":
- "Si us plau, desbloqueja els popups i torna-ho a intentar"
-
- ,"Error loading form": "Error al carregar formulari"
- ,"Error loading report": "Error en carregar l'informe"
- ,"By using this site you accept cookies": "En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització de continguts i anàlisi."
- ,"New version available": "Hi ha una nova actualització, la pàgina recarregarà automàticament per descarregar-la"
-
- ,"AppName": "Verdnatura"
-
- ,"Home": "Inici"
- ,"Orders": "Encàrrecs"
- ,"Basket": "Cistella"
- ,"Last orders": "Últims comandes"
- ,"Invoices": "Factures"
- ,"Catalog": "Catàleg"
- ,"About": "Coneix-nos"
- ,"About us": "Quant a"
- ,"Why": "Per què?"
- ,"Location": "Localització"
- ,"Administration": "Administració"
- ,"Control panel": "Panell de control"
- ,"Users": "Usuaris"
- ,"Connections": "Conexions"
- ,"Visits": "Visites"
- ,"News": "Noticies"
- ,"Photos": "Fotos"
- ,"Items": "Artícles"
- ,"Reports": "Informes"
- ,"Shelves": "Estanterías"
- ,"Items list": "Llistat articles"
- ,"Contact": "Vull ser client"
- ,"Training": "Formació"
- ,"Agencies": "Agències"
- ,"Configuration": "Configuració"
- ,"Account": "Compte"
- ,"Addresses": "Direccions"
-
- ,"AmountToPay:": "Quantitat a pagar (€):"
- ,"AmountError": "La quantitat ha de ser un nombre positiu"
- ,"PayError": "Error al realitzar el pagament"
-}
diff --git a/js/hedera/locale/ca.yml b/js/hedera/locale/ca.yml
new file mode 100644
index 00000000..10db75d8
--- /dev/null
+++ b/js/hedera/locale/ca.yml
@@ -0,0 +1,60 @@
+User: Usuari
+Password: Contrasenya
+Beta: Beta
+Do not sign out: No tancar sessió
+Log in as guest: Accedir com a convidat
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: ¿Has oblidat la teva contrasenya?
+Yet you are not a customer?: Encara no ets client?
+Sign up: Registrarme
+You've been too idle: Has estat massa temps inactiu i la sessió ha expirat
+Invalid login: >-
+ Usuari o contrasenya incorrectes, recorda que s'hi distingeix entre majúscula
+ i minúscula
+Please write your user name: Si us plau introdueix el teu nom d'usuari
+A mail has been sent wich you can recover your password: T'hem enviat un correu on podràs recuperar la teva contrasenya
+Menu: Menú
+Exit: Sortir
+Test the new website: Prova la nova web!
+Old website: Web antiga
+Recent changes: Canvis recents
+Print: Imprimir
+Please unlock popups and try again: 'Si us plau, desbloqueja els popups i torna-ho a intentar'
+Error loading form: Error al carregar formulari
+Error loading report: Error en carregar l'informe
+By using this site you accept cookies: >-
+ En utilitzar aquest lloc web acceptes l'ús de cookies per a la personalització
+ de continguts i anàlisi.
+New version available: >-
+ Hi ha una nova actualització, la pàgina recarregarà automàticament per
+ descarregar-la
+AppName: Verdnatura
+Home: Inici
+Orders: Encàrrecs
+Basket: Cistella
+Last orders: Últims comandes
+Invoices: Factures
+Catalog: Catàleg
+About: Coneix-nos
+About us: Quant a
+Why: Per què?
+Location: Localització
+Administration: Administració
+Control panel: Panell de control
+Users: Usuaris
+Connections: Conexions
+Visits: Visites
+News: Noticies
+Photos: Fotos
+Items: Artícles
+Reports: Informes
+Shelves: Estanterías
+Items list: Llistat articles
+Contact: Vull ser client
+Training: Formació
+Agencies: Agències
+Configuration: Configuració
+Account: Compte
+Addresses: Direccions
diff --git a/js/hedera/locale/en.json b/js/hedera/locale/en.json
deleted file mode 100644
index fbedb0e6..00000000
--- a/js/hedera/locale/en.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "User"
- ,"Password": "Password"
- ,"Beta": "Beta"
- ,"Do not sign out": "Do not sign out"
- ,"Log in as guest": "Log in as guest"
- ,"Enter": "Enter"
- ,"Login mail": "clientes@verdnatura.es"
- ,"Login phone": "+34 607 562 391"
- ,"Password forgotten? Push here": "Password forgotten? Push here"
- ,"Yet you are not a customer?": "Yet you are not a customer?"
- ,"Sign up": "Sign up"
-
- ,"You've been too idle": "You have been idle too long and your session has expired"
- ,"Invalid login": "Username or password incorrect, remember that it is case-sensitive"
- ,"Please write your user name": "Please write your user name"
- ,"A mail has been sent wich you can recover your password": "A mail has been sent wich you can recover your password"
-
- ,"Menu": "Menu"
- ,"Exit": "Exit"
- ,"Test the new website": "Test the new website!"
- ,"Old website": "Old website"
- ,"Recent changes": "Recent changes"
-
- ,"Print": "Print"
- ,"Please unlock popups and try again":
- "Please unlock popups and try again"
-
- ,"Error loading form": "Error while loading form"
- ,"Error loading report": "Error loading report"
- ,"By using this site you accept cookies": "By using this website you accept the use of cookies for customization of content and analysis."
- ,"New version available": "There is a new update, the page will automatically recharge to download it"
-
- ,"AppName": "Verdnatura"
-
- ,"Home": "Home"
- ,"Orders": "Orders"
- ,"Basket": "Basket"
- ,"Last orders": "Last orders"
- ,"Invoices": "Invoices"
- ,"Catalog": "Catalog"
- ,"About": "About"
- ,"About us": "About us"
- ,"Why": "Why"
- ,"Location": "Location"
- ,"Administration": "Administration"
- ,"Control panel": "Control panel"
- ,"Users": "Users"
- ,"Connections": "Connections"
- ,"Visits": "Visits"
- ,"News": "News"
- ,"Photos": "Photos"
- ,"Items": "Items"
- ,"Reports": "Reports"
- ,"Shelves": "Shelves"
- ,"Items list": "Items list"
- ,"Contact": "Contact"
- ,"Training": "Training"
- ,"Agencies": "Agencies"
- ,"Configuration": "Configuration"
- ,"Account": "Account"
- ,"Addresses": "Addresses"
-
- ,"AmountToPay:": "Amount to pay (€):"
- ,"AmountError": "The amount must be a positive number"
- ,"PayError": "Failed to make the payment"
-}
diff --git a/js/hedera/locale/en.yml b/js/hedera/locale/en.yml
new file mode 100644
index 00000000..e71747dc
--- /dev/null
+++ b/js/hedera/locale/en.yml
@@ -0,0 +1,56 @@
+User: User
+Password: Password
+Beta: Beta
+Do not sign out: Do not sign out
+Log in as guest: Log in as guest
+Enter: Enter
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: Password forgotten? Push here
+Yet you are not a customer?: Yet you are not a customer?
+Sign up: Sign up
+You've been too idle: You have been idle too long and your session has expired
+Invalid login: 'Username or password incorrect, remember that it is case-sensitive'
+Please write your user name: Please write your user name
+A mail has been sent wich you can recover your password: A mail has been sent wich you can recover your password
+Menu: Menu
+Exit: Exit
+Test the new website: Test the new website!
+Old website: Old website
+Recent changes: Recent changes
+Print: Print
+Please unlock popups and try again: Please unlock popups and try again
+Error loading form: Error while loading form
+Error loading report: Error loading report
+By using this site you accept cookies: >-
+ By using this website you accept the use of cookies for customization of
+ content and analysis.
+New version available: 'There is a new update, the page will automatically recharge to download it'
+AppName: Verdnatura
+Home: Home
+Orders: Orders
+Basket: Basket
+Last orders: Last orders
+Invoices: Invoices
+Catalog: Catalog
+About: About
+About us: About us
+Why: Why
+Location: Location
+Administration: Administration
+Control panel: Control panel
+Users: Users
+Connections: Connections
+Visits: Visits
+News: News
+Photos: Photos
+Items: Items
+Reports: Reports
+Shelves: Shelves
+Items list: Items list
+Contact: Contact
+Training: Training
+Agencies: Agencies
+Configuration: Configuration
+Account: Account
+Addresses: Addresses
diff --git a/js/hedera/locale/es.json b/js/hedera/locale/es.json
deleted file mode 100644
index bf755ed0..00000000
--- a/js/hedera/locale/es.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "Usuario"
- ,"Password": "Contraseña"
- ,"Beta": "Beta"
- ,"Do not sign out": "No cerrar sesión"
- ,"Log in as guest": "Entrar como invitado"
- ,"Enter": "Entrar"
- ,"Login mail": "clientes@verdnatura.es"
- ,"Login phone": "+34 963 242 100"
- ,"Password forgotten? Push here": "¿Has olvidado tu contraseña?"
- ,"Yet you are not a customer?": "¿Todavía no eres cliente?"
- ,"Sign up": "Registrarme"
-
- ,"You've been too idle": "Has estado demasiado tiempo inactivo y la sesión ha expirado"
- ,"Invalid login": "Usuario o contraseña incorrectos, recuerda que se hace distinción entre mayúsculas y minúsculas"
- ,"Please write your user name": "Por favor escribe tu nombre de usuario"
- ,"A mail has been sent wich you can recover your password": "Te hemos enviado un correo donde podrás recuperar tu contraseña"
-
- ,"Menu": "Menú"
- ,"Exit": "Salir"
- ,"Test the new website": "¡Prueba la nueva web!"
- ,"Old website": "Web antigua"
- ,"Recent changes": "Cambios recientes"
-
- ,"Print": "Imprimir"
- ,"Please unlock popups and try again":
- "Por favor, desbloquea los popups y vuélvelo a intentar"
-
- ,"Error loading form": "Error al cargar formulario"
- ,"Error loading report": "Error al cargar el informe"
- ,"By using this site you accept cookies": "Al utilizar este sitio web aceptas el uso de cookies para la personalización de contenidos y análisis."
- ,"New version available": "Hay una nueva actualización, la página se recargará automaticamente para descargarla"
-
- ,"AppName": "Verdnatura"
-
- ,"Home": "Inicio"
- ,"Orders": "Pedidos"
- ,"Basket": "Cesta"
- ,"Last orders": "Últimos pedidos"
- ,"Invoices": "Facturas"
- ,"Catalog": "Catálogo"
- ,"About": "Conócenos"
- ,"About us": "Sobre nosotros"
- ,"Why": "¿Por qué?"
- ,"Location": "Localización"
- ,"Administration": "Administración"
- ,"Control panel": "Panel de control"
- ,"Users": "Usuarios"
- ,"Connections": "Conexiones"
- ,"Visits": "Visitas"
- ,"News": "Noticias"
- ,"Photos": "Fotos"
- ,"Items": "Artículos"
- ,"Reports": "Informes"
- ,"Shelves": "Estanterías"
- ,"Items list": "Listado artículos"
- ,"Contact": "Quiero ser cliente"
- ,"Training": "Formación"
- ,"Agencies": "Agencias"
- ,"Configuration": "Configuración"
- ,"Account": "Cuenta"
- ,"Addresses": "Direcciones"
-
- ,"AmountToPay:": "Cantidad a pagar (€):"
- ,"AmountError": "La cantidad debe ser un número positivo"
- ,"PayError": "Error al realizar el pago"
-}
diff --git a/js/hedera/locale/es.yml b/js/hedera/locale/es.yml
new file mode 100644
index 00000000..8cbccf56
--- /dev/null
+++ b/js/hedera/locale/es.yml
@@ -0,0 +1,60 @@
+User: Usuario
+Password: Contraseña
+Beta: Beta
+Do not sign out: No cerrar sesión
+Log in as guest: Entrar como invitado
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 963 242 100
+Password forgotten? Push here: ¿Has olvidado tu contraseña?
+Yet you are not a customer?: ¿Todavía no eres cliente?
+Sign up: Registrarme
+You've been too idle: Has estado demasiado tiempo inactivo y la sesión ha expirado
+Invalid login: >-
+ Usuario o contraseña incorrectos, recuerda que se hace distinción entre
+ mayúsculas y minúsculas
+Please write your user name: Por favor escribe tu nombre de usuario
+A mail has been sent wich you can recover your password: Te hemos enviado un correo donde podrás recuperar tu contraseña
+Menu: Menú
+Exit: Salir
+Test the new website: ¡Prueba la nueva web!
+Old website: Web antigua
+Recent changes: Cambios recientes
+Print: Imprimir
+Please unlock popups and try again: 'Por favor, desbloquea los popups y vuélvelo a intentar'
+Error loading form: Error al cargar formulario
+Error loading report: Error al cargar el informe
+By using this site you accept cookies: >-
+ Al utilizar este sitio web aceptas el uso de cookies para la personalización
+ de contenidos y análisis.
+New version available: >-
+ Hay una nueva actualización, la página se recargará automaticamente para
+ descargarla
+AppName: Verdnatura
+Home: Inicio
+Orders: Pedidos
+Basket: Cesta
+Last orders: Últimos pedidos
+Invoices: Facturas
+Catalog: Catálogo
+About: Conócenos
+About us: Sobre nosotros
+Why: ¿Por qué?
+Location: Localización
+Administration: Administración
+Control panel: Panel de control
+Users: Usuarios
+Connections: Conexiones
+Visits: Visitas
+News: Noticias
+Photos: Fotos
+Items: Artículos
+Reports: Informes
+Shelves: Estanterías
+Items list: Listado artículos
+Contact: Quiero ser cliente
+Training: Formación
+Agencies: Agencias
+Configuration: Configuración
+Account: Cuenta
+Addresses: Direcciones
diff --git a/js/hedera/locale/fr.json b/js/hedera/locale/fr.json
deleted file mode 100644
index 49370e0e..00000000
--- a/js/hedera/locale/fr.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "Utilisateur"
- ,"Password": "Mot de passe"
- ,"Beta": "Beta"
- ,"Do not sign out": "Garder ma session active"
- ,"Log in as guest": "Entrez en tant qu'invité"
- ,"Enter": "Entrer"
- ,"Login mail": "ruben@verdnatura.es"
- ,"Login phone": "+33 781 533 900"
- ,"Password forgotten? Push here": "as tu oublié ton mot de passe?"
- ,"Yet you are not a customer?": "Êtes-vous Pas encore client?"
- ,"Sign up": "Inscription"
-
- ,"You've been too idle": "Il a eu le temps de trop paresseux et votre session a expiré"
- ,"Invalid login": "Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre majuscules et minuscules"
- ,"Please write your user name": "S'il vous plaît entrer votre nom d'utilisateur"
- ,"A mail has been sent wich you can recover your password": "Nous avons envoyé un e-mail où vous pouvez récupérer votre mot de passe"
-
- ,"Menu": "Menu"
- ,"Exit": "Laisser"
- ,"Test the new website": "Testez le nouveau site!"
- ,"Old website": "Ancien site web"
- ,"Recent changes": "Modifications récentes"
-
- ,"Print": "Imprimir"
- ,"Please unlock popups and try again":
- "S'il vous plaît déverrouiller pop ups et essayez à nouveau"
-
- ,"Error loading form": "Forme erreur de chargement"
- ,"Error loading report": "Rapport erreur de chargement"
- ,"By using this site you accept cookies": "En utilisant ce site, vous acceptez l'utilisation de cookies pour personnaliser le contenu et l'analyse."
- ,"New version available": "Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour télécharger"
-
- ,"AppName": "Verdnatura"
-
- ,"Home": "Accueil"
- ,"Orders": "Commandes"
- ,"Basket": "Panier"
- ,"Last orders": "Dernières commandes"
- ,"Invoices": "Facturas"
- ,"Catalog": "Catalogue"
- ,"About": "Nous"
- ,"About us": "A propos de nous"
- ,"Why": "Pourquoi?"
- ,"Location": "Emplacement"
- ,"Administration": "Administration"
- ,"Control panel": "Panneau de contrôle"
- ,"Users": "Utilisateurs"
- ,"Connections": "Connexions"
- ,"Visits": "Visites"
- ,"News": "Nouvelles"
- ,"Photos": "Photos"
- ,"Items": "Articles"
- ,"Reports": "Rapport"
- ,"Shelves": "Etagères"
- ,"Items list": "Liste des articles"
- ,"Contact": "Je veux être client"
- ,"Training": "Formation"
- ,"Agencies": "Agences"
- ,"Configuration": "Configuration"
- ,"Account": "Compte"
- ,"Addresses": "Adresses"
-
- ,"AmountToPay:": "Montant à payer (€):"
- ,"AmountError": "La quantité doit être un neméro positif"
- ,"PayError": "Impossible d'effectuer le paiement"
-}
diff --git a/js/hedera/locale/fr.yml b/js/hedera/locale/fr.yml
new file mode 100644
index 00000000..5564407c
--- /dev/null
+++ b/js/hedera/locale/fr.yml
@@ -0,0 +1,60 @@
+User: Utilisateur
+Password: Mot de passe
+Beta: Beta
+Do not sign out: Garder ma session active
+Log in as guest: Entrez en tant qu'invité
+Enter: Entrer
+Login mail: ruben@verdnatura.es
+Login phone: +33 781 533 900
+Password forgotten? Push here: as tu oublié ton mot de passe?
+Yet you are not a customer?: Êtes-vous Pas encore client?
+Sign up: Inscription
+You've been too idle: Il a eu le temps de trop paresseux et votre session a expiré
+Invalid login: >-
+ Utilisateur ou mot de passe incorrect, n'oubliez pas de distinction entre
+ majuscules et minuscules
+Please write your user name: S'il vous plaît entrer votre nom d'utilisateur
+A mail has been sent wich you can recover your password: Nous avons envoyé un e-mail où vous pouvez récupérer votre mot de passe
+Menu: Menu
+Exit: Laisser
+Test the new website: Testez le nouveau site!
+Old website: Ancien site web
+Recent changes: Modifications récentes
+Print: Imprimir
+Please unlock popups and try again: S'il vous plaît déverrouiller pop ups et essayez à nouveau
+Error loading form: Forme erreur de chargement
+Error loading report: Rapport erreur de chargement
+By using this site you accept cookies: >-
+ En utilisant ce site, vous acceptez l'utilisation de cookies pour
+ personnaliser le contenu et l'analyse.
+New version available: >-
+ Il ya une nouvelle mise à jour, la page sera automatiquement recargargará pour
+ télécharger
+AppName: Verdnatura
+Home: Accueil
+Orders: Commandes
+Basket: Panier
+Last orders: Dernières commandes
+Invoices: Facturas
+Catalog: Catalogue
+About: Nous
+About us: A propos de nous
+Why: Pourquoi?
+Location: Emplacement
+Administration: Administration
+Control panel: Panneau de contrôle
+Users: Utilisateurs
+Connections: Connexions
+Visits: Visites
+News: Nouvelles
+Photos: Photos
+Items: Articles
+Reports: Rapport
+Shelves: Etagères
+Items list: Liste des articles
+Contact: Je veux être client
+Training: Formation
+Agencies: Agences
+Configuration: Configuration
+Account: Compte
+Addresses: Adresses
diff --git a/js/hedera/locale/mn.json b/js/hedera/locale/mn.json
deleted file mode 100644
index 59fe70db..00000000
--- a/js/hedera/locale/mn.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "Хэрэглэгчийн"
- ,"Password": "нууц үг"
- ,"Beta": "Бета"
- ,"Do not sign out": "Гаргаж гарын үсэг зураагүй байна"
- ,"Log in as guest": "Зочин байдлаар оруулна уу"
- ,"Enter": "энд бичнэ үү"
- ,"Login mail": "clientes@verdnatura.es"
- ,"Login phone": "+34 607 562 391"
- ,"Password forgotten? Push here": "Нууц үг мартсан? энд түлхэх"
- ,"Yet you are not a customer?": "Гэсэн хэдий ч та хэрэглэгчийн биш гэж үү?"
- ,"Sign up": "бүртгүүлэх"
-
- ,"You've been too idle": "Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна"
- ,"Invalid login": "Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай"
- ,"Please write your user name": "Хэрэглэгчийн нэрээ бичнэ үү"
- ,"A mail has been sent wich you can recover your password": "Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн"
-
- ,"Menu": "Цэс"
- ,"Exit": "гарах"
- ,"Test the new website": "Шинэ вэб шалгана!"
- ,"Old website": "Хуучин вэб сайт"
- ,"Recent changes": "Сүүлийн өөрчлөлтүүд"
-
- ,"Print": "Хэвлэх"
- ,"Please unlock popups and try again":
- "Поп өгсөх түгжээ дахин оролдоно уу"
-
- ,"Error loading form": "Алдаа бол ачих хэлбэр"
- ,"Error loading report": "Алдаа ачих тайлан"
- ,"By using this site you accept cookies": "Энэ вэб сайтыг ашиглан та агуулга, дүн шинжилгээ хийх тохиргоонууд жигнэмэг хэрэглэхийг хүлээн зөвшөөрдөг."
- ,"New version available": "Шинэ шинэчлэх байна, хуудас автоматаар татаж авах цэнэглэж болно"
-
- ,"AppName": "Verdnatura"
-
- ,"Home": "Нүүр хуудас"
- ,"Orders": "захиалга"
- ,"Basket": "сагс"
- ,"Last orders": "Өнгөрсөн захиалга"
- ,"Invoices": "Нэхэмжлэх"
- ,"Catalog": "Каталог"
- ,"About": "тухай"
- ,"About us": "бидний тухай"
- ,"Why": "яагаад"
- ,"Location": "Байрлал"
- ,"Administration": "захиргаа"
- ,"Control panel": "хяналтын самбар"
- ,"Users": "Хэрэглэгчид нь"
- ,"Connections": "холболт"
- ,"Visits": "уулзалт"
- ,"News": "мэдээ"
- ,"Photos": "Фото зураг"
- ,"Items": "зүйл"
- ,"Reports": "мэдээ"
- ,"Shelves": "тавиур"
- ,"Items list": "зүйлс жагсаалт"
- ,"Contact": "Холбоо барих"
- ,"Training": "сургалт"
- ,"Agencies": "байгууллагууд"
- ,"Configuration": "Тохиргоо"
- ,"Account": "Дансны"
- ,"Addresses": "хаягууд"
-
- ,"AmountToPay:": "Amount to pay (€):"
- ,"AmountError": "The amount must be a positive number"
- ,"PayError": "Failed to make the payment"
-}
diff --git a/js/hedera/locale/mn.yml b/js/hedera/locale/mn.yml
new file mode 100644
index 00000000..06ee6aac
--- /dev/null
+++ b/js/hedera/locale/mn.yml
@@ -0,0 +1,56 @@
+User: Хэрэглэгчийн
+Password: нууц үг
+Beta: Бета
+Do not sign out: Гаргаж гарын үсэг зураагүй байна
+Log in as guest: Зочин байдлаар оруулна уу
+Enter: энд бичнэ үү
+Login mail: clientes@verdnatura.es
+Login phone: +34 607 562 391
+Password forgotten? Push here: Нууц үг мартсан? энд түлхэх
+Yet you are not a customer?: Гэсэн хэдий ч та хэрэглэгчийн биш гэж үү?
+Sign up: бүртгүүлэх
+You've been too idle: 'Та нар ч бас зогссон байсан, чуулган хугацаа дууссан байна'
+Invalid login: 'Хэрэглэгчийн нэр эсвэл нууц үг буруу, Тэр хэргийг мэдрэмтгий гэдгийг санаарай'
+Please write your user name: Хэрэглэгчийн нэрээ бичнэ үү
+A mail has been sent wich you can recover your password: Мэйл та нууц үгээ сэргээх боломжтой А байна илгээсэн
+Menu: Цэс
+Exit: гарах
+Test the new website: Шинэ вэб шалгана!
+Old website: Хуучин вэб сайт
+Recent changes: Сүүлийн өөрчлөлтүүд
+Print: Хэвлэх
+Please unlock popups and try again: Поп өгсөх түгжээ дахин оролдоно уу
+Error loading form: Алдаа бол ачих хэлбэр
+Error loading report: Алдаа ачих тайлан
+By using this site you accept cookies: >-
+ Энэ вэб сайтыг ашиглан та агуулга, дүн шинжилгээ хийх тохиргоонууд жигнэмэг
+ хэрэглэхийг хүлээн зөвшөөрдөг.
+New version available: 'Шинэ шинэчлэх байна, хуудас автоматаар татаж авах цэнэглэж болно'
+AppName: Verdnatura
+Home: Нүүр хуудас
+Orders: захиалга
+Basket: сагс
+Last orders: Өнгөрсөн захиалга
+Invoices: Нэхэмжлэх
+Catalog: Каталог
+About: тухай
+About us: бидний тухай
+Why: яагаад
+Location: Байрлал
+Administration: захиргаа
+Control panel: хяналтын самбар
+Users: Хэрэглэгчид нь
+Connections: холболт
+Visits: уулзалт
+News: мэдээ
+Photos: Фото зураг
+Items: зүйл
+Reports: мэдээ
+Shelves: тавиур
+Items list: зүйлс жагсаалт
+Contact: Холбоо барих
+Training: сургалт
+Agencies: байгууллагууд
+Configuration: Тохиргоо
+Account: Дансны
+Addresses: хаягууд
diff --git a/js/hedera/locale/pt.json b/js/hedera/locale/pt.json
deleted file mode 100644
index 0d712efe..00000000
--- a/js/hedera/locale/pt.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "User": "Usuario"
- ,"Password": "Palavra-Passe"
- ,"Beta": "Beta"
- ,"Do not sign out": "Não finalizar Sessão"
- ,"Log in as guest": "Entrar como convidado"
- ,"Enter": "Entrar"
- ,"Login mail": "clientes@verdnatura.es"
- ,"Login phone": "+34 963 242 100"
- ,"Password forgotten? Push here": "Não lembro minha palavra-passe"
- ,"Yet you are not a customer?": "Ainda não és cliente?"
- ,"Sign up": "Cadastrar-se"
-
- ,"You've been too idle": "Muito tempo de inatividade, a sessão foi finalizada"
- ,"Invalid login": "Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e minusculas"
- ,"Please write your user name": "Por favor, escreva seu nome de usuário"
- ,"A mail has been sent wich you can recover your password": "Um e-mail foi enviado para recuperar sua palavra-passe"
-
- ,"Menu": "Menú"
- ,"Exit": "Sair"
- ,"Test the new website": "Prove a nova pagina web"
- ,"Old website": "Web antiga"
- ,"Recent changes": "Modificações recentes"
-
- ,"Print": "Imprimir"
- ,"Please unlock popups and try again":
- "Por favor, desbloqueie os pop-ups e volte a tentar"
-
- ,"Error loading form": "Erro ao carregar formulario"
- ,"Error loading report": "Erro ao carregar o informe"
- ,"By using this site you accept cookies": "Ao utilizar esta pagina web, aceitas o uso de cookies para a personalização de conteúdos e análise."
- ,"New version available": "Existe uma nova atualização, a página se atualizará automaticamente"
-
- ,"AppName": "VerdNatura"
-
- ,"Home": "Principio"
- ,"Orders": "Encomendas"
- ,"Basket": "Cesta"
- ,"Last orders": "Últimas encomendas"
- ,"Invoices": "Facturas"
- ,"Catalog": "Catálogo"
- ,"About": "Conheça-nos"
- ,"About us": "Sobre nós"
- ,"Why": "Por quê?"
- ,"Location": "Localização"
- ,"Administration": "Administração"
- ,"Control panel": "Painel de controle"
- ,"Users": "Usuarios"
- ,"Connections": "Conexões"
- ,"Visits": "Visitas"
- ,"News": "Noticias"
- ,"Photos": "Fotos"
- ,"Items": "Artigos"
- ,"Reports": "Relatórios"
- ,"Shelves": "Estantes"
- ,"Items list": "Lista de Itens"
- ,"Contact": "Quero ser cliente"
- ,"Training": "Formação"
- ,"Agencies": "Agências"
- ,"Configuration": "Configuração"
- ,"Account": "Conta"
- ,"Addresses": "Moradas"
-
- ,"AmountToPay:": "Quantidade a pagar (€):"
- ,"AmountError": "A quantidade deve ser um número positivo"
- ,"PayError": "Erro ao realizar o pagamento"
-}
diff --git a/js/hedera/locale/pt.yml b/js/hedera/locale/pt.yml
new file mode 100644
index 00000000..7519aec4
--- /dev/null
+++ b/js/hedera/locale/pt.yml
@@ -0,0 +1,58 @@
+User: Usuario
+Password: Palavra-Passe
+Beta: Beta
+Do not sign out: Não finalizar Sessão
+Log in as guest: Entrar como convidado
+Enter: Entrar
+Login mail: clientes@verdnatura.es
+Login phone: +34 963 242 100
+Password forgotten? Push here: Não lembro minha palavra-passe
+Yet you are not a customer?: Ainda não és cliente?
+Sign up: Cadastrar-se
+You've been too idle: 'Muito tempo de inatividade, a sessão foi finalizada'
+Invalid login: >-
+ Usuário ou Palavra-Passe incorreto, lembre-se de diferenciar maiusculas e
+ minusculas
+Please write your user name: 'Por favor, escreva seu nome de usuário'
+A mail has been sent wich you can recover your password: Um e-mail foi enviado para recuperar sua palavra-passe
+Menu: Menú
+Exit: Sair
+Test the new website: Prove a nova pagina web
+Old website: Web antiga
+Recent changes: Modificações recentes
+Print: Imprimir
+Please unlock popups and try again: 'Por favor, desbloqueie os pop-ups e volte a tentar'
+Error loading form: Erro ao carregar formulario
+Error loading report: Erro ao carregar o informe
+By using this site you accept cookies: >-
+ Ao utilizar esta pagina web, aceitas o uso de cookies para a personalização de
+ conteúdos e análise.
+New version available: 'Existe uma nova atualização, a página se atualizará automaticamente'
+AppName: VerdNatura
+Home: Principio
+Orders: Encomendas
+Basket: Cesta
+Last orders: Últimas encomendas
+Invoices: Facturas
+Catalog: Catálogo
+About: Conheça-nos
+About us: Sobre nós
+Why: Por quê?
+Location: Localização
+Administration: Administração
+Control panel: Painel de controle
+Users: Usuarios
+Connections: Conexões
+Visits: Visitas
+News: Noticias
+Photos: Fotos
+Items: Artigos
+Reports: Relatórios
+Shelves: Estantes
+Items list: Lista de Itens
+Contact: Quero ser cliente
+Training: Formação
+Agencies: Agências
+Configuration: Configuração
+Account: Conta
+Addresses: Moradas
diff --git a/js/hedera/style.css b/js/hedera/style.css
index 7208bdfd..1a8ff50b 100644
--- a/js/hedera/style.css
+++ b/js/hedera/style.css
@@ -268,10 +268,8 @@ input[type=checkbox],
input[type=radio]
{
cursor: pointer;
- margin: 0.2em;
- padding: 0.3em;
- width: 0.8em;
- height: 0.8em;
+ margin: .2em;
+ padding: .3em;
}
select
{
@@ -305,10 +303,10 @@ input[type=reset],
.button
{
border: none;
- padding: 0.5em;
+ padding: .5em;
background-color: transparent;
margin: -0.5em;
- border-radius: 0.1em;
+ border-radius: .1em;
}
/* Flat button */
diff --git a/js/htk/htk.js b/js/htk/htk.js
index c2fb0a68..98be4e69 100644
--- a/js/htk/htk.js
+++ b/js/htk/htk.js
@@ -14,6 +14,7 @@ Htk = module.exports = {
,ImageEditor : require ('./image-editor')
,Assistant : require ('./assistant')
,AssistantBar : require ('./assistant-bar')
+ ,Loader : require ('./loader')
,Field : require ('./field')
,Column : require ('./column')
};
diff --git a/js/htk/loader.js b/js/htk/loader.js
new file mode 100644
index 00000000..8ca67313
--- /dev/null
+++ b/js/htk/loader.js
@@ -0,0 +1,79 @@
+
+var Widget = require ('./widget');
+
+module.exports = new Class
+({
+ Tag: 'htk-loader'
+ ,Extends: Widget
+ ,Properties: {
+ form:
+ {
+ type: Db.Form
+ ,set: function (x)
+ {
+ this.link ({_form: x}, {'status-changed': this.onFormChange});
+ this.onFormChange ();
+ }
+ ,get: function ()
+ {
+ return this._form;
+ }
+ }
+ }
+
+ ,initialize: function ()
+ {
+ var node = this.createRoot ('div');
+ node.className = 'htk-loader';
+
+ var div = this.createElement ('div');
+ div.className = 'spinner';
+
+ var spinner = new Htk.Spinner ();
+ div.appendChild (spinner.node);
+
+ var childs = this.createElement ('div');
+
+ this.spinner = spinner;
+ this.div = div;
+ this.childs = childs;
+ this.isLoading = true;
+ this.stop ();
+ }
+
+ ,appendChild: function (child)
+ {
+ this.childs.appendChild (child);
+ }
+
+ ,stop: function ()
+ {
+ if (!this.isLoading)
+ return;
+
+ this.isLoading = false;
+ this.spinner.stop ();
+ Vn.Node.removeChilds (this.node);
+ this.node.appendChild (this.childs);
+ }
+
+ ,start: function ()
+ {
+ if (this.isLoading)
+ return;
+
+ this.isLoading = true;
+ this.spinner.start ();
+ Vn.Node.removeChilds (this.node);
+ this.node.appendChild (this.div);
+ }
+
+ ,onFormChange: function ()
+ {
+ if (this._form.ready)
+ this.stop ();
+ else
+ this.start ();
+ }
+});
+
diff --git a/js/htk/locale/ca.json b/js/htk/locale/ca.json
deleted file mode 100644
index 48d74aee..00000000
--- a/js/htk/locale/ca.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "Sí"
- ,"False": "No"
- ,"Null": "Nul"
- ,"ChangeDate": "Cambiar Data"
- ,"Sort": "Ordenar"
- ,"At": "a les"
- ,"Of": "de"
- ,"OfThe": "del"
- ,"Remove": "Esborrar"
- ,"Loading": "Carregant"
- ,"Loading...": "Carregant..."
- ,"ReallyDelete": "Estàs segur que vols esborrar la línia?"
- ,"YouMustBeLoggedIn": "Has d'estar registrat com a usuari"
- ,"EmptyList": "Llistat buit"
- ,"NoData": "Sense dades"
- ,"ErrorLoadingData": "Error"
- ,"Error": "Error"
- ,"Image": "Imatge"
- ,"File": "Arxiu"
- ,"FileName": "Nom"
- ,"UpdateImage": "Afegir o actualitzar Imatge"
- ,"UploadFile": "Putjar arxiu"
- ,"ImageAdded": "Imatge afegida correctament"
- ,"Close": "Tancar"
- ,"Previous": "Anterior"
- ,"Next": "Següent"
- ,"Search": "Cercar"
- ,"Search...": "Cercar..."
-}
diff --git a/js/htk/locale/ca.yml b/js/htk/locale/ca.yml
new file mode 100644
index 00000000..651d6135
--- /dev/null
+++ b/js/htk/locale/ca.yml
@@ -0,0 +1,28 @@
+'True': Sí
+'False': 'No'
+'Null': Nul
+ChangeDate: Cambiar Data
+Sort: Ordenar
+At: a les
+Of: de
+OfThe: del
+Remove: Esborrar
+Loading: Carregant
+Loading...: Carregant...
+ReallyDelete: Estàs segur que vols esborrar la línia?
+YouMustBeLoggedIn: Has d'estar registrat com a usuari
+EmptyList: Llistat buit
+NoData: Sense dades
+ErrorLoadingData: Error
+Error: Error
+Image: Imatge
+File: Arxiu
+FileName: Nom
+UpdateImage: Afegir o actualitzar Imatge
+UploadFile: Putjar arxiu
+ImageAdded: Imatge afegida correctament
+Close: Tancar
+Previous: Anterior
+Next: Següent
+Search: Cercar
+Search...: Cercar...
diff --git a/js/htk/locale/en.json b/js/htk/locale/en.json
deleted file mode 100644
index 7f34c222..00000000
--- a/js/htk/locale/en.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "True"
- ,"False": "False"
- ,"Null": "Null"
- ,"ChangeDate": "Change date"
- ,"Sort": "Sort"
- ,"At": "at"
- ,"Of": "of"
- ,"OfThe": "of the"
- ,"Remove": "Remove"
- ,"Loading": "Loading"
- ,"Loading...": "Loading..."
- ,"ReallyDelete": "Are you sure you want to delete the line?"
- ,"YouMustBeLoggedIn": "You must be a registered user"
- ,"EmptyList": "Empty list"
- ,"NoData": "No data"
- ,"ErrorLoadingData": "Error"
- ,"Error": "Error"
- ,"Image": "Image"
- ,"File": "File"
- ,"FileName": "File name"
- ,"UpdateImage": "Add or update an image"
- ,"UploadFile": "Upload file"
- ,"ImageAdded": "Image added successfully"
- ,"Close": "Close"
- ,"Previous": "Previous"
- ,"Next": "Next"
- ,"Search": "Search"
- ,"Search...": "Search..."
-}
diff --git a/js/htk/locale/en.yml b/js/htk/locale/en.yml
new file mode 100644
index 00000000..8a081b29
--- /dev/null
+++ b/js/htk/locale/en.yml
@@ -0,0 +1,28 @@
+'True': 'True'
+'False': 'False'
+'Null': 'Null'
+ChangeDate: Change date
+Sort: Sort
+At: at
+Of: of
+OfThe: of the
+Remove: Remove
+Loading: Loading
+Loading...: Loading...
+ReallyDelete: Are you sure you want to delete the line?
+YouMustBeLoggedIn: You must be a registered user
+EmptyList: Empty list
+NoData: No data
+ErrorLoadingData: Error
+Error: Error
+Image: Image
+File: File
+FileName: File name
+UpdateImage: Add or update an image
+UploadFile: Upload file
+ImageAdded: Image added successfully
+Close: Close
+Previous: Previous
+Next: Next
+Search: Search
+Search...: Search...
diff --git a/js/htk/locale/es.json b/js/htk/locale/es.json
deleted file mode 100644
index c2f600a6..00000000
--- a/js/htk/locale/es.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "Si"
- ,"False": "No"
- ,"Null": "Nulo"
- ,"ChangeDate": "Cambiar Fecha"
- ,"Sort": "Ordenar"
- ,"At": "a las"
- ,"Of": "de"
- ,"OfThe": "del"
- ,"Remove": "Borrar"
- ,"Loading": "Cargando"
- ,"Loading...": "Cargando..."
- ,"ReallyDelete": "¿Estás seguro de que quieres borrar la línea?"
- ,"YouMustBeLoggedIn": "Debes estar registrado como usuario"
- ,"EmptyList": "Lista vacía"
- ,"NoData": "Sin datos"
- ,"ErrorLoadingData": "Error"
- ,"Error": "Error"
- ,"Image": "Imagen"
- ,"File": "Archivo"
- ,"FileName": "Nombre"
- ,"UpdateImage": "Añadir o actualizar imagen"
- ,"UploadFile": "Subir archivo"
- ,"ImageAdded": "Imagen añadida correctamente"
- ,"Close": "Cerrar"
- ,"Previous": "Anterior"
- ,"Next": "Siguiente"
- ,"Search": "Buscar"
- ,"Search...": "Buscar..."
-}
diff --git a/js/htk/locale/es.yml b/js/htk/locale/es.yml
new file mode 100644
index 00000000..42cad4b4
--- /dev/null
+++ b/js/htk/locale/es.yml
@@ -0,0 +1,28 @@
+'True': Si
+'False': 'No'
+'Null': Nulo
+ChangeDate: Cambiar Fecha
+Sort: Ordenar
+At: a las
+Of: de
+OfThe: del
+Remove: Borrar
+Loading: Cargando
+Loading...: Cargando...
+ReallyDelete: ¿Estás seguro de que quieres borrar la línea?
+YouMustBeLoggedIn: Debes estar registrado como usuario
+EmptyList: Lista vacía
+NoData: Sin datos
+ErrorLoadingData: Error
+Error: Error
+Image: Imagen
+File: Archivo
+FileName: Nombre
+UpdateImage: Añadir o actualizar imagen
+UploadFile: Subir archivo
+ImageAdded: Imagen añadida correctamente
+Close: Cerrar
+Previous: Anterior
+Next: Siguiente
+Search: Buscar
+Search...: Buscar...
diff --git a/js/htk/locale/fr.json b/js/htk/locale/fr.json
deleted file mode 100644
index 56e03bce..00000000
--- a/js/htk/locale/fr.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "Si"
- ,"False": "Aucun"
- ,"Null": "Nul"
- ,"ChangeDate": "Modification de la date"
- ,"Sort": "Ordre"
- ,"At": "à"
- ,"Of": "de"
- ,"OfThe": "de"
- ,"Remove": "Effacer"
- ,"Loading": "Chargement"
- ,"Loading...": "Chargement..."
- ,"ReallyDelete": "Voulez-vous vraiment supprimer la ligne?"
- ,"YouMustBeLoggedIn": "Vous devez être un utilisateur enregistré"
- ,"EmptyList": "Vider la liste"
- ,"NoData": "Aucune donnée"
- ,"ErrorLoadingData": "Erreur"
- ,"Error": "Erreur"
- ,"Image": "Image"
- ,"File": "Archives"
- ,"FileName": "Nom"
- ,"UpdateImage": "Ajouter our mettre à jour l'image"
- ,"UploadFile": "Télécharger le fichier"
- ,"ImageAdded": "Image ajoutée correctement"
- ,"Close": "Croche"
- ,"Previous": "Précédent"
- ,"Next": "Suivant"
- ,"Search": "Recherche"
- ,"Search...": "Recherche..."
-}
diff --git a/js/htk/locale/fr.yml b/js/htk/locale/fr.yml
new file mode 100644
index 00000000..55e5b90d
--- /dev/null
+++ b/js/htk/locale/fr.yml
@@ -0,0 +1,28 @@
+'True': Si
+'False': Aucun
+'Null': Nul
+ChangeDate: Modification de la date
+Sort: Ordre
+At: à
+Of: de
+OfThe: de
+Remove: Effacer
+Loading: Chargement
+Loading...: Chargement...
+ReallyDelete: Voulez-vous vraiment supprimer la ligne?
+YouMustBeLoggedIn: Vous devez être un utilisateur enregistré
+EmptyList: Vider la liste
+NoData: Aucune donnée
+ErrorLoadingData: Erreur
+Error: Erreur
+Image: Image
+File: Archives
+FileName: Nom
+UpdateImage: Ajouter our mettre à jour l'image
+UploadFile: Télécharger le fichier
+ImageAdded: Image ajoutée correctement
+Close: Croche
+Previous: Précédent
+Next: Suivant
+Search: Recherche
+Search...: Recherche...
diff --git a/js/htk/locale/mn.json b/js/htk/locale/mn.json
deleted file mode 100644
index b9b6f6c3..00000000
--- a/js/htk/locale/mn.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "True"
- ,"False": "False"
- ,"Null": "Null"
- ,"ChangeDate": "Change date"
- ,"Sort": "Sort"
- ,"At": "at"
- ,"Of": "of"
- ,"OfThe": "of the"
- ,"Remove": "Remove"
- ,"Loading": "Loading"
- ,"Loading...": "Loading..."
- ,"ReallyDelete": "Are you sure you want to delete the line?"
- ,"YouMustBeLoggedIn": "You must be a registered user"
- ,"EmptyList": "Empty list"
- ,"NoData": "No data"
- ,"ErrorLoadingData": "Error"
- ,"Error": "Error"
- ,"Image": "Image"
- ,"File": "File"
- ,"FileName": "File name"
- ,"UpdateImage": "Add or update an image"
- ,"UploadFile": "Upload file"
- ,"ImageAdded": "Image added successfully"
- ,"Close": "Close"
- ,"Previous": "Previous"
- ,"Next": "Next"
- ,"Search": "хайх"
- ,"Search...": "хайх..."
-}
diff --git a/js/htk/locale/mn.yml b/js/htk/locale/mn.yml
new file mode 100644
index 00000000..7c92ea41
--- /dev/null
+++ b/js/htk/locale/mn.yml
@@ -0,0 +1,28 @@
+'True': 'True'
+'False': 'False'
+'Null': 'Null'
+ChangeDate: Change date
+Sort: Sort
+At: at
+Of: of
+OfThe: of the
+Remove: Remove
+Loading: Loading
+Loading...: Loading...
+ReallyDelete: Are you sure you want to delete the line?
+YouMustBeLoggedIn: You must be a registered user
+EmptyList: Empty list
+NoData: No data
+ErrorLoadingData: Error
+Error: Error
+Image: Image
+File: File
+FileName: File name
+UpdateImage: Add or update an image
+UploadFile: Upload file
+ImageAdded: Image added successfully
+Close: Close
+Previous: Previous
+Next: Next
+Search: хайх
+Search...: хайх...
diff --git a/js/htk/locale/pt.json b/js/htk/locale/pt.json
deleted file mode 100644
index 9aac96e1..00000000
--- a/js/htk/locale/pt.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "True": "Sim"
- ,"False": "Não"
- ,"Null": "Nulo"
- ,"ChangeDate": "Modificar Data"
- ,"Sort": "Organizar"
- ,"At": "às"
- ,"Of": "de"
- ,"OfThe": "de"
- ,"Remove": "Eliminar"
- ,"Loading": "Carregando"
- ,"Loading...": "Carregando..."
- ,"ReallyDelete": "Tens certeza que queres eliminar esta linha?"
- ,"YouMustBeLoggedIn": "Deves estar registrado como usuario"
- ,"EmptyList": "Lista vazia"
- ,"NoData": "Sem dados"
- ,"ErrorLoadingData": "Erro"
- ,"Error": "Erro"
- ,"Image": "Imagem"
- ,"File": "Arquivo"
- ,"FileName": "Nome"
- ,"UpdateImage": "Adicionar ou atualizar imagem"
- ,"UploadFile": "Subir arquivo"
- ,"ImageAdded": "Imagen adicionada corretamente"
- ,"Close": "Fechar"
- ,"Previous": "Anterior"
- ,"Next": "Seguinte"
- ,"Search": "Procurar"
- ,"Search...": "Procurar..."
-}
diff --git a/js/htk/locale/pt.yml b/js/htk/locale/pt.yml
new file mode 100644
index 00000000..305ecf0c
--- /dev/null
+++ b/js/htk/locale/pt.yml
@@ -0,0 +1,28 @@
+'True': Sim
+'False': Não
+'Null': Nulo
+ChangeDate: Modificar Data
+Sort: Organizar
+At: às
+Of: de
+OfThe: de
+Remove: Eliminar
+Loading: Carregando
+Loading...: Carregando...
+ReallyDelete: Tens certeza que queres eliminar esta linha?
+YouMustBeLoggedIn: Deves estar registrado como usuario
+EmptyList: Lista vazia
+NoData: Sem dados
+ErrorLoadingData: Erro
+Error: Erro
+Image: Imagem
+File: Arquivo
+FileName: Nome
+UpdateImage: Adicionar ou atualizar imagem
+UploadFile: Subir arquivo
+ImageAdded: Imagen adicionada corretamente
+Close: Fechar
+Previous: Anterior
+Next: Seguinte
+Search: Procurar
+Search...: Procurar...
diff --git a/js/htk/style.css b/js/htk/style.css
index 13ca048b..ff2e360b 100644
--- a/js/htk/style.css
+++ b/js/htk/style.css
@@ -652,7 +652,7 @@ td.cell-image .htk-image
background-color: initial;
}
-/* Loader */
+/* Spinner */
.htk-spinner
{
@@ -681,6 +681,13 @@ td.cell-image .htk-image
border-left-color: white;
}
+/* Loader */
+
+.htk-loader > .spinner
+{
+ text-align: center;
+}
+
} /*+++++++++ Screen end */
@keyframes spinner
diff --git a/js/vn/locale.js b/js/vn/locale.js
index e6348f99..2ee50062 100644
--- a/js/vn/locale.js
+++ b/js/vn/locale.js
@@ -1,4 +1,4 @@
-
+var yaml = require('js-yaml');
vnLocaleStrings = {};
/**
@@ -44,7 +44,7 @@ module.exports =
,createRequest: function (data, isDef, lang)
{
- var langFile = this.getLocalePath (data.path, lang);
+ var langFile = data.path +'/locale/'+ lang +'.yml'+ Vn.getVersion ();
var request = new XMLHttpRequest ();
request.open ('get', langFile, true);
@@ -82,7 +82,7 @@ module.exports =
return false;
try {
- this.add (JSON.parse (request.responseText));
+ this.add (yaml.safeLoad (request.responseText));
return true;
}
catch (e) {
@@ -91,11 +91,6 @@ module.exports =
return false
}
-
- ,getLocalePath: function (path, lang)
- {
- return path +'/locale/'+ lang +'.json'+ Vn.getVersion ();
- }
,loadScript: function (path, callback)
{
diff --git a/js/vn/locale/ca.json b/js/vn/locale/ca.json
deleted file mode 100644
index e18ac876..00000000
--- a/js/vn/locale/ca.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Diumenge"
- ,"Monday": "Dilluns"
- ,"Tuesday": "Dimarts"
- ,"Wednesday": "Dimecres"
- ,"Thursday": "Dijous"
- ,"Friday": "Divendres"
- ,"Saturday": "Dissabte"
-
- ,"Su": "Dg"
- ,"Mo": "Dl"
- ,"Tu": "Dt"
- ,"We": "Dc"
- ,"Th": "Dj"
- ,"Fr": "Dv"
- ,"Sa": "Ds"
-
- ,"January": "Gener"
- ,"February": "Febrer"
- ,"March": "Març"
- ,"April": "Abril"
- ,"May": "Maig"
- ,"June": "Juny"
- ,"July": "Juliol"
- ,"August": "Agost"
- ,"September": "Setembre"
- ,"October": "Octubre"
- ,"November": "Novembre"
- ,"December": "Decembre"
-
- ,"Jan": "Gen"
- ,"Feb": "Febr"
- ,"Mar": "Març"
- ,"Apr": "Abr"
- ,"MayAbr": "Maig"
- ,"Jun": "Juny"
- ,"Jul": "Jul"
- ,"Ago": "Ag"
- ,"Sep": "Set"
- ,"Oct": "Oct"
- ,"Nov": "Nov"
- ,"Dec": "Des"
-
- ,"%A, %B %e": "%A, %e de %B"
-
- ,"Something went wrong":
- "Alguna cosa ha anat malament"
- ,"The server does not respond, please check your Internet connection":
- "El servidor no respon, si us plau comprova la teva connexió a Internet"
-}
diff --git a/js/vn/locale/ca.yml b/js/vn/locale/ca.yml
new file mode 100644
index 00000000..4f7830c6
--- /dev/null
+++ b/js/vn/locale/ca.yml
@@ -0,0 +1,40 @@
+Sunday: Diumenge
+Monday: Dilluns
+Tuesday: Dimarts
+Wednesday: Dimecres
+Thursday: Dijous
+Friday: Divendres
+Saturday: Dissabte
+Su: Dg
+Mo: Dl
+Tu: Dt
+We: Dc
+Th: Dj
+Fr: Dv
+Sa: Ds
+January: Gener
+February: Febrer
+March: Març
+April: Abril
+May: Maig
+June: Juny
+July: Juliol
+August: Agost
+September: Setembre
+October: Octubre
+November: Novembre
+December: Decembre
+Jan: Gen
+Feb: Febr
+Mar: Març
+Apr: Abr
+Jun: Juny
+Jul: Jul
+Ago: Ag
+Sep: Set
+Oct: Oct
+Nov: Nov
+Dec: Des
+'%A, %B %e': '%A, %e de %B'
+Something went wrong: Alguna cosa ha anat malament
+'The server does not respond, please check your Internet connection': 'El servidor no respon, si us plau comprova la teva connexió a Internet'
diff --git a/js/vn/locale/en.json b/js/vn/locale/en.json
deleted file mode 100644
index daeb5f0d..00000000
--- a/js/vn/locale/en.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Sunday"
- ,"Monday": "Monday"
- ,"Tuesday": "Tuesday"
- ,"Wednesday": "Wednesday"
- ,"Thursday": "Thursday"
- ,"Friday": "Friday"
- ,"Saturday": "Saturday"
-
- ,"Su": "Su"
- ,"Mo": "Mo"
- ,"Tu": "Tu"
- ,"We": "We"
- ,"Th": "Th"
- ,"Fr": "Fr"
- ,"Sa": "Sa"
-
- ,"January": "January"
- ,"February": "February"
- ,"March": "March"
- ,"April": "April"
- ,"May": "May"
- ,"June": "June"
- ,"July": "July"
- ,"August": "August"
- ,"September": "September"
- ,"October": "October"
- ,"November": "November"
- ,"December": "December"
-
- ,"Jan": "Jan"
- ,"Feb": "Feb"
- ,"Mar": "Mar"
- ,"Apr": "Apr"
- ,"MayAbr": "May"
- ,"Jun": "Jun"
- ,"Jul": "Jul"
- ,"Ago": "Ago"
- ,"Sep": "Sep"
- ,"Oct": "Oct"
- ,"Nov": "Nov"
- ,"Dec": "Dic"
-
- ,"%A, %B %e": "%A, %B %e"
-
- ,"Something went wrong":
- "Something went wrong"
- ,"The server does not respond, please check your Internet connection":
- "The server does not respond, please check you Internet connection"
-}
diff --git a/js/vn/locale/en.yml b/js/vn/locale/en.yml
new file mode 100644
index 00000000..136a2be7
--- /dev/null
+++ b/js/vn/locale/en.yml
@@ -0,0 +1,40 @@
+Sunday: Sunday
+Monday: Monday
+Tuesday: Tuesday
+Wednesday: Wednesday
+Thursday: Thursday
+Friday: Friday
+Saturday: Saturday
+Su: Su
+Mo: Mo
+Tu: Tu
+We: We
+Th: Th
+Fr: Fr
+Sa: Sa
+January: January
+February: February
+March: March
+April: April
+May: May
+June: June
+July: June
+August: August
+September: September
+October: October
+November: November
+December: December
+Jan: Jan
+Feb: Feb
+Mar: Mar
+Apr: Apr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Dic
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Something went wrong
+'The server does not respond, please check your Internet connection': 'The server does not respond, please check you Internet connection'
diff --git a/js/vn/locale/es.json b/js/vn/locale/es.json
deleted file mode 100644
index 6f34bcb6..00000000
--- a/js/vn/locale/es.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Domingo"
- ,"Monday": "Lunes"
- ,"Tuesday": "Martes"
- ,"Wednesday": "Miércoles"
- ,"Thursday": "Jueves"
- ,"Friday": "Viernes"
- ,"Saturday": "Sábado"
-
- ,"Su": "Do"
- ,"Mo": "Lu"
- ,"Tu": "Ma"
- ,"We": "Mi"
- ,"Th": "Ju"
- ,"Fr": "Vi"
- ,"Sa": "Sa"
-
- ,"January": "Enero"
- ,"February": "Febrero"
- ,"March": "Marzo"
- ,"April": "Abril"
- ,"May": "Mayo"
- ,"June": "Junio"
- ,"July": "Julio"
- ,"August": "Agosto"
- ,"September": "Septiembre"
- ,"October": "Octubre"
- ,"November": "Noviembre"
- ,"December": "Diciembre"
-
- ,"Jan": "Ene"
- ,"Feb": "Feb"
- ,"Mar": "Mar"
- ,"Apr": "Abr"
- ,"MayAbr": "May"
- ,"Jun": "Jun"
- ,"Jul": "Jul"
- ,"Ago": "Ago"
- ,"Sep": "Sep"
- ,"Oct": "Oct"
- ,"Nov": "Nov"
- ,"Dec": "Dic"
-
- ,"%A, %B %e": "%A, %e de %B"
-
- ,"Something went wrong":
- "Algo salió mal"
- ,"The server does not respond, please check your Internet connection":
- "El servidor no responde, por favor comprueba tu conexión a Internet"
-}
diff --git a/js/vn/locale/es.yml b/js/vn/locale/es.yml
new file mode 100644
index 00000000..4c36ae6d
--- /dev/null
+++ b/js/vn/locale/es.yml
@@ -0,0 +1,40 @@
+Sunday: Domingo
+Monday: Lunes
+Tuesday: Martes
+Wednesday: Miércoles
+Thursday: Jueves
+Friday: Viernes
+Saturday: Sábado
+Su: Do
+Mo: Lu
+Tu: Ma
+We: Mi
+Th: Ju
+Fr: Vi
+Sa: Sa
+January: Enero
+February: Febrero
+March: Marzo
+April: Abril
+May: May
+June: Junio
+July: Julio
+August: Agosto
+September: Septiembre
+October: Octubre
+November: Noviembre
+December: Diciembre
+Jan: Ene
+Feb: Feb
+Mar: Mar
+Apr: Abr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Dic
+'%A, %B %e': '%A, %e de %B'
+Something went wrong: Algo salió mal
+'The server does not respond, please check your Internet connection': 'El servidor no responde, por favor comprueba tu conexión a Internet'
diff --git a/js/vn/locale/fr.json b/js/vn/locale/fr.json
deleted file mode 100644
index 782043d5..00000000
--- a/js/vn/locale/fr.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Dimanche"
- ,"Monday": "Lundi"
- ,"Tuesday": "Mardi"
- ,"Wednesday": "Mercredi"
- ,"Thursday": "Jeudi"
- ,"Friday": "Vendredi"
- ,"Saturday": "Samedi"
-
- ,"Su": "Do"
- ,"Mo": "Lu"
- ,"Tu": "Ma"
- ,"We": "Me"
- ,"Th": "Je"
- ,"Fr": "Ve"
- ,"Sa": "Sa"
-
- ,"January": "Janvier"
- ,"February": "Février"
- ,"March": "Mars"
- ,"April": "Avril"
- ,"May": "Mai"
- ,"June": "Juin"
- ,"July": "Juillet"
- ,"August": "Août"
- ,"September": "Septembre"
- ,"October": "Octobre"
- ,"November": "Novembre"
- ,"December": "Décembre"
-
- ,"Jan": "Jan"
- ,"Feb": "Fév"
- ,"Mar": "Mars"
- ,"Apr": "Avr"
- ,"MayAbr": "Mai"
- ,"Jun": "Juin"
- ,"Jul": "Juil"
- ,"Ago": "Août"
- ,"Sep": "Sep"
- ,"Oct": "Oct"
- ,"Nov": "Nov"
- ,"Dec": "Déc"
-
- ,"%A, %B %e": "%A, %B %e"
-
- ,"Something went wrong":
- "Quelque-chose s'est mal passé"
- ,"The server does not respond, please check your Internet connection":
- "Le serveur ne répond pas, s'il vous plaît vérifier votre connexion Internet"
-}
diff --git a/js/vn/locale/fr.yml b/js/vn/locale/fr.yml
new file mode 100644
index 00000000..ac496f83
--- /dev/null
+++ b/js/vn/locale/fr.yml
@@ -0,0 +1,40 @@
+Sunday: Dimanche
+Monday: Lundi
+Tuesday: Mardi
+Wednesday: Mercredi
+Thursday: Jeudi
+Friday: Vendredi
+Saturday: Samedi
+Su: Do
+Mo: Lu
+Tu: Ma
+We: Me
+Th: Je
+Fr: Ve
+Sa: Sa
+January: Janvier
+February: Février
+March: Mars
+April: Avril
+May: Mai
+June: Juin
+July: Juillet
+August: Août
+September: Septembre
+October: Octobre
+November: Novembre
+December: Décembre
+Jan: Jan
+Feb: Fév
+Mar: Mars
+Apr: Avr
+Jun: Juin
+Jul: Juil
+Ago: Août
+Sep: Sep
+Oct: Oct
+Nov: Nov
+Dec: Déc
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Quelque-chose s'est mal passé
+'The server does not respond, please check your Internet connection': 'Le serveur ne répond pas, s''il vous plaît vérifier votre connexion Internet'
diff --git a/js/vn/locale/mn.json b/js/vn/locale/mn.json
deleted file mode 100644
index 225bcecf..00000000
--- a/js/vn/locale/mn.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Ням гараг"
- ,"Monday": "Даваа гариг"
- ,"Tuesday": "Мягмар"
- ,"Wednesday": "Лхагва"
- ,"Thursday": "Пүрэв"
- ,"Friday": "Баасан гариг"
- ,"Saturday": "Бямба"
-
- ,"Su": "Ня"
- ,"Mo": "Да"
- ,"Tu": "Мя"
- ,"We": "Лх"
- ,"Th": "Пү"
- ,"Fr": "Ба"
- ,"Sa": "Бя"
-
- ,"January": "оны нэгдүгээр сарын"
- ,"February": "хоёрдугаар сар"
- ,"March": "Гуравдугаар сарын"
- ,"April": "Дөрөвдүгээр сар"
- ,"May": "May"
- ,"June": "June"
- ,"July": "June"
- ,"August": "Наймдугаар сар"
- ,"September": "Есдүгээр"
- ,"October": "Аравдугаар сар"
- ,"November": "Арваннэгдүгээр"
- ,"December": "Арванхоёрдугаар сар"
-
- ,"Jan": "оны"
- ,"Feb": "хоё"
- ,"Mar": "Гур"
- ,"Apr": "Дөр"
- ,"MayAbr": "May"
- ,"Jun": "Jun"
- ,"Jul": "Jul"
- ,"Ago": "Най"
- ,"Sep": "Есд"
- ,"Oct": "Ара"
- ,"Nov": "Арв"
- ,"Dec": "Арв"
-
- ,"%A, %B %e": "%A, %B %e"
-
- ,"Something went wrong":
- "Something went wrong"
- ,"The server does not respond, please check your Internet connection":
- "The server does not respond, please check you Internet connection"
-}
diff --git a/js/vn/locale/mn.yml b/js/vn/locale/mn.yml
new file mode 100644
index 00000000..f1023a84
--- /dev/null
+++ b/js/vn/locale/mn.yml
@@ -0,0 +1,40 @@
+Sunday: Ням гараг
+Monday: Даваа гариг
+Tuesday: Мягмар
+Wednesday: Лхагва
+Thursday: Пүрэв
+Friday: Баасан гариг
+Saturday: Бямба
+Su: Ня
+Mo: Да
+Tu: Мя
+We: Лх
+Th: Пү
+Fr: Ба
+Sa: Бя
+January: оны нэгдүгээр сарын
+February: хоёрдугаар сар
+March: Гуравдугаар сарын
+April: Дөрөвдүгээр сар
+May: May
+June: June
+July: June
+August: Наймдугаар сар
+September: Есдүгээр
+October: Аравдугаар сар
+November: Арваннэгдүгээр
+December: Арванхоёрдугаар сар
+Jan: оны
+Feb: хоё
+Mar: Гур
+Apr: Дөр
+Jun: Jun
+Jul: Jul
+Ago: Най
+Sep: Есд
+Oct: Ара
+Nov: Арв
+Dec: Арв
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Something went wrong
+'The server does not respond, please check your Internet connection': 'The server does not respond, please check you Internet connection'
diff --git a/js/vn/locale/pt.json b/js/vn/locale/pt.json
deleted file mode 100644
index c5cd4361..00000000
--- a/js/vn/locale/pt.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "Sunday": "Domingo"
- ,"Monday": "Segunda-Feira"
- ,"Tuesday": "Terça-Feira"
- ,"Wednesday": "Quarta-Feira"
- ,"Thursday": "Quinta-Feira"
- ,"Friday": "Sexta-Feira"
- ,"Saturday": "Sábado"
-
- ,"Su": "Do"
- ,"Mo": "Seg"
- ,"Tu": "Ter"
- ,"We": "Qua"
- ,"Th": "Qui"
- ,"Fr": "Sex"
- ,"Sa": "Sab"
-
- ,"January": "Janeiro"
- ,"February": "Fevereiro"
- ,"March": "Março"
- ,"April": "Abril"
- ,"May": "Maio"
- ,"June": "Junho"
- ,"July": "Julho"
- ,"August": "Agosto"
- ,"September": "Septembro"
- ,"October": "Outubro"
- ,"November": "Novembro"
- ,"December": "Dezembro"
-
- ,"Jan": "Jan"
- ,"Feb": "Fev"
- ,"Mar": "Mar"
- ,"Apr": "Abr"
- ,"MayAbr": "Mai"
- ,"Jun": "Jun"
- ,"Jul": "Jul"
- ,"Ago": "Ago"
- ,"Sep": "Set"
- ,"Oct": "Out"
- ,"Nov": "Nov"
- ,"Dec": "Dez"
-
- ,"%A, %B %e": "%A, %B %e"
-
- ,"Something went wrong":
- "Algo deu errado"
- ,"The server does not respond, please check your Internet connection":
- "O servidor não responde, por favor, verifique sua conexão com a Internet"
-}
diff --git a/js/vn/locale/pt.yml b/js/vn/locale/pt.yml
new file mode 100644
index 00000000..5a0da485
--- /dev/null
+++ b/js/vn/locale/pt.yml
@@ -0,0 +1,40 @@
+Sunday: Domingo
+Monday: Segunda-Feira
+Tuesday: Terça-Feira
+Wednesday: Quarta-Feira
+Thursday: Quinta-Feira
+Friday: Sexta-Feira
+Saturday: Sábado
+Su: Do
+Mo: Seg
+Tu: Ter
+We: Qua
+Th: Qui
+Fr: Sex
+Sa: Sab
+January: Janeiro
+February: Fevereiro
+March: Março
+April: Abril
+May: Mai
+June: Junho
+July: Julho
+August: Agosto
+September: Septembro
+October: Outubro
+November: Novembro
+December: Dezembro
+Jan: Jan
+Feb: Fev
+Mar: Mar
+Apr: Abr
+Jun: Jun
+Jul: Jul
+Ago: Ago
+Sep: Set
+Oct: Out
+Nov: Nov
+Dec: Dez
+'%A, %B %e': '%A, %B %e'
+Something went wrong: Algo deu errado
+'The server does not respond, please check your Internet connection': 'O servidor não responde, por favor, verifique sua conexão com a Internet'
diff --git a/js/vn/mutators.js b/js/vn/mutators.js
index d167689a..af723213 100644
--- a/js/vn/mutators.js
+++ b/js/vn/mutators.js
@@ -7,12 +7,11 @@ var Mutators = Class.Mutators;
var _Extends = Mutators.Extends;
-Mutators.Extends = function () {
+Mutators.Extends = function ()
+{
_Extends.apply (this, arguments);
-
- if (this.Properties === undefined)
- this.implement ({Properties: {}});
-};
+ this.implement ({Properties: {}});
+}
Mutators.Tag = function (tagName)
{
diff --git a/package.json b/package.json
index 3159b2ce..54ed992e 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,13 @@
"url-loader": "^0.5.7",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.9.1",
- "webpack-merge": "^4.1.0"
+ "webpack-merge": "^4.1.0",
+ "yaml-loader": "^0.5.0"
},
"dependencies": {
+ "js-yaml": "^3.10.0",
"mootools": "^1.5.2",
+ "require-yaml": "0.0.1",
"tinymce": "^4.4.3"
},
"scripts": {
diff --git a/pages/main/manifest.json b/pages/main/manifest.json
index ccfa40bb..815513d8 100644
--- a/pages/main/manifest.json
+++ b/pages/main/manifest.json
@@ -7,5 +7,6 @@
}
],
"start_url": "/index.php",
- "display": "standalone"
+ "display": "standalone",
+ "theme_color": "#009688"
}
diff --git a/pages/production/main.js b/pages/production/main.js
index 3cbb71b3..ab388a4d 100644
--- a/pages/production/main.js
+++ b/pages/production/main.js
@@ -2,18 +2,19 @@
/**
* Time in seconds between every request.
*/
-var INTERVAL = 10;
+var INTERVAL = 15;
var requestInterval = INTERVAL;
var failedRequests = 0;
var timeoutId = null;
var request = null;
-var lastText = null;
-var lastError = null;
+var myText;
+var myStatus;
+var myError;
function onBodyLoad ()
{
- updateText ();
+ setTimeout (setText, 1000);
}
function onSettingsClick ()
@@ -25,6 +26,9 @@ function onSettingsClick ()
deviceId = prompt ('Enter the device identifier', deviceId);
+ if (deviceId == null)
+ return;
+
if (deviceId)
localStorage.setItem ('hederaDeviceId', deviceId);
else if (deviceId === '')
@@ -41,6 +45,12 @@ function onSettingsClick ()
request = null;
}
+ setText ();
+}
+
+function setText ()
+{
+ display (null, null, null);
updateText ();
}
@@ -50,7 +60,7 @@ function updateText ()
if (!deviceId)
{
- display ('Device id not set', true);
+ display (null, null, 'Device id not set');
return;
}
@@ -74,27 +84,29 @@ function onRequestChange (request)
switch (request.status)
{
case 200:
- var json = JSON.parse (request.responseText);
- display (json.data);
+ var data = JSON.parse (request.responseText).data;
+ display (data.displayText, data.status, null);
requestInterval = INTERVAL;
failedRequests = 0;
break;
case 400:
var json = JSON.parse (request.responseText);
throw new Error (json.data.message);
+ case 0:
+ throw new Error ('Connection lost');
default:
throw new Error ('HTTP '+ request.status +': '+ request.statusText);
}
}
catch (e)
{
- display (e.message, true);
+ display (myText, myStatus, e.message);
console.error (e.message);
failedRequests++;
if (failedRequests > 10 && requestInterval < 60)
{
- requestInterval += parseInt (Math.random() * 10) + 1;
+ requestInterval += parseInt (Math.random() * INTERVAL) + 1;
console.warn ('Request interval increased to %d seconds.', requestInterval);
}
}
@@ -103,34 +115,37 @@ function onRequestChange (request)
request = null;
}
-function display (text, error)
+function display (text, status, error)
{
- var bgColor;
+ if (text === myText && status === myStatus && error === myError)
+ return;
- if (!error)
+ var bgColor;
+ var body = document.body;
+
+ if (error)
+ {
+ text = text ? text : 'Er';
+ $('error').textContent = error;
+ $('error').style.display = 'block';
+ bgColor = 'red';
+ }
+ else
{
- $('text').textContent = text;
$('error').textContent = '';
$('error').style.display = 'none';
bgColor = 'green';
}
- else
- {
- $('text').textContent = 'Er';
- $('error').textContent = text;
- $('error').style.display = 'block';
- bgColor = 'red';
- }
- if (text != lastText || lastError != error)
- {
- var body = document.body;
- body.addEventListener ('transitionend', onTransitionEnd);
- body.style.backgroundColor = bgColor;
- }
+ $('text').textContent = text;
+ body.className = status ? status : '';
- lastText = text;
- lastError = error;
+ body.addEventListener ('transitionend', onTransitionEnd);
+ body.style.backgroundColor = bgColor;
+
+ myText = text;
+ myStatus = status;
+ myError = error;
}
function onTransitionEnd ()
diff --git a/pages/production/style.css b/pages/production/style.css
index d5beb353..bc8beb90 100644
--- a/pages/production/style.css
+++ b/pages/production/style.css
@@ -8,6 +8,18 @@ body
font-family: Sans;
transition: background-color 500ms ease-in;
}
+body.idle
+{
+ background-color: #08D;
+}
+body.doing
+{
+ background-color: #333;
+}
+body.done
+{
+ background-color: #4A0;
+}
#container
{
width: 100%;
diff --git a/pages/update-browser/locale/ca.json b/pages/update-browser/locale/ca.json
deleted file mode 100644
index 888067e7..00000000
--- a/pages/update-browser/locale/ca.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Actualitza el teu navegador"
- ,"ContinueAnyway": "Continuar igualment"
-}
diff --git a/pages/update-browser/locale/ca.yml b/pages/update-browser/locale/ca.yml
new file mode 100644
index 00000000..6dc920c4
--- /dev/null
+++ b/pages/update-browser/locale/ca.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Actualitza el teu navegador
+ContinueAnyway: Continuar igualment
diff --git a/pages/update-browser/locale/en.json b/pages/update-browser/locale/en.json
deleted file mode 100644
index 1735de56..00000000
--- a/pages/update-browser/locale/en.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Upgrade your browser"
- ,"ContinueAnyway": "Continue anyway"
-}
diff --git a/pages/update-browser/locale/en.yml b/pages/update-browser/locale/en.yml
new file mode 100644
index 00000000..3660ead7
--- /dev/null
+++ b/pages/update-browser/locale/en.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Upgrade your browser
+ContinueAnyway: Continue anyway
diff --git a/pages/update-browser/locale/es.json b/pages/update-browser/locale/es.json
deleted file mode 100644
index 7e92fd86..00000000
--- a/pages/update-browser/locale/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Actualiza tu navegador"
- ,"ContinueAnyway": "Continuar de todos modos"
-}
diff --git a/pages/update-browser/locale/es.yml b/pages/update-browser/locale/es.yml
new file mode 100644
index 00000000..39adff07
--- /dev/null
+++ b/pages/update-browser/locale/es.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Actualiza tu navegador
+ContinueAnyway: Continuar de todos modos
diff --git a/pages/update-browser/locale/fr.json b/pages/update-browser/locale/fr.json
deleted file mode 100644
index c9e977e0..00000000
--- a/pages/update-browser/locale/fr.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Mettez à jour votre navigateur"
- ,"ContinueAnyway": "Continuer"
-}
diff --git a/pages/update-browser/locale/fr.yml b/pages/update-browser/locale/fr.yml
new file mode 100644
index 00000000..8500ff28
--- /dev/null
+++ b/pages/update-browser/locale/fr.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Mettez à jour votre navigateur
+ContinueAnyway: Continuer
diff --git a/pages/update-browser/locale/mn.json b/pages/update-browser/locale/mn.json
deleted file mode 100644
index 1735de56..00000000
--- a/pages/update-browser/locale/mn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Upgrade your browser"
- ,"ContinueAnyway": "Continue anyway"
-}
diff --git a/pages/update-browser/locale/mn.yml b/pages/update-browser/locale/mn.yml
new file mode 100644
index 00000000..3660ead7
--- /dev/null
+++ b/pages/update-browser/locale/mn.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Upgrade your browser
+ContinueAnyway: Continue anyway
diff --git a/pages/update-browser/locale/pt.json b/pages/update-browser/locale/pt.json
deleted file mode 100644
index 494cf9ab..00000000
--- a/pages/update-browser/locale/pt.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "UpdateYourBrowser": "Atualize seu navegador"
- ,"ContinueAnyway": "Continuar de todas maneiras"
-}
diff --git a/pages/update-browser/locale/pt.yml b/pages/update-browser/locale/pt.yml
new file mode 100644
index 00000000..37048a27
--- /dev/null
+++ b/pages/update-browser/locale/pt.yml
@@ -0,0 +1,2 @@
+UpdateYourBrowser: Atualize seu navegador
+ContinueAnyway: Continuar de todas maneiras
diff --git a/pages/version-menu/locale/ca.json b/pages/version-menu/locale/ca.json
deleted file mode 100644
index 3f51080b..00000000
--- a/pages/version-menu/locale/ca.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Benvingut a Verdnatura, On vols anar?"
-
- ,"New website": "Nova web"
- ,"(Fantastic)": "(Fantàstica)"
- ,"Old website": "Antiga web"
- ,"(Best choose new)": "(Millor triï la nova)"
-}
diff --git a/pages/version-menu/locale/ca.yml b/pages/version-menu/locale/ca.yml
new file mode 100644
index 00000000..62ddfddb
--- /dev/null
+++ b/pages/version-menu/locale/ca.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Benvingut a Verdnatura, On vols anar?'
+New website: Nova web
+(Fantastic): (Fantàstica)
+Old website: Antiga web
+(Best choose new): (Millor triï la nova)
diff --git a/pages/version-menu/locale/en.json b/pages/version-menu/locale/en.json
deleted file mode 100644
index fa6ddf49..00000000
--- a/pages/version-menu/locale/en.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
-
- ,"New website": "New website"
- ,"(Fantastic)": "(Fantastic)"
- ,"Old website": "Old website"
- ,"(Best choose new)": "(Best choose new)"
-}
diff --git a/pages/version-menu/locale/en.yml b/pages/version-menu/locale/en.yml
new file mode 100644
index 00000000..4691428e
--- /dev/null
+++ b/pages/version-menu/locale/en.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Welcome to Verdnatura, where are you going?'
+New website: New website
+(Fantastic): (Fantastic)
+Old website: Old website
+(Best choose new): (Best choose new)
diff --git a/pages/version-menu/locale/es.json b/pages/version-menu/locale/es.json
deleted file mode 100644
index ed3396a8..00000000
--- a/pages/version-menu/locale/es.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Bienvenido a Verdnatura, ¿Dónde quieres ir?"
-
- ,"New website": "Nueva web"
- ,"(Fantastic)": "(Fantástica)"
- ,"Old website": "Antigua web"
- ,"(Best choose new)": "(Mejor elige la nueva)"
-}
diff --git a/pages/version-menu/locale/es.yml b/pages/version-menu/locale/es.yml
new file mode 100644
index 00000000..0b22d9b5
--- /dev/null
+++ b/pages/version-menu/locale/es.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bienvenido a Verdnatura, ¿Dónde quieres ir?'
+New website: Nueva web
+(Fantastic): (Fantástica)
+Old website: Antigua web
+(Best choose new): (Mejor elige la nueva)
diff --git a/pages/version-menu/locale/fr.json b/pages/version-menu/locale/fr.json
deleted file mode 100644
index 17aa6376..00000000
--- a/pages/version-menu/locale/fr.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Bienvenue à Verdnatura, où allez-vous?"
-
- ,"New website": "Nouveau site web"
- ,"(Fantastic)": "(Fantastique)"
- ,"Old website": "Vieux web"
- ,"(Best choose new)": "(Mieux choisir le nouveau)"
-}
diff --git a/pages/version-menu/locale/fr.yml b/pages/version-menu/locale/fr.yml
new file mode 100644
index 00000000..e9b002f2
--- /dev/null
+++ b/pages/version-menu/locale/fr.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bienvenue à Verdnatura, où allez-vous?'
+New website: Nouveau site web
+(Fantastic): (Fantastique)
+Old website: Vieux web
+(Best choose new): (Mieux choisir le nouveau)
diff --git a/pages/version-menu/locale/mn.json b/pages/version-menu/locale/mn.json
deleted file mode 100644
index fa6ddf49..00000000
--- a/pages/version-menu/locale/mn.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Welcome to Verdnatura, where are you going?"
-
- ,"New website": "New website"
- ,"(Fantastic)": "(Fantastic)"
- ,"Old website": "Old website"
- ,"(Best choose new)": "(Best choose new)"
-}
diff --git a/pages/version-menu/locale/mn.yml b/pages/version-menu/locale/mn.yml
new file mode 100644
index 00000000..4691428e
--- /dev/null
+++ b/pages/version-menu/locale/mn.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Welcome to Verdnatura, where are you going?'
+New website: New website
+(Fantastic): (Fantastic)
+Old website: Old website
+(Best choose new): (Best choose new)
diff --git a/pages/version-menu/locale/pt.json b/pages/version-menu/locale/pt.json
deleted file mode 100644
index a40e0c6b..00000000
--- a/pages/version-menu/locale/pt.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Welcome to Verdnatura, where are you going?": "Bem-Vindo a VerdNatura, onde queres ir?"
-
- ,"New website": "Nova Web"
- ,"(Fantastic)": "(Fantástica)"
- ,"Old website": "Antiga web"
- ,"(Best choose new)": "(Melhor escolher a nova)"
-}
diff --git a/pages/version-menu/locale/pt.yml b/pages/version-menu/locale/pt.yml
new file mode 100644
index 00000000..8c02c51e
--- /dev/null
+++ b/pages/version-menu/locale/pt.yml
@@ -0,0 +1,5 @@
+'Welcome to Verdnatura, where are you going?': 'Bem-Vindo a VerdNatura, onde queres ir?'
+New website: Nova Web
+(Fantastic): (Fantástica)
+Old website: Antiga web
+(Best choose new): (Melhor escolher a nova)
diff --git a/reports/delivery-note/delivery-note.js b/reports/delivery-note/delivery-note.js
index 17d086c8..d74693d5 100644
--- a/reports/delivery-note/delivery-note.js
+++ b/reports/delivery-note/delivery-note.js
@@ -2,7 +2,15 @@
Hedera.DeliveryNote = new Class
({
Extends: Hedera.Report
-
+
+ ,onTicketReady: function (form)
+ {
+ if (form.get ('method') != 'PICKUP')
+ Vn.Node.setText (this.$('method'), _('Agency'));
+ else
+ Vn.Node.setText (this.$('method'), _('Warehouse'));
+ }
+
,subtotalRenderer: function (column, form)
{
column.value = this.subtotal (form);
diff --git a/reports/delivery-note/style.css b/reports/delivery-note/style.css
index c0eaad65..85589f44 100644
--- a/reports/delivery-note/style.css
+++ b/reports/delivery-note/style.css
@@ -12,11 +12,15 @@
{
margin-bottom: 2em;
}
-.report .header > p
+.report .header > div > p
{
text-align: right;
margin: .1em 0;
}
+.report .address
+{
+ margin-top: .8em;
+}
.report .footer
{
font-weight: bold;
diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml
index e0eb38d1..5d2b960a 100644
--- a/reports/delivery-note/ui.xml
+++ b/reports/delivery-note/ui.xml
@@ -1,6 +1,6 @@
Testing
+
-
-
-
-
-
- _Delivery
+
+
+
+
+
+
+
+