From 64422e30b4de975b5aef433090a651bd8b8c1a48 Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 5 May 2023 21:38:43 +0100 Subject: [PATCH 1/9] v6.4 --- CHANGELOG.md | 2 ++ VERSION.md | 2 +- db/schema.ver | 2 +- releasenotes.md | 8 +------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84756c86..4fe3bf97 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # CHANGELOG +### Version 6.4 + ### Version 6.3 - Add phpMyAdmin for docker images - Add a message to notify user that SDS document generation its in preview state diff --git a/VERSION.md b/VERSION.md index 0faee7d9..c596943a 100755 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -6.3 +6.4 diff --git a/db/schema.ver b/db/schema.ver index 0faee7d9..c596943a 100644 --- a/db/schema.ver +++ b/db/schema.ver @@ -1 +1 @@ -6.3 +6.4 diff --git a/releasenotes.md b/releasenotes.md index 4dcc86f3..c50aa6df 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,8 +1,2 @@ -Whats New in v6.3 +Whats New in v6.4 ---------------------- -- Add phpMyAdmin by default for docker installations, link can be found under the maintanance tab in settings -- Complete rewrite suppliers page -- Add additional info fields for suppliers -- Improvements in SDS document generation - This feature its still in beta state -- Ingredients CSV import/export extended to support allergen status and notes impact -- Ingredients JSON import/export From a16238cdf1b7ef585fba65985c2840db0de7d6e4 Mon Sep 17 00:00:00 2001 From: JB Date: Fri, 5 May 2023 22:14:35 +0100 Subject: [PATCH 2/9] Fix supplier details edit modal --- CHANGELOG.md | 1 + pages/suppliers.php | 12 +++--------- releasenotes.md | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fe3bf97..d0881ccb 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG ### Version 6.4 +- Fix supplier details edit modal ### Version 6.3 - Add phpMyAdmin for docker images diff --git a/pages/suppliers.php b/pages/suppliers.php index 8443c667..86640176 100644 --- a/pages/suppliers.php +++ b/pages/suppliers.php @@ -391,17 +391,11 @@ function reload_data() { - -

Supplier Details

+
Supplier Details
diff --git a/releasenotes.md b/releasenotes.md index c50aa6df..f48bfa26 100755 --- a/releasenotes.md +++ b/releasenotes.md @@ -1,2 +1,3 @@ Whats New in v6.4 ---------------------- +- Fix supplier's details update modal box From 74a3e3f748d1e19ab9a475235916fc281bd36f0d Mon Sep 17 00:00:00 2001 From: JB Date: Sun, 7 May 2023 22:51:58 +0100 Subject: [PATCH 3/9] Add available var list in SDS Html Editor --- CHANGELOG.md | 1 + core/genDoc.php | 2 ++ js/helpers.js | 21 ++++++++++++ pages/editHtmlTmpl.php | 72 ++++++++++++++++++++++++++++++++---------- releasenotes.md | 1 + 5 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 js/helpers.js diff --git a/CHANGELOG.md b/CHANGELOG.md index d0881ccb..d64af16d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ### Version 6.4 - Fix supplier details edit modal +- Add available var list in SDS Html Editor ### Version 6.3 - Add phpMyAdmin for docker images diff --git a/core/genDoc.php b/core/genDoc.php index 51dd6fa8..226d7d3b 100644 --- a/core/genDoc.php +++ b/core/genDoc.php @@ -28,6 +28,7 @@ $search = array( '%LOGO%', + '%BRAND_LOGO%', '%BRAND_NAME%', '%BRAND_ADDRESS%', '%BRAND_EMAIL%', @@ -55,6 +56,7 @@ $replace = array( __PVLOGO__, + __BRANDLOGO__, $settings['brandName'], $settings['brandAddress'], $settings['brandEmail'], diff --git a/js/helpers.js b/js/helpers.js new file mode 100644 index 00000000..2996e4b3 --- /dev/null +++ b/js/helpers.js @@ -0,0 +1,21 @@ +function insertAtCaret(areaId,text) { + var txtarea = document.getElementById(areaId); + var scrollPos = txtarea.scrollTop; + var strPos = 0; + var br = ((txtarea.selectionStart || txtarea.selectionStart == '0') ? "ff" : (document.selection ? "ie" : false ) ); + if (br == "ie") { txtarea.focus(); + var range = document.selection.createRange(); + range.moveStart ('character', -txtarea.value.length); strPos = range.text.length; + } else if (br == "ff") strPos = txtarea.selectionStart; + var front = (txtarea.value).substring(0,strPos); + var back = (txtarea.value).substring(strPos,txtarea.value.length); + txtarea.value=front+text+back; strPos = strPos + text.length; if (br == "ie") { txtarea.focus(); + var range = document.selection.createRange(); + range.moveStart ('character', -txtarea.value.length); + range.moveStart ('character', strPos); + range.moveEnd ('character', 0); + range.select(); + } else if (br == "ff") { txtarea.selectionStart = strPos; txtarea.selectionEnd = strPos; txtarea.focus(); + } + txtarea.scrollTop = scrollPos; +} \ No newline at end of file diff --git a/pages/editHtmlTmpl.php b/pages/editHtmlTmpl.php index ce944c0f..3fc04481 100644 --- a/pages/editHtmlTmpl.php +++ b/pages/editHtmlTmpl.php @@ -26,31 +26,71 @@ + +
- - - - - - -
-

-
Please refer here for special variables syntax
-

- -

-
-
-
- +

+
+
+ HTML Content: + +
+
+
+ Special vars + +
+
+
+
+
Please refer here for special variables syntax
+
+ +
+ +