Fix for Shortcuts

Keyboard Shortcuts Help modl returning 404 / not displaying
This commit is contained in:
WShells
2024-04-17 15:24:26 +03:00
committed by jekkos
parent 9fc2a4edbd
commit e07cfd4143
4 changed files with 28 additions and 28 deletions

View File

@@ -17,6 +17,7 @@ $routes->add('no_access/(:any)/(:any)', 'No_access::index/$1/$2');
$routes->add('sales/index/(:any)', 'Sales::manage/$1');
$routes->add('sales/index/(:any)/(:any)', 'Sales::manage/$1/$2');
$routes->add('sales/index/(:any)/(:any)/(:any)', 'Sales::manage/$1/$2/$3');
$routes->add('sales/sales_keyboard_help', 'Sales::sales_keyboard_help');
$routes->add('items/save_inventory/(:num)', 'Items::save_inventory/$1');

View File

@@ -1712,9 +1712,9 @@ class Sales extends Secure_Controller
/**
* @return void
*/
public function sales_keyboard_help()
public function sales_keyboard_help() : void
{
$this->load->view('sales/help');
echo view('sales/help');
}
/**

View File

@@ -1,57 +1,57 @@
<div class="container-fluid">
<ul class="nav nav-tabs" id="SCTabs" data-toggle="tab">
<li class="active"><a href="#system_shortcuts" data-toggle="tab" title="<?= $this->lang->line('sales_key_system'); ?>"><?= $this->lang->line('sales_key_system'); ?></a></li>
<li><a href="#browser_shortcuts" data-toggle="tab" title="<?= $this->lang->line('sales_key_browser'); ?>"><?= $this->lang->line('sales_key_browser'); ?></a></li>
<li class="active"><a href="#system_shortcuts" data-toggle="tab" title="<?= lang('Sales.key_system'); ?>"><?= lang('Sales.key_system'); ?></a></li>
<li><a href="#browser_shortcuts" data-toggle="tab" title="<?= lang('Sales.key_browser'); ?>"><?= lang('Sales.key_browser'); ?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="system_shortcuts">
<table class="table table-striped table-hover">
<thead>
<tr>
<th><?= $this->lang->line('sales_key_help'); ?></th>
<th><?= $this->lang->line('sales_key_function'); ?></th>
<th><?= lang('Sales.key_help'); ?></th>
<th><?= lang('Sales.key_function'); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td><code>ESC</code></td>
<td><?= $this->lang->line('sales_key_cancel'); ?></td>
<td><?= lang('Sales.key_cancel'); ?></td>
</tr>
<tr>
<td><code>ALT + 1</code></td>
<td><?= $this->lang->line('sales_key_item_search'); ?></td>
<td><?= lang('Sales.key_item_search'); ?></td>
</tr>
<tr>
<td><code>ALT + 2</code></td>
<td><?= $this->lang->line('sales_key_customer_search'); ?></td>
<td><?= lang('Sales.key_customer_search'); ?></td>
</tr>
<tr>
<td><code>ALT + 3</code></td>
<td><?= $this->lang->line('sales_key_suspend'); ?></td>
<td><?= lang('Sales.key_suspend'); ?></td>
</tr>
<tr>
<td><code>ALT + 4</code></td>
<td><?= $this->lang->line('sales_key_suspended'); ?></td>
<td><?= lang('Sales.key_suspended'); ?></td>
</tr>
<tr>
<td><code>ALT + 5</code></td>
<td><?= $this->lang->line('sales_key_tendered'); ?></td>
<td><?= lang('Sales.key_tendered'); ?></td>
</tr>
<tr>
<td><code>ALT + 6</code></td>
<td><?= $this->lang->line('sales_key_payment'); ?></td>
<td><?= lang('Sales.key_payment'); ?></td>
</tr>
<tr>
<td><code>ALT + 7</code></td>
<td><?= $this->lang->line('sales_key_finish_sale'); ?></td>
<td><?= lang('Sales.key_finish_sale'); ?></td>
</tr>
<tr>
<td><code>ALT + 8</code></td>
<td><?= $this->lang->line('sales_key_finish_quote'); ?></td>
<td><?= lang('Sales.key_finish_quote'); ?></td>
</tr>
<tr>
<td><code>ALT + 9</code></td>
<td><?= $this->lang->line('sales_key_help_modal'); ?></td>
<td><?= lang('Sales.key_help_modal'); ?></td>
</tr>
</tbody>
</table>
@@ -61,34 +61,34 @@
<table class="table table-striped table-hover">
<thead>
<tr>
<th><?= $this->lang->line('sales_key_help'); ?></th>
<th><?= $this->lang->line('sales_key_function'); ?></th>
<th><?= lang('Sales.key_help'); ?></th>
<th><?= lang('Sales.key_function'); ?></th>
</tr>
</thead>
<tbody>
<tr>
<td><code>F11</code></td>
<td><?= $this->lang->line('sales_key_full'); ?></td>
<td><?= lang('Sales.key_full'); ?></td>
</tr>
<tr>
<td><code>CTRL + </code></td>
<td><?= $this->lang->line('sales_key_in'); ?></td>
<td><?= lang('Sales.key_in'); ?></td>
</tr>
<tr>
<td><code>CTRL -</code></td>
<td><?= $this->lang->line('sales_key_out'); ?></td>
<td><?= lang('Sales.key_out'); ?></td>
</tr>
<tr>
<td><code>CTRL + 0</code></td>
<td><?= $this->lang->line('sales_key_restore'); ?></td>
<td><?= lang('Sales.key_restore'); ?></td>
</tr>
<tr>
<td><code>CTRL + P</code></td>
<td><?= $this->lang->line('sales_key_print'); ?></td>
<td><?= lang('Sales.key_print'); ?></td>
</tr>
<tr>
<td><code>CTRL + F</code></td>
<td><?= $this->lang->line('sales_key_search'); ?></td>
<td><?= lang('Sales.key_search'); ?></td>
</tr>
</tbody>
</table>

View File

@@ -445,11 +445,10 @@ if(isset($success))
title="<?= lang(ucfirst($controller_name) .".new_customer") ?>">
<span class="glyphicon glyphicon-user">&nbsp</span><?= lang(ucfirst($controller_name) .".new_customer") ?>
</button>
<button class='btn btn-default btn-sm modal-dlg' id='show_keyboard_help' data-href="<?= site_url("$controller_name/sales_keyboard_help") ?>"
title="<?= lang(ucfirst($controller_name) .'.key_title'); ?>">
<span class="glyphicon glyphicon-share-alt">&nbsp</span><?= lang(ucfirst($controller_name) .'.key_help'); ?>
<button class='btn btn-default btn-sm modal-dlg' id='show_keyboard_help' data-href="<?= esc("$controller_name/sales_keyboard_help") ?>"
title="<?= lang(ucfirst($controller_name) .'.key_title') ?>">
<span class="glyphicon glyphicon-share-alt">&nbsp</span><?= lang(ucfirst($controller_name) .'.key_help') ?>
</button>
</div>
<?php
}