dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Add stock avaibility

Browse Source
This commit is contained in:
mDeflotte
2011-10-13 16:37:07 +00:00
parent e562ef0efa
commit 5d839d97f0
2 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminProducts.php
+32 -58
View File
@@ -2843,14 +2843,7 @@ class AdminProducts extends AdminTab
} }
}); });
}); });
</script> </script>';
<tr>
<td class="col-left">'.$this->l('Pre-tax wholesale price:').'</td>
<td style="padding-bottom:5px;">
'.($currency->format % 2 != 0 ? $currency->sign.' ' : '').'<input size="11" maxlength="14" name="wholesale_price" type="text" value="'.htmlentities($this->getFieldValue($obj, 'wholesale_price'), ENT_COMPAT, 'UTF-8').'" onchange="this.value = this.value.replace(/,/g, \'.\');" />'.($currency->format % 2 == 0 ? ' '.$currency->sign : '').'
<span style="margin-left:10px">'.$this->l('The wholesale price at which you bought this product').'</span>
</td>
</tr>';
echo ' echo '
<tr> <tr>
<td class="col-left">'.$this->l('Pre-tax retail price:').'</td> <td class="col-left">'.$this->l('Pre-tax retail price:').'</td>
@@ -3666,11 +3659,11 @@ class AdminProducts extends AdminTab
{ {
// Get all id_product_atribute // Get all id_product_atribute
$attributes = $obj->getAttributeCombinaisons($this->context->language->id); $attributes = $obj->getAttributesResume($this->context->language->id);
if (empty($attributes)) if (empty($attributes))
$attributes[] = array( $attributes[] = array(
'id_product_attribute' => 0, 'id_product_attribute' => 0,
'attribute_name' => '' 'attribute_designation' => ''
); );
// Get physical quantities & available quantities // Get physical quantities & available quantities
@@ -3687,7 +3680,7 @@ class AdminProducts extends AdminTab
$availableQuantity[$attribute['id_product_attribute']] = StockAvailable::getStockAvailableForProduct((int)$obj->id, $attribute['id_product_attribute']); $availableQuantity[$attribute['id_product_attribute']] = StockAvailable::getStockAvailableForProduct((int)$obj->id, $attribute['id_product_attribute']);
// Get all product designation // Get all product designation
$productDesignation[$attribute['id_product_attribute']] = $obj->name[$this->context->language->id].' '.$attribute['attribute_name']; $productDesignation[$attribute['id_product_attribute']] = rtrim($obj->name[$this->context->language->id].' - '.$attribute['attribute_designation'], ' - ');
} }
$return = ' $return = '
@@ -4202,56 +4195,37 @@ class AdminProducts extends AdminTab
</tr>'; </tr>';
if (Configuration::get('PS_USE_ECOTAX')) if (Configuration::get('PS_USE_ECOTAX'))
echo' echo'
<tr> <tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">'.$this->l('Eco-tax:').'</td> <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">'.$this->l('Eco-tax:').'</td>
<td style="padding-bottom:5px;">'.($currency->format % 2 != 0 ? $currency->sign.' ' : '').'<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, \'.\');" />'.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' ('.$this->l('overrides Eco-tax on Information tab').')</td> <td style="padding-bottom:5px;">'.($currency->format % 2 != 0 ? $currency->sign.' ' : '').'<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, \'.\');" />'.($currency->format % 2 == 0 ? ' '.$currency->sign : '').' ('.$this->l('overrides Eco-tax on Information tab').')</td>
</tr>'; </tr>';
echo' echo'
<tr id="initial_stock_attribute"> </tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">'.$this->l('Initial stock:').'</td> <tr>
<td><input type="text" name="attribute_quantity" size="3" maxlength="6" value="0"/></td> <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">'.$this->l('Minimum quantity:').'</td>
</tr> <td style="padding-bottom:5px;">
</tr> <input size="3" maxlength="6" name="minimal_quantity" id="minimal_quantity" type="text" value="'.($this->getFieldValue($obj, 'minimal_quantity') ? $this->getFieldValue($obj, 'minimal_quantity') : 1).'" />
<tr id="stock_mvt_attribute" style="display:none;"> <p>'.$this->l('The minimum quantity to buy this product (set to 1 to disable this feature)').'</p>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">'.$this->l('Stock movement:').'</td> </td>
<td style="padding-bottom:5px;"> </tr>
<select id="id_mvt_reason" name="id_mvt_reason"> <tr style="display:none;" id="attr_qty_stock">
<option value="-1">--</option>'; <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">'.$this->l('Quantity in stock:').'</td>
$reasons = StockMvtReason::getStockMvtReasons($this->context->language->id); <td style="padding-bottom:5px;"><b><span style="display:none;" id="attribute_quantity"></span></b></td>
foreach ($reasons as $reason) </tr>
echo '<option rel="'.$reason['sign'].'" value="'.$reason['id_stock_mvt_reason'].'" '.(Configuration::get('PS_STOCK_MVT_REASON_DEFAULT') == $reason['id_stock_mvt_reason'] ? 'selected="selected"' : '').'>'.$reason['name'].'</option>'; <tr>
echo '</select> <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left" style="width:150px">'.$this->l('Available date:').'</td>
<input type="text" name="attribute_mvt_quantity" size="3" maxlength="6" value="0"/>&nbsp;&nbsp; <td style="padding-bottom:5px;"><input id="available_date" name="available_date" value="'.(($this->getFieldValue($obj, 'available_date') != 0) ? stripslashes(htmlentities(Tools::displayDate($this->getFieldValue($obj, 'available_date'), $language['id_lang']))) : '0000-00-00').'" style="text-align: center;" type="text" />
<span style="display:none;" id="mvt_sign"></span> <p>'.$this->l('The available date when this product is out of stock').'</p>
<br /> </td>
<div class="hint clear" style="display: block;width: 70%;">'.$this->l('Choose the reason and enter the quantity that you want to increase or decrease in your stock').'</div> </tr>';
</td> // date picker include
</tr> includeDatepicker('available_date');
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left">'.$this->l('Minimum quantity:').'</td>
<td style="padding-bottom:5px;">
<input size="3" maxlength="6" name="minimal_quantity" id="minimal_quantity" type="text" value="'.($this->getFieldValue($obj, 'minimal_quantity') ? $this->getFieldValue($obj, 'minimal_quantity') : 1).'" />
<p>'.$this->l('The minimum quantity to buy this product (set to 1 to disable this feature)').'</p>
</td>
</tr>
<tr style="display:none;" id="attr_qty_stock">
<td style="width:150px">'.$this->l('Quantity in stock:').'</td>
<td style="padding-bottom:5px;"><b><span style="display:none;" id="attribute_quantity"></span></b></td>
</tr>
<tr>
<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left" style="width:150px">'.$this->l('Available date:').'</td>
<td style="padding-bottom:5px;"><input id="available_date" name="available_date" value="'.(($this->getFieldValue($obj, 'available_date') != 0) ? stripslashes(htmlentities(Tools::displayDate($this->getFieldValue($obj, 'available_date'), $language['id_lang']))) : '0000-00-00').'" style="text-align: center;" type="text" />
<p>'.$this->l('The available date when this product is out of stock').'</p>
</td>
</tr>';
// date picker include
includeDatepicker('available_date');
echo ' echo '
<tr><td colspan="2"><hr style="width:100%;" /></td></tr> <tr><td colspan="2"><hr style="width:100%;" /></td></tr>
<tr> <tr>
<td style="width:150px">'.$this->l('Image:').'</td> <td style="width:150px">'.$this->l('Image:').'</td>
<td style="padding-bottom:5px;"> <td style="padding-bottom:5px;">
<ul id="id_image_attr">'; <ul id="id_image_attr">';
$i = 0; $i = 0;
$imageType = ImageType::getByNameNType('small', 'products'); $imageType = ImageType::getByNameNType('small', 'products');
classes/Product.php
+23
View File
@@ -1298,6 +1298,29 @@ class ProductCore extends ObjectModel
return ($result); return ($result);
} }
/**
* Get all available product attributes resume
*
* @param integer $id_lang Language id
* @return array Product attributes combinaisons
*/
public function getAttributesResume($id_lang, $attribute_value_separator = ' - ', $attribute_separator = ', ')
{
if (!Combination::isFeatureActive())
return array();
$sql = 'SELECT pa.*, GROUP_CONCAT(agl.`name`, \''.pSQL($attribute_value_separator).'\', al.`name` SEPARATOR \''.pSQL($attribute_separator).'\') as attribute_designation, stock.quantity
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON pac.`id_product_attribute` = pa.`id_product_attribute`
LEFT JOIN `'._DB_PREFIX_.'attribute` a ON a.`id_attribute` = pac.`id_attribute`
LEFT JOIN `'._DB_PREFIX_.'attribute_group` ag ON ag.`id_attribute_group` = a.`id_attribute_group`
LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (a.`id_attribute` = al.`id_attribute` AND al.`id_lang` = '.(int)$id_lang.')
LEFT JOIN `'._DB_PREFIX_.'attribute_group_lang` agl ON (ag.`id_attribute_group` = agl.`id_attribute_group` AND agl.`id_lang` = '.(int)$id_lang.')
'.Product::sqlStock('pa', 'pa').'
WHERE pa.`id_product` = '.(int)$this->id.'
GROUP BY pa.`id_product_attribute`';
return Db::getInstance()->executeS($sql);
}
/** /**
* Get all available product attributes combinaisons * Get all available product attributes combinaisons
* *