From e0329472efa7215245f260fe29145c1509b80be6 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Mon, 1 Jan 2018 11:59:25 +0000 Subject: [PATCH] Various fixes --- application/controllers/Config.php | 2 +- application/controllers/Sales.php | 3 +- application/language/ar-EG/items_lang.php | 1 - application/language/az-AZ/items_lang.php | 1 - application/language/bg/items_lang.php | 1 - application/language/de-CH/items_lang.php | 1 - application/language/de/items_lang.php | 1 - application/language/en-GB/config_lang.php | 62 ++++++++++--------- application/language/en-GB/items_lang.php | 2 +- application/language/en-US/items_lang.php | 1 - application/language/es/items_lang.php | 1 - application/language/fr/items_lang.php | 1 - application/language/hr-HR/items_lang.php | 1 - application/language/hu-HU/items_lang.php | 1 - application/language/id/items_lang.php | 1 - application/language/lo/items_lang.php | 1 - application/language/nl-BE/items_lang.php | 1 - application/language/pt-BR/items_lang.php | 1 - application/language/ru/items_lang.php | 1 - application/language/sv/items_lang.php | 1 - application/language/th/items_lang.php | 1 - application/language/tr/giftcards_lang.php | 1 - application/language/tr/items_lang.php | 1 - application/language/zh/items_lang.php | 1 - application/libraries/Sale_lib.php | 1 - ...hp => 20180101100000_upgrade_to_3_2_0.php} | 0 .../migrations/sqlscripts/3.0.2_to_3.1.1.sql | 6 +- .../migrations/sqlscripts/3.1.1_to_3.2.0.sql | 11 ++++ .../migrations/sqlscripts/3.2.0_to_3.3.0.sql | 4 -- application/views/configs/general_config.php | 32 +++++----- database/database.sql | 3 +- database/tables.sql | 3 +- 32 files changed, 68 insertions(+), 81 deletions(-) rename application/migrations/{20171211100000_upgrade_to_3_2_0.php => 20180101100000_upgrade_to_3_2_0.php} (100%) delete mode 100644 application/migrations/sqlscripts/3.2.0_to_3.3.0.sql diff --git a/application/controllers/Config.php b/application/controllers/Config.php index 6cd5cb4c0..9c62ce8ae 100644 --- a/application/controllers/Config.php +++ b/application/controllers/Config.php @@ -299,7 +299,7 @@ class Config extends Secure_Controller 'suggestions_second_column' => $this->input->post('suggestions_second_column'), 'suggestions_third_column' => $this->input->post('suggestions_third_column'), 'giftcard_number' => $this->input->post('giftcard_number'), - 'derive_sale_quantity' => $this->input->post('derive_sale_quantity') != NULL, + 'derive_sale_quantity' => $this->input->post('derive_sale_quantity') != NULL, 'statistics' => $this->input->post('statistics') != NULL, 'custom1_name' => $this->input->post('custom1_name'), 'custom2_name' => $this->input->post('custom2_name'), diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 3b9523a12..0e2f871ea 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -464,8 +464,7 @@ class Sales extends Secure_Controller $quantity = parse_decimals($this->input->post('quantity')); $discount = parse_decimals($this->input->post('discount')); $item_location = $this->input->post('location'); - $total = $this->input->post('total') != '' ? $this->input->post('total') : NULL; - error_log('>>>Sales.php total-' . $total); + $total = $this->input->post('total') != '' ? $this->input->post('total') : NULL; if($this->form_validation->run() != FALSE) { diff --git a/application/language/ar-EG/items_lang.php b/application/language/ar-EG/items_lang.php index d7d7c830d..43cb29ee7 100644 --- a/application/language/ar-EG/items_lang.php +++ b/application/language/ar-EG/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "الكمية المطلوب خصمها أو اضافتها"; $lang["items_allow_alt_desciption"] = "وصف بديل"; $lang["items_allow_alt_description"] = "السماح بوصف بديل"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "تحرير جماعى"; $lang["items_buy_price_required"] = "سعر الشراء مطلوب"; $lang["items_cannot_be_deleted"] = "لايمكن حذف الأصناف المختارة، واحد أو أكثر منها لديه مبيعات"; diff --git a/application/language/az-AZ/items_lang.php b/application/language/az-AZ/items_lang.php index be8417b71..702e475b4 100644 --- a/application/language/az-AZ/items_lang.php +++ b/application/language/az-AZ/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "inventor toplama və çixma üçün"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "lternativ təsvirə icazə"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "kütləvi dəyişiklik"; $lang["items_buy_price_required"] = "alış qiyməti və mütləq məsafə"; $lang["items_cannot_be_deleted"] = "işarələnmiş mallardan silmək olmur cunki bəziləri satılır."; diff --git a/application/language/bg/items_lang.php b/application/language/bg/items_lang.php index 5a36d6c73..676def89d 100644 --- a/application/language/bg/items_lang.php +++ b/application/language/bg/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Inventory to add or subtract."; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Allow Alternate Description"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Bulk Edit"; $lang["items_buy_price_required"] = "Purchase Price is a required field."; $lang["items_cannot_be_deleted"] = "Could not delete selected Item(s), one or more of the selected Items have sales."; diff --git a/application/language/de-CH/items_lang.php b/application/language/de-CH/items_lang.php index a2c25fb13..d088dc1ae 100644 --- a/application/language/de-CH/items_lang.php +++ b/application/language/de-CH/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Bestandsänderung"; $lang["items_allow_alt_desciption"] = "Erlaube Alt. Bez."; $lang["items_allow_alt_description"] = "Erlaube Alt. Bez."; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Sammeländerung"; $lang["items_buy_price_required"] = "Einkaufspreis ist erforderlich"; $lang["items_cannot_be_deleted"] = "Gewählte Artikel können nicht gelöscht werden, einer odere mehrere weisen Verkäufe auf"; diff --git a/application/language/de/items_lang.php b/application/language/de/items_lang.php index 5215fe21c..c97842cf7 100644 --- a/application/language/de/items_lang.php +++ b/application/language/de/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Bestandsänderung"; $lang["items_allow_alt_desciption"] = "Erlaube Alt. Bez."; $lang["items_allow_alt_description"] = "Erlaube Alt. Bez."; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Sammeländerung"; $lang["items_buy_price_required"] = "Einkaufspreis ist erforderlich"; $lang["items_cannot_be_deleted"] = "Gewählte Artikel können nicht gelöscht werden, einer odere mehrere weisen Verkäufe auf"; diff --git a/application/language/en-GB/config_lang.php b/application/language/en-GB/config_lang.php index 423c4c954..f16a8fd5c 100644 --- a/application/language/en-GB/config_lang.php +++ b/application/language/en-GB/config_lang.php @@ -65,29 +65,31 @@ $lang["config_customer_sales_tax_support"] = "Customer Sales Tax Support"; $lang["config_date_or_time_format"] = "Date and Time Filter"; $lang["config_datetimeformat"] = "Date and Time Format"; $lang["config_decimal_point"] = "Decimal Point"; -$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number"; -$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field"; -$lang["config_default_barcode_height_number"] = "The default barcode height must be a number"; -$lang["config_default_barcode_height_required"] = "The default barcode height is a required field"; -$lang["config_default_barcode_num_in_row_number"] = "The default barcode number in row must be a number"; -$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field"; -$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number"; -$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field"; -$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number"; -$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field"; -$lang["config_default_barcode_width_number"] = "The default barcode width must be a number"; -$lang["config_default_barcode_width_required"] = "The default barcode width is a required field"; +$lang["config_default_barcode_font_size_number"] = "Default Barcode Font size must be a number"; +$lang["config_default_barcode_font_size_required"] = "Default Barcode Font size is a required field"; +$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number"; +$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field"; +$lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in row must be a number"; +$lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in row is a required field"; +$lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number"; +$lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field"; +$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number"; +$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field"; +$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number"; +$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field"; $lang["config_default_origin_tax_code"] = "Default Origin Tax Code"; $lang["config_default_sales_discount"] = "Default Sales Discount %"; -$lang["config_default_sales_discount_number"] = "The default sales discount must be a number"; -$lang["config_default_sales_discount_required"] = "The default sales discount is a required field"; -$lang["config_default_tax_name_number"] = "The default tax name must be a string"; -$lang["config_default_tax_name_required"] = "The default tax name is a required field"; +$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number"; +$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field"; +$lang["config_default_tax_name_number"] = "Default Tax Name must be a string"; +$lang["config_default_tax_name_required"] = "Default Tax Name is a required field"; $lang["config_default_tax_rate"] = "Default Tax Rate %"; $lang["config_default_tax_rate_1"] = "Tax 1 Rate"; $lang["config_default_tax_rate_2"] = "Tax 2 Rate"; -$lang["config_default_tax_rate_number"] = "The default tax rate must be a number"; -$lang["config_default_tax_rate_required"] = "The default tax rate is a required field"; +$lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number"; +$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field"; +$lang["config_derive_sale_quantity"] = "Allow Derived Sale Quantity"; +$lang["config_derive_sale_quantity_tooltip"] = "If checked then a new item type will provided for items ordered by extended amount" $lang["config_dinner_table"] = "Table"; $lang["config_dinner_table_duplicate"] = "Please use an unique table name"; $lang["config_dinner_table_enable"] = "Enable Dinner Tables"; @@ -148,7 +150,7 @@ $lang["config_license_configuration"] = "License Statement"; $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"] = "The lines per page is a required field"; +$lang["config_lines_per_page_required"] = "Lines Per Page is a required field"; $lang["config_locale"] = "Localisation"; $lang["config_locale_configuration"] = "Localisation Configuration"; $lang["config_locale_info"] = "Localisation Configuration Information"; @@ -184,27 +186,27 @@ $lang["config_payment_options_order"] = "Payment Options Order"; $lang["config_phone"] = "Company Phone"; $lang["config_phone_required"] = "Company phone is a required field"; $lang["config_print_bottom_margin"] = "Margin Bottom"; -$lang["config_print_bottom_margin_number"] = "The default bottom margin must be a number"; -$lang["config_print_bottom_margin_required"] = "The default bottom margin is a required field"; +$lang["config_print_bottom_margin_number"] = "Default Bottom Margin must be a number"; +$lang["config_print_bottom_margin_required"] = "Default Bottom Margin is a required field"; $lang["config_print_footer"] = "Print Browser Footer"; $lang["config_print_header"] = "Print Browser Header"; $lang["config_print_left_margin"] = "Margin Left"; -$lang["config_print_left_margin_number"] = "The default left margin must be a number"; -$lang["config_print_left_margin_required"] = "The default left margin is a required field"; +$lang["config_print_left_margin_number"] = "Default Left Margin must be a number"; +$lang["config_print_left_margin_required"] = "Default Left Margin is a required field"; $lang["config_print_right_margin"] = "Margin Right"; -$lang["config_print_right_margin_number"] = "The default right margin must be a number"; -$lang["config_print_right_margin_required"] = "The default right margin is a required field"; +$lang["config_print_right_margin_number"] = "Default Right Margin must be a number"; +$lang["config_print_right_margin_required"] = "Default Right Margin is a required field"; $lang["config_print_silently"] = "Show Print Dialog"; $lang["config_print_top_margin"] = "Margin Top"; -$lang["config_print_top_margin_number"] = "The default top margin must be a number"; -$lang["config_print_top_margin_required"] = "The default top margin is a required field"; +$lang["config_print_top_margin_number"] = "Default Top Margin must be a number"; +$lang["config_print_top_margin_required"] = "Default Top Margin is a required field"; $lang["config_quantity_decimals"] = "Quantity Decimals"; $lang["config_receipt"] = "Receipt"; $lang["config_receipt_configuration"] = "Receipt Print Settings"; $lang["config_receipt_default"] = "Default"; $lang["config_receipt_font_size"] = "Font Size"; -$lang["config_receipt_font_size_number"] = "The font size must be a number"; -$lang["config_receipt_font_size_required"] = "The font size is a required field"; +$lang["config_receipt_font_size_number"] = "Font Size must be a number"; +$lang["config_receipt_font_size_required"] = "Font Size is a required field"; $lang["config_receipt_info"] = "Receipt Configuration Information"; $lang["config_receipt_printer"] = "Ticket Printer"; $lang["config_receipt_short"] = "Short"; @@ -230,7 +232,7 @@ $lang["config_statistics"] = "Send Statistics"; $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes"; $lang["config_stock_location"] = "Stock location"; $lang["config_stock_location_duplicate"] = "Please use an unique location name"; -$lang["config_stock_location_invalid_chars"] = "The stock location name cannot contain '_'"; +$lang["config_stock_location_invalid_chars"] = "Stock location name cannot contain '_'"; $lang["config_stock_location_required"] = "Stock location is a required field"; $lang["config_suggestions_first_column"] = "Column 1"; $lang["config_suggestions_layout"] = "Search Suggestions Layout"; diff --git a/application/language/en-GB/items_lang.php b/application/language/en-GB/items_lang.php index 38b5f110b..50c79e238 100644 --- a/application/language/en-GB/items_lang.php +++ b/application/language/en-GB/items_lang.php @@ -3,7 +3,7 @@ $lang["items_add_minus"] = "Inventory to add or subtract"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Allow Alternate Description"; -$lang["items_amazon"] = "Amazon"; +$lang["items_amount_entry"] = "Amount Entry"; $lang["items_bulk_edit"] = "Bulk Edit"; $lang["items_buy_price_required"] = "Purchase Price is a required field"; $lang["items_cannot_be_deleted"] = "Could not delete the selected Item(s), one or more of the selected Items have sales"; diff --git a/application/language/en-US/items_lang.php b/application/language/en-US/items_lang.php index 1cb87640b..4ef0d8895 100644 --- a/application/language/en-US/items_lang.php +++ b/application/language/en-US/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Inventory to add or subtract."; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Allow Alternate Description"; -$lang["items_amazon"] = "Amazon"; $lang["items_amount_entry"] = "Amount Entry"; $lang["items_bulk_edit"] = "Bulk Edit"; $lang["items_buy_price_required"] = "Purchase Price is a required field."; diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php index 9dfbb3a24..1803db3d5 100644 --- a/application/language/es/items_lang.php +++ b/application/language/es/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Inventario a agregar/substraer"; $lang["items_allow_alt_desciption"] = "Permitir Descripción Alternativa"; $lang["items_allow_alt_description"] = "Permitir Descripción Alternativa"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Edición Múltiple"; $lang["items_buy_price_required"] = "Precio de Compra es requerido"; $lang["items_cannot_be_deleted"] = "No se pueden borrar los artículos seleccionados. Uno o más tiene(n) ventas."; diff --git a/application/language/fr/items_lang.php b/application/language/fr/items_lang.php index e66675196..c2e0c3f6c 100644 --- a/application/language/fr/items_lang.php +++ b/application/language/fr/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Ajoujer/Soustraire à l'Inventaire"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Autoriser Description Alt"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Édition en groupe"; $lang["items_buy_price_required"] = "Le Prix d'achat est requis"; $lang["items_cannot_be_deleted"] = "Impossible de supprimer. Un ou plusiers des articles sélectionnés a des ventes."; diff --git a/application/language/hr-HR/items_lang.php b/application/language/hr-HR/items_lang.php index de9712968..8510c1be1 100644 --- a/application/language/hr-HR/items_lang.php +++ b/application/language/hr-HR/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Dodavanje/skidanje s inventure"; $lang["items_allow_alt_desciption"] = "Dozvoli Alt opis"; $lang["items_allow_alt_description"] = "Dozvoli Alt opis"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Zajedno uređenje"; $lang["items_buy_price_required"] = "Prodajna cijena je potrebna"; $lang["items_cannot_be_deleted"] = "Nemožete obrisati odabranu stavku, jedna ili više odabranih stavki ima prodaju."; diff --git a/application/language/hu-HU/items_lang.php b/application/language/hu-HU/items_lang.php index bee57c531..03fe6dec3 100644 --- a/application/language/hu-HU/items_lang.php +++ b/application/language/hu-HU/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Mennyiség hozzáadása/elvétele"; $lang["items_allow_alt_desciption"] = "Alternativ leirás eng."; $lang["items_allow_alt_description"] = "Alternativ leirás eng."; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Tömeges módosítás"; $lang["items_buy_price_required"] = "Vételár kötelező mező"; $lang["items_cannot_be_deleted"] = "Nem törölhető a kiválasztott termék, mert van folyamatban lévő eladás!"; diff --git a/application/language/id/items_lang.php b/application/language/id/items_lang.php index 52884ab78..42d96bff5 100644 --- a/application/language/id/items_lang.php +++ b/application/language/id/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Penyesuaian Inventori TAMBAH / KURANG (-)"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Deskripsi Alternatif dimungkinkan"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Ubah Massal"; $lang["items_buy_price_required"] = "Harga Beli wajib diisi"; $lang["items_cannot_be_deleted"] = "Tidak dapat menghapus item terpilih, satu atau lebih item yang dipilih memiliki penjualan."; diff --git a/application/language/lo/items_lang.php b/application/language/lo/items_lang.php index 060e7aa92..67b504470 100644 --- a/application/language/lo/items_lang.php +++ b/application/language/lo/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "ເພີ່ມຫລືຫລຸດປະລິມານສິນຄ້າໃນສາງ"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "ອະນຸຍາດໃຫ້ມີລາຍລະອຽດເສີມ"; -$lang["items_amazon"] = "ອາເມຊອນ"; $lang["items_bulk_edit"] = "ແກ້ໄຂເປັນກຸ່ມ"; $lang["items_buy_price_required"] = "ກະລຸນາກຳນົດລາຄາ."; $lang["items_cannot_be_deleted"] = "ບໍ່ສາມາດລຶບສິນຄ້າທີ່ເລືອກໄດ້, ໃນສິນຄ້າທີ່ເລືອກໄດ້ມີການຂາຍແລ້ວ."; diff --git a/application/language/nl-BE/items_lang.php b/application/language/nl-BE/items_lang.php index 1ebd0559b..80f1c457b 100755 --- a/application/language/nl-BE/items_lang.php +++ b/application/language/nl-BE/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Corrigatie hoeveelheid"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Aanpasbare omschrijving"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Bewerk Selectie"; $lang["items_buy_price_required"] = "Buy price is a required field"; $lang["items_cannot_be_deleted"] = "De geselecteerde producten konden niet worden verwijderd."; diff --git a/application/language/pt-BR/items_lang.php b/application/language/pt-BR/items_lang.php index 21c587b6f..3fafbb385 100644 --- a/application/language/pt-BR/items_lang.php +++ b/application/language/pt-BR/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Inventário para adicionar/subtrair"; $lang["items_allow_alt_desciption"] = "Descrição longa"; $lang["items_allow_alt_description"] = "Permitir atualizar descrição"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Editar Múltiplos Itens"; $lang["items_buy_price_required"] = "Preço de compra é um campo obrigatório"; $lang["items_cannot_be_deleted"] = "Não foi possível excluir os itens selecionados um ou mais dos itens selecionados tem vendas."; diff --git a/application/language/ru/items_lang.php b/application/language/ru/items_lang.php index 36be89bdf..d138d4f3d 100644 --- a/application/language/ru/items_lang.php +++ b/application/language/ru/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Инвентарь для сложения/вычитания"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Разрешить альтернативные описания"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Массовое изменение"; $lang["items_buy_price_required"] = "Цена покупки обязательное пробелья"; $lang["items_cannot_be_deleted"] = "Невозможно удалить выбранные товари, один или более из выбранных товаров имеет продаж."; diff --git a/application/language/sv/items_lang.php b/application/language/sv/items_lang.php index 579d3b0dc..2dc059d24 100644 --- a/application/language/sv/items_lang.php +++ b/application/language/sv/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = ""; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = ""; -$lang["items_amazon"] = ""; $lang["items_bulk_edit"] = ""; $lang["items_buy_price_required"] = ""; $lang["items_cannot_be_deleted"] = ""; diff --git a/application/language/th/items_lang.php b/application/language/th/items_lang.php index 4455deea1..7523ee6bd 100644 --- a/application/language/th/items_lang.php +++ b/application/language/th/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "เพิ่ม/ลบ จำนวนสินค้าคงคลัง"; $lang["items_allow_alt_desciption"] = "อนุญาตให้เพิ่มรายละเอียด"; $lang["items_allow_alt_description"] = "แสดงข้อมูลเพิ่มเติม"; -$lang["items_amazon"] = "อเมซอน"; $lang["items_bulk_edit"] = "แก้ไขความจุ"; $lang["items_buy_price_required"] = "ราคาซื้อขายต้องกรอก"; $lang["items_cannot_be_deleted"] = "ไม่สามารถลบสินค้าที่เลือก, สินค้าที่เลือกถูกขายไปแล้ว."; diff --git a/application/language/tr/giftcards_lang.php b/application/language/tr/giftcards_lang.php index 76aaebf05..f5d852545 100644 --- a/application/language/tr/giftcards_lang.php +++ b/application/language/tr/giftcards_lang.php @@ -2,7 +2,6 @@ $lang["giftcards_add_minus"] = "Eklenen/Çıkarılan Adet"; $lang["giftcards_allow_alt_description"] = "Dip Nota izin ver"; -$lang["giftcards_amazon"] = "Amazon"; $lang["giftcards_bulk_edit"] = "Çoklu Düzenleme"; $lang["giftcards_cannot_be_deleted"] = "Seçili Hediye Çekleri silinemedi, bir veya fazla Hediye Çekinde satış bulunmaktadır."; $lang["giftcards_cannot_find_giftcard"] = "Hediye Çekine ait bilgi bulunamadı"; diff --git a/application/language/tr/items_lang.php b/application/language/tr/items_lang.php index be521d77d..f21ec13fe 100644 --- a/application/language/tr/items_lang.php +++ b/application/language/tr/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "Eklenen/Çıkarılan Adet"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "Dip Nota izin ver"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "Toplu Düzenleme"; $lang["items_buy_price_required"] = "Alış Fiyatı zorunlu alandır"; $lang["items_cannot_be_deleted"] = "Seçili ürünler silinemedi, bazı ürünlerin satışı var."; diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php index 85b4c7c3d..b539def37 100755 --- a/application/language/zh/items_lang.php +++ b/application/language/zh/items_lang.php @@ -3,7 +3,6 @@ $lang["items_add_minus"] = "增/減庫存"; $lang["items_allow_alt_desciption"] = ""; $lang["items_allow_alt_description"] = "允許ALT描述"; -$lang["items_amazon"] = "Amazon"; $lang["items_bulk_edit"] = "批次編輯"; $lang["items_buy_price_required"] = "進貨價為必填欄位"; $lang["items_cannot_be_deleted"] = "無法刪除選定產品，所選產品中的一個或多個有銷售紀綠。"; diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index eaeb617b1..cc9d3bef1 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -1199,7 +1199,6 @@ class Sale_lib */ public function get_quantity_sold($total, $price) { - $quantity = bcdiv($total, $price, quantity_decimals()); return $quantity; diff --git a/application/migrations/20171211100000_upgrade_to_3_2_0.php b/application/migrations/20180101100000_upgrade_to_3_2_0.php similarity index 100% rename from application/migrations/20171211100000_upgrade_to_3_2_0.php rename to application/migrations/20180101100000_upgrade_to_3_2_0.php diff --git a/application/migrations/sqlscripts/3.0.2_to_3.1.1.sql b/application/migrations/sqlscripts/3.0.2_to_3.1.1.sql index 91ba4d6b8..a74b193d1 100644 --- a/application/migrations/sqlscripts/3.0.2_to_3.1.1.sql +++ b/application/migrations/sqlscripts/3.0.2_to_3.1.1.sql @@ -224,11 +224,13 @@ ALTER TABLE `ospos_giftcards` CHANGE `giftcard_number` `giftcard_number` VARCHAR -- add support for select between gitcard number series or random -INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('giftcard_number', 'series'); +INSERT INTO `ospos_app_config` (`key`, `value`) VALUES +('giftcard_number', 'series'); -- add option to print company name in receipt -INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('receipt_show_company_name', '1'); +INSERT INTO `ospos_app_config` (`key`, `value`) VALUES +('receipt_show_company_name', '1'); -- add support for sales tax history migration diff --git a/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql b/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql index 6c511f13a..c4b39d1ea 100644 --- a/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql +++ b/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql @@ -206,3 +206,14 @@ ALTER TABLE `ospos_expenses` ADD COLUMN `supplier_name` varchar(255) DEFAULT NULL, ADD COLUMN `supplier_tax_code` varchar(255) DEFAULT NULL, ADD COLUMN `tax_amount` decimal(15,2) DEFAULT NULL; + + +-- Remove unused barcode quality + +DELETE FROM `ospos_app_config` WHERE `key` = 'barcode_quality'; + + +-- Add new config option to allow derive sale quantity feature + +INSERT INTO `ospos_app_config` (`key`, `value`) VALUES +('derive_sale_quantity', '0'); diff --git a/application/migrations/sqlscripts/3.2.0_to_3.3.0.sql b/application/migrations/sqlscripts/3.2.0_to_3.3.0.sql deleted file mode 100644 index d526ea8ef..000000000 --- a/application/migrations/sqlscripts/3.2.0_to_3.3.0.sql +++ /dev/null @@ -1,4 +0,0 @@ --- Add new config option to allow derive sale quantity feature - -INSERT INTO `ospos_app_config` (`key`, `value`) VALUES -('derive_sale_quantity', '0'); diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index ceaa57323..b6ae14ee0 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -151,7 +151,7 @@ - +
lang->line('config_giftcard_number'), 'giftcard_number', array('class' => 'control-label col-xs-2')); ?>
@@ -172,22 +172,22 @@
-
- lang->line('config_derive_sale_quantity'), 'derive_sale_quantity', array('class' => 'control-label col-xs-2')); ?> -
- 'derive_sale_quantity', - 'id' => 'derive_sale_quantity', - 'value' => 'derive_sale_quantity', - 'checked' => $this->config->item('derive_sale_quantity'))); ?> -   - -
-
+
+ lang->line('config_derive_sale_quantity'), 'derive_sale_quantity', array('class' => 'control-label col-xs-2')); ?> +
+ 'derive_sale_quantity', + 'id' => 'derive_sale_quantity', + 'value' => 'derive_sale_quantity', + 'checked' => $this->config->item('derive_sale_quantity'))); ?> +   + +
+
-
+
lang->line('config_statistics'), 'statistics', array('class' => 'control-label col-xs-2')); ?>