v3.6.3

wpcodefactory · Feb 11, 2025 · dca0915 · dca0915
1 parent 83ba547
commit dca0915
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 82 deletions.
diff --git a/cost-of-goods-for-woocommerce.php b/cost-of-goods-for-woocommerce.php
@@ -3,7 +3,7 @@
 Plugin Name: Cost of Goods: Product Cost & Profit Calculator 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.6.2
+Version: 3.6.3
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: cost-of-goods-for-woocommerce
@@ -49,11 +49,6 @@ function alg_wc_cog_is_plugin_active( $plugin ) {
 	return;
 }
 
-// Composer autoload
-if ( ! class_exists( 'Alg_WC_Cost_of_Goods' ) ) {
-	require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
-}
-
 require_once( 'includes/class-alg-wc-cog.php' );
 
 if ( ! function_exists( 'alg_wc_cog' ) ) {

diff --git a/includes/analytics/src/modules/orders.js b/includes/analytics/src/modules/orders.js
@@ -141,7 +141,6 @@ let orders = {
 						value: Formatting.formatProfit(alg_wc_cog_analytics_obj.profit_template,reportTableData.totals.costs_total,reportTableData.totals.profit_total,reportTableData.totals.net_revenue),
 					},
 				];
-				console.log(reportTableData.totals)
 				reportTableData.summary = newSummary;
 				reportTableData.headers = this.getHeaders(reportTableData);
 				reportTableData.rows = this.getRows(reportTableData)//newRows;

diff --git a/includes/class-alg-wc-cog-orders-meta-boxes.php b/includes/class-alg-wc-cog-orders-meta-boxes.php
@@ -2,7 +2,7 @@
 /**
  * Cost of Goods for WooCommerce - Orders Meta Boxes Class.
  *
- * @version 3.3.7
+ * @version 3.6.3
  * @since   2.2.0
  * @author  WPFactory
  */
