diff --git a/application/config/config.php b/application/config/config.php index 723f72c79..c59d11d95 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -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; /* |-------------------------------------------------------------------------- diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php index c40d4b651..a0ab4134e 100644 --- a/application/language/en/sales_lang.php +++ b/application/language/en/sales_lang.php @@ -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'; -?> \ No newline at end of file +?> diff --git a/application/language/nl-BE/sales_lang.php b/application/language/nl-BE/sales_lang.php index 867bf5459..433dc5a5a 100755 --- a/application/language/nl-BE/sales_lang.php +++ b/application/language/nl-BE/sales_lang.php @@ -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'; diff --git a/css/register.css b/css/register.css index 090886586..88d4b3dd2 100644 --- a/css/register.css +++ b/css/register.css @@ -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