X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_view.inc;h=ec818381900b2a5823d01387e3d131055d89b77e;hb=a0afdae50f1bba4e8802d3699387c8c044392401;hp=d4cc6d5736d2c7e43d064c941fb618346ee80e46;hpb=ac703fc5a78726c48606a5678e402f72ab95d5d9;p=fa-stable.git diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index d4cc6d57..ec818381 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -281,6 +281,12 @@ function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit $rate = input_num('_ex_rate'); if (check_ui_refresh() || !$rate) { // readonly or ui context changed $comp_currency = get_company_currency(); + + if (!isset($from_currency)) + $from_currency = $comp_currency; + if (!isset($to_currency)) + $to_currency = $comp_currency; + if ($from_currency == $comp_currency) $currency = $to_currency; else @@ -560,7 +566,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true) if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT) $alloc_row['Total'] = -$alloc_row['Total']; amount_cell($alloc_row['Total']); - amount_cell($alloc_row['Total'] - $alloc_row['amt']); + amount_cell($alloc_row['Total'] - $alloc_row['alloc']); amount_cell($alloc_row['amt']); end_row(); @@ -908,13 +914,23 @@ function get_js_lookup_window() { function get_js_select_combo_item() { $js = "function selectComboItem(doc, client_id, value){ var element = doc.getElementById(client_id); - var options = element.options; - for (var i = 0, optionsLength = options.length; i < optionsLength; i++) { - if (options[i].value == value) { - element.selectedIndex = i; - element.onchange(); + if (typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT' ){ + var options = element.options; + for (var i = 0, optionsLength = options.length; i < optionsLength; i++) { + if (options[i].value == value) { + element.selectedIndex = i; + element.onchange(); + } } - } + } else { + var stock_element = doc.getElementsByName('stock_id'); + if( stock_element.length > 0) { + stock_element[0].value = value; + var stock_id = doc.getElementById('_stock_id_edit'); + stock_id.value=value; + stock_id.onblur(); + } + } window.close(); }"; return $js; @@ -923,14 +939,26 @@ function get_js_select_combo_item() { function get_js_set_combo_item() { $js = "function setComboItem(doc, client_id, value, text){ var element = doc.getElementById(client_id); - var options = element.options; - options.length = 0; - var option = doc.createElement('option'); - option.value = value; - option.text = text; - element.add(option, 0); - element.selectedIndex = 0; - element.onchange(); + var search = doc.getElementById('_'+client_id+'_edit'); + if(typeof(element) != 'undefined' && element != null && element.tagName === 'SELECT') { + var options = element.options; + options.length = 0; + var option = doc.createElement('option'); + option.value = value; + option.text = text; + element.add(option, 0); + element.selectedIndex = 0; + search.value = ''; + element.onchange(); + } else { + var stock_element = doc.getElementsByName('stock_id'); + if( stock_element.length > 0) { + stock_element[0].value = value; + var stock_id = doc.getElementById('_stock_id_edit'); + stock_id.value=value; + stock_id.onblur(); + } + } window.close(); }"; return $js; @@ -1435,6 +1463,14 @@ function changeCCYear(change) { function changeCCMonth(change) { cC.changeMonth(change); } +window.addEventListener('click', function(e) { + if (document.getElementById('CC').contains(e.target)){} else { + if (cC.visible()) { + cC.hide(); + } + } +}); + document.write(\"\"); document.write(\"
\");"; @@ -1469,7 +1505,7 @@ if (!function_exists('_vd')) function _vl($mixed, $title = '', $exit = false) { - error_log((!empty($title) ? ($title .':') : '') . var_export($mixed, true)); + error_log((!empty($title) ? ($title .':') : '') . print_r($mixed, true)); if ($exit) exit; } @@ -1492,6 +1528,7 @@ if (!isset($payment_services)) { $payment_services = array( 'PayPal' => "https://www.paypal.com/xclick?business=&item_name=&amount=¤cy_code=", + 'XUMM' => "https://xumm.app/detect/request:{{account}}?amount=" ); } /* @@ -1510,6 +1547,41 @@ function payment_link($name, $options) foreach ($options as $id => $option) $patterns['<'.$id.'>'] = urlencode($options[$id]); + if ($name == 'XUMM') + { + // Get the account number for 'XRPL Account' from 'bank_accounts' table + $sql = "SELECT bank_account_number FROM ".TB_PREF."bank_accounts WHERE bank_account_name = 'XRPL Account'"; + $result = db_query($sql, "could not retrieve XRPL Account bank account number"); + $row = db_fetch($result); + if ($row == false) { + display_error(_("Could not retrieve XRPL Account bank account number")); + return false; + } + $account = $row['bank_account_number']; + + // Replace the {{account}} placeholder in the XUMM URL with the extracted account value + $link = str_replace('{{account}}', urlencode($account), $link); + + // Extract XRP exchange rate + $curr_code = 'XRP'; + $date = date('Y-m-d'); // Get the current date in 'YYYY-MM-DD' format + $sql = "SELECT rate_buy FROM ".TB_PREF."exchange_rates WHERE curr_code = '$curr_code' AND date_ = '$date'"; + $result = db_query($sql, "could not retrieve exchange rate for $curr_code - $date"); + $row = db_fetch($result); + if ($row == false) { + display_error(sprintf(_("Could not retrieve exchange rate for %s - %s"), $curr_code, $date)); + return false; + } + $exchange_rate = $row['rate_buy']; + if ($exchange_rate == 0) $exchange_rate = 1; + + // Divide the amount by the exchange rate + $options['amount'] /= $exchange_rate; + + // Replace the placeholder in the XUMM URL with the modified amount value + $link = str_replace('', urlencode($options['amount']), $link); + } + return strtr($link, $patterns); } @@ -1542,7 +1614,25 @@ function trans_editor_link($type, $trans_no) // 35=> Cost Update, ); - return !isset($editor_url[$type]) ? '' : + return !isset($editor_url[$type]) ? '--' : (is_closed_trans($type, $trans_no) ? set_icon(ICON_CLOSED, _('Closed')) : pager_link(_("Edit"), sprintf($editor_url[$type], $trans_no, $type), ICON_EDIT)); } + +function company_logo_on_view() +{ + // Display View Header + global $SysPrefs; + + $logo = company_path() . "/images/" . $SysPrefs->prefs['coy_logo']; + $nl = 1; + if (!empty($SysPrefs->prefs['company_logo_report']) && $SysPrefs->prefs['coy_logo'] != '' && file_exists($logo)) + { + $size = getimagesize($logo); + $height = $size[0] > 150 ? $size[1] * 150 / $size[0] : 30; + $text = ""; + } + else + $text = $SysPrefs->prefs['coy_name']; + display_note($text, 0, $nl, "style='font-size:16px;font-weight:600'"); +} \ No newline at end of file