kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-16 10:44:37 +00:00
Code Issues Projects Releases Wiki Activity

Added the product descrption as a column on the stock overview page (closes #1362)

Browse Source
This commit is contained in:
Bernd Bestel
2021-07-08 20:22:51 +02:00
parent 7595d640f5
commit 8b977644f7
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
localization/strings.pot
View File

@@ -2147,3 +2147,6 @@ msgstr ""
msgid "Show only in-stock products" msgid "Show only in-stock products"
msgstr "" msgstr ""
msgid "Product description"
msgstr ""

6
migrations/0136.sql
View File

@@ -29,7 +29,8 @@ SELECT
plp.purchased_date AS last_purchased, plp.purchased_date AS last_purchased,
plp.price AS last_price, plp.price AS last_price,
p.min_stock_amount, p.min_stock_amount,
pbcs.barcodes AS product_barcodes pbcs.barcodes AS product_barcodes,
p.description as product_description
FROM ( FROM (
SELECT * SELECT *
FROM stock_current FROM stock_current
@@ -80,7 +81,8 @@ SELECT
plp.purchased_date AS last_purchased, plp.purchased_date AS last_purchased,
plp.price AS last_price, plp.price AS last_price,
p.min_stock_amount, p.min_stock_amount,
pbcs.barcodes AS product_barcodes pbcs.barcodes AS product_barcodes,
p.description as product_description
FROM ( FROM (
SELECT * SELECT *
FROM stock_current FROM stock_current

1
public/viewjs/stockoverview.js
View File

@@ -14,6 +14,7 @@
{ 'visible': false, 'targets': 11 }, { 'visible': false, 'targets': 11 },
{ 'visible': false, 'targets': 12 }, { 'visible': false, 'targets': 12 },
{ 'visible': false, 'targets': 13 }, { 'visible': false, 'targets': 13 },
{ 'visible': false, 'targets': 14 },
{ "type": "num", "targets": 3 }, { "type": "num", "targets": 3 },
{ "type": "html-num-fmt", "targets": 9 }, { "type": "html-num-fmt", "targets": 9 },
{ "type": "html-num-fmt", "targets": 10 }, { "type": "html-num-fmt", "targets": 10 },

4
views/stockoverview.blade.php
View File

@@ -169,6 +169,7 @@
<th>{{ $__t('Last purchased') }}</th> <th>{{ $__t('Last purchased') }}</th>
<th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th> <th class="@if(!GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) d-none @endif">{{ $__t('Last price') }}</th>
<th>{{ $__t('Min. stock amount') }}</th> <th>{{ $__t('Min. stock amount') }}</th>
<th>{{ $__t('Product description') }}</th>
@include('components.userfields_thead', array( @include('components.userfields_thead', array(
'userfields' => $userfields 'userfields' => $userfields
@@ -399,6 +400,9 @@
<td> <td>
<span class="locale-number locale-number-quantity-amount">{{ $currentStockEntry->min_stock_amount }}</span> <span class="locale-number locale-number-quantity-amount">{{ $currentStockEntry->min_stock_amount }}</span>
</td> </td>
<td>
{{ $currentStockEntry->product_description }}
</td>
@include('components.userfields_tbody', array( @include('components.userfields_tbody', array(
'userfields' => $userfields, 'userfields' => $userfields,