From cf2ca1e6c7faf7d5daeeba7d1fe89c381f583b21 Mon Sep 17 00:00:00 2001 From: jekkos-t520 Date: Sun, 15 Feb 2015 11:29:04 +0100 Subject: [PATCH] Start receipt rework --- application/views/configs/receipt_config.php | 527 +++++++++++++++++++ application/views/sales/receipt.php | 61 ++- 2 files changed, 560 insertions(+), 28 deletions(-) create mode 100644 application/views/configs/receipt_config.php diff --git a/application/views/configs/receipt_config.php b/application/views/configs/receipt_config.php new file mode 100644 index 000000000..2504c7571 --- /dev/null +++ b/application/views/configs/receipt_config.php @@ -0,0 +1,527 @@ +
lang->line('config_receipt_configuration'); ?>
+'receipt_config_form')); +?> +
+
+
lang->line('common_fields_required_message'); ?>
+
    +lang->line("config_receipt_info"); ?> + +
    +lang->line('config_receipt_show_taxes').':', 'config_receipt_show_taxes',array('class'=>'wide required')); ?> +
    + 'receipt_show_taxes', + 'id'=>'receipt_show_taxes', + 'value'=>$this->config->item('receipt_show_taxes')));?> +
    +
    + +
    +lang->line('config_receipt_printer').':', 'config_receipt_printer',array('class'=>'wide')); ?> +
    + 'config_receipt_printer', + 'id'=>'config_receipt_printer', + 'value'=>$this->config->item('config_receipt_printer')));?> +
    +
    + +
    +lang->line('config_address').':', 'address',array('class'=>'wide required')); ?> +
    + 'address', + 'id'=>'address', + 'rows'=>4, + 'cols'=>17, + 'value'=>$this->config->item('address')));?> +
    +
    + +
    +lang->line('config_phone').':', 'phone',array('class'=>'wide required')); ?> +
    + 'phone', + 'id'=>'phone', + 'value'=>$this->config->item('phone')));?> +
    +
    + +
    +lang->line('config_default_tax_rate_1').':', 'default_tax_1_rate',array('class'=>'wide required')); ?> +
    + 'default_tax_1_name', + 'id'=>'default_tax_1_name', + 'size'=>'10', + 'value'=>$this->config->item('default_tax_1_name')!==FALSE ? $this->config->item('default_tax_1_name') : $this->lang->line('items_sales_tax_1')));?> + + 'default_tax_1_rate', + 'id'=>'default_tax_1_rate', + 'size'=>'4', + 'value'=>$this->config->item('default_tax_1_rate')));?>% +
    +
    + +
    +lang->line('config_default_tax_rate_2').':', 'default_tax_1_rate',array('class'=>'wide')); ?> +
    + 'default_tax_2_name', + 'id'=>'default_tax_2_name', + 'size'=>'10', + 'value'=>$this->config->item('default_tax_2_name')!==FALSE ? $this->config->item('default_tax_2_name') : $this->lang->line('items_sales_tax_2')));?> + + 'default_tax_2_rate', + 'id'=>'default_tax_2_rate', + 'size'=>'4', + 'value'=>$this->config->item('default_tax_2_rate')));?>% +
    +
    + +
    + lang->line('config_currency_symbol').':', 'currency_symbol',array('class'=>'wide')); ?> +
    + 'currency_symbol', + 'id'=>'currency_symbol', + 'value'=>$this->config->item('currency_symbol')));?> +
    + + lang->line('config_currency_side').':', 'currency_side',array('class'=>''));?> +
    + 'currency_side', + 'id'=>'currency_side', + 'value'=>'currency_side', + 'checked'=>$this->config->item('currency_side')));?> +
    +
    + + +
    +lang->line('config_number_format').':', 'number_format',array('class'=>'wide required')); ?> +
    + lang->line('config_thousands_separator'); ?> + ', (komma)', + '.' => '. (dot)', + '' => '(none)' + ), + $this->config->item('thousands_separator')); + ?> + lang->line('config_decimal_point'); ?> + '. (dot)', + ',' => ', (komma)' + ), + $this->config->item('decimal_point')); + ?> +
    +
    + +
    +lang->line('config_sales_invoice_format').':', 'sales_invoice_format',array('class'=>'wide')); ?> +
    + 'sales_invoice_format', + 'id'=>'sales_invoice_format', + 'value'=>$this->config->item('sales_invoice_format'))); ?> +
    +
    + +
    +lang->line('config_recv_invoice_format').':', 'recv_invoice_format',array('class'=>'wide')); ?> +
    + 'recv_invoice_format', + 'id'=>'recv_invoice_format', + 'value'=>$this->config->item('recv_invoice_format'))); ?> +
    +
    + +
    +
    +lang->line('common_email').':', 'email',array('class'=>'wide')); ?> +
    + 'email', + 'id'=>'email', + 'value'=>$this->config->item('email')));?> +
    +
    + + +
    +lang->line('config_fax').':', 'fax',array('class'=>'wide')); ?> +
    + 'fax', + 'id'=>'fax', + 'value'=>$this->config->item('fax')));?> +
    +
    + +
    +lang->line('config_website').':', 'website',array('class'=>'wide')); ?> +
    + 'website', + 'id'=>'website', + 'value'=>$this->config->item('website')));?> +
    +
    + +
    +lang->line('common_return_policy').':', 'return_policy',array('class'=>'wide required')); ?> +
    + 'return_policy', + 'id'=>'return_policy', + 'rows'=>'4', + 'cols'=>'17', + 'value'=>$this->config->item('return_policy')));?> +
    +
    + +
    + lang->line('config_language').':', 'language',array('class'=>'wide required')); ?> +
    + 'English', + 'es' => 'Spanish', + 'ru' => 'Russian', + 'nl-BE' => 'Dutch', + 'zh' => 'Chinese', + 'id' => 'Indonesian', + 'fr' => 'French', + 'th' => 'Thai', + 'tr' => 'Turkish' + ), + $this->config->item('language')); + ?> +
    +
    + +
    +lang->line('config_timezone').':', 'timezone',array('class'=>'wide required')); ?> +
    + '(GMT-11:00) Midway Island, Samoa', + 'America/Adak'=>'(GMT-10:00) Hawaii-Aleutian', + 'Etc/GMT+10'=>'(GMT-10:00) Hawaii', + 'Pacific/Marquesas'=>'(GMT-09:30) Marquesas Islands', + 'Pacific/Gambier'=>'(GMT-09:00) Gambier Islands', + 'America/Anchorage'=>'(GMT-09:00) Alaska', + 'America/Ensenada'=>'(GMT-08:00) Tijuana, Baja California', + 'Etc/GMT+8'=>'(GMT-08:00) Pitcairn Islands', + 'America/Los_Angeles'=>'(GMT-08:00) Pacific Time (US & Canada)', + 'America/Denver'=>'(GMT-07:00) Mountain Time (US & Canada)', + 'America/Chihuahua'=>'(GMT-07:00) Chihuahua, La Paz, Mazatlan', + 'America/Dawson_Creek'=>'(GMT-07:00) Arizona', + 'America/Belize'=>'(GMT-06:00) Saskatchewan, Central America', + 'America/Cancun'=>'(GMT-06:00) Guadalajara, Mexico City, Monterrey', + 'Chile/EasterIsland'=>'(GMT-06:00) Easter Island', + 'America/Chicago'=>'(GMT-06:00) Central Time (US & Canada)', + 'America/New_York'=>'(GMT-05:00) Eastern Time (US & Canada)', + 'America/Havana'=>'(GMT-05:00) Cuba', + 'America/Bogota'=>'(GMT-05:00) Bogota, Lima, Quito, Rio Branco', + 'America/Caracas'=>'(GMT-04:30) Caracas', + 'America/Santiago'=>'(GMT-04:00) Santiago', + 'America/La_Paz'=>'(GMT-04:00) La Paz', + 'Atlantic/Stanley'=>'(GMT-04:00) Faukland Islands', + 'America/Campo_Grande'=>'(GMT-04:00) Brazil', + 'America/Goose_Bay'=>'(GMT-04:00) Atlantic Time (Goose Bay)', + 'America/Glace_Bay'=>'(GMT-04:00) Atlantic Time (Canada)', + 'America/St_Johns'=>'(GMT-03:30) Newfoundland', + 'America/Araguaina'=>'(GMT-03:00) UTC-3', + 'America/Montevideo'=>'(GMT-03:00) Montevideo', + 'America/Miquelon'=>'(GMT-03:00) Miquelon, St. Pierre', + 'America/Godthab'=>'(GMT-03:00) Greenland', + 'America/Argentina/Buenos_Aires'=>'(GMT-03:00) Buenos Aires', + 'America/Sao_Paulo'=>'(GMT-03:00) Brasilia', + 'America/Noronha'=>'(GMT-02:00) Mid-Atlantic', + 'Atlantic/Cape_Verde'=>'(GMT-01:00) Cape Verde Is.', + 'Atlantic/Azores'=>'(GMT-01:00) Azores', + 'Europe/Belfast'=>'(GMT) Greenwich Mean Time : Belfast', + 'Europe/Dublin'=>'(GMT) Greenwich Mean Time : Dublin', + 'Europe/Lisbon'=>'(GMT) Greenwich Mean Time : Lisbon', + 'Europe/London'=>'(GMT) Greenwich Mean Time : London', + 'Africa/Abidjan'=>'(GMT) Monrovia, Reykjavik', + 'Europe/Amsterdam'=>'(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna', + 'Europe/Belgrade'=>'(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague', + 'Europe/Brussels'=>'(GMT+01:00) Brussels, Copenhagen, Madrid, Paris', + 'Africa/Algiers'=>'(GMT+01:00) West Central Africa', + 'Africa/Windhoek'=>'(GMT+01:00) Windhoek', + 'Asia/Beirut'=>'(GMT+02:00) Beirut', + 'Africa/Cairo'=>'(GMT+02:00) Cairo', + 'Asia/Gaza'=>'(GMT+02:00) Gaza', + 'Africa/Blantyre'=>'(GMT+02:00) Harare, Pretoria', + 'Asia/Jerusalem'=>'(GMT+02:00) Jerusalem', + 'Europe/Minsk'=>'(GMT+02:00) Minsk', + 'Asia/Damascus'=>'(GMT+02:00) Syria', + 'Europe/Moscow'=>'(GMT+03:00) Moscow, St. Petersburg, Volgograd', + 'Africa/Addis_Ababa'=>'(GMT+03:00) Nairobi', + 'Asia/Tehran'=>'(GMT+03:30) Tehran', + 'Asia/Dubai'=>'(GMT+04:00) Abu Dhabi, Muscat', + 'Asia/Yerevan'=>'(GMT+04:00) Yerevan', + 'Asia/Kabul'=>'(GMT+04:30) Kabul', + 'Asia/Baku'=>'(GMT+05:00) Baku',/*GARRISON ADDED 4/20/2013*/ + 'Asia/Yekaterinburg'=>'(GMT+05:00) Ekaterinburg', + 'Asia/Tashkent'=>'(GMT+05:00) Tashkent', + 'Asia/Kolkata'=>'(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi', + 'Asia/Katmandu'=>'(GMT+05:45) Kathmandu', + 'Asia/Dhaka'=>'(GMT+06:00) Astana, Dhaka', + 'Asia/Novosibirsk'=>'(GMT+06:00) Novosibirsk', + 'Asia/Rangoon'=>'(GMT+06:30) Yangon (Rangoon)', + 'Asia/Bangkok'=>'(GMT+07:00) Bangkok, Hanoi, Jakarta', + 'Asia/Krasnoyarsk'=>'(GMT+07:00) Krasnoyarsk', + 'Asia/Hong_Kong'=>'(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi', + 'Asia/Irkutsk'=>'(GMT+08:00) Irkutsk, Ulaan Bataar', + 'Australia/Perth'=>'(GMT+08:00) Perth', + 'Australia/Eucla'=>'(GMT+08:45) Eucla', + 'Asia/Tokyo'=>'(GMT+09:00) Osaka, Sapporo, Tokyo', + 'Asia/Seoul'=>'(GMT+09:00) Seoul', + 'Asia/Yakutsk'=>'(GMT+09:00) Yakutsk', + 'Australia/Adelaide'=>'(GMT+09:30) Adelaide', + 'Australia/Darwin'=>'(GMT+09:30) Darwin', + 'Australia/Brisbane'=>'(GMT+10:00) Brisbane', + 'Australia/Hobart'=>'(GMT+10:00) Hobart', + 'Asia/Vladivostok'=>'(GMT+10:00) Vladivostok', + 'Australia/Lord_Howe'=>'(GMT+10:30) Lord Howe Island', + 'Etc/GMT-11'=>'(GMT+11:00) Solomon Is., New Caledonia', + 'Asia/Magadan'=>'(GMT+11:00) Magadan', + 'Pacific/Norfolk'=>'(GMT+11:30) Norfolk Island', + 'Asia/Anadyr'=>'(GMT+12:00) Anadyr, Kamchatka', + 'Pacific/Auckland'=>'(GMT+12:00) Auckland, Wellington', + 'Etc/GMT-12'=>'(GMT+12:00) Fiji, Kamchatka, Marshall Is.', + 'Pacific/Chatham'=>'(GMT+12:45) Chatham Islands', + 'Pacific/Tongatapu'=>'(GMT+13:00) Nuku\'alofa', + 'Pacific/Kiritimati'=>'(GMT+14:00) Kiritimati' + ), $this->config->item('timezone') ? $this->config->item('timezone') : date_default_timezone_get()); + ?> +
    +
    + +
    +lang->line('config_print_after_sale').':', 'print_after_sale',array('class'=>'wide')); ?> +
    + 'print_after_sale', + 'id'=>'print_after_sale', + 'value'=>'print_after_sale', + 'checked'=>$this->config->item('print_after_sale')));?> +
    +
    + +
    +lang->line('config_receiving_calculate_average_price').':', 'receiving_calculate_average_price',array('class'=>'wide')); ?> +
    + 'receiving_calculate_average_price', + 'id'=>'receiving_calculate_average_price', + 'value'=>'receiving_calculate_average_price', + 'checked'=>$this->config->item('receiving_calculate_average_price')));?> +
    +
    + +
    +lang->line('config_tax_included').':', 'tax_included',array('class'=>'wide')); ?> +
    + 'tax_included', + 'id'=>'tax_included', + 'value'=>'tax_included', + 'checked'=>$this->config->item('tax_included')));?> +
    +
    + +
    +lang->line('config_custom1').':', 'config_custom1',array('class'=>'wide')); ?> +
    + 'custom1_name', + 'id'=>'custom1_name', + 'value'=>$this->config->item('custom1_name')));?> +
    +
    + +
    +lang->line('config_custom2').':', 'config_custom2',array('class'=>'wide')); ?> +
    + 'custom2_name', + 'id'=>'custom2_name', + 'value'=>$this->config->item('custom2_name')));?> +
    +
    + +
    +lang->line('config_custom3').':', 'config_custom3',array('class'=>'wide')); ?> +
    + 'custom3_name', + 'id'=>'custom3_name', + 'value'=>$this->config->item('custom3_name')));?> +
    +
    + +
    +lang->line('config_custom4').':', 'config_custom4',array('class'=>'wide')); ?> +
    + 'custom4_name', + 'id'=>'custom4_name', + 'value'=>$this->config->item('custom4_name')));?> +
    +
    + +
    +lang->line('config_custom5').':', 'config_custom5',array('class'=>'wide')); ?> +
    + 'custom5_name', + 'id'=>'custom5_name', + 'value'=>$this->config->item('custom5_name')));?> +
    +
    + +
    +lang->line('config_custom6').':', 'config_custom6',array('class'=>'wide')); ?> +
    + 'custom6_name', + 'id'=>'custom6_name', + 'value'=>$this->config->item('custom6_name')));?> +
    +
    + +
    +lang->line('config_custom7').':', 'config_custom7',array('class'=>'wide')); ?> +
    + 'custom7_name', + 'id'=>'custom7_name', + 'value'=>$this->config->item('custom7_name')));?> +
    +
    + +
    +lang->line('config_custom8').':', 'config_custom8',array('class'=>'wide')); ?> +
    + 'custom8_name', + 'id'=>'custom8_name', + 'value'=>$this->config->item('custom8_name')));?> +
    +
    + +
    +lang->line('config_custom9').':', 'config_custom9',array('class'=>'wide')); ?> +
    + 'custom9_name', + 'id'=>'custom9_name', + 'value'=>$this->config->item('custom9_name')));?> +
    +
    + +
    +lang->line('config_custom10').':', 'config_custom10',array('class'=>'wide')); ?> +
    + 'custom10_name', + 'id'=>'custom10_name', + 'value'=>$this->config->item('custom10_name')));?> +
    +
    + +
    +lang->line('config_backup_database').':', 'config_backup_database',array('class'=>'wide')); ?> +
    + lang->line('config_backup_button'); ?> +
    +
    + + +'submit_form', + 'id'=>'submit_form', + 'value'=>$this->lang->line('common_submit'), + 'class'=>'submit_button float_right') +); +?> +
    +
    + + + \ No newline at end of file diff --git a/application/views/sales/receipt.php b/application/views/sales/receipt.php index 191d32e65..36cc37885 100644 --- a/application/views/sales/receipt.php +++ b/application/views/sales/receipt.php @@ -47,83 +47,88 @@ if (isset($error_message)) - - - - - - + + + + $item) { ?> - - - - - - + + + + + + - - + 0 ) : ?> + + + + + - + $value) { ?> - + - + - + - + $payment) - { ?> + $only_sale_check = TRUE; + + foreach($payments as $payment_id=>$payment) + { + $only_sale_check &= $payment[ SALE_PAYMENT_PAYMENT_TYPE ] == $this->lang->line('sales_check'); + ?> - - + - + - + - +
    lang->line('sales_item_number'); ?>lang->line('items_item'); ?>lang->line('common_price'); ?>lang->line('sales_quantity'); ?>lang->line('sales_discount'); ?>lang->line('sales_total'); ?>lang->line('sales_item_name_short'); ?>lang->line('sales_taxed_price_short'); ?>lang->line('sales_quantity_short'); ?>lang->line('sales_total'); ?>
    lang->line("sales_discount_included")?>
    lang->line('sales_sub_total'); ?>lang->line('sales_sub_total'); ?>
    ::
    lang->line('sales_total'); ?>lang->line('sales_total'); ?>
     
     
    lang->line('sales_payment'); ?>
     
     
    lang->line('sales_giftcard_balance'); ?>lang->line('sales_giftcard_balance'); ?>
    lang->line('sales_change_due'); ?> lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_due' : 'sales_change_due') : 'sales_invoice_amount_due') ; ?>