mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-10 18:09:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

readded bootstrap-select and adjusted styling of dropboxes (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-12 10:57:24 +00:00
parent d2565009d8
commit c124c08f89
7 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,11 +64,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=60b97840ca"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3ded88f8ce"/>
<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=84fd067160" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=52d78ada05" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

14
application/views/receivings/receiving.php
View File

@@ -20,7 +20,7 @@ if (isset($error))
<label class="control-label"><?php echo $this->lang->line('recvs_mode'); ?></label>
</li>
<li class="float_left">
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</li>
<?php
@@ -31,7 +31,7 @@ if (isset($error))
<label class="control-label"><?php echo $this->lang->line('recvs_stock_source'); ?></label>
</li>
<li class="float_left">
<?php echo form_dropdown('stock_source', $stock_locations, $stock_source, array('onchange'=>"$('#mode_form').submit();", 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('stock_source', $stock_locations, $stock_source, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</li>
<?php
@@ -42,7 +42,7 @@ if (isset($error))
<label class="control-label"><?php echo $this->lang->line('recvs_stock_destination'); ?></label>
</li>
<li class="float_left">
<?php echo form_dropdown('stock_destination', $stock_locations, $stock_destination, array('onchange'=>"$('#mode_form').submit();", 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('stock_destination', $stock_locations, $stock_destination, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</li>
<?php
}
@@ -290,7 +290,7 @@ if (isset($error))
<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'));?>
<table class="sales_table_100">
<table class="sales_table_100" id="payment_details">
<tr>
<td><?php echo $this->lang->line('recvs_print_after_sale'); ?></td>
<td>
@@ -328,7 +328,7 @@ if (isset($error))
<tr>
<td><?php echo $this->lang->line('recvs_invoice_number');?></td>
<td>
<?php echo form_input(array('name'=>'recv_invoice_number', 'id'=>'recv_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number, 'size'=>10));?>
<?php echo form_input(array('name'=>'recv_invoice_number', 'id'=>'recv_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number, 'size'=>5));?>
</td>
</tr>
<?php
@@ -337,14 +337,14 @@ if (isset($error))
<tr>
<td><?php echo $this->lang->line('sales_payment'); ?></td>
<td>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'auto')); ?>
</td>
</tr>
<tr>
<td><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
<td>
<?php echo form_input(array('name'=>'amount_tendered', 'value'=>'', 'class'=>'form-control input-sm', 'size'=>'10')); ?>
<?php echo form_input(array('name'=>'amount_tendered', 'value'=>'', 'class'=>'form-control input-sm', 'size'=>'5')); ?>
</td>
</tr>
</table>

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

@@ -30,7 +30,7 @@ if (isset($success))
<label class="control-label"><?php echo $this->lang->line('sales_mode'); ?></label>
</li>
<li class="float_left">
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('mode', $modes, $mode, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</li>
<?php
@@ -41,7 +41,7 @@ if (isset($success))
<label class="control-label"><?php echo $this->lang->line('sales_stock_location'); ?></label>
</li>
<li class="float_left">
<?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('onchange'=>"$('#mode_form').submit();", 'class'=>'form-control input-sm')); ?>
<?php echo form_dropdown('stock_location', $stock_locations, $stock_location, array('onchange'=>"$('#mode_form').submit();", 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'fit')); ?>
</li>
<?php
}
@@ -337,55 +337,53 @@ if (isset($success))
</table>
<div id="payment_details">
<div>
<?php echo form_open("sales/add_payment", array('id'=>'add_payment_form', 'class'=>'form-horizontal')); ?>
<?php
// Show Complete sale button instead of Add Payment if there is no amount due left
if( $payments_cover_total )
{
?>
<table class="sales_table_100">
<tr>
<td><?php echo $this->lang->line('sales_payment');?></td>
<td>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'form-control input-sm', 'disabled'=>'')); ?>
</td>
</tr>
<tr>
<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
<td>
<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm disabled', 'disabled'=>'', 'value'=>to_currency_no_money($amount_due), 'size'=>'10', 'tabindex'=>3)); ?>
</td>
</tr>
</table>
<div class='btn btn-sm btn-success pull-right' id='finish_sale_button' tabindex='4'><?php echo $this->lang->line('sales_complete_sale'); ?></div>
<?php
}
else
{
?>
<table class="sales_table_100">
<tr>
<td><?php echo $this->lang->line('sales_payment');?></td>
<td>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'form-control input-sm')); ?>
</td>
</tr>
<tr>
<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
<td>
<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm', 'value'=>to_currency_no_money($amount_due), 'size'=>'10', 'tabindex'=>3)); ?>
</td>
</tr>
</table>
<?php echo form_open("sales/add_payment", array('id'=>'add_payment_form', 'class'=>'form-horizontal')); ?>
<?php
// Show Complete sale button instead of Add Payment if there is no amount due left
if( $payments_cover_total )
{
?>
<table class="sales_table_100">
<tr>
<td><?php echo $this->lang->line('sales_payment');?></td>
<td>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'auto', 'disabled'=>'')); ?>
</td>
</tr>
<tr>
<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
<td>
<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm disabled', 'disabled'=>'', 'value'=>to_currency_no_money($amount_due), 'size'=>'5', 'tabindex'=>3)); ?>
</td>
</tr>
</table>
<div class='btn btn-sm btn-success pull-right' id='finish_sale_button' tabindex='4'><?php echo $this->lang->line('sales_complete_sale'); ?></div>
<?php
}
else
{
?>
<table class="sales_table_100">
<tr>
<td><?php echo $this->lang->line('sales_payment');?></td>
<td>
<?php echo form_dropdown('payment_type', $payment_options, array(), array('id'=>'payment_types', 'class'=>'selectpicker show-menu-arrow', 'data-style'=>'btn-default btn-sm', 'data-width'=>'auto')); ?>
</td>
</tr>
<tr>
<td><span id="amount_tendered_label"><?php echo $this->lang->line('sales_amount_tendered'); ?></span></td>
<td>
<?php echo form_input(array('name'=>'amount_tendered', 'id'=>'amount_tendered', 'class'=>'form-control input-sm', 'value'=>to_currency_no_money($amount_due), 'size'=>'5', 'tabindex'=>3)); ?>
</td>
</tr>
</table>
<div class='btn btn-sm btn-success pull-right' id='add_payment_button' tabindex='4'><?php echo $this->lang->line('sales_add_payment'); ?></div>
<?php
}
?>
<?php echo form_close(); ?>
</div>
<div class='btn btn-sm btn-success pull-right' id='add_payment_button' tabindex='4'><?php echo $this->lang->line('sales_add_payment'); ?></div>
<?php
}
?>
<?php echo form_close(); ?>
<?php
// Only show this part if there is at least one payment entered.

6
css/ospos.css
View File

@@ -127,6 +127,12 @@ a.rollover img
padding: 3px;
}
button.btn.dropdown-toggle.btn-sm
{
background-color: white;
color: black;
}
@media (min-width: 768px)
{
.navbar-nav > li > a

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=60b97840ca"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3ded88f8ce"/>
<!-- 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=84fd067160" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=52d78ada05" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>