From 8fa30e35fc656652e2ca54152768fd56d66cd917 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Fri, 30 May 2025 18:29:00 +0400 Subject: [PATCH] Sale_event trigger - Refactor function names to camelCase for PSR-12 compliance Signed-off-by: objecttothis --- app/Controllers/Sales.php | 19 ++++++++++--------- app/Libraries/Sale_lib.php | 12 ++++++------ app/Models/Sale.php | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 267d0e602..6b4d7c07b 100644 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -686,6 +686,7 @@ class Sales extends Secure_Controller $data["customer_comments"] = $customerInfo->comments; $data['tax_id'] = $customerInfo->tax_id; } + $taxDetails = $this->tax_lib->getTaxes($data['cart']); // TODO: Duplicated code $data['taxes'] = $taxDetails[0]; $data['discount'] = $this->sale_lib->getDiscount(); @@ -767,7 +768,7 @@ class Sales extends Secure_Controller $this->sale_lib->clearAll(); } } - } elseif ($this->sale_lib->is_work_order_mode()) { + } elseif ($this->sale_lib->isWorkOrderMode()) { if (!($data['price_work_orders'] == 1)) { $data['print_price_info'] = false; @@ -782,7 +783,7 @@ class Sales extends Secure_Controller $workOrderNumber = $this->token_lib->render($workOrderFormat); } - if ($saleId == NEW_ENTRY && $this->sale->check_work_order_number_exists($workOrderNumber)) { + if ($saleId == NEW_ENTRY && $this->sale->workOrderNumberExists($workOrderNumber)) { $data['error'] = lang('Sales.work_order_number_duplicate'); $this->reload($data); } else { @@ -791,17 +792,17 @@ class Sales extends Secure_Controller $saleType = SALE_TYPE_WORK_ORDER; $data['sale_id_num'] = $this->sale->saveValue($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails); - $this->sale_lib->set_suspended_id($data['sale_id_num']); + $this->sale_lib->setSuspendedId($data['sale_id_num']); $data['cart'] = $this->sale_lib->sortAndFilterCard($data['cart']); $data['barcode'] = null; echo view('sales/work_order', $data); - $this->sale_lib->clear_mode(); + $this->sale_lib->clearMode(); $this->sale_lib->clearAll(); } - } elseif ($this->sale_lib->is_quote_mode()) { + } elseif ($this->sale_lib->isQuoteMode()) { $data['sales_quote'] = lang('Sales.quote'); $data['quote_number_label'] = lang('Sales.quote_number'); @@ -811,7 +812,7 @@ class Sales extends Secure_Controller $quoteNumber = $this->token_lib->render($quoteFormat); } - if ($saleId == NEW_ENTRY && $this->sale->check_quote_number_exists($quoteNumber)) { + if ($saleId == NEW_ENTRY && $this->sale->quoteNumberExists($quoteNumber)) { $data['error'] = lang('Sales.quote_number_duplicate'); $this->reload($data); } else { @@ -820,19 +821,19 @@ class Sales extends Secure_Controller $saleType = SALE_TYPE_QUOTE; $data['sale_id_num'] = $this->sale->saveValue($saleId, $data['sale_status'], $data['cart'], $customerId, $employeeId, $data['comments'], $invoiceNumber, $workOrderNumber, $quoteNumber, $saleType, $data['payments'], $data['dinner_table'], $taxDetails); - $this->sale_lib->set_suspended_id($data['sale_id_num']); + $this->sale_lib->setSuspendedId($data['sale_id_num']); $data['cart'] = $this->sale_lib->sortAndFilterCard($data['cart']); $data['barcode'] = null; echo view('sales/quote', $data); - $this->sale_lib->clear_mode(); + $this->sale_lib->clearMode(); $this->sale_lib->clearAll(); } } else { // Save the data to the sales table $data['sale_status'] = COMPLETED; - if ($this->sale_lib->is_return_mode()) { + if ($this->sale_lib->isReturnMode()) { $saleType = SALE_TYPE_RETURN; } else { $saleType = SALE_TYPE_POS; diff --git a/app/Libraries/Sale_lib.php b/app/Libraries/Sale_lib.php index cf1d1d41d..c8a7cd4f3 100644 --- a/app/Libraries/Sale_lib.php +++ b/app/Libraries/Sale_lib.php @@ -358,7 +358,7 @@ class Sale_lib * @param int $suspended_id * @return void */ - public function set_suspended_id(int $suspended_id): void + public function setSuspendedId(int $suspended_id): void { $this->session->set('suspended_id', $suspended_id); } @@ -390,7 +390,7 @@ class Sale_lib /** * @return bool */ - public function is_quote_mode(): bool + public function isQuoteMode(): bool { return ($this->session->get('sales_mode') == 'sale_quote'); // TODO: === ? } @@ -398,7 +398,7 @@ class Sale_lib /** * @return bool */ - public function is_return_mode(): bool + public function isReturnMode(): bool { return ($this->session->get('sales_mode') == 'return'); // TODO: === ? } @@ -406,7 +406,7 @@ class Sale_lib /** * @return bool */ - public function is_work_order_mode(): bool + public function isWorkOrderMode(): bool { return ($this->session->get('sales_mode') == 'sale_work_order'); // TODO: === ? } @@ -809,7 +809,7 @@ class Sale_lib /** * @return void */ - public function clear_mode(): void + public function clearMode(): void { $this->session->remove('sales_mode'); } @@ -1343,7 +1343,7 @@ class Sale_lib public function clearAll(): void { $this->session->set('sale_id', -1); // TODO: Replace -1 with constant - $this->clear_mode(); + $this->clearMode(); $this->clear_table(); $this->empty_cart(); $this->clear_comment(); diff --git a/app/Models/Sale.php b/app/Models/Sale.php index b7da5ba19..3d5c62fa7 100644 --- a/app/Models/Sale.php +++ b/app/Models/Sale.php @@ -952,7 +952,7 @@ class Sale extends Model /** * Checks if quote number exists */ - public function check_quote_number_exists(string $quote_number, string $sale_id = ''): bool + public function quoteNumberExists(string $quote_number, string $sale_id = ''): bool { $builder = $this->db->table('sales'); $builder->where('quote_number', $quote_number); @@ -982,7 +982,7 @@ class Sale extends Model /** * Checks if work order number exists */ - public function check_work_order_number_exists(string $work_order_number, string $sale_id = ''): bool + public function workOrderNumberExists(string $work_order_number, string $sale_id = ''): bool { $builder = $this->db->table('sales'); $builder->where('invoice_number', $work_order_number);