mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-04 23:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Release version set to 2.2.1

Browse Source 
Default time_sess_to_expire set to 86400 (24h)
Suspended sales labels updated to fit UI a bit better
Updated suspended css (for labels not spanning the whole thickbox width)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@98 c3eb156b-1dc0-44e1-88ae-e38439141b53
This commit is contained in:
jekkos
2014-03-30 19:07:25 +00:00
parent f6e5ae3d12
commit 79f0e4396f
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/config/config.php
View File

@@ -9,7 +9,7 @@
|
|
*/
$config['application_version'] = '2.2.0';
$config['application_version'] = '2.2.1';
/*
|--------------------------------------------------------------------------
@@ -82,7 +82,7 @@ $config['url_suffix'] = '';
| than english.
|
*/
$config['language'] = 'english';
$config['language'] = 'en';
/*
|--------------------------------------------------------------------------
@@ -264,8 +264,8 @@ $config['sess_encrypt_cookie'] = FALSE;
$config['sess_use_database'] = TRUE;
$config['sess_table_name'] = 'ospos_sessions';
$config['sess_match_ip'] = FALSE;
$config['sess_match_useragent'] = TRUE;
$config['sess_time_to_update'] = 300;
$config['sess_match_useragent'] = FAlSE;
$config['sess_time_to_update'] = 86400;
/*
|--------------------------------------------------------------------------

6
application/language/en/sales_lang.php
View File

@@ -69,10 +69,10 @@ $lang['sales_delete_unsuccessful'] = 'You have unsuccessfully deleted a sale';
$lang['sales_suspend_sale'] = 'Suspend Sale';
$lang['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sale?';
$lang['sales_suspended_sales'] = 'Suspended Sales';
$lang['sales_suspended_sale_id'] = 'Suspended Sale ID';
$lang['sales_suspended_sale_id'] = 'ID';
$lang['sales_date'] = 'Date';
$lang['sales_comments'] = 'Comments';
$lang['sales_unsuspend_and_delete'] = 'Unsuspend and Delete';
$lang['sales_unsuspend_and_delete'] = '';
$lang['sales_unsuspend'] = 'Unsuspend';
$lang['sales_successfully_suspended_sale'] = 'Your sale has been successfully suspended';
$lang['sales_email_receipt'] = 'E-Mail Receipt';
@@ -84,4 +84,4 @@ $lang['sales_amount_due'] = 'Amount Due';
$lang['sales_payment_type'] = "Type";
$lang['sales_payment_amount'] = "Amount";
$lang['sales_basic_information']='Sale information';
?>
?>

2
application/language/nl-BE/sales_lang.php
View File

@@ -67,7 +67,7 @@ $lang['sales_date']='Datum';
$lang['sales_delete_successful'] = 'U hebt een aankoop verwijderd';
$lang['sales_delete_unsuccessful'] = 'U kan deze aankoop niet verwijderen';
$lang['sales_suspend_sale'] = 'Bewaar aankoop';
$lang['sales_confirm_suspend_sale'] = 'Are you sure you want to suspend this sale?';
$lang['sales_confirm_suspend_sale'] = 'Bent u zeker dat u deze aankoop wil bewaren?';
$lang['sales_suspended_sales'] = 'Bewaarde Aankopen';
$lang['sales_suspended_sale_id'] = 'ID';
$lang['sales_date'] = 'Date';

11
css/register.css
View File

@@ -9,7 +9,7 @@
{
position:relative;
background-color:#DDD;
padding: 8px 0px 8px 0px;
padding: 8px 5px 8px 5px;
}
#show_suspended_sales_button
@@ -123,14 +123,9 @@
margin-top:5px;
clear:both;
}
#suspended_sales_table th
#suspended_sales_table
{
text-align:center;
}
#suspended_sales_table td
{
padding: 7px;
width:100%;
}
#credit_card_form fieldset