diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php
index 626bc92e4..f188bb961 100644
--- a/application/views/sales/receipt.php
+++ b/application/views/sales/receipt.php
@@ -43,197 +43,6 @@ $(document).ready(function()
' . $this->lang->line('sales_takings'), array('class'=>'btn btn-info btn-sm', 'id'=>'show_takings_button')); ?>
-
-
-
-
-
-
-load->view("partial/footer"); ?>
+load->view("sales/" . $this->config->item('receipt_template')); ?>
+load->view("partial/footer"); ?>
\ No newline at end of file
diff --git a/application/views/sales/receipt_default.php b/application/views/sales/receipt_default.php
new file mode 100644
index 000000000..7b935a5d6
--- /dev/null
+++ b/application/views/sales/receipt_default.php
@@ -0,0 +1,191 @@
+
- Appconfig->get('company_logo') != '')
- {
- ?>
- ); ?>)
-
-
-
-
- config->item('company'); ?>
- config->item('address')); ?>
- config->item('phone'); ?>
-
-
-
-
-
-
- lang->line('customers_customer').": ".$customer; ?>
-
-
- lang->line('sales_id').": ".$sale_id; ?>
-
-
- lang->line('sales_invoice_number').": ".$invoice_number; ?>
-
-
- lang->line('employees_employee').": ".$employee; ?>
- | lang->line('sales_description_abbrv'); ?> | -lang->line('sales_price'); ?> | -lang->line('sales_quantity'); ?> | -lang->line('sales_total'); ?> | -
|---|---|---|---|
| - | - | - | Appconfig->get('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?> | -
| - - Appconfig->get('receipt_show_serialnumber')) - { - ?> - | - - | ||
| lang->line("sales_discount_included")?> | -- | ||
| lang->line('sales_sub_total'); ?> | -- | ||
| lang->line('sales_discount'); ?>: | -- | ||
| lang->line('sales_sub_total'); ?> | -config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?> | -||
| : | -- | ||
| lang->line('sales_total'); ?> | -- | ||
| - | |||
| - | - | ||
| - | |||
| lang->line('sales_giftcard_balance'); ?> | -- | ||
| lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> | -- | ||
- config->item('return_policy')); ?>
-
-
-
- 
- -
-- -
+
+
+
+
\ No newline at end of file
diff --git a/application/views/sales/receipt_short.php b/application/views/sales/receipt_short.php
new file mode 100644
index 000000000..ce486c6e7
--- /dev/null
+++ b/application/views/sales/receipt_short.php
@@ -0,0 +1,185 @@
+
+ Appconfig->get('company_logo') != '')
+ {
+ ?>
+
+
+
+
+
+ config->item('company'); ?>
+ config->item('address')); ?>
+ config->item('phone'); ?>
+
+
+
+
+
+
+ lang->line('customers_customer').": ".$customer; ?>
+
+
+ lang->line('sales_id').": ".$sale_id; ?>
+
+
+ lang->line('sales_invoice_number').": ".$invoice_number; ?>
+
+
+ lang->line('employees_employee').": ".$employee; ?>
+ | lang->line('sales_description_abbrv'); ?> | +lang->line('sales_price'); ?> | +lang->line('sales_quantity'); ?> | +lang->line('sales_total'); ?> | +
|---|---|---|---|
| + | + | + | Appconfig->get('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?> | +
| + + Appconfig->get('receipt_show_serialnumber')) + { + ?> + | + + | ||
| lang->line("sales_discount_included")?> | ++ | ||
| lang->line('sales_sub_total'); ?> | ++ | ||
| lang->line('sales_discount'); ?>: | ++ | ||
| lang->line('sales_sub_total'); ?> | +config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?> | +||
| : | ++ | ||
| lang->line('sales_total'); ?> | ++ | ||
| + | |||
| + | + | ||
| + | |||
| lang->line('sales_giftcard_balance'); ?> | ++ | ||
| lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> | ++ | ||
+ config->item('return_policy')); ?>
+
+
+
+
+ +
++ +
+
+
+
+
\ No newline at end of file
diff --git a/database/2.4_to_3.0.sql b/database/2.4_to_3.0.sql
index 8a3eeeec6..fbca2b54a 100644
--- a/database/2.4_to_3.0.sql
+++ b/database/2.4_to_3.0.sql
@@ -40,18 +40,19 @@ ALTER TABLE `ospos_customers`
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'),
- ('invoice_enable', '1'),
- ('country_codes', 'us'),
- ('notify_horizontal_position', 'right'),
- ('notify_vertical_position', 'top'),
- ('payment_options_order', 'cashdebitcredit'),
- ('protocol', 'mail'),
- ('mailpath', '/usr/sbin/sendmail'),
- ('smtp_port', '465'),
- ('smtp_timeout', '5'),
- ('smtp_crypto', 'ssl');
+('receipt_show_description', '1'),
+('receipt_show_serialnumber', '1'),
+('invoice_enable', '1'),
+('country_codes', 'us'),
+('notify_horizontal_position', 'right'),
+('notify_vertical_position', 'top'),
+('payment_options_order', 'cashdebitcredit'),
+('protocol', 'mail'),
+('mailpath', '/usr/sbin/sendmail'),
+('smtp_port', '465'),
+('smtp_timeout', '5'),
+('smtp_crypto', 'ssl'),
+('receipt_template', 'receipt_default');
DELETE FROM `ospos_app_config` WHERE `key` = 'use_invoice_template';
diff --git a/database/database.sql b/database/database.sql
index d3ce2ee6d..a4be257c0 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -76,7 +76,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('mailpath', '/usr/sbin/sendmail'),
('smtp_port', '465'),
('smtp_timeout', '5'),
-('smtp_crypto', 'ssl');
+('smtp_crypto', 'ssl'),
+('receipt_template', 'receipt_default');
-- --------------------------------------------------------
diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql
index fb63ca5e7..8d58763e5 100644
--- a/database/migrate_phppos_dist.sql
+++ b/database/migrate_phppos_dist.sql
@@ -76,7 +76,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('mailpath', '/usr/sbin/sendmail'),
('smtp_port', '465'),
('smtp_timeout', '5'),
-('smtp_crypto', 'ssl');
+('smtp_crypto', 'ssl'),
+('receipt_template', 'receipt_default');
-- --------------------------------------------------------
diff --git a/database/tables.sql b/database/tables.sql
index 38cdfffd1..6df0d4430 100644
--- a/database/tables.sql
+++ b/database/tables.sql
@@ -76,7 +76,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('mailpath', '/usr/sbin/sendmail'),
('smtp_port', '465'),
('smtp_timeout', '5'),
-('smtp_crypto', 'ssl');
+('smtp_crypto', 'ssl'),
+('receipt_template', 'receipt_default');
-- --------------------------------------------------------
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 419889df4..690f79a06 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -150,6 +150,9 @@ config_receipt_show_taxes,Adók mutatása,Zeige MWSt,Toon VAT,Mostrar impuestos,
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,Mostrar descripcion,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Show Description,Exibir descrição,Show Description
config_receipt_show_serialnumber,Show Serial Number,Show Serial Number,Show Serial Number,Mostra numero de serie,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Show Serial Number,Exibir número serial,Show Serial Number
+config_receipt_template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template,Receipt Template
+config_receipt_default,Default,Default,Default,Default,Default,Default,Default,Default,Default,Default,Default,Default,Default
+config_receipt_short,Short,Short,Short,Short,Short,Short,Short,Short,Short,Short,Short,Short,Short
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
+ Appconfig->get('company_logo') != '')
+ {
+ ?>
+
+
+
+
+
+ config->item('company'); ?>
+ config->item('address')); ?>
+ config->item('phone'); ?>
+
+
+
+
+
+
+ lang->line('customers_customer').": ".$customer; ?>
+
+
+ lang->line('sales_id').": ".$sale_id; ?>
+
+
+ lang->line('recvs_invoice_number').": ".$invoice_number; ?>
+
+
+ lang->line('employees_employee').": ".$employee; ?>
+ | lang->line('sales_description_abbrv'); ?> | +lang->line('sales_quantity'); ?> | +lang->line('sales_total'); ?> | +|||
|---|---|---|---|---|---|
| + | |||||
| + | + | Appconfig->get('receipt_show_total_discount') ? 'total' : 'discounted_total')]); ?> | +|||
| + + Appconfig->get('receipt_show_serialnumber')) + { + ?> + | + + | ||||
| lang->line("sales_discount_included")?> | ++ | ||||
| lang->line('sales_sub_total'); ?> | ++ | ||||
| lang->line('sales_discount'); ?>: | ++ | ||||
| lang->line('sales_sub_total'); ?> | +config->item('tax_included') ? $tax_exclusive_subtotal : $discounted_subtotal); ?> | +||||
| : | ++ | ||||
| lang->line('sales_total'); ?> | ++ | ||||
| + | + | ||||
| lang->line('sales_giftcard_balance'); ?> | ++ | ||||
| lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?> | ++ | ||||
+ config->item('return_policy')); ?>
+
+
+
+
+ +
++ +