mirror of
https://github.com/grocy/grocy.git
synced 2025-08-21 04:43:32 +00:00
Show the product card also on /products (closes #2185)
This commit is contained in:
@@ -2,5 +2,5 @@
|
|||||||
- Manage all your household equipment/devices in one place and have the information/instruction manual at hand when needed
|
- Manage all your household equipment/devices in one place and have the information/instruction manual at hand when needed
|
||||||
- New feature: Products can now have pictures
|
- New feature: Products can now have pictures
|
||||||
- Add them in the product edit page
|
- Add them in the product edit page
|
||||||
- Will be shown in the productcard (purchase/consume/etc. pages) and when you click the product name on the stock overview page (a little image icon next to the product name indicates if the product has an image)
|
- Will be shown in the product card (purchase/consume/etc. pages) and when you click the product name on the stock overview page (a little image icon next to the product name indicates if the product has an image)
|
||||||
- Recipes and the new equipment edit page now have a little editor with text formatting capabilities
|
- Recipes and the new equipment edit page now have a little editor with text formatting capabilities
|
||||||
|
@@ -27,12 +27,12 @@
|
|||||||
- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
|
- There is also a new sub feature flag `FEATURE_FLAG_STOCK_PRODUCT_FREEZING` to disable this if you don't need it (defaults to `true`)
|
||||||
|
|
||||||
### Stock improvements/fixes
|
### Stock improvements/fixes
|
||||||
- The productcard gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
|
- The product card gets now also refreshed after a transaction was posted (purchase/consume/etc.) (thanks @kriddles)
|
||||||
- The product field calories (kcal) now also allows decimal numbers
|
- The product field calories (kcal) now also allows decimal numbers
|
||||||
- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
|
- On the inventory page, "New amount" is now prefilled with the current stock amount of the selected product
|
||||||
- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
|
- Fixed that entering partial amounts was not possible on the inventory page (only applies if the product option "Allow partial units in stock" is enabled)
|
||||||
- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
|
- Fixed that on purchase a wrong minimum amount was enforced for products with enabled tare weight handling in combination with different purchase/stock quantity units
|
||||||
- Fixed that the productcard did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
|
- Fixed that the product card did not load correctly when `FEATURE_FLAG_STOCK_LOCATION_TRACKING` was set to `false` (thanks @kriddles)
|
||||||
- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
|
- Fixed that the "Add as barcode to existing product" workflow did not work twice when not switching the page inbetween
|
||||||
|
|
||||||
### Shopping list improvements/fixes
|
### Shopping list improvements/fixes
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
- Improved that when editing a unit conversion, the "Quantity unit from" and "Quantity unit to" of the corresponding inverse conversion is now also updated accordingly if changed (until now only the factor was updated automatically)
|
- Improved that when editing a unit conversion, the "Quantity unit from" and "Quantity unit to" of the corresponding inverse conversion is now also updated accordingly if changed (until now only the factor was updated automatically)
|
||||||
- Changed that the "Move on open" product option can now always be used/set, even when the "Default location" and "Default consume location" are the same
|
- Changed that the "Move on open" product option can now always be used/set, even when the "Default location" and "Default consume location" are the same
|
||||||
- Fixed that stock entry notes were lost when consuming/opening/transferring a partial amount of the corresponding stock entry (thanks @akoshpinter)
|
- Fixed that stock entry notes were lost when consuming/opening/transferring a partial amount of the corresponding stock entry (thanks @akoshpinter)
|
||||||
- Fixed that the average shelf life of a product (on the productcard) was wrong when the corresponding stock entry was edited
|
- Fixed that the average shelf life of a product (on the product card) was wrong when the corresponding stock entry was edited
|
||||||
- Fixed that when the stock setting "Decimal places allowed for amounts" was set to `0`, unit conversion (if any) failed when adding the corresponding product to stock
|
- Fixed that when the stock setting "Decimal places allowed for amounts" was set to `0`, unit conversion (if any) failed when adding the corresponding product to stock
|
||||||
- Fixed that consuming a parent product which is not in stock itself (so essentially using any of the child products) may failed when unit conversions were involved (the current stock amount check was wrong in that case)
|
- Fixed that consuming a parent product which is not in stock itself (so essentially using any of the child products) may failed when unit conversions were involved (the current stock amount check was wrong in that case)
|
||||||
- Fixed that the status button counters on the stock overview page ("X products are overdue" and so on) included products which have the option `Never show on stock overview` enabled
|
- Fixed that the status button counters on the stock overview page ("X products are overdue" and so on) included products which have the option `Never show on stock overview` enabled
|
||||||
|
@@ -31,6 +31,7 @@
|
|||||||
- The product option "Quick consume amount" (the amount used for the "quick consume/open buttons" on the stock overview page) has been split into another option "Quick open amount", to be able to set different amounts for consume and open (defaults to the "Quick consume amount" per product, so no changed behavior when not configured)
|
- The product option "Quick consume amount" (the amount used for the "quick consume/open buttons" on the stock overview page) has been split into another option "Quick open amount", to be able to set different amounts for consume and open (defaults to the "Quick consume amount" per product, so no changed behavior when not configured)
|
||||||
- Changed that for the product's average and last price (and for the price history chart) stock transactions with an empty or `0` price are ignored
|
- Changed that for the product's average and last price (and for the price history chart) stock transactions with an empty or `0` price are ignored
|
||||||
- Added a filter option to only show currently out-of-stock products on the products list (master data) page
|
- Added a filter option to only show currently out-of-stock products on the products list (master data) page
|
||||||
|
- When clicking the product name on the products list (master data) page, the product card will now be displayed (like on the stock overview page)
|
||||||
- Fixed that hiding the "Purchased date" column (table options) on the stock entries page didn't work
|
- Fixed that hiding the "Purchased date" column (table options) on the stock entries page didn't work
|
||||||
- Fixed that sorting by the "Value" and "Min. stock amount" columns on the stock overview page didn't work
|
- Fixed that sorting by the "Value" and "Min. stock amount" columns on the stock overview page didn't work
|
||||||
- Fixed that the consumed amount was wrong, when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved
|
- Fixed that the consumed amount was wrong, when consuming multiple substituted subproducts at once and when multiple/different conversion factors were involved
|
||||||
|
@@ -176,3 +176,9 @@ $("#merge-products-save-button").on("click", function(e)
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).on("click", ".product-name-cell", function(e)
|
||||||
|
{
|
||||||
|
Grocy.Components.ProductCard.Refresh($(e.currentTarget).attr("data-product-id"));
|
||||||
|
$("#productcard-modal").modal("show");
|
||||||
|
});
|
||||||
|
@@ -174,7 +174,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="product-name-cell cursor-link"
|
||||||
|
data-product-id="{{ $product->id }}">
|
||||||
{{ $product->name }}
|
{{ $product->name }}
|
||||||
@if(!empty($product->picture_file_name))
|
@if(!empty($product->picture_file_name))
|
||||||
<i class="fa-solid fa-image text-muted"
|
<i class="fa-solid fa-image text-muted"
|
||||||
@@ -283,4 +284,21 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="modal fade"
|
||||||
|
id="productcard-modal"
|
||||||
|
tabindex="-1">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content text-center">
|
||||||
|
<div class="modal-body">
|
||||||
|
@include('components.productcard')
|
||||||
|
</div>
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button"
|
||||||
|
class="btn btn-secondary"
|
||||||
|
data-dismiss="modal">{{ $__t('Close') }}</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@stop
|
@stop
|
||||||
|
Reference in New Issue
Block a user