refs #5122 Order check fixes

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (23.6.2) stable; urgency=low
+hedera-web (23.6.3) stable; urgency=low
 
   * Initial Release.
 

forms/ecomerce/pending/locale/ca.yml

@@ -1 +1,8 @@
 Pending: Pendents
+PendingOrders: Comandes pendents
+NewOrder: Nova comanda
+ViewOrder: Veure comanda
+RemoveOrder: Eliminar comanda
+LoadOrderIntoCart: Carregar comanda a la cistella
+AreYouSureDeleteOrder: Segur que vols esborrar la comanda?
+OrderLoadedIntoBasket: Comanda carregada a la cistella!

forms/ecomerce/pending/locale/en.yml

@@ -1 +1,8 @@
 Pending: Pending
+PendingOrders: Pending orders
+NewOrder: New order
+ViewOrder: View order
+RemoveOrder: Delete order
+LoadOrderIntoCart: Load order into cart
+AreYouSureDeleteOrder: Are you sure you want to delete the order?
+OrderLoadedIntoBasket: Order loaded into basket!

forms/ecomerce/pending/locale/es.yml

@@ -5,4 +5,4 @@ ViewOrder: Ver pedido
 RemoveOrder: Eliminar pedido
 LoadOrderIntoCart: Cargar pedido en la cesta
 AreYouSureDeleteOrder: ¿Seguro que quieres borrar el pedido?
-OrderLoadedIntoBasket: ¡Pedido cargado en la cesta!
+OrderLoadedIntoBasket: ¡Pedido cargado en la cesta!

forms/ecomerce/pending/locale/fr.yml

@@ -1 +1,8 @@
-Pending: Pendents
+Pending: En attente
+PendingOrders: Commandes en attente
+NewOrder: Nouvelle commande
+ViewOrder: Afficher la commande
+RemoveOrder: Supprimer la commande
+LoadOrderIntoCart: Charger la commande dans le panier
+AreYouSureDeleteOrder: Êtes-vous sûr de vouloir supprimer la commande?
+OrderLoadedIntoBasket: Commande chargée dans le panier!

forms/ecomerce/pending/locale/pt.yml

@@ -1 +1,8 @@
-Pending: Pendientes
+Pending: Pendentes
+PendingOrders: Pedidos pendentes
+NewOrder: Novo pedido
+ViewOrder: Ver pedido
+RemoveOrder: Excluir pedido
+LoadOrderIntoCart: Carrega o pedido no carrinho
+AreYouSureDeleteOrder: Tem certeza de que deseja excluir o pedido?
+OrderLoadedIntoBasket: Pedido carregado na cesta!

js/hedera/basket.js

@@ -32,11 +32,14 @@ module.exports = class {
 					continue: 'catalog'
 				};
 
-				if (err.code == 'orderNotOwnedByUser') {
-					this.constructor.unload();
-				} else {
-					dst.id = this.orderId;
-					Htk.Toast.showError(err.message);
+				switch(err.code) {
+					case 'orderConfirmed':
+					case 'orderNotOwnedByUser':
+						this.constructor.unload();
+						break;
+					default:
+						dst.id = this.orderId;
+						Htk.Toast.showError(err.message);
 				}
 
 				this.app.hash.setAll(dst);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "23.6.2",
+  "version": "23.6.3",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {

web/json-service.php

@@ -48,13 +48,13 @@ class JsonService extends RestService {
 
 		$json = new JsonException();
 		
-		if (_ENABLE_DEBUG || $errno & $eUser)
+		if (_ENABLE_DEBUG || $errno & $eUser) {
 			$json->message = $message;
-		else
+			$json->code = $errno;
+		} else
 			$json->message = s('Something went wrong');
 		
 		if (_ENABLE_DEBUG) {
-			$json->code = $errno;
 			$json->file = $file;
 			$json->line = $line;
 		}