mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-05-24 16:28:40 -04:00
Made description and serialnumber optional in receipts (#499)
This commit is contained in:
FrancescoUK
@@ -164,18 +164,20 @@ class Config extends Secure_area
|
||||
function save_receipt()
|
||||
{
|
||||
$batch_save_data = array (
|
||||
'use_invoice_template' => $this->input->post ( 'use_invoice_template' ) != null,
|
||||
'invoice_default_comments' => $this->input->post ( 'invoice_default_comments' ),
|
||||
'invoice_email_message' => $this->input->post ( 'invoice_email_message' ),
|
||||
'receipt_show_taxes' => $this->input->post ( 'receipt_show_taxes' ) != null,
|
||||
'print_silently' => $this->input->post ( 'print_silently' ) != null,
|
||||
'print_header' => $this->input->post ( 'print_header' ) != null,
|
||||
'print_footer' => $this->input->post ( 'print_footer' ) != null,
|
||||
'print_top_margin' => $this->input->post ( 'print_top_margin' ),
|
||||
'print_left_margin' => $this->input->post ( 'print_left_margin' ),
|
||||
'print_bottom_margin' => $this->input->post ( 'print_bottom_margin' ),
|
||||
'print_right_margin' => $this->input->post ( 'print_right_margin' ),
|
||||
'show_total_discount' => $this->input->post( 'show_total_discount' ) != null
|
||||
'use_invoice_template' => $this->input->post('use_invoice_template') != null,
|
||||
'invoice_default_comments' => $this->input->post('invoice_default_comments'),
|
||||
'invoice_email_message' => $this->input->post('invoice_email_message'),
|
||||
'receipt_show_taxes' => $this->input->post('receipt_show_taxes') != null,
|
||||
'receipt_show_total_discount' => $this->input->post('receipt_show_total_discount') != null,
|
||||
'receipt_show_description' => $this->input->post('receipt_show_description') != null,
|
||||
'receipt_show_serialnumber' => $this->input->post('receipt_show_serialnumber') != null,
|
||||
'print_silently' => $this->input->post('print_silently') != null,
|
||||
'print_header' => $this->input->post('print_header') != null,
|
||||
'print_footer' => $this->input->post('print_footer') != null,
|
||||
'print_top_margin' => $this->input->post('print_top_margin'),
|
||||
'print_left_margin' => $this->input->post('print_left_margin'),
|
||||
'print_bottom_margin' => $this->input->post('print_bottom_margin'),
|
||||
'print_right_margin' => $this->input->post('print_right_margin')
|
||||
);
|
||||
$result = $this->Appconfig->batch_save( $batch_save_data );
|
||||
$success = $result ? true : false;
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Druckereinstellungen";
|
||||
$lang["config_receipt_info"] = "Quittungsinformation";
|
||||
$lang["config_receipt_printer"] = "Quittungsdrucker";
|
||||
$lang["config_receipt_show_taxes"] = "Zeige MWSt";
|
||||
$lang["config_receipt_show_total_discount"] = "Zeige Gesamtrabatt";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Berechne Durchschnittseinkaufspreis";
|
||||
$lang["config_recv_invoice_format"] = "Format Eingangsrechnung";
|
||||
$lang["config_return_policy_required"] = "Rücknahmepolitik erforderlich";
|
||||
$lang["config_sales_invoice_format"] = "Format Verkaufsrechnung";
|
||||
$lang["config_saved_successfully"] = "Einstellungen erfolgreich gesichert";
|
||||
$lang["config_saved_unsuccessfully"] = "Einstellungen konnten nicht gesichert werden";
|
||||
$lang["config_show_total_discount"] = "Zeige Gesamtrabatt";
|
||||
$lang["config_stock_location"] = "Lagerort";
|
||||
$lang["config_stock_location_duplicate"] = "Bitte verwenden Sie einen eindeutigen Lagerort";
|
||||
$lang["config_stock_location_invalid_chars"] = "Der Lagerort kann keine Unterstriche enthalten";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
|
||||
$lang["config_return_policy_required"] = "Return policy is a required field";
|
||||
$lang["config_sales_invoice_format"] = "Sales Invoice Format";
|
||||
$lang["config_saved_successfully"] = "Configuration saved successfully";
|
||||
$lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$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 can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Tax Included";
|
||||
$lang["config_thousands_separator"] = "Thousands Separator";
|
||||
$lang["config_timezone"] = "Timezone";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "Website";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Parámetros de Impresión";
|
||||
$lang["config_receipt_info"] = "Información de Configuración de Recibo";
|
||||
$lang["config_receipt_printer"] = "Impresora de Ticket";
|
||||
$lang["config_receipt_show_taxes"] = "Mostrar impuestos";
|
||||
$lang["config_receipt_show_total_discount"] = "Mostrar Descuento Total";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc precio promedio (Recepción)";
|
||||
$lang["config_recv_invoice_format"] = "Formato de Factura de Recepción";
|
||||
$lang["config_return_policy_required"] = "Política de Devolución es requerida";
|
||||
$lang["config_sales_invoice_format"] = "Formato de Facturas de Venta";
|
||||
$lang["config_saved_successfully"] = "Configuración guardada satisfactoriamente";
|
||||
$lang["config_saved_unsuccessfully"] = "Configuración no guardada";
|
||||
$lang["config_show_total_discount"] = "Mostrar Descuento Total";
|
||||
$lang["config_stock_location"] = "Ubicación de Inventario";
|
||||
$lang["config_stock_location_duplicate"] = "Por favor use un nombre de inventario único";
|
||||
$lang["config_stock_location_invalid_chars"] = "Nombre de la Ubicación de Inventario no debe contener '_'";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
|
||||
$lang["config_return_policy_required"] = "Le Message est un champ requis";
|
||||
$lang["config_sales_invoice_format"] = "Sales Invoice Format";
|
||||
$lang["config_saved_successfully"] = "Configuration sauvegardée";
|
||||
$lang["config_saved_unsuccessfully"] = "Échec de sauvegarde de configuration";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$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 can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Tax Included";
|
||||
$lang["config_thousands_separator"] = "Thousands Separator";
|
||||
$lang["config_timezone"] = "Fuseau Horaire";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "Site-web";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Postavke štamapnja";
|
||||
$lang["config_receipt_info"] = "Informacije o POS računu";
|
||||
$lang["config_receipt_printer"] = "POS printer";
|
||||
$lang["config_receipt_show_taxes"] = "Prikaži porez";
|
||||
$lang["config_receipt_show_total_discount"] = "Pokaži ukupni popust";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Računaj prosječnu cijenu (primke)";
|
||||
$lang["config_recv_invoice_format"] = "Oblik ulaznog računa(primke)";
|
||||
$lang["config_return_policy_required"] = "Polje za povratne obavijesti je potrebno";
|
||||
$lang["config_sales_invoice_format"] = "Oblik fakture";
|
||||
$lang["config_saved_successfully"] = "Konfiguracija je uspješno snimljena";
|
||||
$lang["config_saved_unsuccessfully"] = "Konfiguracija nije uspješno snimljena";
|
||||
$lang["config_show_total_discount"] = "Pokaži ukupni popust";
|
||||
$lang["config_stock_location"] = "Lokacija skladišta";
|
||||
$lang["config_stock_location_duplicate"] = "Molim koristite jedinstveni naziv skladišta";
|
||||
$lang["config_stock_location_invalid_chars"] = "Naziv skaldišta ne može sadržavati '_'";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Nyomtatási beállitások";
|
||||
$lang["config_receipt_info"] = "Nyugta beállítási információk";
|
||||
$lang["config_receipt_printer"] = "Jegy nyomtató";
|
||||
$lang["config_receipt_show_taxes"] = "Adók mutatása";
|
||||
$lang["config_receipt_show_total_discount"] = "Összes kedvezmény mutatása";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Átl. Ár számitása (visszáru)";
|
||||
$lang["config_recv_invoice_format"] = "Visszatérítési számla formátum";
|
||||
$lang["config_return_policy_required"] = "Return policy is a required field";
|
||||
$lang["config_sales_invoice_format"] = "Eladási számla formátum";
|
||||
$lang["config_saved_successfully"] = "Beállítások sikeresen elmentve";
|
||||
$lang["config_saved_unsuccessfully"] = "Beállítások mentése sikertelen";
|
||||
$lang["config_show_total_discount"] = "Összes kedvezmény mutatása";
|
||||
$lang["config_stock_location"] = "Bolt helye";
|
||||
$lang["config_stock_location_duplicate"] = "Kérem egyedi helyszin nevet használjon";
|
||||
$lang["config_stock_location_invalid_chars"] = "A bolt helyének neve nem tartalmazhat '_' karaktert";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Format Nota";
|
||||
$lang["config_return_policy_required"] = "Kebijakan retur wajib diisi";
|
||||
$lang["config_sales_invoice_format"] = "Format Nota";
|
||||
$lang["config_saved_successfully"] = "Konfigurasi berhasil disimpan";
|
||||
$lang["config_saved_unsuccessfully"] = "Konfigurasi tidak berhasil disimpan";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$lang["config_stock_location"] = "Lokasi Stock";
|
||||
$lang["config_stock_location_duplicate"] = "Please use an unique location name";
|
||||
$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Dikenakan Pajak";
|
||||
$lang["config_thousands_separator"] = "Pemisah Ribuan";
|
||||
$lang["config_timezone"] = "Zona Waktu";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "Situs Perusahaan";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Instellingen";
|
||||
$lang["config_receipt_info"] = "Ticket Instellingen";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Toon VAT";
|
||||
$lang["config_receipt_show_total_discount"] = "Toon Totale Korting";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Formattering Order #";
|
||||
$lang["config_return_policy_required"] = "De retourvoorwaarden moeten ingevuld worden";
|
||||
$lang["config_sales_invoice_format"] = "Formattering Aankoop #";
|
||||
$lang["config_saved_successfully"] = "Configuratie werd bewaard";
|
||||
$lang["config_saved_unsuccessfully"] = "Configuratie kon niet worden bewaard";
|
||||
$lang["config_show_total_discount"] = "Toon Totale Korting";
|
||||
$lang["config_stock_location"] = "Stock locatie";
|
||||
$lang["config_stock_location_duplicate"] = "Vul een unieke naam in";
|
||||
$lang["config_stock_location_invalid_chars"] = "De bedrijfsnaam moet ingevuld worden";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Configuração de Impressão";
|
||||
$lang["config_receipt_info"] = "Informações de configuração de Recibos";
|
||||
$lang["config_receipt_printer"] = "Imprimir recibo";
|
||||
$lang["config_receipt_show_taxes"] = "Mostrar Impostos";
|
||||
$lang["config_receipt_show_total_discount"] = "Mostrar total desconto";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc Médio de Preço (Recebimento)";
|
||||
$lang["config_recv_invoice_format"] = "Formato da fatura de recebimento";
|
||||
$lang["config_return_policy_required"] = "A política de devolução é um campo obrigatório";
|
||||
$lang["config_sales_invoice_format"] = "Formato da Fatura de Vendas";
|
||||
$lang["config_saved_successfully"] = "Configuração salva com sucesso";
|
||||
$lang["config_saved_unsuccessfully"] = "Configuração não salva";
|
||||
$lang["config_show_total_discount"] = "Mostrar total desconto";
|
||||
$lang["config_stock_location"] = "Localização do Estoque";
|
||||
$lang["config_stock_location_duplicate"] = "Por favor, use um nome de localização única";
|
||||
$lang["config_stock_location_invalid_chars"] = "O nome do local de ações não pode conter '_'";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
|
||||
$lang["config_return_policy_required"] = "Возвратний полис обязательный пробел";
|
||||
$lang["config_sales_invoice_format"] = "Sales Invoice Format";
|
||||
$lang["config_saved_successfully"] = "Конфигурация успешно сохранена";
|
||||
$lang["config_saved_unsuccessfully"] = "Конфигурация сохраненная безуспешно";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$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 can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Tax Included";
|
||||
$lang["config_thousands_separator"] = "Thousands Separator";
|
||||
$lang["config_timezone"] = "Часовой пояс";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "Веб-сайт";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "ใบส่งของ";
|
||||
$lang["config_return_policy_required"] = "ต้องกรอกเงื่อนไขการคืนสินค้า";
|
||||
$lang["config_sales_invoice_format"] = "รหัสใบเสร็จ";
|
||||
$lang["config_saved_successfully"] = "บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว";
|
||||
$lang["config_saved_unsuccessfully"] = "บันทึกข้อมูลร้านค้าไม่สำเร็จ";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$lang["config_stock_location"] = "สถานที่เก็บ";
|
||||
$lang["config_stock_location_duplicate"] = "";
|
||||
$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "รวมภาษีแล้ว";
|
||||
$lang["config_thousands_separator"] = "ตัวคั่นหลักพัน";
|
||||
$lang["config_timezone"] = "โซนเวลา";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "เว็บไซต์";
|
||||
$lang["config_locale_configuration"] = "ตั้งค่าภาษา";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
|
||||
$lang["config_return_policy_required"] = "İade Politikası zorunlu alandır";
|
||||
$lang["config_sales_invoice_format"] = "Sales Invoice Format";
|
||||
$lang["config_saved_successfully"] = "Yapılandırma kaydedildi";
|
||||
$lang["config_saved_unsuccessfully"] = "Yapılandırma kaydedilemedi";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$lang["config_stock_location"] = "Mağaza Yeri";
|
||||
$lang["config_stock_location_duplicate"] = "Please use an unique location name";
|
||||
$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Tax Included";
|
||||
$lang["config_thousands_separator"] = "Thousands Separator";
|
||||
$lang["config_timezone"] = "Saat Dilimi";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "Website";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -106,13 +106,15 @@ $lang["config_receipt_configuration"] = "Print Settings";
|
||||
$lang["config_receipt_info"] = "Receipt Configuration Information";
|
||||
$lang["config_receipt_printer"] = "Ticket Printer";
|
||||
$lang["config_receipt_show_taxes"] = "Show Taxes";
|
||||
$lang["config_receipt_show_total_discount"] = "Show Total Discount";
|
||||
$lang["config_receipt_show_description"] = "Show Description";
|
||||
$lang["config_receipt_show_serialnumber"] = "Show Serial Number";
|
||||
$lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
|
||||
$lang["config_recv_invoice_format"] = "Receivings Invoice Format";
|
||||
$lang["config_return_policy_required"] = "退換貨政策為必填";
|
||||
$lang["config_sales_invoice_format"] = "Sales Invoice Format";
|
||||
$lang["config_saved_successfully"] = "組態設置儲存成功";
|
||||
$lang["config_saved_unsuccessfully"] = "組態設置儲存失敗";
|
||||
$lang["config_show_total_discount"] = "Show total discount";
|
||||
$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 can not contain '_'";
|
||||
@@ -122,7 +124,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
|
||||
$lang["config_tax_included"] = "Tax Included";
|
||||
$lang["config_thousands_separator"] = "Thousands Separator";
|
||||
$lang["config_timezone"] = "時區";
|
||||
$lang["config_use_invoice_template"] = "Use invoice template";
|
||||
$lang["config_use_invoice_template"] = "Use Invoice Template";
|
||||
$lang["config_website"] = "網站";
|
||||
$lang["config_locale_configuration"] = "Localisation Configuration";
|
||||
$lang["config_locale_info"] = "Localisation Configuration Information";
|
||||
|
||||
@@ -49,13 +49,35 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('config_show_total_discount'), 'show_total_discount', array('class'=>'control-label col-xs-2')); ?>
|
||||
<?php echo form_label($this->lang->line('config_receipt_show_total_discount'), 'receipt_show_total_discount', array('class'=>'control-label col-xs-2')); ?>
|
||||
<div class='col-xs-1'>
|
||||
<?php echo form_checkbox(array(
|
||||
'name'=>'show_total_discount',
|
||||
'value'=>'show_total_discount',
|
||||
'id'=>'show_total_discount',
|
||||
'checked'=>$this->config->item('show_total_discount')));?>
|
||||
'name'=>'receipt_show_total_discount',
|
||||
'value'=>'receipt_show_total_discount',
|
||||
'id'=>'receipt_show_total_discount',
|
||||
'checked'=>$this->config->item('receipt_show_total_discount')));?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('config_receipt_show_description'), 'receipt_show_description', array('class'=>'control-label col-xs-2')); ?>
|
||||
<div class='col-xs-1'>
|
||||
<?php echo form_checkbox(array(
|
||||
'name'=>'receipt_show_description',
|
||||
'value'=>'receipt_show_description',
|
||||
'id'=>'receipt_show_description',
|
||||
'checked'=>$this->config->item('receipt_show_description')));?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('config_receipt_show_serialnumber'), 'receipt_show_serialnumber', array('class'=>'control-label col-xs-2')); ?>
|
||||
<div class='col-xs-1'>
|
||||
<?php echo form_checkbox(array(
|
||||
'name'=>'receipt_show_serialnumber',
|
||||
'value'=>'receipt_show_serialnumber',
|
||||
'id'=>'receipt_show_serialnumber',
|
||||
'checked'=>$this->config->item('receipt_show_serialnumber')));?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -74,11 +74,25 @@ if (isset($error_message))
|
||||
<td><?php echo ucfirst($item['name']); ?></td>
|
||||
<td><?php echo to_currency($item['price']); ?></td>
|
||||
<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
|
||||
<td class="total-value"><?php echo to_currency($item[($this->Appconfig->get('show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
|
||||
<td class="total-value"><?php echo to_currency($item[($this->Appconfig->get('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2"><?php echo $item['description']; ?></td>
|
||||
<td><?php echo $item['serialnumber']; ?></td>
|
||||
<?php
|
||||
if($this->Appconfig->get('receipt_show_description'))
|
||||
{
|
||||
?>
|
||||
<td colspan="2"><?php echo $item['description']; ?></td>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if($this->Appconfig->get('receipt_show_serialnumber'))
|
||||
{
|
||||
?>
|
||||
<td><?php echo $item['serialnumber']; ?></td>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</tr>
|
||||
<?php
|
||||
if ($item['discount'] > 0)
|
||||
@@ -96,7 +110,7 @@ if (isset($error_message))
|
||||
?>
|
||||
|
||||
<?php
|
||||
if ($this->Appconfig->get('show_total_discount') && $discount > 0)
|
||||
if ($this->Appconfig->get('receipt_show_total_discount') && $discount > 0)
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
@@ -105,7 +119,7 @@ if (isset($error_message))
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="3" class="total-value"><?php echo $this->lang->line('sales_discount'); ?>:</td>
|
||||
<td class="total-value"><?php echo to_currency($discount*-1); ?></td>
|
||||
<td class="total-value"><?php echo to_currency($discount * -1); ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
@@ -137,7 +151,7 @@ if (isset($error_message))
|
||||
<tr>
|
||||
</tr>
|
||||
|
||||
<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('show_total_discount') && $discount > 0)); ?>
|
||||
<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('receipt_show_total_discount') && $discount > 0)); ?>
|
||||
<tr>
|
||||
<td colspan="3" style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo $this->lang->line('sales_total'); ?></td>
|
||||
<td style="text-align:right;<?php echo $border? 'border-top: 2px solid black;' :''; ?>"><?php echo to_currency($total); ?></td>
|
||||
|
||||
@@ -50,11 +50,25 @@
|
||||
<td><?php echo ucfirst($item['name']); ?></td>
|
||||
<td><?php echo to_currency($item['price']); ?></td>
|
||||
<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
|
||||
<td style="text-align:right;"><?php echo to_currency($item[($this->Appconfig->get('show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
|
||||
<td style="text-align:right;"><?php echo to_currency($item[($this->Appconfig->get('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2"><?php echo $item['description']; ?></td>
|
||||
<td><?php echo $item['serialnumber']; ?></td>
|
||||
<?php
|
||||
if($this->Appconfig->get('receipt_show_description'))
|
||||
{
|
||||
?>
|
||||
<td colspan="2"><?php echo $item['description']; ?></td>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if($this->Appconfig->get('receipt_show_serialnumber'))
|
||||
{
|
||||
?>
|
||||
<td><?php echo $item['serialnumber']; ?></td>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</tr>
|
||||
<?php
|
||||
if ($item['discount'] > 0)
|
||||
@@ -72,7 +86,7 @@
|
||||
?>
|
||||
|
||||
<?php
|
||||
if ($this->Appconfig->get('show_total_discount') && $discount > 0)
|
||||
if ($this->Appconfig->get('receipt_show_total_discount') && $discount > 0)
|
||||
{
|
||||
?>
|
||||
<tr>
|
||||
@@ -113,7 +127,7 @@
|
||||
<tr>
|
||||
</tr>
|
||||
|
||||
<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('show_total_discount') && $discount > 0)); ?>
|
||||
<?php $border = (!$this->Appconfig->get('receipt_show_taxes') && !($this->Appconfig->get('receipt_show_total_discount') && $discount > 0)); ?>
|
||||
<tr>
|
||||
<td colspan="3" style="<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right;"><?php echo $this->lang->line('sales_total'); ?></td>
|
||||
<td style="<?php echo $border? 'border-top: 2px solid black;' :''; ?>text-align:right"><?php echo to_currency($total); ?></td>
|
||||
|
||||
@@ -32,4 +32,9 @@ ALTER TABLE `ospos_items_taxes`
|
||||
ALTER TABLE `ospos_customers`
|
||||
ADD COLUMN `discount_percent` decimal(15,2) NOT NULL DEFAULT '0.00';
|
||||
|
||||
UPDATE `ospos_app_config` SET `key` = 'receipt_show_total_discount' WHERE `key` = 'show_total_discount';
|
||||
|
||||
INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
|
||||
('receipt_show_description', '1'),
|
||||
('receipt_show_serialnumber', '1');
|
||||
|
||||
@@ -43,6 +43,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
|
||||
('barcode_page_cellspacing', '20'),
|
||||
('barcode_generate_if_empty', '0'),
|
||||
('receipt_show_taxes', '0'),
|
||||
('receipt_show_total_discount', '1'),
|
||||
('receipt_show_description', '1'),
|
||||
('receipt_show_serialnumber', '1'),
|
||||
('use_invoice_template', '1'),
|
||||
('invoice_email_message', 'Dear $CU, In attachment the receipt for sale $INV'),
|
||||
('print_silently', '1'),
|
||||
@@ -54,7 +57,6 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
|
||||
('print_right_margin', '0'),
|
||||
('default_sales_discount', '0'),
|
||||
('lines_per_page', '25'),
|
||||
('show_total_discount', '1'),
|
||||
('dateformat', 'm/d/Y'),
|
||||
('timeformat', 'H:i:s'),
|
||||
('currency_symbol', '$'),
|
||||
|
||||
@@ -105,13 +105,15 @@ config_receipt_configuration,Nyomtatási beállitások,Druckereinstellungen,Prin
|
||||
config_receipt_info,Nyugta beállítási információk,Quittungsinformation,Ticket Instellingen,Información de Configuración de Recibo,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Informações de configuração de Recibos,Informacije o POS računu
|
||||
config_receipt_printer,Jegy nyomtató,Quittungsdrucker,Ticket Printer,Impresora de Ticket,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Imprimir recibo,POS printer
|
||||
config_receipt_show_taxes,Adók mutatása,Zeige MWSt,Toon VAT,Mostrar impuestos,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Mostrar Impostos,Prikaži porez
|
||||
config_receipt_show_total_discount,Összes kedvezmény mutatása,Zeige Gesamtrabatt,Toon Totale Korting,Mostrar Descuento Total,Show Total Discount,Show Total Discount,Show Total Discount,Show Total Discount,Show Total Discount,Show Total Discount,Show Total Discount,Mostrar total desconto,Pokaži ukupni popust
|
||||
config_receipt_show_description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description
|
||||
config_receipt_show_serialnumber,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number
|
||||
config_receiving_calculate_average_price,Átl. Ár számitása (visszáru),Berechne Durchschnittseinkaufspreis,Calc avg. Price (Receiving),Calc precio promedio (Recepción),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc avg. Price (Receiving),Calc Médio de Preço (Recebimento),Računaj prosječnu cijenu (primke)
|
||||
config_recv_invoice_format,Visszatérítési számla formátum,Format Eingangsrechnung,Formattering Order #,Formato de Factura de Recepción,Receivings Invoice Format,Receivings Invoice Format,Receivings Invoice Format,Receivings Invoice Format,ใบส่งของ,Receivings Invoice Format,Format Nota,Formato da fatura de recebimento,Oblik ulaznog računa(primke)
|
||||
config_return_policy_required,Return policy is a required field,Rücknahmepolitik erforderlich,De retourvoorwaarden moeten ingevuld worden,Política de Devolución es requerida,Return policy is a required field,Le Message est un champ requis,退換貨政策為必填,Возвратний полис обязательный пробел,ต้องกรอกเงื่อนไขการคืนสินค้า,İade Politikası zorunlu alandır,Kebijakan retur wajib diisi,A política de devolução é um campo obrigatório,Polje za povratne obavijesti je potrebno
|
||||
config_sales_invoice_format,Eladási számla formátum,Format Verkaufsrechnung,Formattering Aankoop #,Formato de Facturas de Venta,Sales Invoice Format,Sales Invoice Format,Sales Invoice Format,Sales Invoice Format,รหัสใบเสร็จ,Sales Invoice Format,Format Nota,Formato da Fatura de Vendas,Oblik fakture
|
||||
config_saved_successfully,Beállítások sikeresen elmentve,Einstellungen erfolgreich gesichert,Configuratie werd bewaard,Configuración guardada satisfactoriamente,Configuration saved successfully,Configuration sauvegardée,組態設置儲存成功,Конфигурация успешно сохранена,บันทึกข้อมูลร้านค้าเรียบร้อยแล้ว,Yapılandırma kaydedildi,Konfigurasi berhasil disimpan,Configuração salva com sucesso,Konfiguracija je uspješno snimljena
|
||||
config_saved_unsuccessfully,Beállítások mentése sikertelen,Einstellungen konnten nicht gesichert werden,Configuratie kon niet worden bewaard,Configuración no guardada,Configuration saved unsuccessfully,Échec de sauvegarde de configuration,組態設置儲存失敗,Конфигурация сохраненная безуспешно,บันทึกข้อมูลร้านค้าไม่สำเร็จ,Yapılandırma kaydedilemedi,Konfigurasi tidak berhasil disimpan,Configuração não salva,Konfiguracija nije uspješno snimljena
|
||||
config_show_total_discount,Összes kedvezmény mutatása,Zeige Gesamtrabatt,Toon Totale Korting,Mostrar Descuento Total,Show total discount,Show total discount,Show total discount,Show total discount,Show total discount,Show total discount,Show total discount,Mostrar total desconto,Pokaži ukupni popust
|
||||
config_stock_location,Bolt helye,Lagerort,Stock locatie,Ubicación de Inventario,Stock location,Stock location,Stock location,Stock location,สถานที่เก็บ,Mağaza Yeri,Lokasi Stock,Localização do Estoque,Lokacija skladišta
|
||||
config_stock_location_duplicate,Kérem egyedi helyszin nevet használjon,Bitte verwenden Sie einen eindeutigen Lagerort,Vul een unieke naam in,Por favor use un nombre de inventario único,Please use an unique location name,Please use an unique location name,Please use an unique location name,Please use an unique location name,,Please use an unique location name,Please use an unique location name,"Por favor, use um nome de localização única",Molim koristite jedinstveni naziv skladišta
|
||||
config_stock_location_invalid_chars,A bolt helyének neve nem tartalmazhat '_' karaktert,Der Lagerort kann keine Unterstriche enthalten,De bedrijfsnaam moet ingevuld worden,Nombre de la Ubicación de Inventario no debe contener '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',O nome do local de ações não pode conter '_',Naziv skaldišta ne može sadržavati '_'
|
||||
@@ -121,7 +123,7 @@ config_tax_decimals,Tax Decimals,Tax Decimals,Tax Decimals,Tax Decimals,Tax Deci
|
||||
config_tax_included,Adókat tartalmaz,MWSt inbegriffen,VAT Inbegrepen,Impuestos incluidos,Tax Included,Tax Included,Tax Included,Tax Included,รวมภาษีแล้ว,Tax Included,Dikenakan Pajak,Imposto Incluído,Uključuje porez
|
||||
config_thousands_separator,Ezres elválasztó,Tausendertrennzeichen,Thousands Separator,Separador de miles,Thousands Separator,Thousands Separator,Thousands Separator,Thousands Separator,ตัวคั่นหลักพัน,Thousands Separator,Pemisah Ribuan,Separador de milhar,Razdjelnik za tisućice
|
||||
config_timezone,Időzóna,Zeitzone,Tijdzone,Zona Horaria,Timezone,Fuseau Horaire,時區,Часовой пояс,โซนเวลา,Saat Dilimi,Zona Waktu,Fuso horário,Vremenska zona
|
||||
config_use_invoice_template,Számla sablon használata,Verwende Rechnungsvorlage,Gebruik template voor facturen,Use plantilla de factura,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Usar modelo de fatura,Koristi predložak za fakture
|
||||
config_use_invoice_template,Számla sablon használata,Verwende Rechnungsvorlage,Gebruik template voor facturen,Use plantilla de factura,Use Invoice Template,Use Invoice Template,Use Invoice Template,Use Invoice Template,Use Invoice Template,Use Invoice Template,Use Invoice Template,Usar modelo de fatura,Koristi predložak za fakture
|
||||
config_website,Weboldal,Website,Website,Sitio Web,Website,Site-web,網站,Веб-сайт,เว็บไซต์,Website,Situs Perusahaan,Site da internet,web strana
|
||||
config_locale_configuration,Lokalizációs beállitások,Länderkonfiguration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,Localisation Configuration,ตั้งค่าภาษา,Localisation Configuration,Localisation Configuration,Configuração de Localização,Konfiguracija
|
||||
config_locale_info,Lokalizációs beállitási információk,Info Länderkonfiguration,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Localisation Configuration Information,Informações da Configuração de Localização,Informacije o lokalnoj konfiguraciji
|
||||
|
||||
|
Reference in New Issue
Block a user