github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-10 06:26:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Review

Browse Source 
- Default FEATURE_FLAG_THERMAL_PRINTER to disabled
- Added missing localization strings (and slightly adjusted one)
This commit is contained in:
Bernd Bestel 2021-06-18 20:34:24 +02:00
parent 2b0bbc34c0
commit f6e3546d3f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-dist.php
View File

@ -198,7 +198,7 @@ Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true);
Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in due date fields on (supported) mobile browsers Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in due date fields on (supported) mobile browsers
Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true); Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true);
Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true); Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true);
Setting('FEATURE_FLAG_THERMAL_PRINTER', true); Setting('FEATURE_FLAG_THERMAL_PRINTER', false);
// Feature settings // Feature settings
Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to true, opened items will be counted as missing for calculating if a product is below its minimum stock amount Setting('FEATURE_SETTING_STOCK_COUNT_OPENED_PRODUCTS_AGAINST_MINIMUM_STOCK_AMOUNT', true); // When set to true, opened items will be counted as missing for calculating if a product is below its minimum stock amount

12
localization/strings.pot
View File

@ -2077,3 +2077,15 @@ msgstr ""
msgid "A product or a note is required" msgid "A product or a note is required"
msgstr "" msgstr ""
msgid "Thermal printer"
msgstr ""
msgid "Printing"
msgstr ""
msgid "Connecting to printer..."
msgstr ""
msgid "Unable to print"
msgstr ""

34
public/viewjs/shoppinglist.js
View File

@ -433,14 +433,16 @@ $(document).on("click", "#print-shopping-list-button", function(e)
cancel: { cancel: {
label: __t('Cancel'), label: __t('Cancel'),
className: 'btn-secondary', className: 'btn-secondary',
callback: function () { callback: function()
{
bootbox.hideAll(); bootbox.hideAll();
} }
}, },
printtp: { printtp: {
label: __t('Thermal printer'), label: __t('Thermal printer'),
className: 'btn-secondary', className: 'btn-secondary',
callback: function () { callback: function()
{
bootbox.hideAll(); bootbox.hideAll();
var printHeader = $("#print-show-header").prop("checked"); var printHeader = $("#print-show-header").prop("checked");
var thermalPrintDialog = bootbox.dialog({ var thermalPrintDialog = bootbox.dialog({
@ -448,14 +450,14 @@ $(document).on("click", "#print-shopping-list-button", function(e)
message: '<p><i class="fa fa-spin fa-spinner"></i> ' + __t('Connecting to printer...') + '</p>' message: '<p><i class="fa fa-spin fa-spinner"></i> ' + __t('Connecting to printer...') + '</p>'
}); });
//Delaying for one second so that the alert can be closed //Delaying for one second so that the alert can be closed
setTimeout(function () setTimeout(function()
{ {
Grocy.Api.Get('print/shoppinglist/thermal?list=' + $("#selected-shopping-list").val() + '&printHeader=' + printHeader, Grocy.Api.Get('print/shoppinglist/thermal?list=' + $("#selected-shopping-list").val() + '&printHeader=' + printHeader,
function (result) function(result)
{ {
bootbox.hideAll(); bootbox.hideAll();
}, },
function (xhr) function(xhr)
{ {
console.error(xhr); console.error(xhr);
var validResponse = true; var validResponse = true;
@ -468,9 +470,10 @@ $(document).on("click", "#print-shopping-list-button", function(e)
} }
if (validResponse) if (validResponse)
{ {
thermalPrintDialog.find('.bootbox-body').html(__t('Unable to print: ') + jsonError.error_message); thermalPrintDialog.find('.bootbox-body').html(__t('Unable to print') + '<br><pre><code>' + jsonError.error_message + '</pre></code>');
} else { } else
thermalPrintDialog.find('.bootbox-body').html(__t('Unable to print: ') + xhr.responseText); {
thermalPrintDialog.find('.bootbox-body').html(__t('Unable to print') + '<br><pre><code>' + xhr.responseText + '</pre></code>');
} }
} }
); );
@ -480,29 +483,32 @@ $(document).on("click", "#print-shopping-list-button", function(e)
ok: { ok: {
label: __t('Print'), label: __t('Print'),
className: 'btn-primary responsive-button', className: 'btn-primary responsive-button',
callback: function () callback: function()
{ {
bootbox.hideAll(); bootbox.hideAll();
$('.modal-backdrop').remove(); $('.modal-backdrop').remove();
$(".print-timestamp").text(moment().format("l LT")); $(".print-timestamp").text(moment().format("l LT"));
$("#description-for-print").html($("#description").val()); $("#description-for-print").html($("#description").val());
if ($("#description").text().isEmpty()) { if ($("#description").text().isEmpty())
{
$("#description-for-print").parent().addClass("d-print-none"); $("#description-for-print").parent().addClass("d-print-none");
} }
if (!$("#print-show-header").prop("checked")) { if (!$("#print-show-header").prop("checked"))
{
$("#print-header").addClass("d-none"); $("#print-header").addClass("d-none");
} }
if (!$("#print-group-by-product-group").prop("checked")) { if (!$("#print-group-by-product-group").prop("checked"))
{
shoppingListPrintShadowTable.rowGroup().enable(false); shoppingListPrintShadowTable.rowGroup().enable(false);
shoppingListPrintShadowTable.order.fixed({}); shoppingListPrintShadowTable.order.fixed({});
shoppingListPrintShadowTable.draw(); shoppingListPrintShadowTable.draw();
} }
$(".print-layout-container").addClass("d-none"); $(".print-layout-container").addClass("d-none");
$("." + $("input[name='print-layout-type']:checked").val()).removeClass("d-none"); $("." + $("input[name='print-layout-type']:checked").val()).removeClass("d-none");
window.print(); window.print();
} }