diff --git a/README.md b/README.md index 7be6538..4fad8b2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Demonstration of subform super power + *Author*: [Oh Martin](mailto:oh@nampharm.com.na) + *Name*: [Subform Power](https://nampharm.com.na) + *First Build*: 24th May, 2024 -+ *Last Build*: 21st August, 2024 ++ *Last Build*: 4th February, 2025 + *Version*: 1.0.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -21,7 +21,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **25804** ++ *Line count*: **25865** + *File count*: **246** + *Folder count*: **85** diff --git a/SubformpowerInstallerPowerloader.php b/SubformpowerInstallerPowerloader.php index ef9d5fc..b958771 100644 --- a/SubformpowerInstallerPowerloader.php +++ b/SubformpowerInstallerPowerloader.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerInstallerPowerloader.php diff --git a/SubformpowerInstallerScript.php b/SubformpowerInstallerScript.php index 623b7ed..3524321 100644 --- a/SubformpowerInstallerScript.php +++ b/SubformpowerInstallerScript.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerInstallerScript.php diff --git a/admin/README.txt b/admin/README.txt index 7be6538..4fad8b2 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -8,7 +8,7 @@ Demonstration of subform super power + *Author*: [Oh Martin](mailto:oh@nampharm.com.na) + *Name*: [Subform Power](https://nampharm.com.na) + *First Build*: 24th May, 2024 -+ *Last Build*: 21st August, 2024 ++ *Last Build*: 4th February, 2025 + *Version*: 1.0.1 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html @@ -21,7 +21,7 @@ due to [Automated Component Builder](https://www.joomlacomponentbuilder.com)) > (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**, > never making one mistake or taking any coffee break.) -+ *Line count*: **25804** ++ *Line count*: **25865** + *File count*: **246** + *Folder count*: **85** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index a1cd2fe..dfa224d 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage admin.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 6dda8cc..a87cd41 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 5bf6cd9..41cbd37 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 53169e4..2e126af 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 06db944..9a80816 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 2f8d8f3..cbfd240 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage dashboard.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 450f1f5..17d65ef 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage admin.js diff --git a/admin/forms/currency.xml b/admin/forms/currency.xml index 154d2f6..c12ad98 100644 --- a/admin/forms/currency.xml +++ b/admin/forms/currency.xml @@ -122,10 +122,7 @@ type="countries" name="country" label="COM_SUBFORMPOWER_CURRENCY_COUNTRY_LABEL" - description="COM_SUBFORMPOWER_CURRENCY_COUNTRY_DESCRIPTION" - message="COM_SUBFORMPOWER_CURRENCY_COUNTRY_MESSAGE" class="list_class" - layout="joomla.form.field.list-fancy-select" validate="guid" button="true" /> diff --git a/admin/language/en-GB/en-GB.com_subformpower.ini b/admin/language/en-GB/en-GB.com_subformpower.ini index 5026a27..58d3463 100644 --- a/admin/language/en-GB/en-GB.com_subformpower.ini +++ b/admin/language/en-GB/en-GB.com_subformpower.ini @@ -46,7 +46,7 @@ COM_SUBFORMPOWER_COUNTRIES_EDIT_STATE_DESC="Allows the users in this group to up COM_SUBFORMPOWER_COUNTRIES_EDIT_VERSION="Countries Edit Version" COM_SUBFORMPOWER_COUNTRIES_EDIT_VERSION_DESC="Allows the users in this group to edit versions of version countries" COM_SUBFORMPOWER_COUNTRIES_EMPTYSTATE_BUTTON_ADD="Add your first country" -COM_SUBFORMPOWER_COUNTRIES_EMPTYSTATE_CONTENT="country view (dynamic build)" +COM_SUBFORMPOWER_COUNTRIES_EMPTYSTATE_CONTENT="country view" COM_SUBFORMPOWER_COUNTRIES_EMPTYSTATE_TITLE="No countries have been created yet." COM_SUBFORMPOWER_COUNTRIES_EXPORT="Countries Export" COM_SUBFORMPOWER_COUNTRIES_EXPORT_DESC="Allows the users in this group to export export countries" @@ -185,9 +185,7 @@ COM_SUBFORMPOWER_CURRENCIES_N_ITEMS_UNPUBLISHED_1="%s Currency unpublished." COM_SUBFORMPOWER_CURRENCIES_SUBMENU="Currencies Submenu" COM_SUBFORMPOWER_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_SUBFORMPOWER_CURRENCY="Currency" -COM_SUBFORMPOWER_CURRENCY_COUNTRY_DESCRIPTION="The primary currency id is set here." COM_SUBFORMPOWER_CURRENCY_COUNTRY_LABEL="Country" -COM_SUBFORMPOWER_CURRENCY_COUNTRY_MESSAGE="Error! Please add some primary currency id here." COM_SUBFORMPOWER_CURRENCY_CREATED_BY_DESC="The user that created this Currency." COM_SUBFORMPOWER_CURRENCY_CREATED_BY_LABEL="Created By" COM_SUBFORMPOWER_CURRENCY_CREATED_DATE_DESC="The date this Currency was created." diff --git a/admin/layouts/country/currencies_fullwidth.php b/admin/layouts/country/currencies_fullwidth.php index bb26d4f..6dc5de7 100644 --- a/admin/layouts/country/currencies_fullwidth.php +++ b/admin/layouts/country/currencies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage currencies_fullwidth.php @@ -24,6 +24,7 @@ use Joomla\CMS\HTML\HTMLHelper as Html; use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper; use JCB\Joomla\Utilities\StringHelper; use JCB\Joomla\Utilities\ArrayHelper; +use Joomla\CMS\User\UserFactoryInterface; // No direct access to this file defined('_JEXEC') or die; @@ -53,9 +54,9 @@ else $ref = ($id) ? "&ref=country&refid=" . $id : ""; } // set the create new URL -$new = "index.php?option=com_subformpower&view=currencies&task=currency.edit" . $ref; +$new = "index.php?option=com_subformpower&view=currencies&task=currency.add" . $ref; // set the create new and close URL -$close_new = "index.php?option=com_subformpower&view=currencies&task=currency.edit"; +$close_new = "index.php?option=com_subformpower&view=currencies&task=currency.add"; // load the action object $can = SubformpowerHelper::getActions('currency'); @@ -93,8 +94,8 @@ $can = SubformpowerHelper::getActions('currency'); authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; $userChkOut = Factory::getContainer()-> - get(\Joomla\CMS\User\UserFactoryInterface::class)-> - loadUserById($item->checked_out); + get(UserFactoryInterface::class)-> + loadUserById($item->checked_out ?? 0); $canDo = SubformpowerHelper::getActions('currency',$item,'currencies'); ?> diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 5560275..ae95e52 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 7ac4fcd..2713918 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index db70134..35b25aa 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_right.php diff --git a/admin/layouts/country/more_stuff_fullwidth.php b/admin/layouts/country/more_stuff_fullwidth.php index 67456bb..60540c2 100644 --- a/admin/layouts/country/more_stuff_fullwidth.php +++ b/admin/layouts/country/more_stuff_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage more_stuff_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index afe11bb..32a64ca 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index 0620536..bf11005 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage publlshing.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 2729eda..3b1c0aa 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 38b93eb..90271d0 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 8dd8997..63c70d9 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index afe11bb..32a64ca 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index 0620536..bf11005 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage publlshing.php diff --git a/admin/services/provider.php b/admin/services/provider.php index 4dac2ca..bd2be5f 100644 --- a/admin/services/provider.php +++ b/admin/services/provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage provider.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 4632ff6..8d04c59 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -3,7 +3,7 @@ SET time_zone = "+00:00"; CREATE TABLE IF NOT EXISTS `#__subformpower_country` ( `id` INT(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', + `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `guid` VARCHAR(36) NOT NULL DEFAULT '', `iso` VARCHAR(255) NOT NULL DEFAULT '', `isothree` VARCHAR(255) NOT NULL DEFAULT '', @@ -12,17 +12,17 @@ CREATE TABLE IF NOT EXISTS `#__subformpower_country` ( `phonecode` VARCHAR(255) NOT NULL DEFAULT '', `timezone` VARCHAR(255) NOT NULL DEFAULT '', `params` TEXT NULL, - `published` TINYINT(3) NOT NULL DEFAULT 1, - `created_by` INT(10) unsigned NOT NULL DEFAULT 0, - `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, + `published` TINYINT(3) NULL DEFAULT 1, + `created_by` INT unsigned NULL, + `modified_by` INT unsigned, `created` DATETIME DEFAULT CURRENT_TIMESTAMP, - `modified` DATETIME DEFAULT NULL, - `checked_out` int(11) unsigned NOT NULL DEFAULT 0, - `checked_out_time` DATETIME DEFAULT NULL, - `version` INT(10) unsigned NOT NULL DEFAULT 1, - `hits` INT(10) unsigned NOT NULL DEFAULT 0, - `access` INT(10) unsigned NOT NULL DEFAULT 0, - `ordering` INT(11) NOT NULL DEFAULT 0, + `modified` DATETIME, + `checked_out` int unsigned, + `checked_out_time` DATETIME, + `version` INT(10) unsigned NULL DEFAULT 1, + `hits` INT(10) unsigned NULL DEFAULT 0, + `access` INT(10) unsigned NULL DEFAULT 0, + `ordering` INT(11) NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `idx_name` (`name`), KEY `idx_guid` (`guid`), @@ -35,23 +35,23 @@ CREATE TABLE IF NOT EXISTS `#__subformpower_country` ( CREATE TABLE IF NOT EXISTS `#__subformpower_currency` ( `id` INT(11) NOT NULL AUTO_INCREMENT, - `asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', + `asset_id` INT(10) unsigned NULL DEFAULT 0 COMMENT 'FK to the #__assets table.', `country` VARCHAR(36) NOT NULL DEFAULT '', `ext_number` INT(10) NOT NULL DEFAULT 0, `guid` VARCHAR(36) NOT NULL DEFAULT '', `symbol` VARCHAR(255) NULL DEFAULT '', `params` TEXT NULL, - `published` TINYINT(3) NOT NULL DEFAULT 1, - `created_by` INT(10) unsigned NOT NULL DEFAULT 0, - `modified_by` INT(10) unsigned NOT NULL DEFAULT 0, + `published` TINYINT(3) NULL DEFAULT 1, + `created_by` INT unsigned NULL, + `modified_by` INT unsigned, `created` DATETIME DEFAULT CURRENT_TIMESTAMP, - `modified` DATETIME DEFAULT NULL, - `checked_out` int(11) unsigned NOT NULL DEFAULT 0, - `checked_out_time` DATETIME DEFAULT NULL, - `version` INT(10) unsigned NOT NULL DEFAULT 1, - `hits` INT(10) unsigned NOT NULL DEFAULT 0, - `access` INT(10) unsigned NOT NULL DEFAULT 0, - `ordering` INT(11) NOT NULL DEFAULT 0, + `modified` DATETIME, + `checked_out` int unsigned, + `checked_out_time` DATETIME, + `version` INT(10) unsigned NULL DEFAULT 1, + `hits` INT(10) unsigned NULL DEFAULT 0, + `access` INT(10) unsigned NULL DEFAULT 0, + `ordering` INT(11) NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `idx_ext_number` (`ext_number`), KEY `idx_country` (`country`), diff --git a/admin/src/Controller/CountriesController.php b/admin/src/Controller/CountriesController.php index b2997ce..48e6a74 100644 --- a/admin/src/Controller/CountriesController.php +++ b/admin/src/Controller/CountriesController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesController.php diff --git a/admin/src/Controller/CountryController.php b/admin/src/Controller/CountryController.php index d85253a..9f85d36 100644 --- a/admin/src/Controller/CountryController.php +++ b/admin/src/Controller/CountryController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountryController.php @@ -71,6 +71,22 @@ class CountryController extends FormController */ protected $view_list = 'countries'; + /** + * Referral value + * + * @var string + * @since 5.0 + */ + protected string $ref; + + /** + * Referral ID value + * + * @var int + * @since 5.0 + */ + protected int $refid; + /** * Method override to check if you can add a new record. * diff --git a/admin/src/Controller/CurrenciesController.php b/admin/src/Controller/CurrenciesController.php index ec47ccf..e525bcd 100644 --- a/admin/src/Controller/CurrenciesController.php +++ b/admin/src/Controller/CurrenciesController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrenciesController.php diff --git a/admin/src/Controller/CurrencyController.php b/admin/src/Controller/CurrencyController.php index 014afde..6e2897e 100644 --- a/admin/src/Controller/CurrencyController.php +++ b/admin/src/Controller/CurrencyController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrencyController.php @@ -71,6 +71,22 @@ class CurrencyController extends FormController */ protected $view_list = 'currencies'; + /** + * Referral value + * + * @var string + * @since 5.0 + */ + protected string $ref; + + /** + * Referral ID value + * + * @var int + * @since 5.0 + */ + protected int $refid; + /** * Method override to check if you can add a new record. * diff --git a/admin/src/Controller/DisplayController.php b/admin/src/Controller/DisplayController.php index d99aca4..bdaadd6 100644 --- a/admin/src/Controller/DisplayController.php +++ b/admin/src/Controller/DisplayController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage DisplayController.php diff --git a/admin/src/Controller/ImportController.php b/admin/src/Controller/ImportController.php index fa3ce79..3afd256 100644 --- a/admin/src/Controller/ImportController.php +++ b/admin/src/Controller/ImportController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage ImportController.php diff --git a/admin/src/Controller/SubformpowerController.php b/admin/src/Controller/SubformpowerController.php index 5ef6ebc..dd56bea 100644 --- a/admin/src/Controller/SubformpowerController.php +++ b/admin/src/Controller/SubformpowerController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerController.php diff --git a/admin/src/Extension/SubformpowerComponent.php b/admin/src/Extension/SubformpowerComponent.php index 2d719d7..464006e 100644 --- a/admin/src/Extension/SubformpowerComponent.php +++ b/admin/src/Extension/SubformpowerComponent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerComponent.php diff --git a/admin/src/Field/CountriesField.php b/admin/src/Field/CountriesField.php index c6742f2..0f39e6d 100644 --- a/admin/src/Field/CountriesField.php +++ b/admin/src/Field/CountriesField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesField.php @@ -25,6 +25,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use Joomla\CMS\Component\ComponentHelper; use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper; +use Joomla\CMS\Uri\Uri; // No direct access to this file \defined('_JEXEC') or die; @@ -79,7 +80,7 @@ class CountriesField extends ListField $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; // get the return value. - $_uri = (string) \Joomla\CMS\Uri\Uri::getInstance(); + $_uri = (string) Uri::getInstance(); $_return = urlencode(base64_encode($_uri)); // load return value. $ref .= '&return=' . $_return; @@ -110,12 +111,14 @@ class CountriesField extends ListField // build script $script[] = " document.addEventListener('DOMContentLoaded', function() { - document.getElementById('jform_".$button_code_name."').addEventListener('change', function(e) { + let ".$button_code_name."Field = document.getElementById('jform_".$button_code_name."'); + if (!".$button_code_name."Field) { return; } + ".$button_code_name."Field.addEventListener('change', function(e) { e.preventDefault(); let ".$button_code_name."Value = this.value; ".$button_code_name."Button(".$button_code_name."Value); }); - let ".$button_code_name."Value = document.getElementById('jform_".$button_code_name."').value; + let ".$button_code_name."Value = ".$button_code_name."Field.value; ".$button_code_name."Button(".$button_code_name."Value); }); function ".$button_code_name."Button(value) { diff --git a/admin/src/Field/CountriesfilterisoField.php b/admin/src/Field/CountriesfilterisoField.php index 3a36d1d..0c6da81 100644 --- a/admin/src/Field/CountriesfilterisoField.php +++ b/admin/src/Field/CountriesfilterisoField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesfilterisoField.php diff --git a/admin/src/Field/CountriesfilterisothreeField.php b/admin/src/Field/CountriesfilterisothreeField.php index 4914b24..fa7b572 100644 --- a/admin/src/Field/CountriesfilterisothreeField.php +++ b/admin/src/Field/CountriesfilterisothreeField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesfilterisothreeField.php diff --git a/admin/src/Field/CountriesfilternumcodeField.php b/admin/src/Field/CountriesfilternumcodeField.php index 51565e2..edbe9e0 100644 --- a/admin/src/Field/CountriesfilternumcodeField.php +++ b/admin/src/Field/CountriesfilternumcodeField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesfilternumcodeField.php diff --git a/admin/src/Field/CountriesfilterphonecodeField.php b/admin/src/Field/CountriesfilterphonecodeField.php index 4db796d..1df4eb0 100644 --- a/admin/src/Field/CountriesfilterphonecodeField.php +++ b/admin/src/Field/CountriesfilterphonecodeField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesfilterphonecodeField.php diff --git a/admin/src/Field/CurrenciesfiltersymbolField.php b/admin/src/Field/CurrenciesfiltersymbolField.php index e78700e..6a9e3fd 100644 --- a/admin/src/Field/CurrenciesfiltersymbolField.php +++ b/admin/src/Field/CurrenciesfiltersymbolField.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrenciesfiltersymbolField.php diff --git a/admin/src/Helper/HeaderCheck.php b/admin/src/Helper/HeaderCheck.php index 077bb1a..4544f71 100644 --- a/admin/src/Helper/HeaderCheck.php +++ b/admin/src/Helper/HeaderCheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HeaderCheck.php diff --git a/admin/src/Helper/PowerloaderHelper.php b/admin/src/Helper/PowerloaderHelper.php index 73dd223..e3ce705 100644 --- a/admin/src/Helper/PowerloaderHelper.php +++ b/admin/src/Helper/PowerloaderHelper.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage PowerloaderHelper.php diff --git a/admin/src/Helper/SubformpowerHelper.php b/admin/src/Helper/SubformpowerHelper.php index 234a689..f48637e 100644 --- a/admin/src/Helper/SubformpowerHelper.php +++ b/admin/src/Helper/SubformpowerHelper.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerHelper.php diff --git a/admin/src/Model/CountriesModel.php b/admin/src/Model/CountriesModel.php index 152f280..52b021b 100644 --- a/admin/src/Model/CountriesModel.php +++ b/admin/src/Model/CountriesModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesModel.php diff --git a/admin/src/Model/CountryModel.php b/admin/src/Model/CountryModel.php index 4c8ce35..a4100c5 100644 --- a/admin/src/Model/CountryModel.php +++ b/admin/src/Model/CountryModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountryModel.php diff --git a/admin/src/Model/CurrenciesModel.php b/admin/src/Model/CurrenciesModel.php index 0d05058..d149794 100644 --- a/admin/src/Model/CurrenciesModel.php +++ b/admin/src/Model/CurrenciesModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrenciesModel.php diff --git a/admin/src/Model/CurrencyModel.php b/admin/src/Model/CurrencyModel.php index c4e249a..e1bd9fe 100644 --- a/admin/src/Model/CurrencyModel.php +++ b/admin/src/Model/CurrencyModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrencyModel.php diff --git a/admin/src/Model/ImportModel.php b/admin/src/Model/ImportModel.php index 4d55673..0b3d0c9 100644 --- a/admin/src/Model/ImportModel.php +++ b/admin/src/Model/ImportModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage ImportModel.php diff --git a/admin/src/Model/SubformpowerModel.php b/admin/src/Model/SubformpowerModel.php index e14d007..4650757 100644 --- a/admin/src/Model/SubformpowerModel.php +++ b/admin/src/Model/SubformpowerModel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage SubformpowerModel.php diff --git a/admin/src/Rule/GuidRule.php b/admin/src/Rule/GuidRule.php index 6be40d4..4803c16 100644 --- a/admin/src/Rule/GuidRule.php +++ b/admin/src/Rule/GuidRule.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage GuidRule.php diff --git a/admin/src/Table/CountryTable.php b/admin/src/Table/CountryTable.php index d9d8c56..e844b18 100644 --- a/admin/src/Table/CountryTable.php +++ b/admin/src/Table/CountryTable.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountryTable.php diff --git a/admin/src/Table/CurrencyTable.php b/admin/src/Table/CurrencyTable.php index 3cfb68b..50ee666 100644 --- a/admin/src/Table/CurrencyTable.php +++ b/admin/src/Table/CurrencyTable.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrencyTable.php diff --git a/admin/src/View/Countries/HtmlView.php b/admin/src/View/Countries/HtmlView.php index 727afce..f78947d 100644 --- a/admin/src/View/Countries/HtmlView.php +++ b/admin/src/View/Countries/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php @@ -45,6 +45,7 @@ use JCB\Joomla\Utilities\StringHelper; * * @since 1.6 */ +#[\AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -109,9 +110,10 @@ class HtmlView extends BaseHtmlView * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * * @return void + * @throws \Exception * @since 1.6 */ - public function display($tpl = null) + public function display($tpl = null): void { // Assign data to the view $this->items = $this->get('Items'); diff --git a/admin/src/View/Country/HtmlView.php b/admin/src/View/Country/HtmlView.php index 573dc7d..3066f5c 100644 --- a/admin/src/View/Country/HtmlView.php +++ b/admin/src/View/Country/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php @@ -44,6 +44,7 @@ use JCB\Joomla\Utilities\StringHelper; * * @since 1.6 */ +#[\AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -132,9 +133,10 @@ class HtmlView extends BaseHtmlView * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * * @return void + * @throws \Exception * @since 1.6 */ - public function display($tpl = null) + public function display($tpl = null): void { // set params $this->params = ComponentHelper::getParams('com_subformpower'); diff --git a/admin/src/View/Currencies/HtmlView.php b/admin/src/View/Currencies/HtmlView.php index 0aa19db..1201cdc 100644 --- a/admin/src/View/Currencies/HtmlView.php +++ b/admin/src/View/Currencies/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php @@ -45,6 +45,7 @@ use JCB\Joomla\Utilities\StringHelper; * * @since 1.6 */ +#[\AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -109,9 +110,10 @@ class HtmlView extends BaseHtmlView * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * * @return void + * @throws \Exception * @since 1.6 */ - public function display($tpl = null) + public function display($tpl = null): void { // Assign data to the view $this->items = $this->get('Items'); diff --git a/admin/src/View/Currency/HtmlView.php b/admin/src/View/Currency/HtmlView.php index b6b8b55..ccdaf74 100644 --- a/admin/src/View/Currency/HtmlView.php +++ b/admin/src/View/Currency/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php @@ -44,6 +44,7 @@ use JCB\Joomla\Utilities\StringHelper; * * @since 1.6 */ +#[\AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** @@ -132,9 +133,10 @@ class HtmlView extends BaseHtmlView * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * * @return void + * @throws \Exception * @since 1.6 */ - public function display($tpl = null) + public function display($tpl = null): void { // set params $this->params = ComponentHelper::getParams('com_subformpower'); diff --git a/admin/src/View/Import/HtmlView.php b/admin/src/View/Import/HtmlView.php index 8fa617d..313230c 100644 --- a/admin/src/View/Import/HtmlView.php +++ b/admin/src/View/Import/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php diff --git a/admin/src/View/Subformpower/HtmlView.php b/admin/src/View/Subformpower/HtmlView.php index f319c1e..ea8cff0 100644 --- a/admin/src/View/Subformpower/HtmlView.php +++ b/admin/src/View/Subformpower/HtmlView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage HtmlView.php @@ -36,13 +36,17 @@ use JCB\Joomla\Utilities\StringHelper; * * @since 1.6 */ +#[\AllowDynamicProperties] class HtmlView extends BaseHtmlView { /** * View display method + * * @return void + * @throws \Exception + * @since 1.6 */ - function display($tpl = null) + function display($tpl = null): void { // Assign data to the view $this->icons = $this->get('Icons'); @@ -104,7 +108,7 @@ class HtmlView extends BaseHtmlView // set page title $this->getDocument()->setTitle(Text::_('COM_SUBFORMPOWER_DASHBOARD')); // add manifest to page JavaScript - $this->getDocument()->addScriptDeclaration("var manifest = JSON.parse('" . json_encode($this->manifest) . "');", "text/javascript"); + $this->getDocument()->addScriptDeclaration("var manifest = JSON.parse(" . json_encode($this->manifest) . ");", "text/javascript"); // add styles foreach ($this->styles as $style) { diff --git a/admin/tmpl/countries/default.php b/admin/tmpl/countries/default.php index 2101252..3e2a29f 100644 --- a/admin/tmpl/countries/default.php +++ b/admin/tmpl/countries/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php diff --git a/admin/tmpl/countries/default_body.php b/admin/tmpl/countries/default_body.php index 6e0647d..89e6151 100644 --- a/admin/tmpl/countries/default_body.php +++ b/admin/tmpl/countries/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_body.php @@ -22,6 +22,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper; +use Joomla\CMS\User\UserFactoryInterface; // No direct access to this file defined('_JEXEC') or die; @@ -33,8 +34,8 @@ $edit = "index.php?option=com_subformpower&view=countries&task=country.edit"; user->authorise('core.manage', 'com_checkin') || $item->checked_out == $this->user->id || $item->checked_out == 0; $userChkOut = Factory::getContainer()-> - get(\Joomla\CMS\User\UserFactoryInterface::class)-> - loadUserById($item->checked_out); + get(UserFactoryInterface::class)-> + loadUserById($item->checked_out ?? 0); $canDo = SubformpowerHelper::getActions('country',$item,'countries'); ?> diff --git a/admin/tmpl/countries/default_foot.php b/admin/tmpl/countries/default_foot.php index 0a03456..30e67a2 100644 --- a/admin/tmpl/countries/default_foot.php +++ b/admin/tmpl/countries/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_foot.php diff --git a/admin/tmpl/countries/default_head.php b/admin/tmpl/countries/default_head.php index 5c2fa6b..425809e 100644 --- a/admin/tmpl/countries/default_head.php +++ b/admin/tmpl/countries/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_head.php diff --git a/admin/tmpl/countries/default_toolbar.php b/admin/tmpl/countries/default_toolbar.php index 48f0c5b..a379d20 100644 --- a/admin/tmpl/countries/default_toolbar.php +++ b/admin/tmpl/countries/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_toolbar.php diff --git a/admin/tmpl/countries/emptystate.php b/admin/tmpl/countries/emptystate.php index d6e8aa5..e6937f7 100644 --- a/admin/tmpl/countries/emptystate.php +++ b/admin/tmpl/countries/emptystate.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage emptystate.php diff --git a/admin/tmpl/country/default.php b/admin/tmpl/country/default.php index 52322c7..08e3e38 100644 --- a/admin/tmpl/country/default.php +++ b/admin/tmpl/country/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php diff --git a/admin/tmpl/currencies/default.php b/admin/tmpl/currencies/default.php index f91142c..a515276 100644 --- a/admin/tmpl/currencies/default.php +++ b/admin/tmpl/currencies/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php diff --git a/admin/tmpl/currencies/default_body.php b/admin/tmpl/currencies/default_body.php index 0a76b9d..301304c 100644 --- a/admin/tmpl/currencies/default_body.php +++ b/admin/tmpl/currencies/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_body.php @@ -22,6 +22,7 @@ use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; use Joomla\CMS\HTML\HTMLHelper as Html; use JCB\Component\Subformpower\Administrator\Helper\SubformpowerHelper; +use Joomla\CMS\User\UserFactoryInterface; // No direct access to this file defined('_JEXEC') or die; @@ -33,8 +34,8 @@ $edit = "index.php?option=com_subformpower&view=currencies&task=currency.edit"; user->authorise('core.manage', 'com_checkin') || $item->checked_out == $this->user->id || $item->checked_out == 0; $userChkOut = Factory::getContainer()-> - get(\Joomla\CMS\User\UserFactoryInterface::class)-> - loadUserById($item->checked_out); + get(UserFactoryInterface::class)-> + loadUserById($item->checked_out ?? 0); $canDo = SubformpowerHelper::getActions('currency',$item,'currencies'); ?> diff --git a/admin/tmpl/currencies/default_foot.php b/admin/tmpl/currencies/default_foot.php index d690a91..d032eca 100644 --- a/admin/tmpl/currencies/default_foot.php +++ b/admin/tmpl/currencies/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_foot.php diff --git a/admin/tmpl/currencies/default_head.php b/admin/tmpl/currencies/default_head.php index fdb3c2e..59ed987 100644 --- a/admin/tmpl/currencies/default_head.php +++ b/admin/tmpl/currencies/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_head.php diff --git a/admin/tmpl/currencies/default_toolbar.php b/admin/tmpl/currencies/default_toolbar.php index e956805..559b685 100644 --- a/admin/tmpl/currencies/default_toolbar.php +++ b/admin/tmpl/currencies/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_toolbar.php diff --git a/admin/tmpl/currencies/emptystate.php b/admin/tmpl/currencies/emptystate.php index 0caeac0..86ea640 100644 --- a/admin/tmpl/currencies/emptystate.php +++ b/admin/tmpl/currencies/emptystate.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage emptystate.php diff --git a/admin/tmpl/currency/default.php b/admin/tmpl/currency/default.php index 3cf4d54..7af3b63 100644 --- a/admin/tmpl/currency/default.php +++ b/admin/tmpl/currency/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php diff --git a/admin/tmpl/import/default.php b/admin/tmpl/import/default.php index cecf923..72e18bb 100644 --- a/admin/tmpl/import/default.php +++ b/admin/tmpl/import/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php diff --git a/admin/tmpl/subformpower/default.php b/admin/tmpl/subformpower/default.php index 5d94879..8bb33a1 100644 --- a/admin/tmpl/subformpower/default.php +++ b/admin/tmpl/subformpower/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default.php @@ -31,18 +31,10 @@ defined('_JEXEC') or die;
- 'main')); ?> - - loadTemplate('main');?> - - + loadTemplate('main');?>
- 'vdm')); ?> - - loadTemplate('vdm');?> - - + loadTemplate('vdm');?>
diff --git a/admin/tmpl/subformpower/default_main.php b/admin/tmpl/subformpower/default_main.php index 763b602..063eaca 100644 --- a/admin/tmpl/subformpower/default_main.php +++ b/admin/tmpl/subformpower/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_main.php diff --git a/admin/tmpl/subformpower/default_vdm.php b/admin/tmpl/subformpower/default_vdm.php index 337e4a5..5491fb1 100644 --- a/admin/tmpl/subformpower/default_vdm.php +++ b/admin/tmpl/subformpower/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage default_vdm.php diff --git a/api/src/Controller/CountriesController.php b/api/src/Controller/CountriesController.php index 48d9889..a1e5be1 100644 --- a/api/src/Controller/CountriesController.php +++ b/api/src/Controller/CountriesController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountriesController.php diff --git a/api/src/Controller/CountryController.php b/api/src/Controller/CountryController.php index e0259e2..d397430 100644 --- a/api/src/Controller/CountryController.php +++ b/api/src/Controller/CountryController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CountryController.php diff --git a/api/src/Controller/CurrenciesController.php b/api/src/Controller/CurrenciesController.php index 99742a0..1544d64 100644 --- a/api/src/Controller/CurrenciesController.php +++ b/api/src/Controller/CurrenciesController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrenciesController.php diff --git a/api/src/Controller/CurrencyController.php b/api/src/Controller/CurrencyController.php index f0b66c2..013d743 100644 --- a/api/src/Controller/CurrencyController.php +++ b/api/src/Controller/CurrencyController.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage CurrencyController.php diff --git a/api/src/View/Countries/JsonapiView.php b/api/src/View/Countries/JsonapiView.php index 235a483..0a2fa42 100644 --- a/api/src/View/Countries/JsonapiView.php +++ b/api/src/View/Countries/JsonapiView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage JsonapiView.php diff --git a/api/src/View/Country/JsonapiView.php b/api/src/View/Country/JsonapiView.php index acf2038..320e20d 100644 --- a/api/src/View/Country/JsonapiView.php +++ b/api/src/View/Country/JsonapiView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage JsonapiView.php diff --git a/api/src/View/Currencies/JsonapiView.php b/api/src/View/Currencies/JsonapiView.php index 43fe12b..569d019 100644 --- a/api/src/View/Currencies/JsonapiView.php +++ b/api/src/View/Currencies/JsonapiView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage JsonapiView.php diff --git a/api/src/View/Currency/JsonapiView.php b/api/src/View/Currency/JsonapiView.php index 693fd66..46e9446 100644 --- a/api/src/View/Currency/JsonapiView.php +++ b/api/src/View/Currency/JsonapiView.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage JsonapiView.php diff --git a/libraries/jcb_powers/JCB.Joomla/src/Subformpower/Table.php b/libraries/jcb_powers/JCB.Joomla/src/Subformpower/Table.php index d00efcf..1ca843d 100644 --- a/libraries/jcb_powers/JCB.Joomla/src/Subformpower/Table.php +++ b/libraries/jcb_powers/JCB.Joomla/src/Subformpower/Table.php @@ -46,6 +46,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => true, ], + 'link' => NULL, ], 'phonecode' => [ 'name' => 'phonecode', @@ -62,6 +63,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'isothree' => [ 'name' => 'isothree', @@ -78,6 +80,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'timezone' => [ 'name' => 'timezone', @@ -94,6 +97,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'numcode' => [ 'name' => 'numcode', @@ -110,6 +114,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'iso' => [ 'name' => 'iso', @@ -126,6 +131,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'guid' => [ 'name' => 'guid', @@ -142,6 +148,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => true, ], + 'link' => NULL, ], 'access' => [ 'name' => 'access', @@ -154,7 +161,7 @@ final class Table extends BaseTable implements Tableinterface 'type' => 'INT(10) unsigned', 'default' => '0', 'key' => true, - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', ], ], ], @@ -174,6 +181,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => true, ], + 'link' => NULL, ], 'symbol' => [ 'name' => 'symbol', @@ -190,6 +198,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => false, ], + 'link' => NULL, ], 'country' => [ 'name' => 'country', @@ -206,6 +215,14 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => true, ], + 'link' => [ + 'type' => 1, + 'table' => '#__subformpower_country', + 'component' => 'com_subformpower', + 'entity' => 'country', + 'value' => 'name', + 'key' => 'guid', + ], ], 'guid' => [ 'name' => 'guid', @@ -222,6 +239,7 @@ final class Table extends BaseTable implements Tableinterface 'unique_key' => false, 'key' => true, ], + 'link' => NULL, ], 'access' => [ 'name' => 'access', @@ -234,7 +252,7 @@ final class Table extends BaseTable implements Tableinterface 'type' => 'INT(10) unsigned', 'default' => '0', 'key' => true, - 'null_switch' => 'NOT NULL', + 'null_switch' => 'NULL', ], ], ], diff --git a/media/js/country.js b/media/js/country.js index 2dc761b..09e6808 100644 --- a/media/js/country.js +++ b/media/js/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage country.js diff --git a/media/js/currency.js b/media/js/currency.js index 4042af2..ad2793d 100644 --- a/media/js/currency.js +++ b/media/js/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 1.0.1 - @build 21st August, 2024 + @build 4th February, 2025 @created 24th May, 2024 @package Subform Power @subpackage currency.js diff --git a/subformpower.xml b/subformpower.xml index c34c838..dabce5a 100644 --- a/subformpower.xml +++ b/subformpower.xml @@ -1,7 +1,7 @@ COM_SUBFORMPOWER - 21st August, 2024 + 4th February, 2025 Oh Martin oh@nampharm.com.na https://nampharm.com.na