Merge pull request 'refs #8480 Hide inactive items' (!101) from test into dev

Reviewed-on: verdnatura/hedera-web#101

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 build/
+dist/
 config.my.php
 .vscode/
 .quasar

Dockerfile

@@ -28,7 +28,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
 
 # Hedera
 
-RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | apt-key add - \
+RUN curl -sL https://apt.verdnatura.es/conf/verdnatura.gpg | tee /etc/apt/trusted.gpg.d/verdnatura.gpg \
     && echo "deb http://apt.verdnatura.es/ bookworm main" \
         > /etc/apt/sources.list.d/vn.list \
     && apt-get update \

debian/changelog

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

forms/admin/items/ui.xml

@@ -18,8 +18,8 @@
 					LEFT JOIN image im
 						ON im.collectionFk = 'catalog'
 						AND im.name = i.image
-				WHERE i.longName LIKE CONCAT('%', #search, '%')
+				WHERE i.isActive
-					OR i.id = #search
+					AND (i.longName LIKE CONCAT('%', #search, '%') OR i.id = #search)
 				ORDER BY i.longName LIMIT 50
 		</db-model>
 		<custom>

forms/ecomerce/catalog/ui.xml

@@ -117,7 +117,7 @@
 		SELECT i.id, i.longName item, i.subName,
 				i.tag5, i.value5, i.tag6, i.value6,
 				i.tag7, i.value7, i.tag8, i.value8,
-				i.relevancy, i.size, i.category, i.minQuantity,
+				i.relevancy, i.size, i.category, b.minQuantity,
 				k.name ink, p.name producer, o.name origin,
 				b.available, b.price, b.`grouping`,
 				i.image, im.updated
@@ -126,19 +126,13 @@
 				LEFT JOIN vn.ink k ON k.id = i.inkFk
 				LEFT JOIN vn.producer p ON p.id = i.producerFk
 				LEFT JOIN vn.origin o ON o.id = i.originFk
-				LEFT JOIN image im
+				LEFT JOIN image im ON im.collectionFk = 'catalog'
-					ON im.collectionFk = 'catalog'
 					AND im.name = i.image
 			WHERE b.available > 0
 			ORDER BY i.relevancy DESC, i.name, i.size
 			LIMIT 5000;
-		DROP TEMPORARY TABLE
+		DROP TEMPORARY TABLE tmp.item;
-			tmp.item,
+		CALL vn.ticketCalculatePurge();
-			tmp.ticketCalculateItem,
-			tmp.ticketComponentPrice,
-			tmp.ticketComponent,
-			tmp.ticketLot,
-			tmp.zoneGetShipped;
 	</db-model>
 	<db-form id="$card" v-model="card" model="items"/>
 	<vn-lot id="card-lot"/>

forms/ecomerce/confirm/index.js

@@ -67,7 +67,7 @@ export default new Class({
 			methods = ['balance'];
 			selectedMethod = 'BALANCE';
 		} else {
-			methods = ['card', 'transfer', 'later'];
+			methods = ['card'];
 
 			if (!creditExceededCond) {
 				methods.push('credit');
@@ -98,9 +98,6 @@ export default new Class({
 			case 'CARD':
 				id = 'cardMethod';
 				break;
-			case 'TRANSFER':
-				id = 'transferMethod';
-				break;
 			default:
 				id = null;
 		}

forms/ecomerce/confirm/ui.xml

@@ -162,32 +162,6 @@
 							<t>You will be redirected to the payment.</t>
 						</div>
 					</div>
-					<div id="transfer-method">
-						<label>
-							<htk-radio radio-group="pay-method" value="TRANSFER"/>
-							<t>Bank Transfer</t>
-						</label>
-						<div>
-							<t>Make a transfer to one account.</t>
-							<htk-repeater form-id="iter">
-								<db-model property="model">
-									SELECT name, iban FROM mainAccountBank	
-								</db-model>
-								<custom>
-									<div class="transfer-account">
-										<p>{{iter.name}}</p>
-										<p>{{iter.iban}}</p>
-									</div>
-								</custom>
-							</htk-repeater>
-						</div>
-					</div>
-					<div id="later-method">
-						<label>
-							<htk-radio radio-group="pay-method" value="LATER"/>
-							<t>Pay later</t>
-						</label>
-					</div>
 				</div>
 			</div>
 			<div class="button-bar vn-mt-md">

forms/reports/shelves/ui.xml

@@ -26,7 +26,7 @@
 				<db-model property="model">
 					SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family,
 					c.shelf, c.maxAmount, c.showPacking, c.stack, it.categoryFk realm
-						FROM shelfConfig c
+						FROM shelfMultiConfig c
 							JOIN vn.itemType it ON it.id = c.family
 				</db-model>
 			</htk-combo>

package.json

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

rest/edi/clean.php

@@ -8,7 +8,7 @@ class Clean extends Edi\Method {
 
 		$cleanPeriod = $db->getValue(
 			"SELECT ic.cleanPeriod
-				FROM imapConfig ic
+				FROM imapMultiConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$deleted = 0;

rest/edi/lib/method.php

@@ -14,7 +14,7 @@ abstract class Method extends \Vn\Lib\Method {
 
 		$imapConf = $db->getRow(
 			"SELECT ic.host, ic.user, ic.pass, ic.successFolder, ic.errorFolder
-				FROM imapConfig ic
+				FROM imapMultiConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$this->mailbox = sprintf('{%s/imap/ssl/novalidate-cert}',