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

more adjustments to sales/register bootstrapisation (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-10 09:58:10 +00:00
parent 70938f7b41
commit 940a899231
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,11 +65,11 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=fab2796a66"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3d75aef5c6"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=0bc5d892d3" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=0c7651c855" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

31
application/views/sales/register.php
View File

@@ -235,18 +235,16 @@ if (isset($success))
}
else
{
echo form_open("sales/select_customer", array('id'=>'select_customer_form', 'class'=>'form-horizontal'));
?>
<div class="form-group" style="margin: 0">
<?php echo form_open("sales/select_customer", array('id'=>'select_customer_form', 'class'=>'form-horizontal')); ?>
<div class="form-group" id="select_customer">
<label id="customer_label" for="customer" class="control-label" style="margin-bottom: 1em;"><?php echo $this->lang->line('sales_select_customer'); ?></label>
<?php echo form_input(array('name'=>'customer', 'id'=>'customer', 'class'=>'form-control input-sm', 'value'=>$this->lang->line('sales_start_typing_customer_name')));?>
</div>
<?php echo form_close(); ?>
<h4 style="margin-top: 0.4em; margin-bottom: 0;"><?php echo $this->lang->line('common_or'); ?></h4>
<?php echo anchor("customers/view/-1", $this->lang->line('sales_new_customer'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-submit none', 'id'=>'new_customer_button', 'title'=>$this->lang->line('sales_new_customer'))); ?>
<?php echo anchor("customers/view/-1", $this->lang->line('sales_new_customer'),
array('class'=>'btn btn-info btn-sm modal-dlg modal-btn-submit none', 'id'=>'new_customer_button', 'title'=>$this->lang->line('sales_new_customer'))); ?>
</div>
<?php echo form_close(); ?>
<?php
}
?>
@@ -281,10 +279,10 @@ if (isset($success))
{
?>
<?php echo form_open("sales/cancel_sale", array('id'=>'cancel_sale_form', 'class'=>'form-horizontal')); ?>
<div id="cancel_sale">
<div class='btn btn-sm btn-danger pull-left' id='cancel_sale_button'><?php echo $this->lang->line('sales_cancel_sale'); ?></div>
<div class='btn btn-sm btn-default pull-right' id='suspend_sale_button'><?php echo $this->lang->line('sales_suspend_sale'); ?></div>
<div class="form-group" id="cancel_sale">
<div class='btn btn-sm btn-default pull-left' id='suspend_sale_button'><?php echo $this->lang->line('sales_suspend_sale'); ?></div>
<div class='btn btn-sm btn-danger pull-right' id='cancel_sale_button'><?php echo $this->lang->line('sales_cancel_sale'); ?></div>
</div>
<?php echo form_close(); ?>
@@ -292,9 +290,9 @@ if (isset($success))
// Only show this part if there is at least one payment entered.
if(count($payments) > 0)
{
echo form_open("sales/complete", array('id'=>'finish_sale_form', 'class'=>'form-horizontal'));
?>
<div id="finish_sale">
<?php echo form_open("sales/complete", array('id'=>'finish_sale_form', 'class'=>'form-horizontal')); ?>
<div class="form-group" id="finish_sale">
<label id="comment_label" for="comment"><?php echo $this->lang->line('common_comments'); ?>:</label>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'4', 'cols'=>'23')); ?>
<?php
@@ -315,8 +313,8 @@ if (isset($success))
}
?>
</div>
<?php echo form_close(); ?>
<?php
echo form_close();
}
?>
@@ -426,7 +424,6 @@ if (isset($success))
?>
</tbody>
</table>
<br />
<?php
}
?>
@@ -437,8 +434,6 @@ if (isset($success))
</div>
</div>
<div class="clearfix" style="margin-bottom: 30px;">&nbsp;</div>
<script type="text/javascript" language="javascript">
$(document).ready(function()
{

13
css/register.css
View File

@@ -45,7 +45,6 @@
#register
{
position: relative;
width: 100%;
padding: 0;
border-collapse: collapse;
@@ -71,6 +70,7 @@
width: 28%;
float: left;
margin-left: 0.1em;
padding-bottom: 1em;
background-color: #BBB;
font-size: 13px;
text-align: center;
@@ -82,6 +82,11 @@
padding-bottom: 0;
}
#overall_sale .form-group
{
margin: 0;
}
#overall_sale .btn
{
margin-top: 0.5em;
@@ -90,14 +95,13 @@
#sale_details
{
position: relative;
width: 100%;
border-top: 2px solid #000;
}
#finish_sale
#select_customer, #cancel_sale, #finish_sale
{
position: relative;
}
#payment_details
@@ -107,7 +111,6 @@
border-top: 2px solid #000;
background-color: #DDD;
margin-top: 0.2em;
margin-bottom: 1em;
padding: 0.5em;
text-align: left;
clear: both;

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -65,11 +65,11 @@
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=fab2796a66"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3d75aef5c6"/>
<!-- 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=0bc5d892d3" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=0c7651c855" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>