diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php index 1ef6edc66..0575d9bcf 100644 --- a/application/views/configs/general_config.php +++ b/application/views/configs/general_config.php @@ -294,7 +294,7 @@ echo form_open('config/save/',array('id'=>'config_form','enctype'=>'multipart/fo
lang->line('config_backup_database').':', 'config_backup_database',array('class'=>'wide')); ?> -
+
lang->line('config_backup_button'); ?>
diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index aacb57c54..a66027124 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -13,177 +13,179 @@ if(isset($error))
'mode_form')); ?> - lang->line('recvs_mode') ?> - - - - lang->line('recvs_stock_source') ?> - - - lang->line('recvs_stock_destination') ?> - - - 'add_item_form')); ?> - -'item','id'=>'item','size'=>'40'));?> -
- ".$this->lang->line('sales_new_item')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); - ?> -
- - - - - - - - - - - - - - - - - - - - - -$item) - { - echo form_open("receivings/edit_item/$line"); + -?> - - - - - + + - + lang->line('recvs_stock_source') ?> + + + lang->line('recvs_stock_destination') ?> + + + + 'add_item_form')); ?> + + - - lang->line('recvs_find_or_scan_item_or_receipt'); } ?> - - +
lang->line('common_delete'); ?>lang->line('recvs_item_name'); ?>lang->line('recvs_cost'); ?>lang->line('recvs_quantity'); ?>lang->line('recvs_discount'); ?>lang->line('recvs_total'); ?>lang->line('recvs_edit'); ?>
-
lang->line('sales_no_items_in_cart'); ?>
-
lang->line('common_delete').']');?>
[ in ] -
'price','value'=>$item['price'],'size'=>'6'));?> - 'quantity','value'=>$item['quantity'],'size'=>'2')); - if ($item['receiving_quantity'] > 1) + + + 'item','id'=>'item','size'=>'40'));?> +
+ ".$this->lang->line('sales_new_item')."
", + array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); + ?> + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - $item) + { + echo form_open("receivings/edit_item/$line"); ?> - - - + + + + lang->line('sales_no_description'); - echo form_hidden('description',''); - } - } + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - -
lang->line('common_delete'); ?>lang->line('recvs_item_name'); ?>lang->line('recvs_cost'); ?>lang->line('recvs_quantity'); ?>lang->line('recvs_discount'); ?>lang->line('recvs_total'); ?>lang->line('recvs_edit'); ?>
x
+
lang->line('sales_no_items_in_cart'); ?>
+
'discount','value'=>$item['discount'],'size'=>'3'));?>lang->line('sales_edit_item'));?>
lang->line('sales_description_abbrv').':';?> - - 'description','value'=>base64_decode($item['description']),'size'=>'20')); - } - else - { - if (base64_decode($item['description'])!='') +
lang->line('common_delete').']');?>
[ in ] +
'price','value'=>$item['price'],'size'=>'6'));?> + 'quantity','value'=>$item['quantity'],'size'=>'2')); + if ($item['receiving_quantity'] > 1) + { + ?> + x 'discount','value'=>$item['discount'],'size'=>'3'));?>lang->line('sales_edit_item'));?>
lang->line('sales_description_abbrv').':';?> + + 'description','value'=>base64_decode($item['description']),'size'=>'20')); + } + else + { + if (base64_decode($item['description'])!='') + { + echo base64_decode($item['description']); + echo form_hidden('description',base64_decode($item['description'])); + } + else + { + echo $this->lang->line('sales_no_description'); + echo form_hidden('description',''); + } + } + ?> +
+
diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php index 520df7bfc..12a6dd779 100644 --- a/application/views/reports/date_input.php +++ b/application/views/reports/date_input.php @@ -79,7 +79,7 @@ echo form_button(array( 'name'=>'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), - 'class'=>'submit_button') + 'class'=>'btn btn-primary btn-sm') ); ?> diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php index 951258a52..a246f38b2 100644 --- a/application/views/reports/date_input_excel_export.php +++ b/application/views/reports/date_input_excel_export.php @@ -40,7 +40,7 @@ echo form_button(array( 'name'=>'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), - 'class'=>'submit_button') + 'class'=>'btn btn-primary btn-sm') ); ?> diff --git a/application/views/reports/excel_export.php b/application/views/reports/excel_export.php index ab628c26a..28d48f084 100644 --- a/application/views/reports/excel_export.php +++ b/application/views/reports/excel_export.php @@ -16,7 +16,7 @@ echo form_button(array( 'name'=>'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), - 'class'=>'submit_button') + 'class'=>'btn btn-primary btn-sm') ); ?> diff --git a/application/views/reports/inventory_summary_input.php b/application/views/reports/inventory_summary_input.php index 7fc1db563..14800324b 100644 --- a/application/views/reports/inventory_summary_input.php +++ b/application/views/reports/inventory_summary_input.php @@ -26,7 +26,7 @@ echo form_button(array( 'name'=>'generate_report', 'id'=>'generate_report', 'content'=>$this->lang->line('common_submit'), - 'class'=>'submit_button') + 'class'=>'btn btn-primary btn-sm') ); ?> diff --git a/application/views/sales/register.php b/application/views/sales/register.php index 1d1bf0e53..5cf1d3eff 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -21,52 +21,49 @@ if (isset($success)) ?>
- 'mode_form')); ?> - lang->line('sales_mode') ?> - - 1) - { - ?> - lang->line('sales_stock_location') ?> - - + 'mode_form')); ?> + + + - Employee->has_grant('reports_sales', $this->session->userdata('person_id'))) - { - ?> -
- lang->line('sales_takings'); ?> -
- + 1) + { + ?> + lang->line('sales_stock_location') ?> + + + + Employee->has_grant('reports_sales', $this->session->userdata('person_id'))) + { + ?> +
lang->line('sales_takings'); ?>
+ -
".$this->lang->line('sales_suspended_sales')."
", + "
".$this->lang->line('sales_suspended_sales')."
", array('class'=>'thickbox none','title'=>$this->lang->line('sales_suspended_sales'))); ?> -
- - 'add_item_form')); ?> - - - 'item','id'=>'item','size'=>'40','tabindex'=>'1')); ?> -
- ".$this->lang->line('sales_new_item')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); - ?> - + 'add_item_form')); ?> + + + 'item','id'=>'item','size'=>'40','tabindex'=>'1')); ?> +
+ ".$this->lang->line('sales_new_item')."
", + array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); + ?> + diff --git a/css/general.css b/css/general.css index 333915b6b..9ba839b73 100644 --- a/css/general.css +++ b/css/general.css @@ -34,42 +34,6 @@ label.required padding: 4px; } -.submit_button -{ - padding: 5px; - color: #fff; - background-color: #0a6184; - border: 2px solid #ddd; -} - -.delete_button -{ - padding: 5px; - color: #fff; - background-color: #ea4729; - border: 2px solid #ddd; -} -.small_button -{ - position:relative; - width:95px; - height:30px; - background-image: url(../images/small_action_button.jpg); - background-repeat:no-repeat; - cursor:pointer; -} -.small_button span -{ - position:absolute; - width:100%; - top:30%; - left:0%; - color:#FFF; - font-size:0.9em; - font-weight:bold; - text-align:center; -} - .float_left { float:left; @@ -80,28 +44,6 @@ label.required float:right; } -.big_button -{ - position:relative; - width:119px; - height:45px; - background-image: url(../images/big_action_button.jpg); - background-repeat:no-repeat; - cursor:pointer; -} - -.big_button span -{ - position:absolute; - width:100%; - top:35%; - color:#FFF; - font-size:0.9em; - font-weight:bold; - text-align:center; -} - - .warning_message { text-align:center; @@ -149,6 +91,7 @@ input line-height: 0; height: 0; } + .clearfix { display: inline-block; } html[xmlns] .clearfix { display: block; } * html .clearfix { height: 1%; } diff --git a/css/menubar.css b/css/menubar.css deleted file mode 100644 index f33e1e952..000000000 --- a/css/menubar.css +++ /dev/null @@ -1,93 +0,0 @@ -#menubar -{ - position:relative; - margin:0px; - padding:0px; - background-image: url("../images/menubar/menubar_bg.gif"); - background-repeat: repeat-x; - width:100%; - height:100px; - color:#FFFFFF; - text-align:left; - text-align:center; -} - -#menubar_container -{ - position:relative; - margin:0 auto; - width:960px; - text-align:left; -} - -.menu_item -{ - float:left; - width:65px; - height:100%; - text-align:center; -} - - -#menubar a:link, #menubar a:visited, #menubar a -{ - color:#FFFFFF; - text-decoration:underline; -} - -#menubar a:hover -{ - color:#CCCCCC; - text-decoration:underline; -} - -.menu_item -{ - font-size:11px; -} - -#menubar_company_info -{ - position:absolute; - left:0px; - top:18px; - width:250px; - height:55%; -} - -#company_title -{ - font-size:14px; - font-weight:bold; -} - -#menubar_navigation -{ - position:relative; - width:75%; - left:315px; - top:8px; - height:45%; -} - -#menubar_footer -{ - position:absolute; - top:80px; - left:0px; - height:17%; - padding-top:3px; - font-size:10px; - font-weight:bold; -} - -#menubar_date -{ - position:absolute; - top:80px; - right:0px; - height:17%; - padding-top:3px; - font-size:10px; - font-weight:bold; -} \ No newline at end of file diff --git a/css/ospos.css b/css/ospos.css index 3a909ed22..bc8fdd996 100644 --- a/css/ospos.css +++ b/css/ospos.css @@ -1,5 +1,4 @@ @import url(autocomplete.css); -@import url(menubar.css); @import url(general.css); @import url(popupbox.css); @import url(register.css); diff --git a/css/register.css b/css/register.css index 9d5f46e87..d9ccf1e15 100644 --- a/css/register.css +++ b/css/register.css @@ -4,13 +4,22 @@ width:70%; font-size:13px; } + #mode_form { position:relative; background-color:#DDD; + width:100%; padding: 8px 5px 8px 5px; } +#sales_overview +{ + position:absolute; + top:3px; + right:130px; +} + #show_suspended_sales_button { position:absolute; @@ -29,7 +38,6 @@ background-color:#BBBBBB; width:100%; padding: 8px 0px 8px 0px; - } #new_item_button_register @@ -43,7 +51,6 @@ { border: 1px solid #ccc; padding: 2px; - } #item_label,#customer_label @@ -87,7 +94,6 @@ width:28%; padding:5px; font-size:13px; - } #sale_details @@ -121,6 +127,7 @@ margin-top:5px; clear:both; } + #suspended_sales_table { width:100%; @@ -154,11 +161,4 @@ { border: 1px solid #bfbab4; margin: 0 4px 8px 0; -} - -#sales_overview -{ - position:absolute; - top:3px; - right:99px; } \ No newline at end of file diff --git a/images/big_action_button.jpg b/images/big_action_button.jpg deleted file mode 100644 index 830332960..000000000 Binary files a/images/big_action_button.jpg and /dev/null differ diff --git a/images/menubar/menubar_bg.gif b/images/menubar/menubar_bg.gif deleted file mode 100644 index 225df46f4..000000000 Binary files a/images/menubar/menubar_bg.gif and /dev/null differ diff --git a/images/menubar/thumb_clock.png b/images/menubar/thumb_clock.png deleted file mode 100644 index 40c969bfb..000000000 Binary files a/images/menubar/thumb_clock.png and /dev/null differ diff --git a/images/menubar/thumb_colorscheme.png b/images/menubar/thumb_colorscheme.png deleted file mode 100644 index acb711ae7..000000000 Binary files a/images/menubar/thumb_colorscheme.png and /dev/null differ