From 94c12cfb2e7df16adb926f966db8a8ac89d21259 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 22 Oct 2012 17:24:14 +0200 Subject: [PATCH 01/11] Task # 559 : start of price by quantity management --- htdocs/install/mysql/migration/3.2.0-3.3.0.sql | 14 ++++++++++++++ htdocs/langs/en_US/products.lang | 4 +++- htdocs/langs/fr_FR/products.lang | 4 +++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 0600ddfe9a7..3eb339b57dd 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -781,3 +781,17 @@ ALTER TABLE llx_categorie MODIFY COLUMN label varchar(255) NOT NULL; ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (entity, fk_parent, label, type); ALTER TABLE llx_categorie ADD INDEX idx_categorie_type (type); ALTER TABLE llx_categorie ADD INDEX idx_categorie_label (label); + +-- [ task #559 ] Price by quantity management +CREATE TABLE llx_product_price_by_qty +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_product_price integer NOT NULL, + date_price timestamp, + price double (24,8) DEFAULT 0, + price_ttc double (24,8) DEFAULT NULL, + qty_min real DEFAULT 0, + qty_max real DEFAULT 99999 +)ENGINE=innodb; + +ALTER TABLE llx_product_price ADD price_by_qty INT NOT NULL DEFAULT 0; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 5c107a7e50b..8881ce278f9 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -180,4 +180,6 @@ AddThisServiceCard=Create service card HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service -AlwaysUseFixedPrice=Use the fixed price \ No newline at end of file +AlwaysUseFixedPrice=Use the fixed price +PriceByQuantity=Price by quantity +PriceByQuantityRange=Quantity range \ No newline at end of file diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 37c70e544d9..c641adee29a 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -180,4 +180,6 @@ AddThisServiceCard=Créer fiche service HelpAddThisServiceCard=Cette option permet de créer ou de cloner une fiche service si elle n'existe pas. CurrentProductPrice=Prix actuel AlwaysUseNewPrice=Toujours utiliser le prix du jour -AlwaysUseFixedPrice=Utiliser le prix fixé \ No newline at end of file +AlwaysUseFixedPrice=Utiliser le prix fixé +PriceByQuantity=Prix par quantité +PriceByQuantityRange=Grille de quantités \ No newline at end of file From 8ba55f49f16eff4e89c57d98e38c20e3cbbcd3b4 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 22 Oct 2012 17:47:15 +0200 Subject: [PATCH 02/11] Task # 559 : start of price by quantity management --- htdocs/product/class/product.class.php | 107 ++++++++- htdocs/product/price.php | 294 ++++++++++++++++++++++++- 2 files changed, 392 insertions(+), 9 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d6290ce6345..3599552b860 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -61,6 +61,11 @@ class Product extends CommonObject var $multiprices_ttc=array(); var $multiprices_base_type=array(); var $multiprices_tva_tx=array(); + //! Price by quantity arrays + var $price_by_qty; + var $prices_by_qty=array(); + var $prices_by_qty_id=array(); + var $prices_by_qty_list=array(); //! Default VAT rate of product var $tva_tx; //! French VAT NPR (0 or 1) @@ -214,6 +219,10 @@ class Product extends CommonObject if (empty($this->price)) $this->price = 0; if (empty($this->price_min)) $this->price_min = 0; + + // Price by quantity + if (empty($this->price_by_qty)) $this->price_by_qty = 0; + if (empty($this->status)) $this->status = 0; if (empty($this->status_buy)) $this->status_buy = 0; if (empty($this->finished)) $this->finished = 0; @@ -802,9 +811,9 @@ class Product extends CommonObject // Add new price $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,"; - $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc) "; + $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc,price_by_qty) "; $sql.= " VALUES(".($level?$level:1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->price_base_type."',".$this->status.",".$this->tva_tx.",".$this->tva_npr.","; - $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc; + $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty; $sql.= ")"; dol_syslog(get_class($this)."_log_price sql=".$sql); @@ -941,9 +950,10 @@ class Product extends CommonObject * @param double $newminprice New price min * @param int $level 0=standard, >0 = level if multilevel prices * @param int $newnpr 0=Standard vat rate, 1=Special vat rate for French NPR VAT + * @param int $newpsq 1 if it has price by quantity * @return int <0 if KO, >0 if OK */ - function updatePrice($id, $newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0) + function updatePrice($id, $newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0) { global $conf,$langs; @@ -1032,6 +1042,9 @@ class Product extends CommonObject $this->localtax1_tx = $localtax1; $this->localtax2_tx = $localtax2; + // Price by quantity + $this->price_by_qty = $newpsq; + $this->_log_price($user,$level); // Appel des triggers @@ -1166,7 +1179,7 @@ class Product extends CommonObject for ($i=1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { $sql = "SELECT price, price_ttc, price_min, price_min_ttc,"; - $sql.= " price_base_type, tva_tx, tosell"; + $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price"; $sql.= " WHERE price_level=".$i; $sql.= " AND fk_product = '".$this->id."'"; @@ -1183,6 +1196,39 @@ class Product extends CommonObject $this->multiprices_min_ttc[$i]=$result["price_min_ttc"]; $this->multiprices_base_type[$i]=$result["price_base_type"]; $this->multiprices_tva_tx[$i]=$result["tva_tx"]; + + // Price by quantity + $this->prices_by_qty[$i]=$result["price_by_qty"]; + $this->prices_by_qty_id[$i]=$result["rowid"]; + // Récuperation de la liste des prix selon qty si flag positionné + if ($this->prices_by_qty[$i] == 1) + { + $sql = "SELECT rowid,price, price_ttc,qty_min,qty_max"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'"; + $sql.= " ORDER BY qty_min ASC"; + $resultat=array(); + $resql = $this->db->query($sql) ; + if ($resql) + { + $ii=0; + while ($result= $this->db->fetch_array($resql)) { + $resultat[$ii]=array(); + $resultat[$ii]["rowid"]=$result["rowid"]; + $resultat[$ii]["price"]= $result["price"]; + $resultat[$ii]["price_ttc"]= $result["price_ttc"]; + $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["qty_max"]= $result["qty_max"]; + $ii++; + } + $this->prices_by_qty_list[$i]=$resultat; + } + else + { + dol_print_error($this->db); + return -1; + } + } } else { @@ -1190,6 +1236,57 @@ class Product extends CommonObject return -1; } } + } else if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + { + $sql = "SELECT price, price_ttc, price_min, price_min_ttc,"; + $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_price"; + $sql.= " WHERE fk_product = '".$this->id."'"; + $sql.= " ORDER BY date_price DESC"; + $sql.= " LIMIT 1"; + $resql = $this->db->query($sql); + if ($resql) + { + $result = $this->db->fetch_array($resql); + + // Price by quantity + $this->prices_by_qty[0]=$result["price_by_qty"]; + $this->prices_by_qty_id[0]=$result["rowid"]; + // Récuperation de la liste des prix selon qty si flag positionné + if ($this->prices_by_qty[0] == 1) + { + $sql = "SELECT rowid,price, price_ttc,qty_min,qty_max"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'"; + $sql.= " ORDER BY qty_min ASC"; + $resultat=array(); + $resql = $this->db->query($sql) ; + if ($resql) + { + $ii=0; + while ($result= $this->db->fetch_array($resql)) { + $resultat[$ii]=array(); + $resultat[$ii]["rowid"]=$result["rowid"]; + $resultat[$ii]["price"]= $result["price"]; + $resultat[$ii]["price_ttc"]= $result["price_ttc"]; + $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["qty_max"]= $result["qty_max"]; + $ii++; + } + $this->prices_by_qty_list[0]=$resultat; + } + else + { + dol_print_error($this->db); + return -1; + } + } + } + else + { + dol_print_error($this->db); + return -1; + } } $res=$this->load_stock(); @@ -2922,4 +3019,4 @@ class Product extends CommonObject $this->note='This is a comment (private)'; } } -?> +?> \ No newline at end of file diff --git a/htdocs/product/price.php b/htdocs/product/price.php index cd0ce9ba307..079d83b5d74 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -51,7 +51,7 @@ $object = new Product($db); if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) { $result = $object->fetch($id); - + // MultiPrix if (! empty($conf->global->PRODUIT_MULTIPRICES)) { @@ -70,6 +70,8 @@ if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit-> $newpricebase=$_POST["multiprices_base_type_".$i]; $newnpr=(preg_match('/\*/',$_POST["tva_tx_".$i]) ? 1 : 0); $newvat=str_replace('*','',$_POST["tva_tx_".$i]); + $newpsq=GETPOST('psqflag'); + $newpsq = empty($newpsq) ? 0 : $newpsq; break; // We found submited price } } @@ -82,9 +84,11 @@ if ($action == 'update_price' && ! $_POST["cancel"] && ($user->rights->produit-> $newpricebase=$_POST["price_base_type"]; $newnpr=(preg_match('/\*/',$_POST["tva_tx"]) ? 1 : 0); $newvat=str_replace('*','',$_POST["tva_tx"]); + $newpsq=GETPOST('psqflag'); + $newpsq = empty($newpsq) ? 0 : $newpsq; } - if ($object->updatePrice($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr) > 0) + if ($object->updatePrice($object->id, $newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) { $action = ''; $mesg = '
'.$langs->trans("RecordSaved").'
'; @@ -101,6 +105,110 @@ else if ($action == 'delete' && $user->rights->produit->supprimer) if ($result < 0) $mesg='
'.$object->error.'
'; } +/***************************************************** + * Price by quantity + *****************************************************/ +if ($action == 'activate_price_by_qty') { // Activating product price by quantity add a new price, specified as by quantity + $result = $object->fetch($id); + $level=GETPOST('level'); + + $object->updatePrice($object->id, 0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1); +} + +if ($action == 'edit_price_by_qty') { // Edition d'un prix par quantité + $rowid = GETPOST('rowid'); +} + +if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par quantité + $result = $object->fetch($id); + + // Récupération des variables + $rowid = GETPOST('rowid'); + $priceid=GETPOST('priceid'); + $newprice=price2num(GETPOST("price"),'MU'); + //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management and discount management + $qtymin=GETPOST('qty_min'); + $qtymax=GETPOST('qty_max'); + + // Calcul des prix (HT et TTC) + if ($newprice!='' || $newprice==0) + { + if ($object->price_base_type == 'TTC') + { + $price_ttc = price2num($newprice,'MU'); + $price = price2num($newprice) / (1 + ($object->tva_tx / 100)); + $price = price2num($price,'MU'); + + /*if ($newminprice!='' || $newminprice==0) + { + $price_min_ttc = price2num($newminprice,'MU'); + $price_min = price2num($newminprice) / (1 + ($object->tva_tx / 100)); + $price_min = price2num($price_min,'MU'); + } + else + { + $price_min=0; + $price_min_ttc=0; + }*/ + } + else + { + $price = price2num($newprice,'MU'); + $price_ttc = price2num($newprice) * (1 + ($object->tva_tx / 100)); + $price_ttc = price2num($price_ttc,'MU'); + + /*if ($newminprice!='' || $newminprice==0) + { + $price_min = price2num($newminprice,'MU'); + $price_min_ttc = price2num($newminprice) * (1 + ($object->tva_tx / 100)); + $price_min_ttc = price2num($price_min_ttc,'MU'); + //print 'X'.$newminprice.'-'.$price_min; + } + else + { + $price_min=0; + $price_min_ttc=0; + }*/ + } + } + + // Ajout / mise à jour + if($rowid > 0) { + $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; + $sql.= " price='".$price."',"; + $sql.= " price_ttc=".$price_ttc.","; + $sql.= " qty_min=".$qtymin.","; + $sql.= " qty_max=".$qtymax; + $sql.= " WHERE rowid = ".GETPOST('rowid'); + + $result = $db->query($sql); + } else { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min,qty_max) values ("; + $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.','.$qtymax.')'; + + $result = $db->query($sql); + } +} + +if ($action == 'delete_price_by_qty') { + $rowid = GETPOST('rowid'); + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE rowid = ".GETPOST('rowid'); + + $result = $db->query($sql); +} + +if ($action == 'delete_all_price_by_qty') { + $priceid=GETPOST('priceid'); + + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE fk_product_price = ".$priceid; + + $result = $db->query($sql); +} + + /* * View @@ -230,6 +338,104 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print price($object->multiprices_min["$i"]).' '.$langs->trans($object->multiprices_base_type["$i"]); } print ''; + + // Price by quantity + /*if($conf->global->PRODUIT_PRICE_BY_QTY) { + print ''.$langs->trans("PriceByQuantity").' '.$i.''; + if($object->prices_by_qty[$i] == 1) { + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + foreach ($object->prices_by_qty_list[$i] as $j=> $prices) { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + print '
'.$langs->trans("PriceByQuantityRange").''.$langs->trans("HT").''.$langs->trans("TTC").' 
'.$prices['qty_min'].' - '.$prices['qty_max'].''.price($prices['price']).''.price($prices['price_ttc']).''; + print img_delete(); + print '
'; + } else { + print $langs->trans("No"); + } + print ''; + }*/ + + // Price by quantity + if($conf->global->PRODUIT_PRICE_BY_QTY) { + print ''.$langs->trans("PriceByQuantity").' '.$i; + print ''; + + if($object->prices_by_qty[$i] == 1) { + print ''; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + foreach ($object->prices_by_qty_list[$i] as $ii=> $prices) { + if($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } else { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + } + if($action != 'edit_price_by_qty') { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + print '
'.$langs->trans("PriceByQuantityRange").' '.$i.''.$langs->trans("HT").''.$langs->trans("TTC").' 
- '; + print ' '.$object->price_base_type.' 
'.$prices['qty_min'].' - '.$prices['qty_max'].''.price($prices['price']).''.price($prices['price_ttc']).''; + if(($user->rights->produit->creer || $user->rights->service->creer)) { + print ''; + print img_edit().''; + print ''; + print img_delete().''; + } else { + print ' '; + } + print '
- '; + print ' '.$object->price_base_type.' 
'; + } else { + print $langs->trans("No"); + print ' ('.$langs->trans("Activate").')'; + } + print ''; + } } } } @@ -261,6 +467,76 @@ else print price($object->price_min).' '.$langs->trans($object->price_base_type); } print ''; + + // Price by quantity + if($conf->global->PRODUIT_PRICE_BY_QTY) { + print ''.$langs->trans("PriceByQuantity"); + if($object->prices_by_qty[0] == 0) { + print ' '.$langs->trans("Activate"); + } + print ''; + + if($object->prices_by_qty[0] == 1) { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + foreach ($object->prices_by_qty_list[0] as $ii=> $prices) { + if($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } else { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + } + if($action != 'edit_price_by_qty') { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + print '
'.$langs->trans("PriceByQuantityRange").''.$langs->trans("HT").''.$langs->trans("TTC").' 
- '; + print ' '.$object->price_base_type.' 
'.$prices['qty_min'].' - '.$prices['qty_max'].''.price($prices['price']).''.price($prices['price_ttc']).''; + if(($user->rights->produit->creer || $user->rights->service->creer)) { + print ''; + print img_edit().''; + print ''; + print img_delete().''; + } else { + print ' '; + } + print '
- '; + print ' '.$object->price_base_type.' 
'; + } else { + print $langs->trans("No"); + } + print ''; + } } // Status (to sell) @@ -426,7 +702,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights-> // Liste des evolutions du prix $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.recuperableonly,"; -$sql.= " p.price_level, p.price_min, p.price_min_ttc,"; +$sql.= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,"; $sql.= " p.date_price as dp, u.rowid as user_id, u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price as p,"; $sql.= " ".MAIN_DB_PREFIX."user as u"; @@ -464,7 +740,11 @@ if ($result) if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - print ''.$langs->trans("MultiPriceLevelsName").''; + print ''.$langs->trans("MultiPriceLevelsName").''; + } + if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + { + print ''.$langs->trans("Type").''; } print ''.$langs->trans("PriceBase").''; @@ -492,6 +772,12 @@ if ($result) { print ''.$objp->price_level.""; } + // Price by quantity + if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + { + $type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard'; + print ''.$langs->trans($type).""; + } print ''.$langs->trans($objp->price_base_type).""; print ''.vatrate($objp->tva_tx,true,$objp->recuperableonly).""; From 35773d08ff21dbd0c531ffa41acc86cfdbb14692 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 24 Oct 2012 17:16:03 +0200 Subject: [PATCH 03/11] Task # 559 : mysql table creation + index and constraints --- .../install/mysql/migration/3.2.0-3.3.0.sql | 11 +++++-- .../tables/llx_product_price_by_qty.key.sql | 26 ++++++++++++++++ .../mysql/tables/llx_product_price_by_qty.sql | 30 +++++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql create mode 100644 htdocs/install/mysql/tables/llx_product_price_by_qty.sql diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 3eb339b57dd..e32bacf6d9f 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -789,9 +789,14 @@ CREATE TABLE llx_product_price_by_qty fk_product_price integer NOT NULL, date_price timestamp, price double (24,8) DEFAULT 0, - price_ttc double (24,8) DEFAULT NULL, - qty_min real DEFAULT 0, - qty_max real DEFAULT 99999 + price_ttc double (24,8) DEFAULT 0, + qty_min real DEFAULT 0 )ENGINE=innodb; ALTER TABLE llx_product_price ADD price_by_qty INT NOT NULL DEFAULT 0; + +ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min); + +ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price); + +ALTER TABLE llx_product_price_by_qty ADD CONSTRAINT fk_product_price_by_qty_fk_product_price FOREIGN KEY (fk_product_price) REFERENCES llx_product_price (rowid); diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql new file mode 100644 index 00000000000..e96af56e9c0 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql @@ -0,0 +1,26 @@ +-- ============================================================================ +-- Copyright (C) 2002-2003 Rodolphe Quiedeville +-- Copyright (C) 2005-2012 Regis Houssin +-- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2012 Maxime Kohlhaas +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min); + +ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price); + +ALTER TABLE llx_product_price_by_qty ADD CONSTRAINT fk_product_price_by_qty_fk_product_price FOREIGN KEY (fk_product_price) REFERENCES llx_product_price (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql new file mode 100644 index 00000000000..c101a211310 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql @@ -0,0 +1,30 @@ +-- ============================================================================ +-- Copyright (C) 2002-2003 Rodolphe Quiedeville +-- Copyright (C) 2005-2012 Regis Houssin +-- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2012 Maxime Kohlhaas +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +create table llx_product_price_by_qty +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_product_price integer NOT NULL, + date_price timestamp, + price double (24,8) DEFAULT 0, + price_ttc double (24,8) DEFAULT 0, + qty_min real DEFAULT 1 +)ENGINE=innodb; From 2ff77bb2f174a8d133ce0fbf5ae7768c8d0fb1e1 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 24 Oct 2012 17:18:11 +0200 Subject: [PATCH 04/11] Task # 559 : no need for a max quantity --- htdocs/product/class/product.class.php | 6 +-- htdocs/product/price.php | 57 +++++--------------------- 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 3599552b860..fb68e2e6472 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1203,7 +1203,7 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[$i] == 1) { - $sql = "SELECT rowid,price, price_ttc,qty_min,qty_max"; + $sql = "SELECT rowid,price, price_ttc,qty_min"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'"; $sql.= " ORDER BY qty_min ASC"; @@ -1218,7 +1218,6 @@ class Product extends CommonObject $resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["qty_min"]= $result["qty_min"]; - $resultat[$ii]["qty_max"]= $result["qty_max"]; $ii++; } $this->prices_by_qty_list[$i]=$resultat; @@ -1255,7 +1254,7 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[0] == 1) { - $sql = "SELECT rowid,price, price_ttc,qty_min,qty_max"; + $sql = "SELECT rowid,price, price_ttc,qty_min"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'"; $sql.= " ORDER BY qty_min ASC"; @@ -1270,7 +1269,6 @@ class Product extends CommonObject $resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["qty_min"]= $result["qty_min"]; - $resultat[$ii]["qty_max"]= $result["qty_max"]; $ii++; } $this->prices_by_qty_list[0]=$resultat; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 079d83b5d74..2ff0a751e99 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -128,7 +128,6 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu $newprice=price2num(GETPOST("price"),'MU'); //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management and discount management $qtymin=GETPOST('qty_min'); - $qtymax=GETPOST('qty_max'); // Calcul des prix (HT et TTC) if ($newprice!='' || $newprice==0) @@ -177,14 +176,13 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; $sql.= " price='".$price."',"; $sql.= " price_ttc=".$price_ttc.","; - $sql.= " qty_min=".$qtymin.","; - $sql.= " qty_max=".$qtymax; + $sql.= " qty_min=".$qtymin; $sql.= " WHERE rowid = ".GETPOST('rowid'); $result = $db->query($sql); } else { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min,qty_max) values ("; - $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.','.$qtymax.')'; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min) values ("; + $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.')'; $result = $db->query($sql); } @@ -338,35 +336,6 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print price($object->multiprices_min["$i"]).' '.$langs->trans($object->multiprices_base_type["$i"]); } print ''; - - // Price by quantity - /*if($conf->global->PRODUIT_PRICE_BY_QTY) { - print ''.$langs->trans("PriceByQuantity").' '.$i.''; - if($object->prices_by_qty[$i] == 1) { - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - foreach ($object->prices_by_qty_list[$i] as $j=> $prices) { - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - print '
'.$langs->trans("PriceByQuantityRange").''.$langs->trans("HT").''.$langs->trans("TTC").' 
'.$prices['qty_min'].' - '.$prices['qty_max'].''.price($prices['price']).''.price($prices['price_ttc']).''; - print img_delete(); - print '
'; - } else { - print $langs->trans("No"); - } - print ''; - }*/ // Price by quantity if($conf->global->PRODUIT_PRICE_BY_QTY) { @@ -389,8 +358,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - print ' - '; - print ''; + print ''; print ' '.$object->price_base_type.''; print ' '; print ''; @@ -398,7 +366,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; } else { print ''; - print ''.$prices['qty_min'].' - '.$prices['qty_max'].''; + print ''.$prices['qty_min'].''; print ''.price($prices['price']).''; print ''.price($prices['price_ttc']).''; print ''; @@ -420,9 +388,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - print ' - '; - print ''; - print ' '.$object->price_base_type.''; + print ''; + print ' '.$object->price_base_type.''; print ' '; print ''; print ''; @@ -491,8 +458,7 @@ else print ''; print ''; print ''; - print ' - '; - print ''; + print ''; print ' '.$object->price_base_type.''; print ' '; print ''; @@ -500,7 +466,7 @@ else print ''; } else { print ''; - print ''.$prices['qty_min'].' - '.$prices['qty_max'].''; + print ''.$prices['qty_min'].''; print ''.price($prices['price']).''; print ''.price($prices['price_ttc']).''; print ''; @@ -522,9 +488,8 @@ else print ''; print ''; print ''; - print ' - '; - print ''; - print ' '.$object->price_base_type.''; + print ''; + print ' '.$object->price_base_type.''; print ' '; print ''; print ''; From fdc6ed90a42bb410b8f6b22183795caef1fbf686 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 24 Oct 2012 17:22:45 +0200 Subject: [PATCH 05/11] Task # 559 : forgot to update product_price table to add column --- htdocs/install/mysql/tables/llx_product_price.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 12f1257f156..b2de59ff62c 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -36,6 +36,7 @@ create table llx_product_price localtax1_tx double(6,3) DEFAULT 0, localtax2_tx double(6,3) DEFAULT 0, fk_user_author integer, - tosell tinyint DEFAULT 1 + tosell tinyint DEFAULT 1, + price_by_qty integer NOT NULL DEFAULT 0 )ENGINE=innodb; From 03cf96ed318adc65b2c10754209aad18d500516b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 25 Oct 2012 08:18:59 +0200 Subject: [PATCH 06/11] Task # 559 : add discount by qty as done in supplier prices --- .../install/mysql/migration/3.2.0-3.3.0.sql | 3 ++ .../mysql/tables/llx_product_price_by_qty.sql | 2 + htdocs/product/class/product.class.php | 8 +++- htdocs/product/price.php | 38 ++++++++++++------- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index e32bacf6d9f..aea6868f42a 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -800,3 +800,6 @@ ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_le ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price); ALTER TABLE llx_product_price_by_qty ADD CONSTRAINT fk_product_price_by_qty_fk_product_price FOREIGN KEY (fk_product_price) REFERENCES llx_product_price (rowid); + +ALTER TABLE `llx_product_price_by_qty` ADD `remise_percent` DOUBLE NOT NULL DEFAULT '0' AFTER `price_ttc` , +ADD `remise` DOUBLE NOT NULL DEFAULT '0' AFTER `remise_percent`; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql index c101a211310..e0585786235 100644 --- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql @@ -26,5 +26,7 @@ create table llx_product_price_by_qty date_price timestamp, price double (24,8) DEFAULT 0, price_ttc double (24,8) DEFAULT 0, + remise_percent double NOT NULL DEFAULT 0, + remise double NOT NULL DEFAULT 0, qty_min real DEFAULT 1 )ENGINE=innodb; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index fb68e2e6472..ecedea4a10d 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1203,7 +1203,7 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[$i] == 1) { - $sql = "SELECT rowid,price, price_ttc,qty_min"; + $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'"; $sql.= " ORDER BY qty_min ASC"; @@ -1218,6 +1218,8 @@ class Product extends CommonObject $resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["remise_percent"]= $result["remise_percent"]; + $resultat[$ii]["remise"]= $result["remise"]; $ii++; } $this->prices_by_qty_list[$i]=$resultat; @@ -1254,7 +1256,7 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[0] == 1) { - $sql = "SELECT rowid,price, price_ttc,qty_min"; + $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'"; $sql.= " ORDER BY qty_min ASC"; @@ -1269,6 +1271,8 @@ class Product extends CommonObject $resultat[$ii]["price"]= $result["price"]; $resultat[$ii]["price_ttc"]= $result["price_ttc"]; $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["remise_percent"]= $result["remise_percent"]; + $resultat[$ii]["remise"]= $result["remise"]; $ii++; } $this->prices_by_qty_list[0]=$resultat; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2ff0a751e99..42d6712be52 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -126,8 +126,10 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu $rowid = GETPOST('rowid'); $priceid=GETPOST('priceid'); $newprice=price2num(GETPOST("price"),'MU'); - //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management and discount management + //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management $qtymin=GETPOST('qty_min'); + $remise_percent=price2num(GETPOST('remise_percent')); + $remise=0; // TODO : allow dicsoun by amount when available on documents // Calcul des prix (HT et TTC) if ($newprice!='' || $newprice==0) @@ -176,13 +178,15 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; $sql.= " price='".$price."',"; $sql.= " price_ttc=".$price_ttc.","; - $sql.= " qty_min=".$qtymin; + $sql.= " qty_min=".$qtymin.","; + $sql.= " remise_percent=".$remise_percent.","; + $sql.= " remise=".$remise; $sql.= " WHERE rowid = ".GETPOST('rowid'); $result = $db->query($sql); } else { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min) values ("; - $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.')'; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min,remise_percent,remise) values ("; + $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.','.$remise_percent.','.$remise.')'; $result = $db->query($sql); } @@ -349,6 +353,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''.$langs->trans("PriceByQuantityRange").' '.$i.''; print ''.$langs->trans("HT").''; print ''.$langs->trans("TTC").''; + print ''.$langs->trans("Discount").''; print ' '; print ''; foreach ($object->prices_by_qty_list[$i] as $ii=> $prices) { @@ -359,8 +364,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - print ' '.$object->price_base_type.''; - print ' '; + print ' '.$object->price_base_type.''; + //print ' '; + print '< %/td>'; print ''; print ''; print ''; @@ -369,6 +375,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''.$prices['qty_min'].''; print ''.price($prices['price']).''; print ''.price($prices['price_ttc']).''; + print ''.price($prices['remise_percent']).' %'; print ''; if(($user->rights->produit->creer || $user->rights->service->creer)) { print ''; @@ -382,15 +389,16 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; } } - if($action != 'edit_price_by_qty') { + if($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) { print '
'; print ''; print ''; print ''; print ''; print ''; - print ' '.$object->price_base_type.''; - print ' '; + print ' '.$object->price_base_type.''; + //print ' '; + print ' %'; print ''; print ''; print '
'; @@ -449,6 +457,7 @@ else print ''.$langs->trans("PriceByQuantityRange").''; print ''.$langs->trans("HT").''; print ''.$langs->trans("TTC").''; + print ''.$langs->trans("Discount").''; print ' '; print ''; foreach ($object->prices_by_qty_list[0] as $ii=> $prices) { @@ -459,8 +468,9 @@ else print ''; print ''; print ''; - print ' '.$object->price_base_type.''; - print ' '; + print ' '.$object->price_base_type.''; + //print ' '; + print ' %'; print ''; print ''; print ''; @@ -469,6 +479,7 @@ else print ''.$prices['qty_min'].''; print ''.price($prices['price']).''; print ''.price($prices['price_ttc']).''; + print ''.price($prices['remise_percent']).' %'; print ''; if(($user->rights->produit->creer || $user->rights->service->creer)) { print ''; @@ -489,8 +500,9 @@ else print ''; print ''; print ''; - print ' '.$object->price_base_type.''; - print ' '; + print ' '.$object->price_base_type.''; + //print ' '; + print ' %'; print ''; print ''; print ''; From 84df6bd6393c1352361da678d9d857c2b64f0952 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Thu, 25 Oct 2012 08:19:16 +0200 Subject: [PATCH 07/11] Task # 559 : forgot to update supplier prices sql table --- htdocs/install/mysql/tables/llx_product_fournisseur_price.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql index a6cb81527a6..4b7c0cc0306 100644 --- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql +++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql @@ -31,6 +31,8 @@ create table llx_product_fournisseur_price fk_availability integer, price double(24,8) DEFAULT 0, quantity double, + remise_percent double NOT NULL DEFAULT 0, + remise double NOT NULL DEFAULT 0, unitprice double(24,8) DEFAULT 0, charges double(24,8) DEFAULT 0, unitcharges double(24,8) DEFAULT 0, From 0f1617c31d4ddf12beba0d2c460890b595161607 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 26 Oct 2012 01:00:03 +0200 Subject: [PATCH 08/11] Task 559 : add use of price by qty in product selection (select and ajax search) --- htdocs/core/class/html.form.class.php | 367 ++++++++++++++++--------- htdocs/core/tpl/objectline_add.tpl.php | 12 +- htdocs/product/ajax/products.php | 37 ++- htdocs/product/price.php | 2 +- 4 files changed, 272 insertions(+), 146 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 32f76d60eeb..39f9dc167e1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1148,6 +1148,18 @@ class Form { $sql.= ", pl.label as label_translated"; } + // Price by quantity + if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + { + $sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; + if ($price_level >= 1) $sql.= " AND price_level=".$price_level; + $sql.= " ORDER BY date_price"; + $sql.= " DESC LIMIT 1) as price_rowid"; + $sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; + if ($price_level >= 1) $sql.= " AND price_level=".$price_level; + $sql.= " ORDER BY date_price"; + $sql.= " DESC LIMIT 1) as price_by_qty"; + } $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; // Multilang : we add translation if (! empty($conf->global->MAIN_MULTILANGS)) @@ -1209,143 +1221,50 @@ class Form $i = 0; while ($num && $i < $num) { - $outkey=''; - $outval=''; - $outref=''; - $outlabel=''; - $outdesc=''; - $outtype=''; - $outprice_ht=''; - $outprice_ttc=''; - $outpricebasetype=''; - $outtva_tx=''; - - $objp = $this->db->fetch_object($result); - - $label=$objp->label; - if (! empty($objp->label_translated)) $label=$objp->label_translated; - if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','$1',$label,1); - - $outkey=$objp->rowid; - $outref=$objp->ref; - $outlabel=$objp->label; - $outdesc=$objp->description; - $outtype=$objp->fk_product_type; - - $opt = '\n"; - - // Add new entry - // "key" value of json key array is used by jQuery automatically as selected value - // "label" value of json key array is used by jQuery automatically as text for combo box - $outselect.=$opt; - array_push($outjson, array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx)); + $opt = ''; + $optJson = array(); + $objp = $this->db->fetch_object($result); + + if(!empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product + $sql = "SELECT rowid, qty_min, price, price_ttc, remise_percent, remise"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE fk_product_price=".$objp->price_rowid; + + dol_syslog(get_class($this)."::select_produits_do search price by qty sql=".$sql); + $result2 = $this->db->query($sql); + if ($result2) + { + $nb_prices = $this->db->num_rows($result2); + $j = 0; + while ($nb_prices && $j < $nb_prices) { + $objp2 = $this->db->fetch_object($result2); + + $objp->quantity = $objp2->qty_min; + $objp->price = $objp2->price; + $objp->unitprice = $objp2->price; + $objp->remise_percent = $objp2->remise_percent; + $objp->remise = $objp2->remise; + $objp->price_by_qty_rowid = $objp2->rowid; + + $this->_construct_product_list_option($objp, $opt, $optJson, 0, $selected); + + $j++; + + // Add new entry + // "key" value of json key array is used by jQuery automatically as selected value + // "label" value of json key array is used by jQuery automatically as text for combo box + $outselect.=$opt; + array_push($outjson, $optJson); + } + } + } else { + $this->_construct_product_list_option($objp, $opt, $optJson, $price_level, $selected); + // Add new entry + // "key" value of json key array is used by jQuery automatically as selected value + // "label" value of json key array is used by jQuery automatically as text for combo box + $outselect.=$opt; + array_push($outjson, $optJson); + } $i++; } @@ -1363,6 +1282,180 @@ class Form } } + function _construct_product_list_option(&$objp, &$opt, &$optJson, $price_level, $selected) { + global $langs,$conf,$user,$db; + + $outkey=''; + $outval=''; + $outref=''; + $outlabel=''; + $outdesc=''; + $outtype=''; + $outprice_ht=''; + $outprice_ttc=''; + $outpricebasetype=''; + $outtva_tx=''; + $outqty=1; + $outdiscount=0; + + $label=$objp->label; + if (! empty($objp->label_translated)) $label=$objp->label_translated; + if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','$1',$label,1); + + $outkey=$objp->rowid; + $outref=$objp->ref; + $outlabel=$objp->label; + $outdesc=$objp->description; + $outtype=$objp->fk_product_type; + + $opt = '\n"; + $optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount); + } + /** * Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_do) * diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index d9f35ad6971..185656bf231 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -79,7 +79,9 @@ if (! empty($conf->margin->enabled)) { 'price_ht' => 'price_ht', 'origin_price_ht_cache' => 'price_ht', 'origin_tva_tx_cache' => 'tva_tx', - 'origin_price_ttc_cache' => 'price_ttc' + 'origin_price_ttc_cache' => 'price_ttc', + 'qty' => 'qty', + 'remise_percent' => 'discount' ), 'update_textarea' => array( 'product_desc' => 'desc' @@ -158,7 +160,7 @@ if (! empty($conf->margin->enabled)) { - % + % margin->enabled)) { @@ -225,7 +227,9 @@ $(document).ready(function() { $.post('/product/ajax/products.php', { 'action': 'fetch', 'id': $(this).val(), - 'price_level': price_level)?1:$buyer->price_level; ?>}, + 'price_level': price_level)?1:$buyer->price_level; ?>, + 'pbq': $("option:selected", this).attr('pbq') + }, function(data) { if (typeof data != 'undefined') { $('#product_ref').val(data.ref); @@ -237,6 +241,8 @@ $(document).ready(function() { $('#origin_tva_tx_cache').val(data.tva_tx); $('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); //$('#price_base_type_area').show(); + $('#qty').val(data.qty); + $('#remise_percent').val(data.discount); if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances['product_desc'] != "undefined") { CKEDITOR.instances['product_desc'].setData(data.desc).focus(); diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index d1874d11eaa..f5702b72f8c 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -38,9 +38,10 @@ $type=GETPOST('type','int'); $mode=GETPOST('mode','int'); $status=((GETPOST('status','int') >= 0) ? GETPOST('status','int') : -1); $outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0); -$pricelevel=GETPOST('price_level','int'); +$price_level=GETPOST('price_level','int'); $action=GETPOST('action', 'alpha'); $id=GETPOST('id', 'int'); +$price_by_qty_rowid=GETPOST('pbq', 'int'); /* * View @@ -65,11 +66,37 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) $outlabel=$object->label; $outdesc=$object->description; $outtype=$object->type; + $outqty=1; + $outdiscount=0; $found=false; + + // Price by qty + if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1) // If we need a particular price related to qty + { + $sql = "SELECT price, price_ttc, qty_min, remise_percent"; + $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty "; + $sql.= " WHERE rowid=".$price_by_qty_rowid.""; + + $result = $db->query($sql); + if ($result) + { + $objp = $db->fetch_object($result); + if ($objp) + { + $found=true; + $outprice_ht=price($objp->price); + $outprice_ttc=price($objp->price_ttc); + $outpricebasetype=$object->price_base_type; + $outtva_tx=$object->tva_tx; + $outqty=$objp->qty_min; + $outdiscount=$objp->remise_percent; + } + } + } // Multiprice - if (isset($price_level) && $price_level >= 1) // If we need a particular price level (from 1 to 6) + if (! $found && isset($price_level) && $price_level >= 1) // If we need a particular price level (from 1 to 6) { $sql = "SELECT price, price_ttc, price_base_type, tva_tx"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price "; @@ -78,10 +105,10 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) $sql.= " ORDER BY date_price"; $sql.= " DESC LIMIT 1"; - $result = $this->db->query($sql); + $result = $db->query($sql); if ($result) { - $objp = $this->db->fetch_object($result); + $objp = $db->fetch_object($result); if ($objp) { $found=true; @@ -101,7 +128,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) $outtva_tx=$object->tva_tx; } - $outjson = array('ref'=>$outref, 'label'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx); + $outjson = array('ref'=>$outref, 'label'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>$outprice_ht, 'price_ttc'=>$outprice_ttc, 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount); } echo json_encode($outjson); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 42d6712be52..7fe5aa5b89e 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -366,7 +366,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ' '.$object->price_base_type.''; //print ' '; - print '< %/td>'; + print ' %'; print ''; print ''; print ''; From fd5fb90649cfe41ae8dd9faddb182a0d040f130b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 26 Oct 2012 01:07:11 +0200 Subject: [PATCH 09/11] Task # 559 : price defined on product page is unit price. Need to multiplicate this price by qty to have the right global price in the product list --- htdocs/core/class/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d6824ce682e..d23a4b0b46c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1389,8 +1389,8 @@ class Form } else { - $opt.= price($objp->price).' '.$currencytext."/".$objp->quantity; - $outval.= price($objp->price).' '.$currencytextnoent."/".$objp->quantity; + $opt.= price($objp->price * $objp->quantity).' '.$currencytext."/".$objp->quantity; + $outval.= price($objp->price * $objp->quantity).' '.$currencytextnoent."/".$objp->quantity; $opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding $outval.=$langs->transnoentities("Units"); } From 7035ec42f1e047507178e68448110ededfea8a98 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 7 Nov 2012 00:38:53 +0100 Subject: [PATCH 10/11] Task # 559 : Modifications to store unitprice as in supplier prices --- htdocs/core/class/html.form.class.php | 37 +++--- .../tables/llx_product_price_by_qty.key.sql | 2 +- .../mysql/tables/llx_product_price_by_qty.sql | 12 +- htdocs/product/ajax/products.php | 8 +- htdocs/product/class/product.class.php | 16 +-- htdocs/product/price.php | 108 +++++++----------- 6 files changed, 81 insertions(+), 102 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4c78faa6690..dad4173ec60 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1226,9 +1226,10 @@ class Form $objp = $this->db->fetch_object($result); if(!empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product - $sql = "SELECT rowid, qty_min, price, price_ttc, remise_percent, remise"; + $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price=".$objp->price_rowid; + $sql.= " ORDER BY quantity ASC"; dol_syslog(get_class($this)."::select_produits_do search price by qty sql=".$sql); $result2 = $this->db->query($sql); @@ -1239,9 +1240,9 @@ class Form while ($nb_prices && $j < $nb_prices) { $objp2 = $this->db->fetch_object($result2); - $objp->quantity = $objp2->qty_min; + $objp->quantity = $objp2->quantity; $objp->price = $objp2->price; - $objp->unitprice = $objp2->price; + $objp->unitprice = $objp2->unitprice; $objp->remise_percent = $objp2->remise_percent; $objp->remise = $objp2->remise; $objp->price_by_qty_rowid = $objp2->rowid; @@ -1313,14 +1314,8 @@ class Form $opt.= (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)?' pbq="'.$objp->price_by_qty_rowid.'"':''; if (! empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) { - if ($objp->stock > 0) - { - $opt.= ' style="background-color:#32CD32; color:#F5F5F5;"'; - } - else if ($objp->stock <= 0) - { - $opt.= ' style="background-color:#FF0000; color:#F5F5F5;"'; - } + if ($objp->stock > 0) $opt.= ' class="product_line_stock_ok"'; + else if ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"'; } $opt.= '>'; $opt.= $objp->ref.' - '.dol_trunc($label,32).' - '; @@ -1382,21 +1377,21 @@ class Form $outdiscount=$objp->remise_percent; if ($objp->quantity == 1) { - $opt.= price($objp->price).' '.$currencytext."/"; - $outval.= price($objp->price).' '.$currencytextnoent."/"; + $opt.= price($objp->unitprice).' '.$currencytext."/"; + $outval.= price($objp->unitprice).' '.$currencytextnoent."/"; $opt.= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding $outval.=$langs->transnoentities("Unit"); } else { - $opt.= price($objp->price * $objp->quantity).' '.$currencytext."/".$objp->quantity; - $outval.= price($objp->price * $objp->quantity).' '.$currencytextnoent."/".$objp->quantity; + $opt.= price($objp->price).' '.$currencytext."/".$objp->quantity; + $outval.= price($objp->price).' '.$currencytextnoent."/".$objp->quantity; $opt.= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding $outval.=$langs->transnoentities("Units"); } - $outprice_ht=price($objp->price); - $outprice_ttc=price($objp->price_ttc); + $outprice_ht=price($objp->unitprice); + $outprice_ttc=price($objp->unitprice * (1 + ($objp->tva_tx / 100))); $outpricebasetype=$objp->price_base_type; $outtva_tx=$objp->tva_tx; } @@ -1573,8 +1568,12 @@ class Form $label = $objp->label; if ($filterkey && $filterkey != '') $label=preg_replace('/('.preg_quote($filterkey).')/i','$1',$label,1); - $opt.=$objp->ref.' ('.$objp->ref_fourn.') - '; - $outval.=$objRef.' ('.$objRefFourn.') - '; + $opt.=$objp->ref; + if (! empty($objp->idprodfournprice)) $opt.=' ('.$objp->ref_fourn.')'; + $opt.=' - '; + $outval.=$objRef; + if (! empty($objp->idprodfournprice)) $outval.=' ('.$objRefFourn.')'; + $outval.=' - '; $opt.=dol_trunc($objp->label,18).' - '; $outval.=dol_trunc($label,18).' - '; diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql index e96af56e9c0..e6eec68f632 100644 --- a/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.key.sql @@ -19,7 +19,7 @@ -- -- ============================================================================ -ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, qty_min); +ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, quantity); ALTER TABLE llx_product_price_by_qty ADD INDEX idx_product_price_by_qty_fk_product_price (fk_product_price); diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql index e0585786235..556753c309d 100644 --- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql @@ -21,12 +21,12 @@ create table llx_product_price_by_qty ( - rowid integer AUTO_INCREMENT PRIMARY KEY, + rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, fk_product_price integer NOT NULL, - date_price timestamp, - price double (24,8) DEFAULT 0, - price_ttc double (24,8) DEFAULT 0, + date_price timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + price double(24,8) DEFAULT 0, + quantity double DEFAULT NULL, remise_percent double NOT NULL DEFAULT 0, - remise double NOT NULL DEFAULT 0, - qty_min real DEFAULT 1 + remise double NOT NULL DEFAULT 0, + unitprice double(24,8) DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index f5702b72f8c..9e20392fc34 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -74,7 +74,7 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) // Price by qty if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1) // If we need a particular price related to qty { - $sql = "SELECT price, price_ttc, qty_min, remise_percent"; + $sql = "SELECT price, unitprice, quantity, remise_percent"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty "; $sql.= " WHERE rowid=".$price_by_qty_rowid.""; @@ -85,11 +85,11 @@ if (! empty($action) && $action == 'fetch' && ! empty($id)) if ($objp) { $found=true; - $outprice_ht=price($objp->price); - $outprice_ttc=price($objp->price_ttc); + $outprice_ht=price($objp->unitprice); + $outprice_ttc=price($objp->unitprice * (1 + ($object->tva_tx / 100))); $outpricebasetype=$object->price_base_type; $outtva_tx=$object->tva_tx; - $outqty=$objp->qty_min; + $outqty=$objp->quantity; $outdiscount=$objp->remise_percent; } } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ecedea4a10d..bf853d16e75 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1203,10 +1203,10 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[$i] == 1) { - $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise"; + $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[$i]."'"; - $sql.= " ORDER BY qty_min ASC"; + $sql.= " ORDER BY quantity ASC"; $resultat=array(); $resql = $this->db->query($sql) ; if ($resql) @@ -1216,8 +1216,8 @@ class Product extends CommonObject $resultat[$ii]=array(); $resultat[$ii]["rowid"]=$result["rowid"]; $resultat[$ii]["price"]= $result["price"]; - $resultat[$ii]["price_ttc"]= $result["price_ttc"]; - $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["unitprice"]= $result["unitprice"]; + $resultat[$ii]["quantity"]= $result["quantity"]; $resultat[$ii]["remise_percent"]= $result["remise_percent"]; $resultat[$ii]["remise"]= $result["remise"]; $ii++; @@ -1256,10 +1256,10 @@ class Product extends CommonObject // Récuperation de la liste des prix selon qty si flag positionné if ($this->prices_by_qty[0] == 1) { - $sql = "SELECT rowid,price, price_ttc, qty_min, remise_percent, remise"; + $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price = '".$this->prices_by_qty_id[0]."'"; - $sql.= " ORDER BY qty_min ASC"; + $sql.= " ORDER BY quantity ASC"; $resultat=array(); $resql = $this->db->query($sql) ; if ($resql) @@ -1269,8 +1269,8 @@ class Product extends CommonObject $resultat[$ii]=array(); $resultat[$ii]["rowid"]=$result["rowid"]; $resultat[$ii]["price"]= $result["price"]; - $resultat[$ii]["price_ttc"]= $result["price_ttc"]; - $resultat[$ii]["qty_min"]= $result["qty_min"]; + $resultat[$ii]["unitprice"]= $result["unitprice"]; + $resultat[$ii]["quantity"]= $result["quantity"]; $resultat[$ii]["remise_percent"]= $result["remise_percent"]; $resultat[$ii]["remise"]= $result["remise"]; $ii++; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 7fe5aa5b89e..14d6600779d 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -108,6 +108,7 @@ else if ($action == 'delete' && $user->rights->produit->supprimer) /***************************************************** * Price by quantity *****************************************************/ +$error=0; if ($action == 'activate_price_by_qty') { // Activating product price by quantity add a new price, specified as by quantity $result = $object->fetch($id); $level=GETPOST('level'); @@ -127,68 +128,47 @@ if ($action == 'update_price_by_qty') { // Ajout / Mise à jour d'un prix par qu $priceid=GETPOST('priceid'); $newprice=price2num(GETPOST("price"),'MU'); //$newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management - $qtymin=GETPOST('qty_min'); + $quantity=GETPOST('quantity'); $remise_percent=price2num(GETPOST('remise_percent')); - $remise=0; // TODO : allow dicsoun by amount when available on documents + $remise=0; // TODO : allow dicsount by amount when available on documents - // Calcul des prix (HT et TTC) - if ($newprice!='' || $newprice==0) + if (empty($quantity)) { + $error++; + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")).'
'; + } + if (empty($newprice)) + { + $error++; + $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")).'
'; + } + if(!$error) { + // Calcul du prix HT et du prix unitaire if ($object->price_base_type == 'TTC') { - $price_ttc = price2num($newprice,'MU'); $price = price2num($newprice) / (1 + ($object->tva_tx / 100)); - $price = price2num($price,'MU'); - - /*if ($newminprice!='' || $newminprice==0) - { - $price_min_ttc = price2num($newminprice,'MU'); - $price_min = price2num($newminprice) / (1 + ($object->tva_tx / 100)); - $price_min = price2num($price_min,'MU'); - } - else - { - $price_min=0; - $price_min_ttc=0; - }*/ } - else - { - $price = price2num($newprice,'MU'); - $price_ttc = price2num($newprice) * (1 + ($object->tva_tx / 100)); - $price_ttc = price2num($price_ttc,'MU'); - - /*if ($newminprice!='' || $newminprice==0) - { - $price_min = price2num($newminprice,'MU'); - $price_min_ttc = price2num($newminprice) * (1 + ($object->tva_tx / 100)); - $price_min_ttc = price2num($price_min_ttc,'MU'); - //print 'X'.$newminprice.'-'.$price_min; - } - else - { - $price_min=0; - $price_min_ttc=0; - }*/ - } - } - - // Ajout / mise à jour - if($rowid > 0) { - $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; - $sql.= " price='".$price."',"; - $sql.= " price_ttc=".$price_ttc.","; - $sql.= " qty_min=".$qtymin.","; - $sql.= " remise_percent=".$remise_percent.","; - $sql.= " remise=".$remise; - $sql.= " WHERE rowid = ".GETPOST('rowid'); - $result = $db->query($sql); - } else { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,price_ttc,qty_min,remise_percent,remise) values ("; - $sql.= $priceid.','.$price.','.$price_ttc.','.$qtymin.','.$remise_percent.','.$remise.')'; - - $result = $db->query($sql); + $price = price2num($newprice,'MU'); + $unitPrice = price2num($price/$quantity,'MU'); + + // Ajout / mise à jour + if($rowid > 0) { + $sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET"; + $sql.= " price='".$price."',"; + $sql.= " unitprice=".$unitPrice.","; + $sql.= " quantity=".$quantity.","; + $sql.= " remise_percent=".$remise_percent.","; + $sql.= " remise=".$remise; + $sql.= " WHERE rowid = ".GETPOST('rowid'); + + $result = $db->query($sql); + } else { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price_by_qty (fk_product_price,price,unitprice,quantity,remise_percent,remise) values ("; + $sql.= $priceid.','.$price.','.$unitPrice.','.$quantity.','.$remise_percent.','.$remise.')'; + + $result = $db->query($sql); + } } } @@ -352,7 +332,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''.$langs->trans("PriceByQuantityRange").' '.$i.''; print ''.$langs->trans("HT").''; - print ''.$langs->trans("TTC").''; + print ''.$langs->trans("UnitPrice").''; print ''.$langs->trans("Discount").''; print ' '; print ''; @@ -363,7 +343,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - print ''; + print ''; print ' '.$object->price_base_type.''; //print ' '; print ' %'; @@ -372,9 +352,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; } else { print ''; - print ''.$prices['qty_min'].''; + print ''.$prices['quantity'].''; print ''.price($prices['price']).''; - print ''.price($prices['price_ttc']).''; + print ''.price($prices['unitprice']).''; print ''.price($prices['remise_percent']).' %'; print ''; if(($user->rights->produit->creer || $user->rights->service->creer)) { @@ -395,7 +375,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - print ''; + print ''; print ' '.$object->price_base_type.''; //print ' '; print ' %'; @@ -456,7 +436,7 @@ else print ''; print ''.$langs->trans("PriceByQuantityRange").''; print ''.$langs->trans("HT").''; - print ''.$langs->trans("TTC").''; + print ''.$langs->trans("UnitPrice").''; print ''.$langs->trans("Discount").''; print ' '; print ''; @@ -467,7 +447,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ' '.$object->price_base_type.''; //print ' '; print ' %'; @@ -476,9 +456,9 @@ else print ''; } else { print ''; - print ''.$prices['qty_min'].''; + print ''.$prices['quantity'].''; print ''.price($prices['price']).''; - print ''.price($prices['price_ttc']).''; + print ''.price($prices['unitprice']).''; print ''.price($prices['remise_percent']).' %'; print ''; if(($user->rights->produit->creer || $user->rights->service->creer)) { @@ -499,7 +479,7 @@ else print ''; print ''; print ''; - print ''; + print ''; print ' '.$object->price_base_type.''; //print ' '; print ' %'; From 69fa1e9d10af47b6a2ab3ffafd1995b65123819e Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 1 Dec 2012 14:38:59 +0100 Subject: [PATCH 11/11] Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY --- htdocs/product/class/product.class.php | 2 +- htdocs/product/price.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 94889998f26..2b6e28c55f3 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1241,7 +1241,7 @@ class Product extends CommonObject return -1; } } - } else if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + } else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { $sql = "SELECT price, price_ttc, price_min, price_min_ttc,"; $sql.= " price_base_type, tva_tx, tosell, price_by_qty, rowid"; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 14d6600779d..390b09127e7 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -322,7 +322,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; // Price by quantity - if($conf->global->PRODUIT_PRICE_BY_QTY) { + if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) { print ''.$langs->trans("PriceByQuantity").' '.$i; print ''; @@ -424,7 +424,7 @@ else print ''; // Price by quantity - if($conf->global->PRODUIT_PRICE_BY_QTY) { + if($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) { print ''.$langs->trans("PriceByQuantity"); if($object->prices_by_qty[0] == 0) { print ' '.$langs->trans("Activate"); @@ -699,7 +699,7 @@ if ($result) { print ''.$langs->trans("MultiPriceLevelsName").''; } - if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { print ''.$langs->trans("Type").''; } @@ -730,7 +730,7 @@ if ($result) print ''.$objp->price_level.""; } // Price by quantity - if (! empty($conf->global->PRODUIT_PRICE_BY_QTY)) + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { $type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard'; print ''.$langs->trans($type)."";