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

Set delete button color in sales / receivings edit form (#116)

Browse Source 
Fix password field layout in employee edit mode
This commit is contained in:
jekkos
2016-02-28 01:02:27 +01:00
parent fc74708bf5
commit af5d39a394
9 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Reports.php
View File

@@ -915,7 +915,7 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class' => 'modal-dlg modal-btn-submit')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
$summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class' => 'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{

2
application/helpers/table_helper.php
View File

@@ -76,7 +76,7 @@ function get_sales_manage_sale_data_row($sale, $controller)
$table_data_row.='<td width="12%">'.$sale['payment_type'].'</td>';
$table_data_row.='<td width="8%">'.$sale['invoice_number'].'</td>';
$table_data_row.='<td width="8%">';
$table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'], $CI->lang->line('common_edit'),array('class'=>"modal-dlg modal-btn-submit",'title'=>$CI->lang->line($controller_name.'_update')));
$table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'], $CI->lang->line('common_edit'),array('class'=>"modal-dlg modal-btn-delete modal-btn-submit",'title'=>$CI->lang->line($controller_name.'_update')));
$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';
$table_data_row.='<a href="'.site_url($controller_name. "/receipt/" . $sale['sale_id']) . '">' . $CI->lang->line('sales_show_receipt') . '</a>';
$table_data_row.='&nbsp;&nbsp;&nbsp;&nbsp;';

6
application/views/employees/form.php
View File

@@ -20,11 +20,11 @@
</div>
<?php
$password_label_attributes = $person_info->person_id == "" ? array('class'=>'required col-xs-3 control-label'):array();
$password_label_attributes = $person_info->person_id == "" ? array('class'=>'required'):array();
?>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('employees_password'), 'password',$password_label_attributes); ?>
<?php echo form_label($this->lang->line('employees_password'), 'password',array_merge($password_label_attributes, array('class' => 'col-xs-3 control-label'))); ?>
<div class='col-xs-5'>
<?php echo form_password(array(
'name'=>'password',
@@ -35,7 +35,7 @@
</div>
<div class="form-group form-group-sm">
<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password',$password_label_attributes); ?>
<?php echo form_label($this->lang->line('employees_repeat_password'), 'repeat_password',array_merge($password_label_attributes, array('class' => 'col-xs-3 control-label'))); ?>
<div class='col-xs-5'>
<?php echo form_password(array(
'name'=>'repeat_password',

2
application/views/partial/header.php
View File

@@ -68,7 +68,7 @@
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1d6d6ab1bf"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=78112e9e60" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=26dfd3d6cc" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

6
application/views/sales/form.php
View File

@@ -57,12 +57,6 @@
<?php echo form_open("sales/delete/".$sale_info['sale_id'], array('id'=>'sales_delete_form')); ?>
<?php echo form_hidden('sale_id', $sale_info['sale_id']);?>
<?php echo form_submit(array(
'name'=>'submit',
'value'=>$this->lang->line('sales_delete_entire_sale'),
'class'=>'btn btn-danger btn-sm pull-right',
'style'=>'margin-right: 10px;')
); ?>
<?php echo form_close(); ?>
</fieldset>
</div>

12
dist/opensourcepos.js vendored
View File

@@ -52138,7 +52138,15 @@ dialog_support = (function() {
{
btn_id = button_id;
dialog_ref = dlog_ref;
$('form', dlog_ref.$modalBody).first().submit();
debugger;;
if (button_id == 'delete')
{
$("form[id*='delete_form']").submit();
}
else
{
$('form', dlog_ref.$modalBody).first().submit();
}
}
};
@@ -52157,7 +52165,7 @@ dialog_support = (function() {
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: buttons.length ? '' : 'btn-primary',
cssClass: btn_name == 'submit' ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
action: submit(btn_name)
});
}

4
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
js/manage_tables.js
View File

@@ -401,7 +401,15 @@ dialog_support = (function() {
{
btn_id = button_id;
dialog_ref = dlog_ref;
$('form', dlog_ref.$modalBody).first().submit();
debugger;;
if (button_id == 'delete')
{
$("form[id*='delete_form']").submit();
}
else
{
$('form', dlog_ref.$modalBody).first().submit();
}
}
};
@@ -420,7 +428,7 @@ dialog_support = (function() {
buttons.push({
id: btn_name,
label: btn_name.charAt(0).toUpperCase() + btn_name.slice(1),
cssClass: buttons.length ? '' : 'btn-primary',
cssClass: btn_name == 'submit' ? 'btn-primary' : (btn_name == 'delete' ? 'btn-danger' : ''),
action: submit(btn_name)
});
}

2
templates/spacelab/views/partial/header.php
View File

@@ -69,7 +69,7 @@
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=78112e9e60" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=26dfd3d6cc" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>