@@ -228,14 +228,14 @@ function add_order_extra_cost_meta_box() {
 	/**
 	 * render_order_extra_cost_meta_box.
 	 *
-	 * @version 3.3.6
+	 * @version 3.6.3
 	 * @since   1.7.0
 	 * @todo    [maybe] better `$title`
 	 * @todo    [maybe] better styling
 	 * @todo    [maybe] better/customizable `step`
 	 */
 	function render_order_extra_cost_meta_box( $post ) {
-		$order = wc_get_order( get_the_ID() );
+		$order = is_a( $post, 'WC_Order' ) ? $post : wc_get_order( $post->ID );
 		$rows  = '';
 		foreach ( alg_wc_cog()->core->orders->is_order_extra_cost_per_order as $fee_type => $is_enabled ) {
 			if ( $is_enabled ) {

diff --git a/includes/class-alg-wc-cog.php b/includes/class-alg-wc-cog.php
@@ -2,7 +2,7 @@
 /**
  * Cost of Goods for WooCommerce - Costs input.
  *
- * @version 3.5.3
+ * @version 3.6.3
  * @since   3.0.3
  * @author  WPFactory
  */
@@ -35,7 +35,7 @@ final class Alg_WC_Cost_of_Goods {
 		 * @since 1.0.0
 		 * @var   string
 		 */
-		public $version = '3.6.2';
+		public $version = '3.6.3';
 
 		/**
 		 * @since 1.0.0
@@ -131,7 +131,7 @@ function init() {
 		/**
 		 * add_cross_selling_library.
 		 *
-		 * @version 3.5.1
+		 * @version 3.6.3
 		 * @since   3.5.1
 		 *
 		 * @return void
@@ -140,6 +140,7 @@ function add_cross_selling_library(){
 			if ( ! is_admin() ) {
 				return;
 			}
+			require_once plugin_dir_path( alg_wc_cog()->get_filesystem_path() ) . 'vendor/autoload.php';
 			// Cross-selling library.
 			$cross_selling = new \WPFactory\WPFactory_Cross_Selling\WPFactory_Cross_Selling();
 			$cross_selling->setup( array( 'plugin_file_path'   => $this->get_filesystem_path() ) );
@@ -149,7 +150,7 @@ function add_cross_selling_library(){
 		/**
 		 * move_wc_settings_tab_to_wpfactory_submenu.
 		 *
-		 * @version 3.5.3
+		 * @version 3.6.3
 		 * @since   3.5.1
 		 *
 		 * @return void
@@ -158,6 +159,7 @@ function move_wc_settings_tab_to_wpfactory_menu() {
 			if ( ! is_admin() ) {
 				return;
 			}
+			require_once plugin_dir_path( alg_wc_cog()->get_filesystem_path() ) . 'vendor/autoload.php';
 			// WC Settings tab as WPFactory submenu item.
 			$wpf_admin_menu = \WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu::get_instance();
 			$wpf_admin_menu->move_wc_settings_tab_to_wpfactory_menu( array(

diff --git a/langs/cost-of-goods-for-woocommerce-de_DE.po b/langs/cost-of-goods-for-woocommerce-de_DE.po
@@ -36,7 +36,7 @@ msgstr "WPFactory"
 msgid "https://wpfactory.com"
 msgstr "https://wpfactory.com"
 
-#: includes/class-alg-wc-cog.php:265
+#: includes/class-alg-wc-cog.php:267
 msgid "Go Pro"
 msgstr "Gehen Sie zum Profi"
 
@@ -159,7 +159,7 @@ msgstr "Nicht verfügbar"
 
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:116
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:219
-#: includes/class-alg-wc-cog.php:165
+#: includes/class-alg-wc-cog.php:167
 #: includes/pro/class-alg-wc-cog-pro-quick-and-bulk-edit.php:103
 #: includes/settings/class-alg-wc-cog-settings-orders.php:430
 #: includes/settings/class-alg-wc-cog-settings-products.php:253
@@ -249,8 +249,8 @@ msgstr "Sie verkaufen unter den Warenkosten."
 
 #: includes/class-alg-wc-cog-orders.php:754
 #: includes/class-alg-wc-cog-orders.php:1198
-#: includes/pro/class-alg-wc-cog-pro.php:652
-#: includes/pro/class-alg-wc-cog-pro.php:671
+#: includes/pro/class-alg-wc-cog-pro.php:650
+#: includes/pro/class-alg-wc-cog-pro.php:669
 msgid "Cost of goods"
 msgstr "Warenkosten"
 
@@ -352,27 +352,27 @@ msgstr "Kosten der Option(en)."
 msgid "- No change -"
 msgstr "- Keine Änderung -"
 
-#: includes/pro/class-alg-wc-cog-pro.php:593
+#: includes/pro/class-alg-wc-cog-pro.php:591
 msgid "Orders cost and profit successfully recalculated."
 msgstr "Auftragskosten und Gewinn erfolgreich neu berechnet."
 
-#: includes/pro/class-alg-wc-cog-pro.php:604
+#: includes/pro/class-alg-wc-cog-pro.php:602
 msgid "Orders cost and profit recalculating via background processing. You should receive an e-mail when it's complete if the \"Advanced > Background processing > Send email\" option is enabled."
 msgstr "Neuberechnung der Auftragskosten und -gewinne über die Hintergrundverarbeitung. Wenn die Option \"Erweitert > Hintergrundverarbeitung > E-Mail senden\" aktiviert ist, sollten Sie nach Abschluss eine E-Mail erhalten."
 
-#: includes/pro/class-alg-wc-cog-pro.php:607
+#: includes/pro/class-alg-wc-cog-pro.php:605
 msgid "Something went wrong..."
 msgstr "Etwas ist schief gelaufen..."
 
-#: includes/pro/class-alg-wc-cog-pro.php:725
+#: includes/pro/class-alg-wc-cog-pro.php:723
 msgid "Cost of Goods reports are in %s and in %s."
 msgstr "Warenkostenberichte sind in %s und in %s."
 
-#: includes/pro/class-alg-wc-cog-pro.php:727
+#: includes/pro/class-alg-wc-cog-pro.php:725
 msgid "Reports > Orders > Cost of Goods"
 msgstr "Berichte > Bestellungen > Warenkosten"
 
-#: includes/pro/class-alg-wc-cog-pro.php:729
+#: includes/pro/class-alg-wc-cog-pro.php:727
 msgid "Reports > Stock > Cost of Goods"
 msgstr "Berichte > Lager > Warenkosten"
 
@@ -2264,7 +2264,7 @@ msgstr "Verkaufspreis"
 #: includes/analytics/build/index.js:440
 #: includes/analytics/build/index.js:532
 #: includes/analytics/src/modules/categories.js:86
-#: includes/analytics/src/modules/orders.js:163
+#: includes/analytics/src/modules/orders.js:162
 #: includes/analytics/src/modules/products.js:88
 #: includes/analytics/src/modules/revenue.js:86
 #: includes/analytics/build/index.js:86
@@ -2279,7 +2279,7 @@ msgstr "Kosten insgesamt"
 #: includes/analytics/build/index.js:444
 #: includes/analytics/build/index.js:536
 #: includes/analytics/src/modules/categories.js:91
-#: includes/analytics/src/modules/orders.js:168
+#: includes/analytics/src/modules/orders.js:167
 #: includes/analytics/src/modules/products.js:93
 #: includes/analytics/src/modules/revenue.js:91
 #: includes/analytics/build/index.js:91
@@ -3174,7 +3174,7 @@ msgstr ""
 msgid "Ignore quantity sold when calculating profit and costs"
 msgstr ""
 
-#: includes/class-alg-wc-cog.php:166
+#: includes/class-alg-wc-cog.php:168
 msgid "Cost of Goods Sold"
 msgstr ""
 

diff --git a/langs/cost-of-goods-for-woocommerce-nl_NL.po b/langs/cost-of-goods-for-woocommerce-nl_NL.po
@@ -33,7 +33,7 @@ msgstr "Beschouw alle waarden als positief"
 msgid "Sign handling"
 msgstr "Sign handling"
 
-#: includes/class-alg-wc-cog.php:166
+#: includes/class-alg-wc-cog.php:168
 msgid "Cost of Goods Sold"
 msgstr "Kosten van verkochte goederen"
 
@@ -1670,7 +1670,7 @@ msgstr "Product kosten kolom toevoegen"
 #: includes/analytics/build/index.js:444
 #: includes/analytics/build/index.js:536
 #: includes/analytics/src/modules/categories.js:91
-#: includes/analytics/src/modules/orders.js:168
+#: includes/analytics/src/modules/orders.js:167
 #: includes/analytics/src/modules/products.js:93
 #: includes/analytics/src/modules/revenue.js:91
 #: includes/analytics/build/index.js:91
@@ -1685,7 +1685,7 @@ msgstr "Winst totaal"
 #: includes/analytics/build/index.js:440
 #: includes/analytics/build/index.js:532
 #: includes/analytics/src/modules/categories.js:86
-#: includes/analytics/src/modules/orders.js:163
+#: includes/analytics/src/modules/orders.js:162
 #: includes/analytics/src/modules/products.js:88
 #: includes/analytics/src/modules/revenue.js:86
 #: includes/analytics/build/index.js:86
@@ -2515,7 +2515,7 @@ msgstr "Je moet de bestelling kosten en winst opnieuw berekenen nadat je deze in
 msgid "Here you can add extra costs for your orders, e.g. handling fees."
 msgstr "Hier kun je extra kosten toevoegen voor je bestellingen, b.v. behandelkosten."
 
-#: includes/class-alg-wc-cog.php:265
+#: includes/class-alg-wc-cog.php:267
 msgid "Go Pro"
 msgstr "Ga voor Pro"
 
@@ -2799,7 +2799,7 @@ msgstr "Reset instellingen"
 
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:116
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:219
-#: includes/class-alg-wc-cog.php:165
+#: includes/class-alg-wc-cog.php:167
 #: includes/pro/class-alg-wc-cog-pro-quick-and-bulk-edit.php:103
 #: includes/settings/class-alg-wc-cog-settings-orders.php:430
 #: includes/settings/class-alg-wc-cog-settings-products.php:253
@@ -2815,8 +2815,8 @@ msgstr "Winst: %s"
 
 #: includes/class-alg-wc-cog-orders.php:754
 #: includes/class-alg-wc-cog-orders.php:1198
-#: includes/pro/class-alg-wc-cog-pro.php:652
-#: includes/pro/class-alg-wc-cog-pro.php:671
+#: includes/pro/class-alg-wc-cog-pro.php:650
+#: includes/pro/class-alg-wc-cog-pro.php:669
 msgid "Cost of goods"
 msgstr "Kosten van goederen"
 
@@ -2952,27 +2952,27 @@ msgstr ""
 msgid "- No change -"
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:593
+#: includes/pro/class-alg-wc-cog-pro.php:591
 msgid "Orders cost and profit successfully recalculated."
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:604
+#: includes/pro/class-alg-wc-cog-pro.php:602
 msgid "Orders cost and profit recalculating via background processing. You should receive an e-mail when it's complete if the \"Advanced > Background processing > Send email\" option is enabled."
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:607
+#: includes/pro/class-alg-wc-cog-pro.php:605
 msgid "Something went wrong..."
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:725
+#: includes/pro/class-alg-wc-cog-pro.php:723
 msgid "Cost of Goods reports are in %s and in %s."
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:727
+#: includes/pro/class-alg-wc-cog-pro.php:725
 msgid "Reports > Orders > Cost of Goods"
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:729
+#: includes/pro/class-alg-wc-cog-pro.php:727
 msgid "Reports > Stock > Cost of Goods"
 msgstr ""
 

diff --git a/langs/cost-of-goods-for-woocommerce-tr_TR.po b/langs/cost-of-goods-for-woocommerce-tr_TR.po
@@ -14,7 +14,7 @@ msgstr ""
 "X-Generator: Poedit 2.1.1\n"
 "X-Loco-Version: 2.4.3; wp-5.5.1\n"
 
-#: includes/class-alg-wc-cog.php:265
+#: includes/class-alg-wc-cog.php:267
 msgid "Go Pro"
 msgstr "Pro Sürüm Satın Al"
 
@@ -25,7 +25,7 @@ msgstr "Malların maliyetinin altında satış yapıyorsunuz."
 
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:116
 #: includes/class-alg-wc-cog-orders-meta-boxes.php:219
-#: includes/class-alg-wc-cog.php:165
+#: includes/class-alg-wc-cog.php:167
 #: includes/pro/class-alg-wc-cog-pro-quick-and-bulk-edit.php:103
 #: includes/settings/class-alg-wc-cog-settings-orders.php:430
 #: includes/settings/class-alg-wc-cog-settings-products.php:253
@@ -170,8 +170,8 @@ msgstr "ücret"
 
 #: includes/class-alg-wc-cog-orders.php:754
 #: includes/class-alg-wc-cog-orders.php:1198
-#: includes/pro/class-alg-wc-cog-pro.php:652
-#: includes/pro/class-alg-wc-cog-pro.php:671
+#: includes/pro/class-alg-wc-cog-pro.php:650
+#: includes/pro/class-alg-wc-cog-pro.php:669
 msgid "Cost of goods"
 msgstr "Malların maliyeti"
 
@@ -234,24 +234,24 @@ msgstr "Yok"
 msgid "- No change -"
 msgstr "- Değişiklik yok -"
 
-#: includes/pro/class-alg-wc-cog-pro.php:593
+#: includes/pro/class-alg-wc-cog-pro.php:591
 msgid "Orders cost and profit successfully recalculated."
 msgstr "Sipariş maliyeti ve karı başarıyla yeniden hesaplandı."
 
-#: includes/pro/class-alg-wc-cog-pro.php:607
+#: includes/pro/class-alg-wc-cog-pro.php:605
 msgid "Something went wrong..."
 msgstr "Bir şeyler yanlış gitti..."
 
-#: includes/pro/class-alg-wc-cog-pro.php:725
+#: includes/pro/class-alg-wc-cog-pro.php:723
 #, php-format
 msgid "Cost of Goods reports are in %s and in %s."
 msgstr "Mal Maliyeti raporları %s ve %s cinsindendir."
 
-#: includes/pro/class-alg-wc-cog-pro.php:727
+#: includes/pro/class-alg-wc-cog-pro.php:725
 msgid "Reports > Orders > Cost of Goods"
 msgstr "Raporlar> Siparişler> Malların Maliyeti"
 
-#: includes/pro/class-alg-wc-cog-pro.php:729
+#: includes/pro/class-alg-wc-cog-pro.php:727
 msgid "Reports > Stock > Cost of Goods"
 msgstr "Raporlar> Stok> Mal Maliyeti"
 
@@ -1300,7 +1300,7 @@ msgstr ""
 msgid "Currencies costs"
 msgstr ""
 
-#: includes/pro/class-alg-wc-cog-pro.php:604
+#: includes/pro/class-alg-wc-cog-pro.php:602
 msgid "Orders cost and profit recalculating via background processing. You should receive an e-mail when it's complete if the \"Advanced > Background processing > Send email\" option is enabled."
 msgstr ""
 
@@ -3159,7 +3159,7 @@ msgstr ""
 #: includes/analytics/build/index.js:440
 #: includes/analytics/build/index.js:532
 #: includes/analytics/src/modules/categories.js:86
-#: includes/analytics/src/modules/orders.js:163
+#: includes/analytics/src/modules/orders.js:162
 #: includes/analytics/src/modules/products.js:88
 #: includes/analytics/src/modules/revenue.js:86
 #: includes/analytics/build/index.js:86
@@ -3174,7 +3174,7 @@ msgstr ""
 #: includes/analytics/build/index.js:444
 #: includes/analytics/build/index.js:536
 #: includes/analytics/src/modules/categories.js:91
-#: includes/analytics/src/modules/orders.js:168
+#: includes/analytics/src/modules/orders.js:167
 #: includes/analytics/src/modules/products.js:93
 #: includes/analytics/src/modules/revenue.js:91
 #: includes/analytics/build/index.js:91
@@ -3210,7 +3210,7 @@ msgstr ""
 msgid "Ignore quantity sold when calculating profit and costs"
 msgstr ""
 
-#: includes/class-alg-wc-cog.php:166
+#: includes/class-alg-wc-cog.php:168
 msgid "Cost of Goods Sold"
 msgstr ""