From 45f915d6d5661cea2f13e2026afb5cd8796ece80 Mon Sep 17 00:00:00 2001 From: Pablo Pacheco Date: Mon, 14 Oct 2024 11:38:32 -0300 Subject: [PATCH] v3.5.4 --- composer.lock | 24 +++--- cost-of-goods-for-woocommerce.php | 2 +- includes/class-alg-wc-cog.php | 2 +- langs/cost-of-goods-for-woocommerce.pot | 4 +- readme.txt | 6 +- vendor/composer/installed.json | 28 +++---- vendor/composer/installed.php | 16 ++-- .../src/php/class-wpfactory-admin-menu.php | 14 ++-- .../src/php/class-wpfactory-cross-selling.php | 8 +- .../src/scss/admin.scss | 14 ---- .../src/scss/modules/_buttons.scss | 47 ----------- .../src/scss/modules/_categories.scss | 8 -- .../src/scss/modules/_general.scss | 11 --- .../src/scss/modules/_products.scss | 81 ------------------- 14 files changed, 56 insertions(+), 209 deletions(-) delete mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/scss/admin.scss delete mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_buttons.scss delete mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_categories.scss delete mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_general.scss delete mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_products.scss diff --git a/composer.lock b/composer.lock index 05271fd..bc4a8d8 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "wpfactory/wpfactory-admin-menu", - "version": "v1.0.2", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/wpcodefactory/wpfactory-admin-menu.git", - "reference": "89e0b637eb5af737dd4cba52a41797082cb0d7c9" + "reference": "fe48c4100a6b436a3dd39308814887119063c140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wpcodefactory/wpfactory-admin-menu/zipball/89e0b637eb5af737dd4cba52a41797082cb0d7c9", - "reference": "89e0b637eb5af737dd4cba52a41797082cb0d7c9", + "url": "https://api.github.com/repos/wpcodefactory/wpfactory-admin-menu/zipball/fe48c4100a6b436a3dd39308814887119063c140", + "reference": "fe48c4100a6b436a3dd39308814887119063c140", "shasum": "" }, "require-dev": { @@ -49,23 +49,23 @@ ] }, "support": { - "source": "https://github.com/wpcodefactory/wpfactory-admin-menu/tree/v1.0.2", + "source": "https://github.com/wpcodefactory/wpfactory-admin-menu/tree/v1.0.3", "issues": "https://github.com/wpcodefactory/wpfactory-admin-menu/issues" }, - "time": "2024-10-08T22:38:02+00:00" + "time": "2024-10-14T14:01:02+00:00" }, { "name": "wpfactory/wpfactory-cross-selling", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/wpcodefactory/wpfactory-cross-selling.git", - "reference": "7157c3a9fcbf6ea5f1534cabe14de2db30c60601" + "reference": "684288d094437acaf1ea0c0a97db4613660c4504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wpcodefactory/wpfactory-cross-selling/zipball/7157c3a9fcbf6ea5f1534cabe14de2db30c60601", - "reference": "7157c3a9fcbf6ea5f1534cabe14de2db30c60601", + "url": "https://api.github.com/repos/wpcodefactory/wpfactory-cross-selling/zipball/684288d094437acaf1ea0c0a97db4613660c4504", + "reference": "684288d094437acaf1ea0c0a97db4613660c4504", "shasum": "" }, "require": { @@ -100,10 +100,10 @@ ] }, "support": { - "source": "https://github.com/wpcodefactory/wpfactory-cross-selling/tree/v1.0.0", + "source": "https://github.com/wpcodefactory/wpfactory-cross-selling/tree/v1.0.1", "issues": "https://github.com/wpcodefactory/wpfactory-cross-selling/issues" }, - "time": "2024-09-27T19:51:56+00:00" + "time": "2024-10-14T14:27:51+00:00" }, { "name": "wpfactory/wpfactory-promoting-notice", diff --git a/cost-of-goods-for-woocommerce.php b/cost-of-goods-for-woocommerce.php index de784be..cf26e44 100644 --- a/cost-of-goods-for-woocommerce.php +++ b/cost-of-goods-for-woocommerce.php @@ -3,7 +3,7 @@ Plugin Name: Cost of Goods for WooCommerce Plugin URI: https://wpfactory.com/item/cost-of-goods-for-woocommerce/ Description: Save product purchase costs (cost of goods) in WooCommerce. Beautifully. -Version: 3.5.3 +Version: 3.5.4 Author: WPFactory Author URI: https://wpfactory.com Text Domain: cost-of-goods-for-woocommerce diff --git a/includes/class-alg-wc-cog.php b/includes/class-alg-wc-cog.php index d95dba2..43f1490 100644 --- a/includes/class-alg-wc-cog.php +++ b/includes/class-alg-wc-cog.php @@ -35,7 +35,7 @@ final class Alg_WC_Cost_of_Goods { * @since 1.0.0 * @var string */ - public $version = '3.5.3'; + public $version = '3.5.4'; /** * @since 1.0.0 diff --git a/langs/cost-of-goods-for-woocommerce.pot b/langs/cost-of-goods-for-woocommerce.pot index 7780a4e..9c91de8 100644 --- a/langs/cost-of-goods-for-woocommerce.pot +++ b/langs/cost-of-goods-for-woocommerce.pot @@ -2,14 +2,14 @@ # This file is distributed under the GNU General Public License v3.0. msgid "" msgstr "" -"Project-Id-Version: cost-of-goods-for-woocommerce 3.5.3\n" +"Project-Id-Version: cost-of-goods-for-woocommerce 3.5.4\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/cost-of-goods-for-woocommerce\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-10-09T00:51:44+02:00\n" +"POT-Creation-Date: 2024-10-14T16:37:56+02:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.7.1\n" "X-Domain: cost-of-goods-for-woocommerce\n" diff --git a/readme.txt b/readme.txt index af7c37e..618af90 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: wpcodefactory, omardabbas, karzin, anbinder, algoritmika, kousikmu Tags: woocommerce, cost, cost of goods, profit, profit calculator Requires at least: 6.1 Tested up to: 6.6 -Stable tag: 3.5.3 +Stable tag: 3.5.4 License: GNU General Public License v3.0 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -344,6 +344,10 @@ Once activated, access the plugin's settings by navigating to “WooCommerce > S == Changelog == += 3.5.4 - 14/10/2024 = +* Dev - WPFactory admin menu removed from pro version. +* Fix - WPFactory menu and submenus are now visible and accessible. + = 3.5.3 - 08/10/2024 = * Dev - Tabs removed from WPFactory submenu plugin pages. diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 03344cd..79e7e9f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,23 +2,23 @@ "packages": [ { "name": "wpfactory/wpfactory-admin-menu", - "version": "v1.0.2", - "version_normalized": "1.0.2.0", + "version": "v1.0.3", + "version_normalized": "1.0.3.0", "source": { "type": "git", "url": "https://github.com/wpcodefactory/wpfactory-admin-menu.git", - "reference": "89e0b637eb5af737dd4cba52a41797082cb0d7c9" + "reference": "fe48c4100a6b436a3dd39308814887119063c140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wpcodefactory/wpfactory-admin-menu/zipball/89e0b637eb5af737dd4cba52a41797082cb0d7c9", - "reference": "89e0b637eb5af737dd4cba52a41797082cb0d7c9", + "url": "https://api.github.com/repos/wpcodefactory/wpfactory-admin-menu/zipball/fe48c4100a6b436a3dd39308814887119063c140", + "reference": "fe48c4100a6b436a3dd39308814887119063c140", "shasum": "" }, "require-dev": { "wp-cli/wp-cli-bundle": "*" }, - "time": "2024-10-08T22:38:02+00:00", + "time": "2024-10-14T14:01:02+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -46,24 +46,24 @@ ] }, "support": { - "source": "https://github.com/wpcodefactory/wpfactory-admin-menu/tree/v1.0.2", + "source": "https://github.com/wpcodefactory/wpfactory-admin-menu/tree/v1.0.3", "issues": "https://github.com/wpcodefactory/wpfactory-admin-menu/issues" }, "install-path": "../wpfactory/wpfactory-admin-menu" }, { "name": "wpfactory/wpfactory-cross-selling", - "version": "v1.0.0", - "version_normalized": "1.0.0.0", + "version": "v1.0.1", + "version_normalized": "1.0.1.0", "source": { "type": "git", "url": "https://github.com/wpcodefactory/wpfactory-cross-selling.git", - "reference": "7157c3a9fcbf6ea5f1534cabe14de2db30c60601" + "reference": "684288d094437acaf1ea0c0a97db4613660c4504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wpcodefactory/wpfactory-cross-selling/zipball/7157c3a9fcbf6ea5f1534cabe14de2db30c60601", - "reference": "7157c3a9fcbf6ea5f1534cabe14de2db30c60601", + "url": "https://api.github.com/repos/wpcodefactory/wpfactory-cross-selling/zipball/684288d094437acaf1ea0c0a97db4613660c4504", + "reference": "684288d094437acaf1ea0c0a97db4613660c4504", "shasum": "" }, "require": { @@ -72,7 +72,7 @@ "require-dev": { "wp-cli/wp-cli-bundle": "*" }, - "time": "2024-09-27T19:51:56+00:00", + "time": "2024-10-14T14:27:51+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -100,7 +100,7 @@ ] }, "support": { - "source": "https://github.com/wpcodefactory/wpfactory-cross-selling/tree/v1.0.0", + "source": "https://github.com/wpcodefactory/wpfactory-cross-selling/tree/v1.0.1", "issues": "https://github.com/wpcodefactory/wpfactory-cross-selling/issues" }, "install-path": "../wpfactory/wpfactory-cross-selling" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ba17545..37f9a3e 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '28dd26f09034d83162512371524610b84aa60c47', + 'reference' => '9cf6ee290b7a88299f82ef9d4923b966da6038b1', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,25 +13,25 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '28dd26f09034d83162512371524610b84aa60c47', + 'reference' => '9cf6ee290b7a88299f82ef9d4923b966da6038b1', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => false, ), 'wpfactory/wpfactory-admin-menu' => array( - 'pretty_version' => 'v1.0.2', - 'version' => '1.0.2.0', - 'reference' => '89e0b637eb5af737dd4cba52a41797082cb0d7c9', + 'pretty_version' => 'v1.0.3', + 'version' => '1.0.3.0', + 'reference' => 'fe48c4100a6b436a3dd39308814887119063c140', 'type' => 'library', 'install_path' => __DIR__ . '/../wpfactory/wpfactory-admin-menu', 'aliases' => array(), 'dev_requirement' => false, ), 'wpfactory/wpfactory-cross-selling' => array( - 'pretty_version' => 'v1.0.0', - 'version' => '1.0.0.0', - 'reference' => '7157c3a9fcbf6ea5f1534cabe14de2db30c60601', + 'pretty_version' => 'v1.0.1', + 'version' => '1.0.1.0', + 'reference' => '684288d094437acaf1ea0c0a97db4613660c4504', 'type' => 'library', 'install_path' => __DIR__ . '/../wpfactory/wpfactory-cross-selling', 'aliases' => array(), diff --git a/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php index 414f1b5..13f9314 100644 --- a/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php +++ b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php @@ -2,7 +2,7 @@ /** * WPFactory Admin Menu * - * @version 1.0.2 + * @version 1.0.3 * @since 1.0.0 * @author WPFactory */ @@ -30,7 +30,7 @@ class WPFactory_Admin_Menu { * * @var string */ - protected $version = '1.0.1'; + protected $version = '1.0.3'; /** * Menu slug. @@ -66,7 +66,7 @@ class WPFactory_Admin_Menu { * * @var string */ - protected $capability = 'manage_options'; + protected $capability = ''; /** * Icon URL. @@ -131,7 +131,7 @@ public function move_wc_settings_tab_to_wpfactory_menu( $args = null ) { 'wc_settings_tab_id' => '', 'page_title' => '', 'menu_title' => '', - 'capability' => 'manage_options', + 'capability' => class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options', 'position' => 30, ) ); if ( empty( $args['page_title'] ) ) { @@ -187,12 +187,16 @@ function add_submenu_page( $page_title, $menu_title, $capability, $menu_slug, $c /** * Creates WPFactory admin menu. * - * @version 1.0.0 + * @version 1.0.3 * @since 1.0.0 * * @return void */ function create_wpfactory_admin_menu() { + // Set capability. + $this->set_capability( class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options' ); + + // Menu page. \add_menu_page( $this->get_page_title(), $this->get_menu_title(), diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php index 3de29a7..66185b4 100644 --- a/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php +++ b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php @@ -2,7 +2,7 @@ /** * WPFactory Cross-Selling * - * @version 1.0.0 + * @version 1.0.1 * @since 1.0.0 * @author WPFactory */ @@ -32,7 +32,7 @@ class WPFactory_Cross_Selling { * * @var string */ - protected $version = '1.0.0'; + protected $version = '1.0.1'; /** * Setup args. @@ -91,7 +91,7 @@ class WPFactory_Cross_Selling { /** * Setups the class. * - * @version 1.0.0 + * @version 1.0.1 * @since 1.0.0 * * @param $args @@ -117,7 +117,7 @@ function setup( $args = null ) { $args['admin_page'] = wp_parse_args( $args['admin_page'], array( 'page_title' => __( 'WPFactory Recommendations', 'wpfactory-cross-selling' ), 'menu_title' => __( 'Recommendations', 'wpfactory-cross-selling' ), - 'capability' => 'manage_options', + 'capability' => class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options', 'position' => 2 ) ); diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/scss/admin.scss b/vendor/wpfactory/wpfactory-cross-selling/src/scss/admin.scss deleted file mode 100644 index dac79c4..0000000 --- a/vendor/wpfactory/wpfactory-cross-selling/src/scss/admin.scss +++ /dev/null @@ -1,14 +0,0 @@ -/** - * WPFactory Cross-Selling - Admin. - * - * @version 1.0.0 - * @since 1.0.0 - * @author WPFactory - */ - -@import -"modules/general", -"modules/categories", -"modules/buttons", -"modules/products"; - diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_buttons.scss b/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_buttons.scss deleted file mode 100644 index 0863116..0000000 --- a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_buttons.scss +++ /dev/null @@ -1,47 +0,0 @@ -.wpfcs-button { - border-radius: 100px; - font-size: 14px; - padding: 7px 18px; - cursor: pointer; - text-decoration: none; - display: flex; - align-items: center; /* Centers items vertically */ - justify-content: center; - font-weight: 700; - - i { - margin: 0 8px 0 -3px; - } - - &.disabled { - @extend %disabled; - } -} - -.wpfcs-button-1 { - color: #fff; - background: #14243B; - - i { - color: #02AAF2; - } - - &:hover { - background: #204677; - color: #fff; - } -} - -.wpfcs-button-2 { - color: #14243B; - border: 1px solid #DCDCDE; - - i { - color: #1A2DC9; - } - - &:hover { - background: #f5f5f5; - color: #14243B; - } -} \ No newline at end of file diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_categories.scss b/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_categories.scss deleted file mode 100644 index efd72b9..0000000 --- a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_categories.scss +++ /dev/null @@ -1,8 +0,0 @@ -.wpfcs-category { - margin: 33px 0 17px 0; - font-size: 18px; - font-weight: 700; - @media (max-width: 800px) { - text-align: center; - } -} \ No newline at end of file diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_general.scss b/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_general.scss deleted file mode 100644 index 1a34d82..0000000 --- a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_general.scss +++ /dev/null @@ -1,11 +0,0 @@ -%disabled { - pointer-events: none; - opacity: 0.5; - -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */ - filter: grayscale(100%); -} -%readonly { - opacity: 0.5; - -webkit-filter: grayscale(100%); /* Safari 6.0 - 9.0 */ - filter: grayscale(100%); -} \ No newline at end of file diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_products.scss b/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_products.scss deleted file mode 100644 index f673a80..0000000 --- a/vendor/wpfactory/wpfactory-cross-selling/src/scss/modules/_products.scss +++ /dev/null @@ -1,81 +0,0 @@ -.wpfcs-product { - background: #FFFFFF; - padding: 18px 24px; - border: 1px solid #F2F2F2; - display: flex; - justify-content: flex-start; /* Aligns items horizontally (in a row) */ - align-items: center; /* Centers items vertically */ - gap: 18px; - flex-wrap: nowrap; - - &.disabled { - @extend %disabled; - } - - &.readonly { - @extend %readonly; - } - - @media (max-width: 800px) { - flex-wrap: wrap; - justify-content: center; - } -} - -.wpfcs-product-title { - margin: 0 0 7px; - - a { - text-decoration: none; - color: unset; - - &:hover { - color: #135e96; - } - } -} - -.wpfcs-product-desc { - margin: 0; - color: #878787; -} - -.wpfcs-product-actions { - margin-left: auto; - border-left: 1px solid #F2F2F2; - padding: 10px 0 10px 24px; - display: flex; - justify-content: flex-start; /* Aligns items horizontally (in a row) */ - align-items: center; - gap: 10px; - min-width: 239px; - - @media (max-width: 800px) { - margin-left: unset; - padding-left: 0; - border-left: none; - } -} - -.wpfcs-product-img-wrapper { - width: 60px; - height: 60px; - min-width: 60px; - background: rgb(255, 255, 255); - background: linear-gradient(180deg, rgba(255, 255, 255, 1) 0%, rgba(190, 233, 252, 1) 100%); - display: flex; - justify-content: center; - align-items: center; - - * { - font-size: 0; - display: flex; - } -} - -.wpfcs-product-img-wrapper img { - max-width: 100%; - max-height: 100%; - height: auto; - width: auto; -}