From 7a55c2311e097bb93637c9a813bfc22d3f684bd3 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Sun, 7 Jan 2018 14:06:19 -0500 Subject: [PATCH] More missing language elements and one bad reference to a config value. --- application/language/en-US/config_lang.php | 4 ++++ application/language/en-US/customers_lang.php | 1 + application/language/en-US/employees_lang.php | 1 + application/language/en-US/expenses_lang.php | 1 + application/language/en-US/giftcards_lang.php | 1 + application/language/en-US/item_kits_lang.php | 1 + application/language/en-US/receivings_lang.php | 1 + application/language/en-US/reports_lang.php | 1 + application/language/en-US/suppliers_lang.php | 1 + application/language/en-US/taxes_lang.php | 1 + application/libraries/Sale_lib.php | 2 +- application/models/reports/Detailed_sales.php | 1 + application/views/expenses_categories/manage.php | 2 -- 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php index 48795b27c..8611e877a 100644 --- a/application/language/en-US/config_lang.php +++ b/application/language/en-US/config_lang.php @@ -151,6 +151,7 @@ $lang["config_line_sequence"] = "Line Sequence"; $lang["config_lines_per_page"] = "Lines per Page"; $lang["config_lines_per_page_number"] = ""; $lang["config_lines_per_page_required"] = "Lines per Page is a required field."; +$lang["config_lines_per_page_number"] = "Lines per Page must be a number."; $lang["config_locale"] = "Localization"; $lang["config_locale_configuration"] = "Localization Configuration"; $lang["config_locale_info"] = "Localization Configuration Information"; @@ -244,6 +245,9 @@ $lang["config_table_configuration"] = "Table Configuration"; $lang["config_takings_printer"] = "Receipt Printer"; $lang["config_tax"] = "Tax"; $lang["config_tax_category"] = "Tax Category"; +$lang["config_tax_category_duplicate"] = "The entered tax category already exists."; +$lang["config_tax_category_invalid_chars"] = "The entered tax category is invalid."; +$lang["config_tax_category_required"] = "The tax category is required."; $lang["config_tax_category_used"] = "Tax category cannot be deleted because it is being used."; $lang["config_tax_configuration"] = "Tax Configuration"; $lang["config_tax_decimals"] = "Tax Decimals"; diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php index 3c16a37e7..5bef97201 100644 --- a/application/language/en-US/customers_lang.php +++ b/application/language/en-US/customers_lang.php @@ -9,6 +9,7 @@ $lang["customers_basic_information"] = "Information"; $lang["customers_cannot_be_deleted"] = "Could not delete selected customers, one or more of the selected customers has sales."; $lang["customers_company_name"] = "Company"; $lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customer(s)?"; +$lang["customers_confirm_restore"] = "Are you sure you want to restore selected customers(s)?"; $lang["customers_customer"] = "Customer"; $lang["customers_discount"] = "Discount"; $lang["customers_email_duplicate"] = "Email Address is already present in the database."; diff --git a/application/language/en-US/employees_lang.php b/application/language/en-US/employees_lang.php index 5576db5f5..1485a9677 100644 --- a/application/language/en-US/employees_lang.php +++ b/application/language/en-US/employees_lang.php @@ -4,6 +4,7 @@ $lang["employees_basic_information"] = "Information"; $lang["employees_cannot_be_deleted"] = "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account."; $lang["employees_change_password"] = "Change Password"; $lang["employees_confirm_delete"] = "Are you sure you want to delete the selected employee(s)?"; +$lang["employees_confirm_restore"] = "Are you sure you want to restore selected employee(s)?"; $lang["employees_current_password"] = "Current Password"; $lang["employees_current_password_invalid"] = "Current Password is invalid."; $lang["employees_employee"] = "Employee"; diff --git a/application/language/en-US/expenses_lang.php b/application/language/en-US/expenses_lang.php index f21f5d962..ca6f3e0e5 100644 --- a/application/language/en-US/expenses_lang.php +++ b/application/language/en-US/expenses_lang.php @@ -3,6 +3,7 @@ $lang["expenses_add_item"] = "Add Expense"; $lang["expenses_cannot_be_deleted"] = "Could not delete Category Expense(s)"; $lang["expenses_confirm_delete"] = "Are you sure you want to delete the selected Expense?"; +$lang["expenses_confirm_restore"] = "Are you sure you want to restore selected Expenses(s)?"; $lang["expenses_description"] = "Description"; $lang["expenses_error_adding_updating"] = "Error adding/updating Expense"; $lang["expenses_info"] = "Expense Info"; diff --git a/application/language/en-US/giftcards_lang.php b/application/language/en-US/giftcards_lang.php index f779abc9f..a6019e864 100644 --- a/application/language/en-US/giftcards_lang.php +++ b/application/language/en-US/giftcards_lang.php @@ -14,6 +14,7 @@ $lang["giftcards_change_all_to_serialized"] = "Change All To Serialized"; $lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialized"; $lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit the selected Gift Card(s)?"; $lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected Gift Card(s)?"; +$lang["giftcards_confirm_restore"] = "Are you sure you want to restore selected Gift Card(s)?"; $lang["giftcards_cost_price"] = "Wholesale Price"; $lang["giftcards_count"] = "Update Inventory"; $lang["giftcards_current_quantity"] = "Current Quantity"; diff --git a/application/language/en-US/item_kits_lang.php b/application/language/en-US/item_kits_lang.php index a326d876e..ba6bae908 100644 --- a/application/language/en-US/item_kits_lang.php +++ b/application/language/en-US/item_kits_lang.php @@ -4,6 +4,7 @@ $lang["item_kits_add_item"] = "Add Item"; $lang["item_kits_all"] = "All"; $lang["item_kits_cannot_be_deleted"] = "Item Kit(s) delete failed."; $lang["item_kits_confirm_delete"] = "Are you sure you want to delete the selected Item Kit(s)?"; +$lang["item_kits_confirm_restore"] = "Are you sure you want to restore selected Item Kit(s)?"; $lang["item_kits_description"] = "Item Kit Description"; $lang["item_kits_discount_percent"] = "Discount Percent"; $lang["item_kits_error_adding_updating"] = "Item Kit add or update failed."; diff --git a/application/language/en-US/receivings_lang.php b/application/language/en-US/receivings_lang.php index 9233c6b15..d56372f33 100644 --- a/application/language/en-US/receivings_lang.php +++ b/application/language/en-US/receivings_lang.php @@ -36,6 +36,7 @@ $lang["receivings_requisition"] = "Requisition"; $lang["receivings_return"] = "Return"; $lang["receivings_select_supplier"] = "Select Supplier (Optional)"; $lang["receivings_start_typing_supplier_name"] = "Start Typing Supplier's name..."; +$lang["receivings_stock"] = "Stock"; $lang["receivings_stock_destination"] = "Stock Destination"; $lang["receivings_stock_locaiton"] = "Stock Location"; $lang["receivings_stock_source"] = "Stock Source"; diff --git a/application/language/en-US/reports_lang.php b/application/language/en-US/reports_lang.php index 625e57f67..23ebb8a17 100644 --- a/application/language/en-US/reports_lang.php +++ b/application/language/en-US/reports_lang.php @@ -37,6 +37,7 @@ $lang["reports_earned"] = "Points Earned"; $lang["reports_employee"] = "Employee"; $lang["reports_employees"] = "Employees"; $lang["reports_employees_summary_report"] = "Employees Summary Report"; +$lang["reports_expenses"] = "Expenses"; $lang["reports_expenses_categories"] = "Expenses"; $lang["reports_expenses_categories_summary_report"] = "Expense Categories Summary Report"; $lang["reports_expenses_category"] = "Category"; diff --git a/application/language/en-US/suppliers_lang.php b/application/language/en-US/suppliers_lang.php index 1d3464510..8e62cf7ca 100644 --- a/application/language/en-US/suppliers_lang.php +++ b/application/language/en-US/suppliers_lang.php @@ -6,6 +6,7 @@ $lang["suppliers_cannot_be_deleted"] = "Could not delete selected Supplier(s). O $lang["suppliers_company_name"] = "Company Name"; $lang["suppliers_company_name_required"] = "Company Name is a required field."; $lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected Supplier(s)?"; +$lang["suppliers_confirm_restore"] = "Are you sure you want to restore selected Supplier(s)?"; $lang["suppliers_error_adding_updating"] = "Supplier update or add failed."; $lang["suppliers_new"] = "New Supplier"; $lang["suppliers_none_selected"] = "You have not selected Supplier(s) to delete."; diff --git a/application/language/en-US/taxes_lang.php b/application/language/en-US/taxes_lang.php index 426d04b85..398a0a6f3 100644 --- a/application/language/en-US/taxes_lang.php +++ b/application/language/en-US/taxes_lang.php @@ -2,6 +2,7 @@ $lang["taxes_add_exception"] = "Add Exception"; $lang["taxes_confirm_delete"] = "Are you sure you want to delete this Tax Code? This action cannot be undone."; +$lang["taxes_confirm_restore"] = "Are you sure you want to restore selected Tax Code(s)?"; $lang["taxes_default_tax_category"] = "Default Tax Category"; $lang["taxes_error_adding_updating"] = "Tax Code add or update failed."; $lang["taxes_new"] = "New Tax Code"; diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index c286002ca..4517d6303 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -1017,7 +1017,7 @@ class Sale_lib public function reset_cash_flags() { - if($this->CI->lang->line('payment_options_order') != 'cashdebitcredit') + if($this->CI->config->item('payment_options_order') != 'cashdebitcredit') { $cash_mode = 1; } diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php index 562c9ab93..95f7dae12 100644 --- a/application/models/reports/Detailed_sales.php +++ b/application/models/reports/Detailed_sales.php @@ -58,6 +58,7 @@ class Detailed_sales extends Report SUM(cost) AS cost, SUM(profit) AS profit, MAX(payment_type) AS payment_type, + MAX(sale_status) AS sale_status, comment'); $this->db->from('sales_items_temp'); $this->db->where('sale_id', $sale_id); diff --git a/application/views/expenses_categories/manage.php b/application/views/expenses_categories/manage.php index 445e90ba0..391509ee3 100644 --- a/application/views/expenses_categories/manage.php +++ b/application/views/expenses_categories/manage.php @@ -33,8 +33,6 @@ $(document).ready(function() - -