Changeset 2376557

Timestamp:

09/07/2020 01:46:29 PM (5 years ago)

Author:

mechuram

Message:

2.0.6 - Bug-fix - Improper Cart price with tax display

Location:

woo-price-per-unit/trunk

Files:

• languages/woo-price-per-unit-cs_CZ.mo (modified) (previous)
• languages/woo-price-per-unit-cs_CZ.po (modified) (2 diffs)
• languages/woo-price-per-unit.pot (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• woo-price-per-unit.php (modified) (3 diffs)

woo-price-per-unit/trunk/languages/woo-price-per-unit-cs_CZ.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Price Per Unit 2.0.5\n"
+"Project-Id-Version: WooCommerce Price Per Unit 2.0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-15 13:31+0200\n"
-"PO-Revision-Date: 2020-05-15 13:37+0200\n"
+"POT-Creation-Date: 2020-09-07 13:04+0200\n"
+"PO-Revision-Date: 2020-09-07 13:04+0200\n"
 "Last-Translator: administrator <[email protected]>\n"
 "Language-Team: Czech\n"
@@ -11 +11 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_x;_e;_ex;_n\n"

woo-price-per-unit/trunk/languages/woo-price-per-unit.pot

@@ -4 +4 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Price Per Unit 2.0.5\n"
-"POT-Creation-Date: 2020-05-15 13:31+0200\n"
+"Project-Id-Version: WooCommerce Price Per Unit 2.0.6\n"
+"POT-Creation-Date: 2020-09-07 13:04+0200\n"
 "PO-Revision-Date: 2017-04-06 16:00-0500\n"
 "Last-Translator: Martin Mechura\n"
@@ -13 +13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_x:1,2c;_e;_ex:1,2c;_n:1,2;_nx:1,2,4c;esc_html__;esc_attr__\n"
+"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;esc_attr__;esc_html__;esc_html_e;esc_html_x:1,2c;_nx_noop:1,2,3c\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-SearchPath-0: .\n"

woo-price-per-unit/trunk/readme.txt

@@ -2 +2 @@
 Contributors: mechuram 
 Tags: woocommerce, price, weight, price customization
-Stable tag: 2.0.5
+Stable tag: 2.0.6
 Requires PHP: 7.0
-Tested up to: 5.4
+Tested up to: 5.5
 Requires at least: 4.4
 
@@ -80 +80 @@
 **Changelog** 
 
+**2.0.6**
+– Bug-fix – In certain configurations price  with taxes was displayed improperly in Cart
+
 **2.0.5**
 – Bug-fix – Improper price display with taxes
@@ -200 +203 @@
 == Changelog ==
 
+= 2.0.6 =
+– Bug-fix – In certain configurations price  with taxes was displayed improperly in Cart
+
 = 2.0.5 =
 – Bug-fix – Improper price display with taxes

woo-price-per-unit/trunk/woo-price-per-unit.php

@@ -4 +4 @@
 Plugin URI: https://mechcomp.cz/price-per-unit-pro/
 Description: WooCommerce Price Per Unit allows the user to show prices recalculated per units(weight) and do some customization to the look of the prices
-Version: 2.0.5
+Version: 2.0.6
 Author: Martin Mechura
 Author URI: http://mechcomp.cz
 Text Domain: woo-price-per-unit
-WC tested up to: 4.1.0
+WC tested up to: 4.4.1
 WC requires at least: 3.0
 
@@ -588 +588 @@
     public function custom_cart_price($price_text, $product_data, $cart_key)
     {
+        global $woocommerce;
+
         if (is_null($product_data)){
             return $price_text;
@@ -606 +608 @@
             return $price_text;
         }
-        $round_prices = get_option('_mcmp_ppu_disable_price_rounding') == 'yes' ? false : true;
-        $normal_price = wc_get_price_to_display($product, array('price' => $normal_price));
+        $round_prices = get_option('_mcmp_ppu_disable_price_rounding') == 'yes' ? false : true;
+        if ( $woocommerce->cart->display_prices_including_tax() ) {
+            $normal_price = wc_get_price_including_tax( $product );
+        } else {
+            $normal_price = wc_get_price_excluding_tax( $product );
+        }
+        //$normal_price = wc_get_price_to_display($product, array('price' => $normal_price));
         $normal_price = $normal_price / $weight;
         $normal_price = $this->price_ratio_calc($normal_price, $product_id);