[-] MO : retro compatibility fixed with Referral program #PSCFV-1531

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15028 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Discount.php

@@ -126,7 +126,7 @@ class DiscountCore extends CartRule
 	{
 		Tools::displayAsDeprecated();
 		$obj = $this->parent;
-		if (in_array($method, array('add', 'update', 'getIdByName', 'getCustomerDiscounts', 'getValue', 'discountExists', 'createOrderDiscount', 'getVouchersToCartDisplay')))
+		if (in_array($method, array('add', 'update', 'getIdByName', 'getCustomerDiscounts', 'getValue', 'discountExists', 'createOrderDiscount', 'getVouchersToCartDisplay', 'display')))
 			$obj = $this;
 		return call_user_func_array(array($obj, $method), $args);
 	}
@@ -203,9 +203,6 @@ class DiscountCore extends CartRule
 	  */
 	public static function createOrderDiscount($order, $productList, $qtyList, $name, $shipping_cost = false, $id_category = 0, $subcategory = 0)
 	{		
-		// Todo
-		//die ('TODO');
-		
 		$languages = Language::getLanguages($order);
 		$products = $order->getProducts(false, $productList, $qtyList);
 
@@ -252,4 +249,19 @@ class DiscountCore extends CartRule
 
 		return $voucher;
 	}
+
+	/**
+	  * @deprecated 1.5.0.1
+	  */
+	public static function display($value, $type, $currency = null)
+	{
+		if ((float)$value && (int)$type)
+		{
+			if ($type == 1)
+				return $value.chr(37); // ASCII #37 --> % (percent)
+			elseif ($type == 2)
+				return Tools::displayPrice($value, $currency);
+		}
+		return ''; // return a string because it's a display method
+	}
 }

modules/referralprogram/ReferralProgramModule.php

@@ -35,8 +35,8 @@ class ReferralProgramModule extends ObjectModel
 	public $lastname;
 	public $firstname;
 	public $id_customer;
-	public $id_discount;
+	public $id_cart_rule;
-	public $id_discount_sponsor;
+	public $id_cart_rule_sponsor;
 	public $date_add;
 	public $date_upd;
 
@@ -52,8 +52,8 @@ class ReferralProgramModule extends ObjectModel
 			'lastname' =>			array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 128),
 			'firstname' =>			array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 128),
 			'id_customer' =>		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-			'id_discount' =>		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+			'id_cart_rule' =>		array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-			'id_discount_sponsor' =>array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+			'id_cart_rule_sponsor' =>array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
 			'date_add' =>			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 			'date_upd' =>			array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
 		),
@@ -66,14 +66,14 @@ class ReferralProgramModule extends ObjectModel
 
 	public function registerDiscountForSponsor($id_currency)
 	{
-		if ((int)$this->id_discount_sponsor > 0)
+		if ((int)$this->id_cart_rule_sponsor > 0)
 			return false;
 		return $this->registerDiscount((int)$this->id_sponsor, 'sponsor', (int)$id_currency);
 	}
 
 	public function registerDiscountForSponsored($id_currency)
 	{
-		if (!(int)$this->id_customer OR (int)$this->id_discount > 0)
+		if (!(int)$this->id_customer OR (int)$this->id_cart_rule > 0)
 			return false;
 		return $this->registerDiscount((int)$this->id_customer, 'sponsored', (int)$id_currency);
 	}

modules/referralprogram/my-account.tpl

@@ -25,5 +25,5 @@
 *}
 
 <!-- MODULE ReferralProgram -->
-<li class="referralprogram"><a href="{$base_dir_ssl}modules/referralprogram/referralprogram-program.php" title="{l s='Referral program' mod='referralprogram'}"><img src="{$module_template_dir}images/referralprogram.gif" alt="{l s='Referral program' mod='referralprogram'}" class="icon" /> {l s='Referral program' mod='referralprogram'}</a></li>
+<li class="referralprogram"><a href="{$base_dir_ssl}modules/referralprogram/referralprogram-program.php" title="{l s='Referral program' mod='referralprogram'}"><img src="{$module_template_dir}referralprogram.gif" alt="{l s='Referral program' mod='referralprogram'}" class="icon" /> {l s='Referral program' mod='referralprogram'}</a></li>
 <!-- END : MODULE ReferralProgram -->

modules/referralprogram/referralprogram.php

@@ -254,7 +254,7 @@ class ReferralProgram extends Module
 
 		$this->_html .= '
 		<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post">
-		<fieldset class="width3">
+		<fieldset>
 			<legend><img src="'._PS_ADMIN_IMG_.'prefs.gif" alt="'.$this->l('Settings').'" />'.$this->l('Settings').'</legend>
 			<p>
 				<label class="t" for="order_quantity">'.$this->l('Minimum number of orders a sponsored friend must place to get their voucher:').'</label>

modules/referralprogram/translations/fr.php

@@ -22,7 +22,7 @@ $_MODULE['<{referralprogram}prestashop>referralprogram-program_dcc99d8715486f570
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_f6cb78f0afcf7c3a06048a7a5855d6a1'] = 'Des e-mails ont été envoyés à vos amis !';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_79cd362fc64832faa0a2079f1142aa12'] = 'Un e-mail a été envoyé à votre amis !';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_2b90ca4a7b1c83e0a3bb65899725cd65'] = 'Des e-mails de rappel ont été envoyés à vos amis !';
-$_MODULE['<{referralprogram}prestashop>referralprogram-program_819e52b3c6ca4db131dcfea19188a0c3'] = 'Un e-mail de rappel a été envoyé à votre amis !';
+$_MODULE['<{referralprogram}prestashop>referralprogram-program_819e52b3c6ca4db131dcfea19188a0c3'] = 'Un e-mail de rappel a été envoyé à votre ami !';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_46ee2fe8845962d24bf5178a26e109f3'] = 'Parrainer mes amis';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_c56567bc42584de1a7ac430039b3a87e'] = 'Amis en attente';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_58c7f2542ab2e2c3e4e39e851ea0f225'] = 'Mes amis parrainés';
@@ -45,7 +45,7 @@ $_MODULE['<{referralprogram}prestashop>referralprogram-program_31fde7b05ac8952da
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_8e8dc296c6bf3876468aa028974bfebe'] = 'E-mail d\'invitation';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_a86073a0c3b0bebf11bd807caf8e505a'] = 'l\'e-mail par défaut';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_7532696b81dfc0b94a37e876677152c5'] = 'qui sera envoyé à vos amis.';
-$_MODULE['<{referralprogram}prestashop>referralprogram-program_ad3d06d03d94223fa652babc913de686'] = 'Validez';
+$_MODULE['<{referralprogram}prestashop>referralprogram-program_ad3d06d03d94223fa652babc913de686'] = 'Valider';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_59352cd5314a67c0fb10c964831920f3'] = 'Pour parrainer vos amis, vous devez finaliser au moins';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_ec7342814444c667ab93181b30b28e38'] = 'Ces amis parrainés n\'ont pas encore effectué d\'achat, mais vous pouvez les relancer ! Pour ce faire, vous devez cocher les cases des amis que vous voulez relancer, puis cliquer sur le bouton \"Relancer mes amis\"';
 $_MODULE['<{referralprogram}prestashop>referralprogram-program_3e717a04ff77cd5fa068d8ad9d3facc8'] = 'Dernière invitation';