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

// Fix small bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16724 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-08-06 13:55:43 +00:00
parent 87af65d2e2
commit ca80cbc4b1
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/orders/form.tpl
+2 -2
View File
@@ -588,7 +588,7 @@
stock[id_product][this.id_product_attribute] = this.qty_in_stock; stock[id_product][this.id_product_attribute] = this.qty_in_stock;
}); });
stock[this.id_product][0] = this.stock; stock[this.id_product][0] = this.stock[0];
attributes_html += '</select>'; attributes_html += '</select>';
}); });
products_found += '</select>'; products_found += '</select>';
@@ -597,7 +597,7 @@
$('#products_found #customization_list').contents().find('body').html(customization_html); $('#products_found #customization_list').contents().find('body').html(customization_html);
display_product_attributes(); display_product_attributes();
display_product_customizations(); display_product_customizations();
$('#id_product').click(); $('#id_product').change();
} }
else else
{ {
classes/Product.php
-3
View File
@@ -4748,9 +4748,6 @@ class ProductCore extends ObjectModel
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && is_null($manager)) if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && is_null($manager))
$manager = StockManagerFactory::getManager(); $manager = StockManagerFactory::getManager();
if (is_null($id_shop))
$id_shop = Context::getContext()->shop->id;
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Product::usesAdvancedStockManagement($id_product) && if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && Product::usesAdvancedStockManagement($id_product) &&
StockAvailable::dependsOnStock($id_product, $id_shop)) StockAvailable::dependsOnStock($id_product, $id_shop))
return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true); return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true);
controllers/admin/AdminOrdersController.php
+1 -2
View File
@@ -1379,7 +1379,7 @@ class AdminOrdersControllerCore extends AdminController
$productObj = new Product((int)$product['id_product'], false, (int)$this->context->language->id); $productObj = new Product((int)$product['id_product'], false, (int)$this->context->language->id);
$combinations = array(); $combinations = array();
$attributes = $productObj->getAttributesGroups((int)$this->context->language->id); $attributes = $productObj->getAttributesGroups((int)$this->context->language->id);
$product['qty_in_stock'] = StockAvailable::getQuantityAvailableByProduct((int)$product['id_product'], 0, (int)$this->context->shop->id);
// Tax rate for this customer // Tax rate for this customer
if (Tools::isSubmit('id_address')) if (Tools::isSubmit('id_address'))
$product['tax_rate'] = $productObj->getTaxesRate(new Address(Tools::getValue('id_address'))); $product['tax_rate'] = $productObj->getTaxesRate(new Address(Tools::getValue('id_address')));
@@ -1420,7 +1420,6 @@ class AdminOrdersControllerCore extends AdminController
$product['stock'][0] = Product::getRealQuantity($product['id_product'], 0, 0); $product['stock'][0] = Product::getRealQuantity($product['id_product'], 0, 0);
foreach ($combinations as &$combination) foreach ($combinations as &$combination)
$combination['attributes'] = rtrim($combination['attributes'], ' - '); $combination['attributes'] = rtrim($combination['attributes'], ' - ');
$product['combinations'] = $combinations; $product['combinations'] = $combinations;