From 8b0338b95baaae51d750e0f046004af15a064a88 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 11 Oct 2010 06:39:28 +0000 Subject: [PATCH] Added temrs category parameter in cale_payment_list --- includes/ui/ui_lists.inc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 055bc4c9..7b276fdf 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -1439,17 +1439,14 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub //----------------------------------------------------------------------------------------------- // Payment type selector for current user. // -function sale_payment_list($name, $selected_id=null, $submit_on_change=true) +function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true) { $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms"; - $paym = get_sales_point(user_pos()); - - if (!$paym['cash_sale'] || !$paym['credit_sale']) { - if ($paym['cash_sale']) // only cash + + if ($category == PM_CASH) // only cash $sql .= " WHERE days_before_due=0 AND day_in_following_month=0"; - else + if ($category == PM_CREDIT) // only delayed payments $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0"; - } return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array( @@ -1459,13 +1456,13 @@ function sale_payment_list($name, $selected_id=null, $submit_on_change=true) } -function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=true) +function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true) { if ($label != null) echo "$label\n"; echo ""; - echo sale_payment_list($name, $selected_id, $submit_on_change); + echo sale_payment_list($name, $category, $selected_id, $submit_on_change); echo "\n"; } -- 2.30.2