Projekt

Allgemein

Profil

GX-Bug #46835 » p_google_special_price-Fix.patch

Moritz Bunjes, 09.06.2016 11:15

Unterschiede anzeigen:

src/system/classes/csv/CSVFunctionLibrary.inc.php (revision )
1 1
<?php
2 2
/* --------------------------------------------------------------
3
   CSVFunctionLibrary.inc.php 2015-08-16
3
   CSVFunctionLibrary.inc.php 2016-06-08
4 4
   Gambio GmbH
5 5
   http://www.gambio.de
6
   Copyright (c) 2015 Gambio GmbH
6
   Copyright (c) 2016 Gambio GmbH
7 7
   Released under the GNU General Public License (Version 2)
8 8
   [http://www.gnu.org/licenses/gpl-2.0.html]
9 9
   --------------------------------------------------------------
......
684 684
	protected function p_google_special_price( $p_data_array )
685 685
	{
686 686
		$t_return = '';
687
		
687
		if( $this->coo_xtc_price->xtcCheckSpecial($p_data_array[ 'products_id' ]) )
688
		if($this->coo_xtc_price->xtcCheckSpecial($p_data_array['products_id']))
688 689
		{
689
			$t_return = $this->coo_xtc_price->xtcGetPrice($p_data_array['products_id'], false, 1, $p_data_array['products_tax_class_id'], '', 0, 0, true);
690
			if($this->coo_scheme->v_data_array['export_properties'] == 1
691
			   && isset($p_data_array['products_properties_combis_id'])
692
			   && $p_data_array['products_properties_combis_id'] > 0
693
			)
694
			{
695
				$t_return = $this->coo_xtc_price->xtcGetPrice($p_data_array['products_id'], false, 1,
696
				                                              $p_data_array['products_tax_class_id'], '', 0, 0, true,
697
				                                              true, $p_data_array['products_properties_combis_id']);
698
			}
699
			else
700
			{
701
				$t_return = $this->coo_xtc_price->xtcGetPrice($p_data_array['products_id'], false, 1,
702
				                                              $p_data_array['products_tax_class_id'], '', 0, 0, true);
703
			}
704
			
690
			$t_return = number_format( $t_return, 2, ',', '' ) . " " . $this->p_currency();
705
			$t_return = number_format($t_return, 2, ',', '') . " " . $this->p_currency();
691 706
		}
707
		
692 708
		return $t_return;
693 709
	}
694 710

  
    (1-1/1)