Added full support for editable item descriptions in sales

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 52cfaa41e886e89cee800daed8c5a40b042b8e82..bb20dce6abf46658ea78a9c7f6d61a88e8385a22 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -13,7 +13,7 @@ include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
 
 //--------------------------------------------------------------------------------
-function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
+function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount, $description='')
 {
        // calculate item price to sum of kit element prices factor for 
        // value distribution over all exploded kit items
@@ -47,7 +47,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
         if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id'])
         {      // this is sales kit - recurse 
                add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'],
-                       $item_price, $discount, $std_price);
+                       $item_price, $discount);
         }
         else
         {      // stock item record eventually with foreign code
@@ -63,9 +63,10 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
                        }
                }
                $order->add_to_cart (count($order->line_items), $item['stock_id'], 
-                       $new_item_qty*$item['quantity'], $item_price, $discount);
+                       $new_item_qty*$item['quantity'], $item_price, $discount, 0,0, $description);
         }
        }
+
 }
 //---------------------------------------------------------------------------------
 
@@ -217,23 +218,27 @@ function display_order_summary($title, &$order, $editable_items=false)
        if ($id==-1 && $editable_items)
                sales_order_item_controls($order, $k);
 
-/*
-       $display_total = price_format($total);
-       label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right",
-               "nowrap align=right", 2);
-*/
        $colspan = 6;
-       small_amount_row(_("Shipping Charge"), 'freight_cost', price_format(get_post('freight_cost',0)), "colspan=$colspan align=right");
+       if ($order->trans_no!=0)
+               ++$colspan;
+       start_row();
+       label_cell(_("Shipping Charge"), "colspan=$colspan align=right");
+       small_amount_cells(null, 'freight_cost', price_format(get_post('freight_cost',0)));
+       label_cell('', 'colspan=2');
+       end_row();
        $display_sub_total = price_format($total + input_num('freight_cost'));
 
-       label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
+       label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2);
 
        $taxes = $order->get_taxes(input_num('freight_cost'));
-       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included);
+       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
 
        $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
 
-       label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
+       start_row();
+       label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
+       submit_cells('update', _("Update"), "colspan=2", _("Refresh"), true);
+       end_row();
 
        end_table();
        if ($has_marked) {
@@ -482,11 +487,19 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
                $_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec);
                $_POST['price'] = price_format($order->line_items[$id]->price);
                $_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
-               $_POST['item_description'] = $order->line_items[$id]->item_description;
                $units = $order->line_items[$id]->units;
+               $_POST['item_description'] = $order->line_items[$id]->item_description;
                hidden('stock_id', $_POST['stock_id']);
                label_cell($_POST['stock_id']);
-               text_cells(null,'item_description', null, 45, 150);
+               if ($order->line_items[$id]->descr_editable)
+                       text_cells(null,'item_description', null, 45, 150);
+               else {
+                       hidden('item_description', $_POST['item_description']);
+                       label_cell($_POST['item_description']);
+               }
+//             } else {
+//                     sales_items_list_cells(null,'item_description', null, false, true);
+//             }
                //label_cell($order->line_items[$line_no]->item_description, "nowrap");
            $Ajax->activate('items_table');
        }