- Total
+ Total
diff --git a/web/js/hedera/login.css b/web/js/hedera/login.css
index b840d47c..c540860c 100755
--- a/web/js/hedera/login.css
+++ b/web/js/hedera/login.css
@@ -62,7 +62,7 @@ body
right: 0;
}
-@media (max-height: 700px)
+@media (max-height: 630px)
{
.vn-login
{
diff --git a/web/js/hedera/style.css b/web/js/hedera/style.css
index 8633bb62..31553bde 100755
--- a/web/js/hedera/style.css
+++ b/web/js/hedera/style.css
@@ -10,7 +10,7 @@
/* Desktop - Laptop 1360x768 */
@media (max-resolution: 119dpi) and (min-device-width: 1340px) and (max-device-width: 1899px)
{
- body { font-size: 12pt; }
+ body { font-size: 11pt; }
}
/* Desktop - FHD 1920x1080 */
diff --git a/web/locale/ca/forms/ecomerce/orders.json b/web/locale/ca/forms/ecomerce/orders.json
index 8d8345d8..49f1c177 100755
--- a/web/locale/ca/forms/ecomerce/orders.json
+++ b/web/locale/ca/forms/ecomerce/orders.json
@@ -11,7 +11,7 @@
,"LastOrders": "Últimes comandes"
,"Balance:": "Saldo:"
- ,"PaymentInfo": "La quantitat que 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, esborra la quantitat suggerida i introdueix la quantitat que vulguis."
+ ,"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"
diff --git a/web/locale/en/forms/ecomerce/orders.json b/web/locale/en/forms/ecomerce/orders.json
index a2833d1b..fc2c17ec 100755
--- a/web/locale/en/forms/ecomerce/orders.json
+++ b/web/locale/en/forms/ecomerce/orders.json
@@ -11,7 +11,7 @@
,"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, delete the suggested amount and enter the amount you want."
+ ,"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"
diff --git a/web/locale/es/forms/ecomerce/orders.json b/web/locale/es/forms/ecomerce/orders.json
index d529fee7..cc8c5ddc 100755
--- a/web/locale/es/forms/ecomerce/orders.json
+++ b/web/locale/es/forms/ecomerce/orders.json
@@ -11,7 +11,7 @@
,"LastOrders": "Últimos pedidos"
,"Balance:": "Saldo:"
- ,"PaymentInfo": "La cantidad que 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, borra la cantidad sugerida e introduce la cantidad que desees."
+ ,"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"
diff --git a/web/locale/pt/forms/ecomerce/orders.json b/web/locale/pt/forms/ecomerce/orders.json
index f9da5c4b..cdb5f7c9 100644
--- a/web/locale/pt/forms/ecomerce/orders.json
+++ b/web/locale/pt/forms/ecomerce/orders.json
@@ -11,7 +11,7 @@
,"LastOrders": "Últimos pedidos"
,"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, apague a quantidade sugerida e introduza a quantidade que deseje."
+ ,"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"
diff --git a/web/rest/tpv.php b/web/rest/tpv.php
index d01ae0f7..e4ce989b 100755
--- a/web/rest/tpv.php
+++ b/web/rest/tpv.php
@@ -28,7 +28,6 @@ class RestMod extends Rest\Module
,'params' => $params
,'signature' => $signature
];
- trigger_error (print_r ($result, TRUE));
return $result;
}
diff --git a/web/rest/visits-sync.php b/web/rest/visits-sync.php
new file mode 100644
index 00000000..35fcdd0b
--- /dev/null
+++ b/web/rest/visits-sync.php
@@ -0,0 +1,57 @@
+conn;
+ $result = $conn->query ("SELECT id, agent FROM visit_agent "
+ ."WHERE version = '0.0' OR platform = 'unknown' OR cookies IS NULL ORDER BY id DESC");
+
+ $stmt = $conn->prepare (
+ 'UPDATE visit_agent SET platform = ?, browser = ?, version = ?, javascript = ?, cookies = ? WHERE id = ?');
+
+ if ($result && $stmt)
+ {
+ set_time_limit (0);
+
+ $stmt->bind_param('sssiii'
+ ,$platform
+ ,$browser
+ ,$version
+ ,$javascript
+ ,$cookies
+ ,$id
+ );
+
+ // Update the visit info using browscap
+
+ while ($row = $result->fetch_assoc ())
+ {
+ $info = get_browser ($row['agent']);
+ $platform = $info->platform;
+ $browser = $info->browser;
+ $version = $info->version;
+ $javascript = $info->javascript;
+ $cookies = $info->cookies;
+ $id = $row['id'];
+ $stmt->execute ();
+ }
+
+ $result = TRUE;
+ }
+ else
+ $result = FALSE;
+
+ if ($stmt)
+ $stmt->close ();
+ if ($result)
+ $result->free ();
+
+ return $result;
+ }
+}
+
+?>
diff --git a/web/visits-sync.php b/web/visits-sync.php
deleted file mode 100755
index 26baca41..00000000
--- a/web/visits-sync.php
+++ /dev/null
@@ -1,66 +0,0 @@
-connect_error)
- exit ($conn->connect_error);
-
-$result = $conn->query ("SELECT id, agent FROM visit_agent "
- ."WHERE version = '0.0' OR platform = 'unknown' OR cookies IS NULL ORDER BY id DESC");
-
-$stmt = $conn->prepare (
- 'UPDATE visit_agent SET platform = ?, browser = ?, version = ?, javascript = ?, cookies = ? WHERE id = ?');
-
-if ($result && $stmt)
-{
- set_time_limit (0);
-
- $stmt->bind_param('sssiii'
- ,$platform
- ,$browser
- ,$version
- ,$javascript
- ,$cookies
- ,$id
- );
-
- while ($row = $result->fetch_assoc ())
- {
- echo sprintf ("Processing row: %d\n", $row['id']);
-
- $info = get_browser ($row['agent']);
- $platform = $info->platform;
- $browser = $info->browser;
- $version = $info->version;
- $javascript = $info->javascript;
- $cookies = $info->cookies;
- $id = $row['id'];
- $stmt->execute ();
- }
-}
-
-if ($stmt)
- $stmt->close ();
-if ($result)
- $result->free ();
-
-if ($conn->errno)
- exit ($conn->error);
-
-$conn->close ();
-
-?>