mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-04 07:12:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start Daily Sales with selected customer (#4019)

Browse Source
This commit is contained in:
Steve Ireland
2024-07-08 20:48:31 -04:00
committed by GitHub
parent c972cdfaf4
commit 034f79e157
5 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controllers/Sales.php
View File

@@ -96,9 +96,22 @@ class Sales extends Secure_Controller
'only_due' => lang('Sales.due_filter'),
'only_check' => lang('Sales.check_filter'),
'only_creditcard' => lang('Sales.credit_filter'),
'only_invoices' => lang('Sales.invoice_filter')
'only_invoices' => lang('Sales.invoice_filter'),
'selected_customer' => lang('Sales.selected_customer')
];
if($this->sale_lib->get_customer() != -1)
{
$selected_filters = ['selected_customer'];
$data['customer_selected'] = true;
}
else
{
$data['customer_selected'] = false;
$selected_filters = [];
}
$data['selected_filters'] = $selected_filters;
echo view('sales/manage', $data);
}
}
@@ -134,6 +147,7 @@ class Sales extends Secure_Controller
'only_cash' => false,
'only_due' => false,
'only_check' => false,
'selected_customer' => false,
'only_creditcard' => false,
'only_invoices' => $this->config['invoice_enable'] && $this->request->getGet('only_invoices', FILTER_SANITIZE_NUMBER_INT),
'is_valid_receipt' => $this->sale->is_valid_receipt($search)

1
app/Language/en-GB/Sales.php
View File

@@ -173,6 +173,7 @@ return [
"sales_tax" => "Sales Tax",
"sales_total" => "",
"select_customer" => "Select Customer",
"selected_customer" => "Selected Customer",
"send_invoice" => "Send Invoice",
"send_quote" => "Send Quote",
"send_receipt" => "Send Receipt",

1
app/Language/en/Sales.php
View File

@@ -173,6 +173,7 @@ return [
"sales_tax" => "Sales Tax",
"sales_total" => "",
"select_customer" => "Select Customer",
"selected_customer" => "Selected Customer",
"send_invoice" => "Send Invoice",
"send_quote" => "Send Quote",
"send_receipt" => "Send Receipt",

7
app/Models/Sale.php
View File

@@ -1559,6 +1559,13 @@ class Sale extends Model
$builder->where('sales_items.item_location', $filters['location_id']);
}
if($filters['selected_customer'] != false)
{
$sale_lib = new Sale_lib();
$builder->where('sales.customer_id', $sale_lib->get_customer());
}
if($filters['only_invoices'])
{
$builder->where('sales.invoice_number IS NOT NULL');

3
app/Views/sales/manage.php
View File

@@ -3,6 +3,7 @@
* @var string $controller_name
* @var string $table_headers
* @var array $filters
* @var array $selected_filters
* @var array $config
*/
?>
@@ -74,7 +75,7 @@ $(document).ready(function()
</button>
<?= form_input (['name' => 'daterangepicker', 'class' => 'form-control input-sm', 'id' => 'daterangepicker']) ?>
<?= form_multiselect('filters[]', $filters, [''], ['id' => 'filters', 'data-none-selected-text'=>lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
<?= form_multiselect('filters[]', $filters, $selected_filters, ['id' => 'filters', 'data-none-selected-text'=>lang('Common.none_selected_text'), 'class' => 'selectpicker show-menu-arrow', 'data-selected-text-format' => 'count > 1', 'data-style' => 'btn-default btn-sm', 'data-width' => 'fit']) ?>
</div>
</div>