From ee4297e22ca89a2e7d9a38c512201e594964e677 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Thu, 18 Feb 2016 21:16:07 +0000 Subject: [PATCH] fix sales/register and receiving button, styles, alignment and code tidy up (#116) --- application/views/receivings/receiving.php | 286 +++++++++++---------- application/views/sales/register.php | 79 +++--- css/register.css | 128 +++++---- 3 files changed, 239 insertions(+), 254 deletions(-) diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index 0b430c585..97ee5988b 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -1,35 +1,30 @@ load->view("partial/header"); ?> -
lang->line('recvs_register'); ?>
+
lang->line('recvs_register'); ?>
".$error.""; } ?> - -
- 'mode_form')); ?> + 'mode_form')); ?> + - - - lang->line('recvs_stock_source') ?> - - - lang->line('recvs_stock_destination') ?> - lang->line('recvs_stock_source'); + echo form_dropdown('stock_source', $stock_locations, $stock_source, 'onchange="$(\'#mode_form\').submit();"'); + + if($mode=='requisition') + { + echo $this->lang->line('recvs_stock_destination'); + echo form_dropdown('stock_destination', $stock_locations, $stock_destination, 'onchange="$(\'#mode_form\').submit();"'); + } } ?> @@ -48,14 +43,12 @@ if(isset($error)) ?> - 'item','id'=>'item','size'=>'40'));?> + 'item','id'=>'item','size'=>'40')); -
- ".$this->lang->line('sales_new_item')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); - ?> -
+ echo anchor("items/view/-1/width:450", $this->lang->line('sales_new_item'), + array('class'=>'btn btn-info btn-sm pull-right thickbox none', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); + ?> @@ -92,7 +85,7 @@ if(isset($error)) ?> lang->line('common_delete').']');?> -
[ in ] +
[ in ] - lang->line('sales_edit_item'));?> + 'edit_item', 'value'=>$this->lang->line('sales_edit_item'), 'class'=>'btn btn-default btn-sm pull-right'));?> 'select_supplier_form')); ?> + echo form_open("receivings/select_supplier",array('id'=>'select_supplier_form')); + ?> 'supplier','id'=>'supplier','size'=>'30','value'=>$this->lang->line('recvs_start_typing_supplier_name')));?> -
-

lang->line('common_or'); ?>

- ".$this->lang->line('recvs_new_supplier')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('recvs_new_supplier'))); - ?> + +
+

lang->line('common_or'); ?>

+ + lang->line('recvs_new_supplier'), + array('class'=>'btn btn-info btn-sm thickbox none', 'id'=>'new_supplier_button', 'title'=>$this->lang->line('recvs_new_supplier'))); + ?>
+
 
- -
-
lang->line('sales_total'); ?>:
-
-
+
+
lang->line('sales_total'); ?>:
+
+
+ 0) { if($mode == 'requisition') { ?> -
+
'finish_receiving_form')); ?>
@@ -240,113 +238,117 @@ if(isset($error)) 'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>

-
- lang->line('recvs_complete_receiving') ?> +
+ lang->line('recvs_complete_receiving') ?>
- - 'cancel_receiving_form')); ?> -
- lang->line('recvs_cancel_receiving')?> + + + 'cancel_receiving_form')); ?> +
+ lang->line('recvs_cancel_receiving')?>
- -
- 'finish_receiving_form')); ?> -
- - 'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?> -

- - - -
- lang->line('recvs_print_after_sale'); ?> - - 'recv_print_after_sale','id'=>'recv_print_after_sale','checked'=>'checked')); - } - else - { - echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale')); - } + +
+ 'finish_receiving_form')); ?> +
+ + 'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?> +

+ + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + - - - - -
+ lang->line('recvs_print_after_sale'); ?> + + 'recv_print_after_sale','id'=>'recv_print_after_sale','checked'=>'checked')); + } + else + { + echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale')); + } + ?> +
+ lang->line('recvs_invoice_enable'); ?> + + 'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10,'checked'=>'checked')); + } + else + { + echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10)); + } + ?> +
+ lang->line('recvs_invoice_number').': ';?> + + 'recv_invoice_number','id'=>'recv_invoice_number','value'=>$invoice_number,'size'=>10));?> +
+ lang->line('sales_payment').': ';?> + + +
+ lang->line('sales_amount_tendered').': ';?> + + 'amount_tendered','value'=>'','size'=>'10')); ?> -
- lang->line('recvs_invoice_enable'); ?> - - 'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10,'checked'=>'checked')); - } - else - { - echo form_checkbox(array('name'=>'recv_invoice_enable','id'=>'recv_invoice_enable','size'=>10)); - } - ?> -
- lang->line('recvs_invoice_number').': ';?> - - 'recv_invoice_number','id'=>'recv_invoice_number','value'=>$invoice_number,'size'=>10));?> -
- lang->line('sales_payment').': ';?> - - -
- lang->line('sales_amount_tendered').': ';?> - - 'amount_tendered','value'=>'','size'=>'10')); - ?> -
-
-
- lang->line('recvs_complete_receiving') ?> -
- - - 'cancel_receiving_form')); ?> -
- lang->line('recvs_cancel_receiving')?> +
+
+
+ lang->line('recvs_complete_receiving') ?>
- -
- + + 'cancel_receiving_form')); ?> +
+ lang->line('recvs_cancel_receiving')?> +
+ +
+
 
