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

// Problem with product return

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-22 09:39:44 +00:00
parent da1326a34d
commit cc7584e340
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/view.tpl
+1 -1
View File
@@ -380,7 +380,7 @@
<td>{$line.type}</td>
<td>{$line.state_name}</td>
<td>
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
{if $line.can_edit}
<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$smarty.get.id_order|escape:'htmlall':'UTF-8'}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<span class="shipping_number_edit" style="display:none;">
classes/Cart.php
+4 -4
View File
@@ -1933,10 +1933,10 @@ class CartCore extends ObjectModel
if (!isset($delivery_option[$id_address]))
foreach ($options as $key => $option)
if ($option['is_best_price'])
{
$delivery_option[$id_address] = $key;
break;
}
{
$delivery_option[$id_address] = $key;
break;
}
if (count($delivery_option) == 1)
$this->id_carrier = $this->getIdCarrierFromDeliveryOption($delivery_option);
classes/Discount.php
+1 -1
View File
@@ -204,7 +204,7 @@ class DiscountCore extends CartRule
public static function createOrderDiscount($order, $productList, $qtyList, $name, $shipping_cost = false, $id_category = 0, $subcategory = 0)
{
// Todo
die ('TODO');
//die ('TODO');
$languages = Language::getLanguages($order);
$products = $order->getProducts(false, $productList, $qtyList);
controllers/admin/AdminOrdersController.php
+3 -1
View File
@@ -474,6 +474,7 @@ class AdminOrdersControllerCore extends AdminController
}
// Delete product
$orderDetail = new OrderDetail((int)($id_order_detail));
if (!$order->deleteProduct($order, $orderDetail, $qtyCancelProduct))
$this->_errors[] = Tools::displayError('An error occurred during deletion of the product.').' <span class="bold">'.$orderDetail->product_name.'</span>';
Hook::exec('cancelProduct', array('order' => $order, 'id_order_detail' => $id_order_detail));
@@ -512,7 +513,8 @@ class AdminOrdersControllerCore extends AdminController
// Generate voucher
if (isset($_POST['generateDiscount']) AND !sizeof($this->_errors))
{
if (!$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip concerning the order #'), isset($_POST['shippingBack'])))
// @todo generate a voucher using cartrules
if (true || !$voucher = Discount::createOrderDiscount($order, $full_product_list, $full_quantity_list, $this->l('Credit Slip concerning the order #'), isset($_POST['shippingBack'])))
$this->_errors[] = Tools::displayError('Cannot generate voucher');
else
{