diff --git a/application/views/receivings/receiving.php b/application/views/receivings/receiving.php index a4bcec8bd..a5174bb0d 100644 --- a/application/views/receivings/receiving.php +++ b/application/views/receivings/receiving.php @@ -81,7 +81,7 @@ if (isset($error)) - +
@@ -289,7 +289,7 @@ if (isset($error)) 'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>

-
lang->line('common_delete'); ?>
+
lang->line('recvs_print_after_sale'); ?> diff --git a/application/views/sales/register.php b/application/views/sales/register.php index 5df08d983..ed77dd19e 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -26,7 +26,7 @@ if (isset($success)) 'mode_form', 'class'=>'form-horizontal panel panel-default')); ?>
    -
  • +
  • @@ -70,14 +70,13 @@ if (isset($success)) 'add_item_form', 'class'=>'form-horizontal panel panel-default')); ?>
      -
    • +
    • 'item', 'id'=>'item', 'class'=>'form-control input-sm', 'size'=>'50', 'tabindex'=>'1')); ?>
    • -
    • lang->line('sales_new_item'), array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-new modal-btn-submit', 'id'=>'new_item_button', 'title'=>$this->lang->line('sales_new_item'))); ?> @@ -88,7 +87,7 @@ if (isset($success)) - +
      @@ -235,7 +234,7 @@ if (isset($success)) if(isset($customer)) { ?> -
      lang->line('common_delete'); ?>
      +
      @@ -295,7 +294,7 @@ if (isset($success)) } ?> -
      lang->line("sales_customer"); ?>
      +
      @@ -324,7 +323,7 @@ if (isset($success)) if(count($cart) > 0) { ?> -
      lang->line('sales_sub_total'); ?> config->item('tax_included') ? $tax_exclusive_subtotal : $subtotal); ?>
      +
      @@ -338,7 +337,7 @@ if (isset($success))
      'add_payment_form', 'class'=>'form-horizontal')); ?> -
      lang->line('sales_payments_total');?>
      +
      lang->line('sales_payment');?> @@ -375,7 +374,7 @@ if (isset($success)) if(count($payments) > 0) { ?> - +
      @@ -406,7 +405,7 @@ if (isset($success)) 'buttons_form', 'class'=>'form-horizontal')); ?>
      -
      lang->line('common_delete'); ?>
      +
      @@ -438,7 +437,7 @@ if (isset($success)) lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?> 'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?> - +
      lang->line('sales_print_after_sale'), 'print_after_sale', array('class'=>'control-label')); ?> diff --git a/css/register.css b/css/register.css index 7876f6c91..ae04ff77b 100644 --- a/css/register.css +++ b/css/register.css @@ -33,7 +33,7 @@ margin-left: 1em; } -#first_li +.first_li { margin-left: 0.2em !important; } @@ -50,7 +50,6 @@ #register { - width: 100%; padding: 0; border-collapse: collapse; } @@ -99,7 +98,12 @@ margin-bottom: 0.5em; } -#customer_info, #sale_totals, #payment_totals, #payment_details, #buttons_sale, #suspended_sales_table +#payment_details, #buttons_sale, #suspended_sales_table +{ + width: 100%; +} + +.sales_table_100 { width: 100%; } @@ -118,34 +122,4 @@ padding: 0.5em; text-align: left; clear: both; -} - -#credit_card_form fieldset -{ - overflow: auto; - border: 0; - margin: 0; - padding: 0; -} - -#credit_card_form fieldset div -{ - float: left; -} - -#credit_card_form fieldset.centered div -{ - text-align: center; -} - -#credit_card_form label -{ - display: block; - margin-bottom: 5px; -} - -#credit_card_form input.text -{ - border: 1px solid #bfbab4; - margin: 0 4px 8px 0; } \ No newline at end of file