diff --git a/application/views/sales/register.php b/application/views/sales/register.php index b6a91a345..705cc3947 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -21,50 +21,39 @@ if (isset($success))
'mode_form')); ?> - - - + + 1) { - ?> - lang->line('sales_stock_location') ?> - - lang->line('sales_stock_location'); + echo form_dropdown('stock_location', $stock_locations, $stock_location, 'onchange="$(\'#mode_form\').submit();"'); } - ?> - lang->line('sales_suspended_sales'), + array('class'=>'btn btn-default btn-sm pull-right thickbox none', 'id'=>'show_suspended_sales_button', 'title'=>$this->lang->line('sales_suspended_sales'))); + if ($this->Employee->has_grant('reports_sales', $this->session->userdata('person_id'))) { - ?> -
lang->line('sales_takings'); ?>
 - lang->line('sales_takings'), + array('class'=>'btn btn-primary btn-sm pull-right', 'id'=>'sales_takings_button', 'title'=>$this->lang->line('sales_takings'))); } ?> - - ".$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')); ?> + + 'item', 'id'=>'item', 'size'=>'40', 'tabindex'=>'1')); -
- ".$this->lang->line('sales_new_item')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_item'))); - ?> -
+ echo anchor("items/view/-1/width:450", $this->lang->line('sales_new_item'), + array('class'=>'btn btn-info btn-sm pull-right thickbox none', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); + ?> + + @@ -209,6 +198,8 @@ if (isset($success))
+ +
'customer','id'=>'customer','size'=>'30','value'=>$this->lang->line('sales_start_typing_customer_name')));?> -

lang->line('common_or'); ?>

- ".$this->lang->line('sales_new_customer')."
", - array('class'=>'thickbox none','title'=>$this->lang->line('sales_new_customer'))); + + lang->line('sales_new_customer'), + array('class'=>'btn btn-info btn-sm thickbox none', 'id'=>'new_customer_button', 'title'=>$this->lang->line('sales_new_customer'))); ?>
@@ -257,17 +248,15 @@ if (isset($success)) { ?> 'cancel_sale_form')); ?> - -
-
- lang->line('sales_cancel_sale'); ?> +
+
+ lang->line('sales_cancel_sale'); ?> +
+ +
+ lang->line('sales_suspend_sale'); ?> +
- -
- lang->line('sales_suspend_sale'); ?> -
-
-
 
@@ -389,8 +378,8 @@ if (isset($success)) -
- lang->line('sales_add_payment'); ?> +
+ lang->line('sales_add_payment'); ?>
diff --git a/css/register.css b/css/register.css index 7f53efe3d..1569876b8 100644 --- a/css/register.css +++ b/css/register.css @@ -1,136 +1,130 @@ #register_wrapper { - float:left; - width:70%; - font-size:13px; + float: left; + width: 70%; + font-size: 13px; +} + +#mode_form, #add_item_form +{ + position: relative; + width: 100%; + padding: 10px 5px 10px 5px; } #mode_form { - position:relative; - background-color:#DDD; - width:100%; - padding: 8px 5px 8px 5px; + background-color: #DDD; + padding-bottom: 15px; } -#sales_overview +#mode_form label { - position:absolute; - top:3px; - right:130px; + font-weight: bold; + margin: 0px 5px 0px 5px; } -#show_suspended_sales_button +#sales_takings_button, #show_suspended_sales_button, #new_item_button { - position:absolute; - top:3px; - right:4px; + position: relative; + bottom: 4px; } -#mode_form span +#sales_takings_button { - font-weight:bold; + margin-right: 5px; } #add_item_form { - position:relative; - background-color:#BBBBBB; - width:100%; - padding: 8px 0px 8px 0px; -} - -#new_item_button_register -{ - position:absolute; - top:3px; - right:4px; + background-color: #BBB; } #add_item_form input { - border: 1px solid #ccc; + border: 1px solid #CCC; padding: 2px; } -#item_label,#customer_label -{ - font-weight:bold; -} - #add_item_form label { + font-weight: bold; margin: 0px 5px 0px 5px; } +#customer_label +{ + font-weight: bold; +} + #register { - position:relative; - width:100%; - padding:0px; - border-collapse:collapse; + position: relative; + width: 100%; + padding: 0px; + border-collapse: collapse; } #register th { - background-color: #999999; + background-color: #999; padding: 5px; text-align: center; - color: #FFFFFF; + color: #FFF; } #register td { - background-color:#EEEEEE; - padding:3px; - text-align:center; + background-color: #EEE; + padding: 3px; + text-align: center; } #overall_sale { - float:left; - margin-left:4px; - background-color:#BBBBBB; - width:28%; - padding:5px; - font-size:13px; + float: left; + margin-left: 4px; + background-color: #BBB; + width: 28%; + padding: 5px; + font-size: 13px; } #sale_details { - position:relative; - width:100%; - margin-top:5px; - border-top:2px solid #000; + position: relative; + width: 100%; + margin-top: 5px; + border-top: 2px solid #000; } #finish_sale { - position:relative; + position: relative; } #payment_details { - float:left; - width:100%; - margin-top:5px; - border-top:2px solid #000; - background-color:#DDD; - margin-bottom:0px; - clear:both; + float: left; + width: 100%; + margin-top: 5px; + border-top: 2px solid #000; + background-color: #DDD; + margin-bottom: 0px; + clear: both; } -#Cancel_sale +#cancel_sale { - float:left; - width:100%; - margin-top:5px; - clear:both; + float: left; + width: 100%; + margin-top: 5px; + clear: both; } #suspended_sales_table { - width:100%; + width: 100%; } #credit_card_form fieldset