diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php index 1c98d8d9d..89bfbd4cd 100644 --- a/app/Controllers/Reports.php +++ b/app/Controllers/Reports.php @@ -1246,13 +1246,15 @@ class Reports extends Secure_Controller public function get_payment_type(): array { return [ - 'all' => lang('Common.none_selected_text'), - 'cash' => lang('Sales.cash'), - 'due' => lang('Sales.due'), - 'check' => lang('Sales.check'), - 'credit' => lang('Sales.credit'), - 'debit' => lang('Sales.debit'), - 'invoices' => lang('Sales.invoice') + 'all' => lang('Common.none_selected_text'), + 'cash' => lang('Sales.cash'), + 'due' => lang('Sales.due'), + 'check' => lang('Sales.check'), + 'credit' => lang('Sales.credit'), + 'debit' => lang('Sales.debit'), + 'bank_transfer' => lang('Sales.bank_transfer'), + 'wallet' => lang('Sales.wallet'), + 'invoices' => lang('Sales.invoice') ]; } diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 555bef6ba..81e263335 100644 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -93,6 +93,8 @@ class Sales extends Secure_Controller 'only_check' => lang('Sales.check_filter'), 'only_creditcard' => lang('Sales.credit_filter'), 'only_debit' => lang('Sales.debit'), + 'only_bank_transfer'=> lang('Sales.bank_transfer'), + 'only_wallet' => lang('Sales.wallet'), 'only_invoices' => lang('Sales.invoice_filter'), 'selected_customer' => lang('Sales.selected_customer') ]; @@ -156,6 +158,8 @@ class Sales extends Secure_Controller 'selected_customer' => false, 'only_creditcard' => false, 'only_debit' => false, + 'only_bank_transfer'=> false, + 'only_wallet' => 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) ]; diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php index fb6024bc2..3ae8f71f1 100644 --- a/app/Helpers/locale_helper.php +++ b/app/Helpers/locale_helper.php @@ -272,6 +272,9 @@ function get_payment_options(): array $payments[lang('Sales.upi')] = lang('Sales.upi'); } + $payments[lang('Sales.bank_transfer')] = lang('Sales.bank_transfer'); + $payments[lang('Sales.wallet')] = lang('Sales.wallet'); + return $payments; } diff --git a/app/Language/en-GB/Sales.php b/app/Language/en-GB/Sales.php index f68d14d45..84a7beae1 100644 --- a/app/Language/en-GB/Sales.php +++ b/app/Language/en-GB/Sales.php @@ -9,6 +9,7 @@ return [ "amount_due" => "Amount Due", "amount_tendered" => "Amount Tendered", "authorized_signature" => "Authorised Signature", + "bank_transfer" => "Bank Transfer", "cancel_sale" => "Cancel", "cash" => "Cash", "cash_1" => "", @@ -223,6 +224,7 @@ return [ "update" => "Update", "upi" => "UPI", "visa" => "", + "wallet" => "Wallet", "wholesale" => "", "work_order" => "Work Order", "work_order_number" => "Work Order Number", diff --git a/app/Language/en/Sales.php b/app/Language/en/Sales.php index c16c345b4..a1524e7fa 100644 --- a/app/Language/en/Sales.php +++ b/app/Language/en/Sales.php @@ -9,6 +9,7 @@ return [ "amount_due" => "Amount Due", "amount_tendered" => "Amount Tendered", "authorized_signature" => "Authorized Signature", + "bank_transfer" => "Bank Transfer", "cancel_sale" => "Cancel", "cash" => "Cash", "cash_1" => "", @@ -223,6 +224,7 @@ return [ "update" => "Update", "upi" => "UPI", "visa" => "", + "wallet" => "Wallet", "wholesale" => "", "work_order" => "Work Order", "work_order_number" => "Work Order Number", diff --git a/app/Language/es-ES/Sales.php b/app/Language/es-ES/Sales.php index 9e5f710d7..61591fb61 100644 --- a/app/Language/es-ES/Sales.php +++ b/app/Language/es-ES/Sales.php @@ -9,6 +9,7 @@ return [ "amount_due" => "Monto Adeudado", "amount_tendered" => "Cantidad Recibida", "authorized_signature" => "Firma Autorizada", + "bank_transfer" => "Transferencia Bancaria", "cancel_sale" => "Cancelar Venta", "cash" => "Efectivo", "cash_1" => "1", @@ -222,6 +223,7 @@ return [ "update" => "Editar", "upi" => "PIN UPI", "visa" => "Tarjeta Visa", + "wallet" => "Monedero", "wholesale" => "Precio al por mayor", "work_order" => "Orden trabajo", "work_order_number" => "Numero Orden Trabajo", diff --git a/app/Language/es-MX/Sales.php b/app/Language/es-MX/Sales.php index 9295d2e36..151b22ad0 100644 --- a/app/Language/es-MX/Sales.php +++ b/app/Language/es-MX/Sales.php @@ -9,6 +9,7 @@ return [ "amount_due" => "Monto de adeudo", "amount_tendered" => "Cantidad Recibida", "authorized_signature" => "Firma Autorizada", + "bank_transfer" => "Transferencia Bancaria", "cancel_sale" => "Cancelar", "cash" => "Efectivo", "cash_1" => "", @@ -222,6 +223,7 @@ return [ "update" => "Actualizar", "upi" => "UPI", "visa" => "", + "wallet" => "Monedero", "wholesale" => "", "work_order" => "Orden de trabajo", "work_order_number" => "Número de orden de trabajo", diff --git a/app/Language/fr/Sales.php b/app/Language/fr/Sales.php index 5fa816844..d528d745d 100644 --- a/app/Language/fr/Sales.php +++ b/app/Language/fr/Sales.php @@ -9,6 +9,7 @@ return [ "amount_due" => "Montant à Payer", "amount_tendered" => "Montant Présenté", "authorized_signature" => "Signature autorisée", + "bank_transfer" => "Virement Bancaire", "cancel_sale" => "Annuler la Vente", "cash" => "Espèce", "cash_1" => "", @@ -222,6 +223,7 @@ return [ "update" => "Éditer", "upi" => "UPI", "visa" => "", + "wallet" => "Portefeuille", "wholesale" => "", "work_order" => "Commande de travail", "work_order_number" => "Numéro de commande", diff --git a/app/Models/Receiving.php b/app/Models/Receiving.php index 2627418e3..13136c539 100644 --- a/app/Models/Receiving.php +++ b/app/Models/Receiving.php @@ -294,7 +294,9 @@ class Receiving extends Model lang('Sales.check') => lang('Sales.check'), lang('Sales.debit') => lang('Sales.debit'), lang('Sales.credit') => lang('Sales.credit'), - lang('Sales.due') => lang('Sales.due') + lang('Sales.due') => lang('Sales.due'), + lang('Sales.bank_transfer') => lang('Sales.bank_transfer'), + lang('Sales.wallet') => lang('Sales.wallet') ]; } diff --git a/app/Models/Sale.php b/app/Models/Sale.php index ff332ff8a..2b21ea9d5 100644 --- a/app/Models/Sale.php +++ b/app/Models/Sale.php @@ -277,6 +277,14 @@ class Sale extends Model $builder->like('payment_type', lang('Sales.debit')); } + if ($filters['only_bank_transfer']) { + $builder->like('payment_type', lang('Sales.bank_transfer')); + } + + if ($filters['only_wallet']) { + $builder->like('payment_type', lang('Sales.wallet')); + } + $builder->groupBy('payment_type'); $payments = $builder->get()->getResultArray(); @@ -1509,5 +1517,13 @@ class Sale extends Model if ($filters['only_check']) { $builder->like('payments.payment_type', lang('Sales.check')); } + + if ($filters['only_bank_transfer']) { + $builder->like('payments.payment_type', lang('Sales.bank_transfer')); + } + + if ($filters['only_wallet']) { + $builder->like('payments.payment_type', lang('Sales.wallet')); + } } }