diff --git a/frontend/modules/settings_write.html b/frontend/modules/settings_write.html
index ab3bfd8bd..794f89d6e 100644
--- a/frontend/modules/settings_write.html
+++ b/frontend/modules/settings_write.html
@@ -125,7 +125,7 @@ Themes
Tax System
-
+
@@ -1292,7 +1288,7 @@ Tax Defaults
@@ -3798,7 +3794,7 @@ Let the software write and read for
Estimated from what each call reported, at list prices, in your currency at a rounded rate. Live voice is counted by the minute of open line while the call is on. Your provider's dashboard is the final word on the bill.
-
+
Search by meaning with my OpenAI key
Optional for own-key accounts. Sends published knowledge and help questions to OpenAI for embeddings, billed to your key. Vectors stay in this installation. Supports up to 5,000 published passages. Cloud managed search uses your managed allowance.
@@ -4931,10 +4927,7 @@
-
+
@@ -5253,11 +5246,7 @@
a ₹200 bill paid as ₹100 UPI + ₹100 cash.
-
+
@@ -5580,7 +5569,7 @@
Printing options
-
+
diff --git a/frontend/static/script/js/core/PosnicPro.js b/frontend/static/script/js/core/PosnicPro.js
index b888abc3e..1188bf235 100644
--- a/frontend/static/script/js/core/PosnicPro.js
+++ b/frontend/static/script/js/core/PosnicPro.js
@@ -2955,7 +2955,7 @@ PosnicPro = {
$('#manage_li_deliverypartners').toggle(on('module_delivery_partners_enable'));
$('#manage_li_webshop').toggle(on('module_webshop_enable'));
$('#manage_li_theme').toggle(on('module_themes_enable'));
- $('#manage_li_ai').toggle(on('ai_enabled') || s.ask_posnic_enabled === true);
+ $('#manage_li_ai').toggle(s.ask_posnic_enabled === true);
$('[data-ask-entry]').toggle(s.ask_posnic_enabled === true);
if (PosnicPro.askposnic) PosnicPro.askposnic.setEnabled(s.ask_posnic_enabled === true);
$('#manage_li_recyclebin').toggle(on('module_recyclebin_enable'));
diff --git a/frontend/static/script/js/core/print-settings.js b/frontend/static/script/js/core/print-settings.js
index 43c6fa929..8cfc78204 100644
--- a/frontend/static/script/js/core/print-settings.js
+++ b/frontend/static/script/js/core/print-settings.js
@@ -79,7 +79,7 @@
state.sales.map(function (v, i) { return row('sales', v, i); }).join('') + row('invoice', state.invoice) + row('quotation', state.quotation) +
'' + languageSettings() + '' +
(desktop() ? '' : '') +
- '');
+ '');
features(featureState);
}
function collect() {
@@ -109,7 +109,8 @@
}
mirror(next);
host.find('[data-print-status]').text(PosnicPro.i18n.t('lang_print_settings_saved', 'Print settings saved.'));
- } catch (error) { host.find('[data-print-status]').text(error.message); }
+ return true;
+ } catch (error) { host.find('[data-print-status]').text(error.message); return false; }
finally { button.prop('disabled', false); }
}
async function mount(data) {
diff --git a/frontend/static/script/js/modules/js/ask_posnic.js b/frontend/static/script/js/modules/js/ask_posnic.js
index e18c3ef25..d748a38fc 100644
--- a/frontend/static/script/js/modules/js/ask_posnic.js
+++ b/frontend/static/script/js/modules/js/ask_posnic.js
@@ -39,7 +39,7 @@ PosnicPro.askposnic = {
this.loadStatus();
},
settingsTab: function (key, focus) {
- if (!this.admin || ['general', 'knowledge', 'access', 'usage', 'schedules'].indexOf(key) === -1) return;
+ if (!this.enabled || !this.admin || ['general', 'knowledge', 'access', 'usage', 'schedules'].indexOf(key) === -1) return;
this.activeSettingsTab = key;
$('[data-ask-tab]').each(function () {
var active = $(this).attr('data-ask-tab') === key;
@@ -576,10 +576,12 @@ PosnicPro.askposnic = {
});
$('#ask_posnic_preferences_form').on('submit', function (event) {
event.preventDefault();
- PosnicPro.request({ url: 'ask-posnic/preferences', method: 'PUT', data: JSON.stringify({ own_key_semantic: $('#ask_pref_own_semantic').is(':checked'), own_key_semantic_budget: Number($('#ask_pref_embedding_budget').val()), help_enabled: $('#ask_pref_help').is(':checked'), insights_enabled: $('#ask_pref_insights').is(':checked'), actions_enabled: $('#ask_pref_actions').is(':checked'), store_conversations: $('#ask_pref_history').is(':checked'), retention_days: Number($('#ask_pref_retention').val()), default_period: $('#ask_pref_period').val(), response_language: $('#ask_pref_language').val(), help_instructions: $('#ask_help_instructions').val(), roles: { help: $('#ask_pref_help_roles').val() || [], insights: $('#ask_pref_insight_roles').val() || [], actions: $('#ask_pref_action_roles').val() || [] }, allowed_actions: $('.ask-allowed-action:checked').map(function () { return this.value; }).get() }) }, function (response) {
+ function savePreferences() { PosnicPro.request({ url: 'ask-posnic/preferences', method: 'PUT', data: JSON.stringify({ own_key_semantic: $('#ask_pref_own_semantic').is(':checked'), own_key_semantic_budget: Number($('#ask_pref_embedding_budget').val()), help_enabled: $('#ask_pref_help').is(':checked'), insights_enabled: $('#ask_pref_insights').is(':checked'), actions_enabled: $('#ask_pref_actions').is(':checked'), store_conversations: $('#ask_pref_history').is(':checked'), retention_days: Number($('#ask_pref_retention').val()), default_period: $('#ask_pref_period').val(), response_language: $('#ask_pref_language').val(), help_instructions: $('#ask_help_instructions').val(), roles: { help: $('#ask_pref_help_roles').val() || [], insights: $('#ask_pref_insight_roles').val() || [], actions: $('#ask_pref_action_roles').val() || [] }, allowed_actions: $('.ask-allowed-action:checked').map(function () { return this.value; }).get() }) }, function (response) {
if (response && response.type === 'success') { self.loadStatus(); PosnicPro.alert('success', response.message); }
else PosnicPro.alert('error', response.message || 'Could not save Ask Posnic settings.');
- });
+ }); }
+ if (self.activeSettingsTab === 'usage') PosnicPro.settings.ai.save(savePreferences);
+ else savePreferences();
});
$('#ask_posnic_schedules').on('click', '.ask-schedule-delete', function () {
PosnicPro.request({ url: 'ask-posnic/schedules/' + encodeURIComponent($(this).data('id')), method: 'DELETE' }, function (response) { if (response && response.type === 'success') self.loadSchedules(); });
diff --git a/frontend/static/script/js/modules/js/receipt-designer-editor.js b/frontend/static/script/js/modules/js/receipt-designer-editor.js
index 11f2d9c67..9730d306b 100644
--- a/frontend/static/script/js/modules/js/receipt-designer-editor.js
+++ b/frontend/static/script/js/modules/js/receipt-designer-editor.js
@@ -303,10 +303,15 @@
status(xhr && xhr.responseJSON && xhr.responseJSON.message || t('Could not save designs. Your changes are still here.'), true);
});
}
- function saveBehaviour() {
+ async function saveBehaviour() {
var button = $('#save-print-behaviour'), note = $('#print-behaviour-status');
+ if (button.prop('disabled')) return;
var values = printOptions(), payload = { printall: values.printall, bill_print_copies: values.bill_print_copies };
button.prop('disabled', true);
+ if (PosnicPro.printSettings && await PosnicPro.printSettings.save() === false) {
+ button.prop('disabled', false);
+ return;
+ }
PosnicPro.put({ url: 'setting/updateCommonSettings', data: JSON.stringify(payload) }, function (res) {
button.prop('disabled', false);
if (res.type !== 'success') { note.text(res.message || PosnicPro.i18n.t('lang_print_save_failed', 'Could not save print settings.')); return; }
diff --git a/frontend/static/script/js/modules/js/settings.js b/frontend/static/script/js/modules/js/settings.js
index 4f34c1c4e..2277ee59b 100644
--- a/frontend/static/script/js/modules/js/settings.js
+++ b/frontend/static/script/js/modules/js/settings.js
@@ -207,7 +207,7 @@ PosnicPro.settings = {
$('#india_qrmp_row').toggle(!above);
}
},
- taxSystemSave: function () {
+ taxSystemSave: function (done) {
var values = {
tax_regime: $('#tax_regime_override').val() || null,
india_gst_type: $('#india_gst_type').val(),
@@ -216,6 +216,7 @@ PosnicPro.settings = {
us_resale_certificate: $.trim($('#us_resale_certificate').val())
};
PosnicPro.put({ url: 'settings/group/tax', data: JSON.stringify(values) }, function (r) {
+ if (r.type === 'success' && done) { done(); return; }
PosnicPro.alert(r.type || 'success', r.message || 'Tax system saved');
PosnicPro.settings.taxSystemLoad();
}, function (xhr) {
@@ -2178,7 +2179,7 @@ if ($wrapper.length) {
/* successLabel: what the toast says on success - each Save button names
its own act ("Module switches saved") instead of the generic server
line, which reads the same from four different screens. */
- updateCommonSetting: function (successLabel) {
+ updateCommonSetting: function (successLabel, done) {
var loader = $(".loader-view-mystore");
$("").appendTo(loader);
var taxDetail = $("#tax_percentage").select2("data");
@@ -2482,9 +2483,10 @@ if ($("#sale_quick_edit").is(":checked")) {
}
}
}
- PosnicPro.alert(response.type,
+ if (response.type !== 'success' || !done) PosnicPro.alert(response.type,
(response.type === 'success' && successLabel) ? successLabel : response.message);
loader.find(".loadingSpinner:first").remove();
+ if (response.type === 'success' && done) done();
}, function (xhr) {
var response = jQuery.parseJSON(xhr.responseText);
PosnicPro.alert(response.type, response.message);
@@ -2561,6 +2563,7 @@ if ($("#sale_quick_edit").is(":checked")) {
var on = function (k) { return s[k] !== false; };
$('#v-pills-taxmodule-tab').toggle(on('module_tax_enable'));
+ $('#v-pills-ai-tab').toggle(s.ask_posnic_enabled === true);
$('#v-pills-credit-tab').toggle(on('module_credit_enable'));
$('#v-pills-marketingmodule-tab').toggle(on('module_marketing_enable'));
$('#v-pills-messagingmodule-tab').toggle(on('module_messaging_enable'));
@@ -4986,7 +4989,11 @@ $("#tax_discount_add").submit(function (event) {
return;
}
if ($('#tax_discount_add').valid()) { // checks form for validity
- PosnicPro.settings.updateCommonSetting('Core Settings saved');
+ PosnicPro.settings.updateCommonSetting('Core Settings saved', function () {
+ if (PosnicPro.settings._sharingLoaded && PosnicPro.settings._sharingDirty) {
+ PosnicPro.settings.saveSharing();
+ } else PosnicPro.alert('success', PosnicPro.i18n.t('lang_successfully_completed', 'Successfully Completed'));
+ });
}
});
$("#tax_checked_all").click(function () {
@@ -7133,6 +7140,8 @@ PosnicPro.settings.SHARING_KEYS = ['share_customers', 'share_suppliers'];
PosnicPro.settings.loadSharing = function () {
if (!$('#sharing_fieldset').length) { return; }
+ PosnicPro.settings._sharingLoaded = false;
+ PosnicPro.settings._sharingDirty = false;
PosnicPro.get({ url: 'settings/group/sharing', data: { level: 'account' } }, function (r) {
var values = (r && r.data && r.data.values) || {};
$.each(PosnicPro.settings.SHARING_KEYS, function (i, key) {
@@ -7142,6 +7151,7 @@ PosnicPro.settings.loadSharing = function () {
$('#set_' + key).prop('checked', PosnicPro.settings._sharingOn(values[key]));
});
$('#sharing_status').text('');
+ PosnicPro.settings._sharingLoaded = r && r.type === 'success';
}, function () {
$('#sharing_status').text(PosnicPro.i18n.t('lang_could_not_read_the_current_setting', 'Could not read the current setting.'));
});
@@ -7169,6 +7179,7 @@ PosnicPro.settings.saveSharing = function () {
PosnicPro.put({ url: 'settings/group/sharing', data: JSON.stringify(payload) }, function (r) {
$('#sharing_save_btn').prop('disabled', false);
$('#sharing_status').text(r.type === 'success' ? 'Saved. Applies to every shop.' : '');
+ if (r.type === 'success') PosnicPro.settings._sharingDirty = false;
PosnicPro.alert(r.type, r.type === 'success' ? 'Sharing saved' : r.message);
}, function (xhr) {
$('#sharing_save_btn').prop('disabled', false);
@@ -10176,7 +10187,7 @@ PosnicPro.settings.ai = {
});
}, function () { /* kept */ });
},
- save: function () {
+ save: function (done) {
var provider = $('#ai_provider').val() || '';
var key = String($('#ai_api_key').val() || '');
var cap = String($('#ai_monthly_cap').val() || '').trim();
@@ -10206,13 +10217,14 @@ PosnicPro.settings.ai = {
that emptiness through would blank the shop's credential the
first time anybody changed the limit. */
if (!key) {
- PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
+ if (!done) PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
'Saved. The AI button now appears on the item screen, beside Description.'));
/* The item screen asks once per session whether AI is usable; that
answer is now stale, so let it ask again rather than leaving the
button hidden until a reload. */
if (PosnicPro.items) { PosnicPro.items._aiAvailable = null; }
$('#ai_api_key').val('');
+ if (done) done();
return;
}
PosnicPro.put({
@@ -10220,7 +10232,7 @@ PosnicPro.settings.ai = {
data: JSON.stringify({ ai_api_key: key })
}, function (second) {
if (second.type === 'success') {
- PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
+ if (!done) PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
'Saved. The AI button now appears on the item screen, beside Description.'));
/* The item screen asks once per session whether AI is usable; that
answer is now stale, so let it ask again rather than leaving the
@@ -10228,6 +10240,7 @@ PosnicPro.settings.ai = {
if (PosnicPro.items) { PosnicPro.items._aiAvailable = null; }
$('#ai_api_key').val('');
PosnicPro.settings.ai.load();
+ if (done) done();
} else {
PosnicPro.alert(second.type, second.message);
}
@@ -10342,3 +10355,5 @@ $(document).on('click','#save_captain_tables',function(){
button.prop('disabled',false);$('#captain_tables_message').text(PosnicPro.i18n.t('lang_successfully_completed','Successfully Completed'));
},function(){button.prop('disabled',false);$('#captain_tables_message').text(PosnicPro.i18n.t('lang_could_not_save_table_settings_please_retry', 'Could not save table settings. Please retry.'));});
});
+
+$(document).on("change", "#sharing_fieldset input", function () { PosnicPro.settings._sharingDirty = true; });
diff --git a/frontend/static/style/css/receipt-designer.css b/frontend/static/style/css/receipt-designer.css
index f24a3417a..adb3725d3 100644
--- a/frontend/static/style/css/receipt-designer.css
+++ b/frontend/static/style/css/receipt-designer.css
@@ -1,6 +1,10 @@
#receipt-designer { --rd-border: #dce3ee; --rd-soft: #f5f7fb; --rd-ink: #203047; color: var(--rd-ink); }
#receipt-designer * { box-sizing: border-box; }
.card:has(#core-tab-print.active) > .card-footer { display: none; }
+.card:has(#core-tab-inventory.active #inv-sub-stock.active) > .card-footer,
+.card:has(#core-tab-inventory.active #inv-sub-expiry.active) > .card-footer,
+.card:has(#core-tab-inventory.active #inv-sub-mobile.active) > .card-footer,
+.card:has(#core-tab-payments.active #pay-sub-gateway.active) > .card-footer { display: none; }
#receipt-designer button, #receipt-designer input, #receipt-designer select, #receipt-designer textarea { font: inherit; }
#receipt-designer button:focus-visible, #receipt-designer input:focus-visible, #receipt-designer select:focus-visible, #receipt-designer textarea:focus-visible { outline: 3px solid #8bb6ff; outline-offset: 2px; }
.rd-topbar { display: flex; flex-wrap: wrap; gap: 8px 16px; align-items: center; justify-content: space-between; margin: 0 0 12px; }
diff --git a/languages/_english.json b/languages/_english.json
index 8918bcc15..4c52e17bb 100644
--- a/languages/_english.json
+++ b/languages/_english.json
@@ -221,7 +221,6 @@
"lang_ai_ordering_assistant": "Let customers ask the assistant on your online ordering page",
"lang_ai_ordering_assistant_hint": "A spark appears on your ordering page. Customers ask in their own words, and the assistant answers from your menu and can add to their order. It never places or pays. Every question is billed to your account above, within the monthly limit, and it is off until you switch it on.",
"lang_ai_provider": "Who answers",
- "lang_ai_save": "Save",
"lang_ai_saved": "Saved. The AI button now appears on the item screen, beside Description.",
"lang_ai_settings": "AI settings",
"lang_ai_spend_calls": "Calls",
@@ -1938,8 +1937,6 @@
"lang_inv": "INV-",
"lang_invalid_data": "Invalid data...!!!",
"lang_invenlog_title": "Inventory Logs",
- "lang_mobile_inventory": "Mobile inventory",
- "lang_inventory_confirmation": "Inventory confirmation",
"lang_inventory_count": "Inventory count",
"lang_inventory_log": "Inventory Log",
"lang_inventory_logs": "Inventory logs",
@@ -2441,6 +2438,7 @@
"lang_minimum_spend_to_earn": "Minimum spend to earn (",
"lang_minutes_ago": "minutes ago",
"lang_mobile": "Mobile Number",
+ "lang_mobile_inventory": "Mobile inventory",
"lang_mobile_inventory_operations": "Mobile inventory operations",
"lang_mobile_no": "Mobile No:",
"lang_mobile_pos_settings": "Mobile POS settings",
@@ -3277,7 +3275,6 @@
"lang_print_sales_receipts": "Sales receipts",
"lang_print_sample": "Print sample",
"lang_print_save_failed": "Could not save print settings.",
- "lang_print_save_settings": "Save print settings",
"lang_print_settings": "Print settings",
"lang_print_settings_saved": "Print settings saved.",
"lang_print_shelf_labels": "Print shelf labels",
@@ -3930,12 +3927,10 @@
"lang_save_loyalty_settings": "Save loyalty settings",
"lang_save_note": "Save note",
"lang_save_outlet": "Save outlet",
- "lang_save_printing_options": "Save printing options",
"lang_save_quotation": "Save quotation",
"lang_save_quotation_settings": "Save quotation settings",
"lang_save_role": "Save Role",
"lang_save_sale": "Save Sale",
- "lang_save_sharing": "Save sharing",
"lang_save_targets": "Save Targets",
"lang_save_template": "Save Template",
"lang_save_the_user_first_then_assign_a_card": "Save the user first, then assign a card.",
diff --git a/languages/ne.json b/languages/ne.json
index f24dc0b9f..e33ac09f9 100644
--- a/languages/ne.json
+++ b/languages/ne.json
@@ -1,4 +1,5 @@
{
+ "lang_mobile_inventory": "मोबाइल इन्भेन्टरी",
"lang_background_colour": "पृष्ठभूमि रङ",
"lang_barcode_format": "बारकोड",
"lang_barcode_margin": "बार मार्जिन",
diff --git a/languages/nl.json b/languages/nl.json
index 3a3209c39..4867f8b17 100644
--- a/languages/nl.json
+++ b/languages/nl.json
@@ -1,4 +1,5 @@
{
+ "lang_mobile_inventory": "Mobiele voorraad",
"lang_made_with_posnic_posnic_com": "Gemaakt met Posnic · posnic.com",
"lang_actual_size": "Werkelijke grootte",
"lang_fit_whole_page": "Hele pagina passend weergeven",
diff --git a/tests/ai-feature-switch.test.js b/tests/ai-feature-switch.test.js
index 292f5aa83..166f9dd6a 100644
--- a/tests/ai-feature-switch.test.js
+++ b/tests/ai-feature-switch.test.js
@@ -131,7 +131,7 @@ test('the sidebar has a way in, gated on the switch', () => {
reachable only by scrolling the settings rail and hoping. */
assert.match(sidebar, /id="manage_li_ai"/, 'the AI row is gone from the sidebar');
assert.match(sidebar, /href="#\/settings\/ai"/, 'the AI row points nowhere');
- assert.match(core, /\$\('#manage_li_ai'\)\.toggle\(on\('ai_enabled'\) \|\| s.ask_posnic_enabled === true\)/,
+ assert.match(core, /\$\('#manage_li_ai'\)\.toggle\(s.ask_posnic_enabled === true\)/,
'the AI sidebar row is not gated on the switch');
});
diff --git a/tests/ask-posnic-focused-ux.test.js b/tests/ask-posnic-focused-ux.test.js
index 6c691a7fc..8dd330bfc 100644
--- a/tests/ask-posnic-focused-ux.test.js
+++ b/tests/ask-posnic-focused-ux.test.js
@@ -56,6 +56,29 @@ test('preferences retain form ownership across tabs and save every section', ()
assert.equal(saved.own_key_semantic, true); assert.deepEqual(saved.allowed_actions, ['stock_count']);
$('[id^="ask_pref_"],#ask_help_instructions,.ask-allowed-action').each(function () { assert.equal(this.form.id, 'ask_posnic_preferences_form'); });
});
+
+test('disabled Ask Posnic never loads protected settings tab APIs', () => {
+ const { ui, calls } = setup();
+ ui.showSettings();
+ ui.setEnabled(false);
+ const before = calls.length;
+ for (const tab of ['knowledge', 'usage', 'schedules']) ui.settingsTab(tab);
+ assert.equal(calls.length, before);
+});
+
+test('one AI usage save writes provider settings before assistant preferences', () => {
+ const { $, ui, PosnicPro } = setup();
+ ui.showSettings(); ui.settingsTab('usage');
+ let finishProvider;
+ let preferenceWrites = 0;
+ PosnicPro.settings.ai.save = done => { finishProvider = done; };
+ PosnicPro.request = () => { preferenceWrites++; };
+ $('#ask_posnic_preferences_form').triggerHandler('submit');
+ assert.equal($('#ai_save').length, 0);
+ assert.equal(preferenceWrites, 0);
+ finishProvider();
+ assert.equal(preferenceWrites, 1);
+});
test('question progress, Enter and new conversation keep the chat usable', () => {
const { $, ui, PosnicPro } = setup();
ui.showDataTablePage();
diff --git a/tests/branch-data-sharing.test.js b/tests/branch-data-sharing.test.js
index 54511295d..135a1472b 100644
--- a/tests/branch-data-sharing.test.js
+++ b/tests/branch-data-sharing.test.js
@@ -122,13 +122,14 @@ test('Settings carries the switches the branch form promised', () => {
for (const id of ['set_share_customers', 'set_share_suppliers']) {
assert.ok(new RegExp(`id="${id}"`).test(settingsHtml), `${id} is missing from Settings`);
}
- assert.match(settingsHtml, /id="sharing_save_btn"/, 'there is no way to save it');
+ assert.match(settingsHtml, /id="tax_discount_add"/, 'there is no Core Settings save form');
});
-test('it has its OWN save, not the general form save', () => {
- /* Everything around it writes to this branch. Riding that save would let a
- screen opened on one shop push that shop's view onto all of them. */
- assert.match(settingsHtml, /onclick="PosnicPro\.settings\.saveSharing\(\);"/, 'no dedicated save');
+test('the unified button keeps sharing on its own account-level endpoint', () => {
+ assert.doesNotMatch(settingsHtml, /id="sharing_save_btn"/, 'duplicate save button');
+ const submit = blockAt(settingsJs, '$("#tax_discount_add").submit(function (event) {');
+ assert.match(submit, /_sharingLoaded && PosnicPro.settings._sharingDirty/);
+ assert.match(submit, /PosnicPro.settings.saveSharing\(\)/);
const save = blockAt(settingsJs, 'PosnicPro.settings.saveSharing = function () {');
assert.match(save, /url: 'settings\/group\/sharing'/, 'it must use the sharing endpoint alone');
assert.match(save, /level: 'account'/, 'writing at branch level would not share anything');
diff --git a/tests/receipt-designer.test.js b/tests/receipt-designer.test.js
index fbe53cb02..5064d2071 100644
--- a/tests/receipt-designer.test.js
+++ b/tests/receipt-designer.test.js
@@ -160,10 +160,12 @@ test('editor adds and reorders blocks, keeps formats independent, and sends a pa
dom.window.close();
});
-test('saving printing behaviour does not submit or discard unsaved receipt designs', () => {
+test('saving printing behaviour does not submit or discard unsaved receipt designs', async () => {
const { dom, w, $, branch } = setup();
$('body').append('');
const sent = [];
+ let printerSaves = 0;
+ w.PosnicPro.printSettings = { save: async () => { printerSaves++; return true; } };
w.PosnicPro.put = (request, done) => {
const data = JSON.parse(request.data); sent.push(data);
done({ type: 'success', data: data });
@@ -173,6 +175,8 @@ test('saving printing behaviour does not submit or discard unsaved receipt desig
$('#rd-block-text').val('New layout text').trigger('input');
$('#printall').prop('checked', true).trigger('change');
$('#save-print-behaviour').trigger('click');
+ await new Promise(resolve => setImmediate(resolve));
+ assert.equal(printerSaves, 1);
assert.deepEqual(sent[0], { printall: 'true', bill_print_copies: '1' });
assert.match($('#print-behaviour-status').text(), /saved/);
assert.match($('.rd-status').text(), /Unsaved/);
@@ -182,6 +186,20 @@ test('saving printing behaviour does not submit or discard unsaved receipt desig
dom.window.close();
});
+test('a failed device printer save prevents a misleading printing-options success', async () => {
+ const { dom, w, $, branch } = setup();
+ $('body').append('');
+ let writes = 0;
+ w.PosnicPro.printSettings = { save: async () => false };
+ w.PosnicPro.put = () => { writes++; };
+ w.PosnicPro.receiptDesignerEditor.load(branch);
+ $('#save-print-behaviour').trigger('click');
+ await new Promise(resolve => setImmediate(resolve));
+ assert.equal(writes, 0);
+ assert.equal($('#save-print-behaviour').prop('disabled'), false);
+ dom.window.close();
+});
+
test('FSSAI prints from current branch details on all formats and an explicit field controls its position', () => {
const { dom, engine, design, sale, $ } = setup();
sale.table_options = 'enable'; sale.country = 'India'; sale.branch_fssai_number = ' 12345678901234 ';
diff --git a/tests/settings-save-routing.test.js b/tests/settings-save-routing.test.js
index 9a4f5e30a..970477bc6 100644
--- a/tests/settings-save-routing.test.js
+++ b/tests/settings-save-routing.test.js
@@ -64,3 +64,24 @@ test('the Core Settings form still saves the receipt designer when Receipt Print
assert.equal(h.requests.length, 1);
} finally { h.dom.window.close(); }
});
+
+test('the single Core Save includes changed account sharing only after the branch save succeeds', () => {
+ const h = setup();
+ h.$('#core-tab-print').removeClass('active');
+ let next, sharing = 0;
+ h.w.PosnicPro.alert = () => {};
+ h.w.PosnicPro.i18n = { t: (_key, fallback) => fallback };
+ h.w.PosnicPro.settings.updateCommonSetting = (_label, done) => { next = done; };
+ h.w.PosnicPro.settings.saveSharing = () => { sharing++; };
+ h.w.PosnicPro.settings._sharingLoaded = true;
+ h.w.PosnicPro.settings._sharingDirty = true;
+ h.$('#tax_discount_add').triggerHandler('submit');
+ assert.equal(sharing, 0);
+ next();
+ assert.equal(sharing, 1);
+ h.w.PosnicPro.settings._sharingDirty = false;
+ h.$('#tax_discount_add').triggerHandler('submit');
+ next();
+ assert.equal(sharing, 1, 'unchanged account sharing must not be overwritten');
+ h.dom.window.close();
+});
diff --git a/tests/settings-single-save.test.js b/tests/settings-single-save.test.js
new file mode 100644
index 000000000..89fccb931
--- /dev/null
+++ b/tests/settings-single-save.test.js
@@ -0,0 +1,41 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const { JSDOM } = require('jsdom');
+
+test('Ask Posnic menu follows its opt-in, even when other AI features are enabled', () => {
+ const dom = new JSDOM('
', { runScripts: 'outside-only' });
+ const w = dom.window;
+ w.$ = require('jquery')(w);
+ w.PosnicPro = { local: { get() {} }, demoSamples: { load() {} } };
+ const source = fs.readFileSync('frontend/static/script/js/core/PosnicPro.js', 'utf8');
+ const start = source.indexOf(' applyModuleSidebar: function () {');
+ const end = source.indexOf('\n },', start);
+ const apply = w.eval('(' + source.slice(start, end + 6).replace('applyModuleSidebar:', '') + ')');
+ for (const enabled of [undefined, false, true, false]) {
+ w.PosnicPro.local.get = key => key === 'general_settings' ? JSON.stringify({ ai_enabled: true, ask_posnic_enabled: enabled }) : null;
+ apply();
+ assert.equal(w.$('#manage_li_ai').css('display') !== 'none', enabled === true);
+ assert.equal(w.$('[data-ask-entry]').css('display') !== 'none', enabled === true);
+ }
+ w.close();
+});
+
+test('specialised Core Settings views hide only the duplicate outer footer', () => {
+ const html = fs.readFileSync('frontend/modules/settings_write.html', 'utf8');
+ const css = fs.readFileSync('frontend/static/style/css/receipt-designer.css', 'utf8');
+ const dom = new JSDOM('' + html);
+ const { document, getComputedStyle } = dom.window;
+ const footer = document.querySelector('#settings_edit_reset').parentElement;
+ for (const [tab, sub] of [['inventory', 'stock'], ['inventory', 'expiry'], ['inventory', 'mobile'], ['payments', 'gateway']]) {
+ document.querySelectorAll('[id^="core-tab-"], [id^="inv-sub-"], [id^="pay-sub-"]').forEach(node => node.classList.remove('active'));
+ document.querySelector('#core-tab-' + tab).classList.add('active');
+ document.querySelector('#' + (tab === 'inventory' ? 'inv' : 'pay') + '-sub-' + sub).classList.add('active');
+ assert.equal(getComputedStyle(footer).display, 'none', tab + '/' + sub);
+ }
+ assert.equal(document.querySelectorAll('#pay-sub-general button').length, 0);
+ assert.equal(document.querySelectorAll('#tax-sub-general button').length, 1);
+ assert.equal(document.querySelector('#sharing_save_btn'), null);
+ assert.equal(document.querySelector('#ai_save'), null);
+ dom.window.close();
+});
@@ -3798,7 +3794,7 @@
-
+
Let the software write and read for
Estimated from what each call reported, at list prices, in your currency at a rounded rate. Live voice is counted by the minute of open line while the call is on. Your provider's dashboard is the final word on the bill.
Search by meaning with my OpenAI key
-
+
@@ -5253,11 +5246,7 @@ a ₹200 bill paid as ₹100 UPI + ₹100 cash.
-
+
@@ -5580,7 +5569,7 @@
diff --git a/frontend/static/script/js/core/PosnicPro.js b/frontend/static/script/js/core/PosnicPro.js
index b888abc3e..1188bf235 100644
--- a/frontend/static/script/js/core/PosnicPro.js
+++ b/frontend/static/script/js/core/PosnicPro.js
@@ -2955,7 +2955,7 @@ PosnicPro = {
$('#manage_li_deliverypartners').toggle(on('module_delivery_partners_enable'));
$('#manage_li_webshop').toggle(on('module_webshop_enable'));
$('#manage_li_theme').toggle(on('module_themes_enable'));
- $('#manage_li_ai').toggle(on('ai_enabled') || s.ask_posnic_enabled === true);
+ $('#manage_li_ai').toggle(s.ask_posnic_enabled === true);
$('[data-ask-entry]').toggle(s.ask_posnic_enabled === true);
if (PosnicPro.askposnic) PosnicPro.askposnic.setEnabled(s.ask_posnic_enabled === true);
$('#manage_li_recyclebin').toggle(on('module_recyclebin_enable'));
diff --git a/frontend/static/script/js/core/print-settings.js b/frontend/static/script/js/core/print-settings.js
index 43c6fa929..8cfc78204 100644
--- a/frontend/static/script/js/core/print-settings.js
+++ b/frontend/static/script/js/core/print-settings.js
@@ -79,7 +79,7 @@
state.sales.map(function (v, i) { return row('sales', v, i); }).join('') + row('invoice', state.invoice) + row('quotation', state.quotation) +
'' + languageSettings() + '
Printing options
-
+
' +
(desktop() ? '' : '') +
- '
');
+ '');
features(featureState);
}
function collect() {
@@ -109,7 +109,8 @@
}
mirror(next);
host.find('[data-print-status]').text(PosnicPro.i18n.t('lang_print_settings_saved', 'Print settings saved.'));
- } catch (error) { host.find('[data-print-status]').text(error.message); }
+ return true;
+ } catch (error) { host.find('[data-print-status]').text(error.message); return false; }
finally { button.prop('disabled', false); }
}
async function mount(data) {
diff --git a/frontend/static/script/js/modules/js/ask_posnic.js b/frontend/static/script/js/modules/js/ask_posnic.js
index e18c3ef25..d748a38fc 100644
--- a/frontend/static/script/js/modules/js/ask_posnic.js
+++ b/frontend/static/script/js/modules/js/ask_posnic.js
@@ -39,7 +39,7 @@ PosnicPro.askposnic = {
this.loadStatus();
},
settingsTab: function (key, focus) {
- if (!this.admin || ['general', 'knowledge', 'access', 'usage', 'schedules'].indexOf(key) === -1) return;
+ if (!this.enabled || !this.admin || ['general', 'knowledge', 'access', 'usage', 'schedules'].indexOf(key) === -1) return;
this.activeSettingsTab = key;
$('[data-ask-tab]').each(function () {
var active = $(this).attr('data-ask-tab') === key;
@@ -576,10 +576,12 @@ PosnicPro.askposnic = {
});
$('#ask_posnic_preferences_form').on('submit', function (event) {
event.preventDefault();
- PosnicPro.request({ url: 'ask-posnic/preferences', method: 'PUT', data: JSON.stringify({ own_key_semantic: $('#ask_pref_own_semantic').is(':checked'), own_key_semantic_budget: Number($('#ask_pref_embedding_budget').val()), help_enabled: $('#ask_pref_help').is(':checked'), insights_enabled: $('#ask_pref_insights').is(':checked'), actions_enabled: $('#ask_pref_actions').is(':checked'), store_conversations: $('#ask_pref_history').is(':checked'), retention_days: Number($('#ask_pref_retention').val()), default_period: $('#ask_pref_period').val(), response_language: $('#ask_pref_language').val(), help_instructions: $('#ask_help_instructions').val(), roles: { help: $('#ask_pref_help_roles').val() || [], insights: $('#ask_pref_insight_roles').val() || [], actions: $('#ask_pref_action_roles').val() || [] }, allowed_actions: $('.ask-allowed-action:checked').map(function () { return this.value; }).get() }) }, function (response) {
+ function savePreferences() { PosnicPro.request({ url: 'ask-posnic/preferences', method: 'PUT', data: JSON.stringify({ own_key_semantic: $('#ask_pref_own_semantic').is(':checked'), own_key_semantic_budget: Number($('#ask_pref_embedding_budget').val()), help_enabled: $('#ask_pref_help').is(':checked'), insights_enabled: $('#ask_pref_insights').is(':checked'), actions_enabled: $('#ask_pref_actions').is(':checked'), store_conversations: $('#ask_pref_history').is(':checked'), retention_days: Number($('#ask_pref_retention').val()), default_period: $('#ask_pref_period').val(), response_language: $('#ask_pref_language').val(), help_instructions: $('#ask_help_instructions').val(), roles: { help: $('#ask_pref_help_roles').val() || [], insights: $('#ask_pref_insight_roles').val() || [], actions: $('#ask_pref_action_roles').val() || [] }, allowed_actions: $('.ask-allowed-action:checked').map(function () { return this.value; }).get() }) }, function (response) {
if (response && response.type === 'success') { self.loadStatus(); PosnicPro.alert('success', response.message); }
else PosnicPro.alert('error', response.message || 'Could not save Ask Posnic settings.');
- });
+ }); }
+ if (self.activeSettingsTab === 'usage') PosnicPro.settings.ai.save(savePreferences);
+ else savePreferences();
});
$('#ask_posnic_schedules').on('click', '.ask-schedule-delete', function () {
PosnicPro.request({ url: 'ask-posnic/schedules/' + encodeURIComponent($(this).data('id')), method: 'DELETE' }, function (response) { if (response && response.type === 'success') self.loadSchedules(); });
diff --git a/frontend/static/script/js/modules/js/receipt-designer-editor.js b/frontend/static/script/js/modules/js/receipt-designer-editor.js
index 11f2d9c67..9730d306b 100644
--- a/frontend/static/script/js/modules/js/receipt-designer-editor.js
+++ b/frontend/static/script/js/modules/js/receipt-designer-editor.js
@@ -303,10 +303,15 @@
status(xhr && xhr.responseJSON && xhr.responseJSON.message || t('Could not save designs. Your changes are still here.'), true);
});
}
- function saveBehaviour() {
+ async function saveBehaviour() {
var button = $('#save-print-behaviour'), note = $('#print-behaviour-status');
+ if (button.prop('disabled')) return;
var values = printOptions(), payload = { printall: values.printall, bill_print_copies: values.bill_print_copies };
button.prop('disabled', true);
+ if (PosnicPro.printSettings && await PosnicPro.printSettings.save() === false) {
+ button.prop('disabled', false);
+ return;
+ }
PosnicPro.put({ url: 'setting/updateCommonSettings', data: JSON.stringify(payload) }, function (res) {
button.prop('disabled', false);
if (res.type !== 'success') { note.text(res.message || PosnicPro.i18n.t('lang_print_save_failed', 'Could not save print settings.')); return; }
diff --git a/frontend/static/script/js/modules/js/settings.js b/frontend/static/script/js/modules/js/settings.js
index 4f34c1c4e..2277ee59b 100644
--- a/frontend/static/script/js/modules/js/settings.js
+++ b/frontend/static/script/js/modules/js/settings.js
@@ -207,7 +207,7 @@ PosnicPro.settings = {
$('#india_qrmp_row').toggle(!above);
}
},
- taxSystemSave: function () {
+ taxSystemSave: function (done) {
var values = {
tax_regime: $('#tax_regime_override').val() || null,
india_gst_type: $('#india_gst_type').val(),
@@ -216,6 +216,7 @@ PosnicPro.settings = {
us_resale_certificate: $.trim($('#us_resale_certificate').val())
};
PosnicPro.put({ url: 'settings/group/tax', data: JSON.stringify(values) }, function (r) {
+ if (r.type === 'success' && done) { done(); return; }
PosnicPro.alert(r.type || 'success', r.message || 'Tax system saved');
PosnicPro.settings.taxSystemLoad();
}, function (xhr) {
@@ -2178,7 +2179,7 @@ if ($wrapper.length) {
/* successLabel: what the toast says on success - each Save button names
its own act ("Module switches saved") instead of the generic server
line, which reads the same from four different screens. */
- updateCommonSetting: function (successLabel) {
+ updateCommonSetting: function (successLabel, done) {
var loader = $(".loader-view-mystore");
$("").appendTo(loader);
var taxDetail = $("#tax_percentage").select2("data");
@@ -2482,9 +2483,10 @@ if ($("#sale_quick_edit").is(":checked")) {
}
}
}
- PosnicPro.alert(response.type,
+ if (response.type !== 'success' || !done) PosnicPro.alert(response.type,
(response.type === 'success' && successLabel) ? successLabel : response.message);
loader.find(".loadingSpinner:first").remove();
+ if (response.type === 'success' && done) done();
}, function (xhr) {
var response = jQuery.parseJSON(xhr.responseText);
PosnicPro.alert(response.type, response.message);
@@ -2561,6 +2563,7 @@ if ($("#sale_quick_edit").is(":checked")) {
var on = function (k) { return s[k] !== false; };
$('#v-pills-taxmodule-tab').toggle(on('module_tax_enable'));
+ $('#v-pills-ai-tab').toggle(s.ask_posnic_enabled === true);
$('#v-pills-credit-tab').toggle(on('module_credit_enable'));
$('#v-pills-marketingmodule-tab').toggle(on('module_marketing_enable'));
$('#v-pills-messagingmodule-tab').toggle(on('module_messaging_enable'));
@@ -4986,7 +4989,11 @@ $("#tax_discount_add").submit(function (event) {
return;
}
if ($('#tax_discount_add').valid()) { // checks form for validity
- PosnicPro.settings.updateCommonSetting('Core Settings saved');
+ PosnicPro.settings.updateCommonSetting('Core Settings saved', function () {
+ if (PosnicPro.settings._sharingLoaded && PosnicPro.settings._sharingDirty) {
+ PosnicPro.settings.saveSharing();
+ } else PosnicPro.alert('success', PosnicPro.i18n.t('lang_successfully_completed', 'Successfully Completed'));
+ });
}
});
$("#tax_checked_all").click(function () {
@@ -7133,6 +7140,8 @@ PosnicPro.settings.SHARING_KEYS = ['share_customers', 'share_suppliers'];
PosnicPro.settings.loadSharing = function () {
if (!$('#sharing_fieldset').length) { return; }
+ PosnicPro.settings._sharingLoaded = false;
+ PosnicPro.settings._sharingDirty = false;
PosnicPro.get({ url: 'settings/group/sharing', data: { level: 'account' } }, function (r) {
var values = (r && r.data && r.data.values) || {};
$.each(PosnicPro.settings.SHARING_KEYS, function (i, key) {
@@ -7142,6 +7151,7 @@ PosnicPro.settings.loadSharing = function () {
$('#set_' + key).prop('checked', PosnicPro.settings._sharingOn(values[key]));
});
$('#sharing_status').text('');
+ PosnicPro.settings._sharingLoaded = r && r.type === 'success';
}, function () {
$('#sharing_status').text(PosnicPro.i18n.t('lang_could_not_read_the_current_setting', 'Could not read the current setting.'));
});
@@ -7169,6 +7179,7 @@ PosnicPro.settings.saveSharing = function () {
PosnicPro.put({ url: 'settings/group/sharing', data: JSON.stringify(payload) }, function (r) {
$('#sharing_save_btn').prop('disabled', false);
$('#sharing_status').text(r.type === 'success' ? 'Saved. Applies to every shop.' : '');
+ if (r.type === 'success') PosnicPro.settings._sharingDirty = false;
PosnicPro.alert(r.type, r.type === 'success' ? 'Sharing saved' : r.message);
}, function (xhr) {
$('#sharing_save_btn').prop('disabled', false);
@@ -10176,7 +10187,7 @@ PosnicPro.settings.ai = {
});
}, function () { /* kept */ });
},
- save: function () {
+ save: function (done) {
var provider = $('#ai_provider').val() || '';
var key = String($('#ai_api_key').val() || '');
var cap = String($('#ai_monthly_cap').val() || '').trim();
@@ -10206,13 +10217,14 @@ PosnicPro.settings.ai = {
that emptiness through would blank the shop's credential the
first time anybody changed the limit. */
if (!key) {
- PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
+ if (!done) PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
'Saved. The AI button now appears on the item screen, beside Description.'));
/* The item screen asks once per session whether AI is usable; that
answer is now stale, so let it ask again rather than leaving the
button hidden until a reload. */
if (PosnicPro.items) { PosnicPro.items._aiAvailable = null; }
$('#ai_api_key').val('');
+ if (done) done();
return;
}
PosnicPro.put({
@@ -10220,7 +10232,7 @@ PosnicPro.settings.ai = {
data: JSON.stringify({ ai_api_key: key })
}, function (second) {
if (second.type === 'success') {
- PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
+ if (!done) PosnicPro.alert('success', PosnicPro.i18n.t('lang_ai_saved',
'Saved. The AI button now appears on the item screen, beside Description.'));
/* The item screen asks once per session whether AI is usable; that
answer is now stale, so let it ask again rather than leaving the
@@ -10228,6 +10240,7 @@ PosnicPro.settings.ai = {
if (PosnicPro.items) { PosnicPro.items._aiAvailable = null; }
$('#ai_api_key').val('');
PosnicPro.settings.ai.load();
+ if (done) done();
} else {
PosnicPro.alert(second.type, second.message);
}
@@ -10342,3 +10355,5 @@ $(document).on('click','#save_captain_tables',function(){
button.prop('disabled',false);$('#captain_tables_message').text(PosnicPro.i18n.t('lang_successfully_completed','Successfully Completed'));
},function(){button.prop('disabled',false);$('#captain_tables_message').text(PosnicPro.i18n.t('lang_could_not_save_table_settings_please_retry', 'Could not save table settings. Please retry.'));});
});
+
+$(document).on("change", "#sharing_fieldset input", function () { PosnicPro.settings._sharingDirty = true; });
diff --git a/frontend/static/style/css/receipt-designer.css b/frontend/static/style/css/receipt-designer.css
index f24a3417a..adb3725d3 100644
--- a/frontend/static/style/css/receipt-designer.css
+++ b/frontend/static/style/css/receipt-designer.css
@@ -1,6 +1,10 @@
#receipt-designer { --rd-border: #dce3ee; --rd-soft: #f5f7fb; --rd-ink: #203047; color: var(--rd-ink); }
#receipt-designer * { box-sizing: border-box; }
.card:has(#core-tab-print.active) > .card-footer { display: none; }
+.card:has(#core-tab-inventory.active #inv-sub-stock.active) > .card-footer,
+.card:has(#core-tab-inventory.active #inv-sub-expiry.active) > .card-footer,
+.card:has(#core-tab-inventory.active #inv-sub-mobile.active) > .card-footer,
+.card:has(#core-tab-payments.active #pay-sub-gateway.active) > .card-footer { display: none; }
#receipt-designer button, #receipt-designer input, #receipt-designer select, #receipt-designer textarea { font: inherit; }
#receipt-designer button:focus-visible, #receipt-designer input:focus-visible, #receipt-designer select:focus-visible, #receipt-designer textarea:focus-visible { outline: 3px solid #8bb6ff; outline-offset: 2px; }
.rd-topbar { display: flex; flex-wrap: wrap; gap: 8px 16px; align-items: center; justify-content: space-between; margin: 0 0 12px; }
diff --git a/languages/_english.json b/languages/_english.json
index 8918bcc15..4c52e17bb 100644
--- a/languages/_english.json
+++ b/languages/_english.json
@@ -221,7 +221,6 @@
"lang_ai_ordering_assistant": "Let customers ask the assistant on your online ordering page",
"lang_ai_ordering_assistant_hint": "A spark appears on your ordering page. Customers ask in their own words, and the assistant answers from your menu and can add to their order. It never places or pays. Every question is billed to your account above, within the monthly limit, and it is off until you switch it on.",
"lang_ai_provider": "Who answers",
- "lang_ai_save": "Save",
"lang_ai_saved": "Saved. The AI button now appears on the item screen, beside Description.",
"lang_ai_settings": "AI settings",
"lang_ai_spend_calls": "Calls",
@@ -1938,8 +1937,6 @@
"lang_inv": "INV-",
"lang_invalid_data": "Invalid data...!!!",
"lang_invenlog_title": "Inventory Logs",
- "lang_mobile_inventory": "Mobile inventory",
- "lang_inventory_confirmation": "Inventory confirmation",
"lang_inventory_count": "Inventory count",
"lang_inventory_log": "Inventory Log",
"lang_inventory_logs": "Inventory logs",
@@ -2441,6 +2438,7 @@
"lang_minimum_spend_to_earn": "Minimum spend to earn (",
"lang_minutes_ago": "minutes ago",
"lang_mobile": "Mobile Number",
+ "lang_mobile_inventory": "Mobile inventory",
"lang_mobile_inventory_operations": "Mobile inventory operations",
"lang_mobile_no": "Mobile No:",
"lang_mobile_pos_settings": "Mobile POS settings",
@@ -3277,7 +3275,6 @@
"lang_print_sales_receipts": "Sales receipts",
"lang_print_sample": "Print sample",
"lang_print_save_failed": "Could not save print settings.",
- "lang_print_save_settings": "Save print settings",
"lang_print_settings": "Print settings",
"lang_print_settings_saved": "Print settings saved.",
"lang_print_shelf_labels": "Print shelf labels",
@@ -3930,12 +3927,10 @@
"lang_save_loyalty_settings": "Save loyalty settings",
"lang_save_note": "Save note",
"lang_save_outlet": "Save outlet",
- "lang_save_printing_options": "Save printing options",
"lang_save_quotation": "Save quotation",
"lang_save_quotation_settings": "Save quotation settings",
"lang_save_role": "Save Role",
"lang_save_sale": "Save Sale",
- "lang_save_sharing": "Save sharing",
"lang_save_targets": "Save Targets",
"lang_save_template": "Save Template",
"lang_save_the_user_first_then_assign_a_card": "Save the user first, then assign a card.",
diff --git a/languages/ne.json b/languages/ne.json
index f24dc0b9f..e33ac09f9 100644
--- a/languages/ne.json
+++ b/languages/ne.json
@@ -1,4 +1,5 @@
{
+ "lang_mobile_inventory": "मोबाइल इन्भेन्टरी",
"lang_background_colour": "पृष्ठभूमि रङ",
"lang_barcode_format": "बारकोड",
"lang_barcode_margin": "बार मार्जिन",
diff --git a/languages/nl.json b/languages/nl.json
index 3a3209c39..4867f8b17 100644
--- a/languages/nl.json
+++ b/languages/nl.json
@@ -1,4 +1,5 @@
{
+ "lang_mobile_inventory": "Mobiele voorraad",
"lang_made_with_posnic_posnic_com": "Gemaakt met Posnic · posnic.com",
"lang_actual_size": "Werkelijke grootte",
"lang_fit_whole_page": "Hele pagina passend weergeven",
diff --git a/tests/ai-feature-switch.test.js b/tests/ai-feature-switch.test.js
index 292f5aa83..166f9dd6a 100644
--- a/tests/ai-feature-switch.test.js
+++ b/tests/ai-feature-switch.test.js
@@ -131,7 +131,7 @@ test('the sidebar has a way in, gated on the switch', () => {
reachable only by scrolling the settings rail and hoping. */
assert.match(sidebar, /id="manage_li_ai"/, 'the AI row is gone from the sidebar');
assert.match(sidebar, /href="#\/settings\/ai"/, 'the AI row points nowhere');
- assert.match(core, /\$\('#manage_li_ai'\)\.toggle\(on\('ai_enabled'\) \|\| s.ask_posnic_enabled === true\)/,
+ assert.match(core, /\$\('#manage_li_ai'\)\.toggle\(s.ask_posnic_enabled === true\)/,
'the AI sidebar row is not gated on the switch');
});
diff --git a/tests/ask-posnic-focused-ux.test.js b/tests/ask-posnic-focused-ux.test.js
index 6c691a7fc..8dd330bfc 100644
--- a/tests/ask-posnic-focused-ux.test.js
+++ b/tests/ask-posnic-focused-ux.test.js
@@ -56,6 +56,29 @@ test('preferences retain form ownership across tabs and save every section', ()
assert.equal(saved.own_key_semantic, true); assert.deepEqual(saved.allowed_actions, ['stock_count']);
$('[id^="ask_pref_"],#ask_help_instructions,.ask-allowed-action').each(function () { assert.equal(this.form.id, 'ask_posnic_preferences_form'); });
});
+
+test('disabled Ask Posnic never loads protected settings tab APIs', () => {
+ const { ui, calls } = setup();
+ ui.showSettings();
+ ui.setEnabled(false);
+ const before = calls.length;
+ for (const tab of ['knowledge', 'usage', 'schedules']) ui.settingsTab(tab);
+ assert.equal(calls.length, before);
+});
+
+test('one AI usage save writes provider settings before assistant preferences', () => {
+ const { $, ui, PosnicPro } = setup();
+ ui.showSettings(); ui.settingsTab('usage');
+ let finishProvider;
+ let preferenceWrites = 0;
+ PosnicPro.settings.ai.save = done => { finishProvider = done; };
+ PosnicPro.request = () => { preferenceWrites++; };
+ $('#ask_posnic_preferences_form').triggerHandler('submit');
+ assert.equal($('#ai_save').length, 0);
+ assert.equal(preferenceWrites, 0);
+ finishProvider();
+ assert.equal(preferenceWrites, 1);
+});
test('question progress, Enter and new conversation keep the chat usable', () => {
const { $, ui, PosnicPro } = setup();
ui.showDataTablePage();
diff --git a/tests/branch-data-sharing.test.js b/tests/branch-data-sharing.test.js
index 54511295d..135a1472b 100644
--- a/tests/branch-data-sharing.test.js
+++ b/tests/branch-data-sharing.test.js
@@ -122,13 +122,14 @@ test('Settings carries the switches the branch form promised', () => {
for (const id of ['set_share_customers', 'set_share_suppliers']) {
assert.ok(new RegExp(`id="${id}"`).test(settingsHtml), `${id} is missing from Settings`);
}
- assert.match(settingsHtml, /id="sharing_save_btn"/, 'there is no way to save it');
+ assert.match(settingsHtml, /id="tax_discount_add"/, 'there is no Core Settings save form');
});
-test('it has its OWN save, not the general form save', () => {
- /* Everything around it writes to this branch. Riding that save would let a
- screen opened on one shop push that shop's view onto all of them. */
- assert.match(settingsHtml, /onclick="PosnicPro\.settings\.saveSharing\(\);"/, 'no dedicated save');
+test('the unified button keeps sharing on its own account-level endpoint', () => {
+ assert.doesNotMatch(settingsHtml, /id="sharing_save_btn"/, 'duplicate save button');
+ const submit = blockAt(settingsJs, '$("#tax_discount_add").submit(function (event) {');
+ assert.match(submit, /_sharingLoaded && PosnicPro.settings._sharingDirty/);
+ assert.match(submit, /PosnicPro.settings.saveSharing\(\)/);
const save = blockAt(settingsJs, 'PosnicPro.settings.saveSharing = function () {');
assert.match(save, /url: 'settings\/group\/sharing'/, 'it must use the sharing endpoint alone');
assert.match(save, /level: 'account'/, 'writing at branch level would not share anything');
diff --git a/tests/receipt-designer.test.js b/tests/receipt-designer.test.js
index fbe53cb02..5064d2071 100644
--- a/tests/receipt-designer.test.js
+++ b/tests/receipt-designer.test.js
@@ -160,10 +160,12 @@ test('editor adds and reorders blocks, keeps formats independent, and sends a pa
dom.window.close();
});
-test('saving printing behaviour does not submit or discard unsaved receipt designs', () => {
+test('saving printing behaviour does not submit or discard unsaved receipt designs', async () => {
const { dom, w, $, branch } = setup();
$('body').append('');
const sent = [];
+ let printerSaves = 0;
+ w.PosnicPro.printSettings = { save: async () => { printerSaves++; return true; } };
w.PosnicPro.put = (request, done) => {
const data = JSON.parse(request.data); sent.push(data);
done({ type: 'success', data: data });
@@ -173,6 +175,8 @@ test('saving printing behaviour does not submit or discard unsaved receipt desig
$('#rd-block-text').val('New layout text').trigger('input');
$('#printall').prop('checked', true).trigger('change');
$('#save-print-behaviour').trigger('click');
+ await new Promise(resolve => setImmediate(resolve));
+ assert.equal(printerSaves, 1);
assert.deepEqual(sent[0], { printall: 'true', bill_print_copies: '1' });
assert.match($('#print-behaviour-status').text(), /saved/);
assert.match($('.rd-status').text(), /Unsaved/);
@@ -182,6 +186,20 @@ test('saving printing behaviour does not submit or discard unsaved receipt desig
dom.window.close();
});
+test('a failed device printer save prevents a misleading printing-options success', async () => {
+ const { dom, w, $, branch } = setup();
+ $('body').append('');
+ let writes = 0;
+ w.PosnicPro.printSettings = { save: async () => false };
+ w.PosnicPro.put = () => { writes++; };
+ w.PosnicPro.receiptDesignerEditor.load(branch);
+ $('#save-print-behaviour').trigger('click');
+ await new Promise(resolve => setImmediate(resolve));
+ assert.equal(writes, 0);
+ assert.equal($('#save-print-behaviour').prop('disabled'), false);
+ dom.window.close();
+});
+
test('FSSAI prints from current branch details on all formats and an explicit field controls its position', () => {
const { dom, engine, design, sale, $ } = setup();
sale.table_options = 'enable'; sale.country = 'India'; sale.branch_fssai_number = ' 12345678901234 ';
diff --git a/tests/settings-save-routing.test.js b/tests/settings-save-routing.test.js
index 9a4f5e30a..970477bc6 100644
--- a/tests/settings-save-routing.test.js
+++ b/tests/settings-save-routing.test.js
@@ -64,3 +64,24 @@ test('the Core Settings form still saves the receipt designer when Receipt Print
assert.equal(h.requests.length, 1);
} finally { h.dom.window.close(); }
});
+
+test('the single Core Save includes changed account sharing only after the branch save succeeds', () => {
+ const h = setup();
+ h.$('#core-tab-print').removeClass('active');
+ let next, sharing = 0;
+ h.w.PosnicPro.alert = () => {};
+ h.w.PosnicPro.i18n = { t: (_key, fallback) => fallback };
+ h.w.PosnicPro.settings.updateCommonSetting = (_label, done) => { next = done; };
+ h.w.PosnicPro.settings.saveSharing = () => { sharing++; };
+ h.w.PosnicPro.settings._sharingLoaded = true;
+ h.w.PosnicPro.settings._sharingDirty = true;
+ h.$('#tax_discount_add').triggerHandler('submit');
+ assert.equal(sharing, 0);
+ next();
+ assert.equal(sharing, 1);
+ h.w.PosnicPro.settings._sharingDirty = false;
+ h.$('#tax_discount_add').triggerHandler('submit');
+ next();
+ assert.equal(sharing, 1, 'unchanged account sharing must not be overwritten');
+ h.dom.window.close();
+});
diff --git a/tests/settings-single-save.test.js b/tests/settings-single-save.test.js
new file mode 100644
index 000000000..89fccb931
--- /dev/null
+++ b/tests/settings-single-save.test.js
@@ -0,0 +1,41 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const { JSDOM } = require('jsdom');
+
+test('Ask Posnic menu follows its opt-in, even when other AI features are enabled', () => {
+ const dom = new JSDOM('