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

Remove padding for comments field in register (#680)

Browse Source 
Properly align checkboxes in right lower corner (#680)
Add fix for bootstrap-tables delete and regen dist (#627)
Tidy up receipt email send code (use empty instead of isset)
This commit is contained in:
jekkos
2016-06-21 08:31:11 +02:00
parent 15fd832705
commit 4cf1c31d4f
9 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,10 +66,10 @@
<!-- 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=0a2ee6807c"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=725a0444ad"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=ac39c5dc2e" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=7f178569bd" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

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

@@ -15,6 +15,7 @@ $(document).ready(function()
{
var send_mail = function()
{
debugger;;
$.get('<?php echo site_url() . "/sales/send_receipt/" . $sale_id_num; ?>',
function(response)
{
@@ -24,7 +25,10 @@ $(document).ready(function()
};
$("#show_email_button").click(send_mail);
<?php echo (isset($email_receipt) && !empty($email_receipt)) ? 1 : 0; ?> && send_email();
<?php if(!empty($customer_email)): ?>
send_email();
<?php endif; ?>
});
</script>
<?php endif; ?>

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

@@ -448,59 +448,64 @@ if (isset($success))
{
?>
<div class="container-fluid">
<div class="form-group form-group-sm">
<div class="col-xs-12">
<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?>
<div class="no-gutter row">
<div class="form-group form-group-sm">
<div class="col-xs-12">
<?php echo form_label($this->lang->line('common_comments'), 'comments', array('class'=>'control-label', 'id'=>'comment_label', 'for'=>'comment')); ?>
<?php echo form_textarea(array('name'=>'comment', 'id'=>'comment', 'class'=>'form-control input-sm', 'value'=>$comment, 'rows'=>'2')); ?>
</div>
</div>
</div>
<div class="row">
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label for="sales_print_after_sale" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'sales_print_after_sale', 'id'=>'sales_print_after_sale', 'value'=>1, 'checked'=>$print_after_sale)); ?>
<?php echo $this->lang->line('sales_print_after_sale')?>
</label>
</div>
<?php
if(!empty($customer_email))
{
?>
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label for="email-receipt" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'email_receipt', 'id'=>'email_receipt', 'value'=>1, 'checked'=>$email_receipt)); ?>
<?php echo $this->lang->line('sales_email_receipt');?>
<label for="sales_print_after_sale" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'sales_print_after_sale', 'id'=>'sales_print_after_sale', 'value'=>1, 'checked'=>$print_after_sale)); ?>
<?php echo $this->lang->line('sales_print_after_sale')?>
</label>
</div>
<?php
}
?>
<?php
if(!empty($customer_email))
{
?>
<div class="col-xs-6">
<label for="email-receipt" class="control-label checkbox">
<?php echo form_checkbox(array('name'=>'email_receipt', 'id'=>'email_receipt', 'value'=>1, 'checked'=>$email_receipt)); ?>
<?php echo $this->lang->line('sales_email_receipt');?>
</label>
</div>
<?php
}
?>
</div>
</div>
<?php
if ($mode == "sale" && $this->config->item('invoice_enable') == TRUE)
{
?>
<div class="row">
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label class="control-label checkbox" for="sales_invoice_enable">
<?php echo form_checkbox(array('name'=>'sales_invoice_enable', 'id'=>'sales_invoice_enable', 'value'=>1, 'checked'=>$invoice_number_enabled)); ?>
<?php echo $this->lang->line('sales_invoice_enable');?>
</label>
</div>
<div class="form-group form-group-sm">
<div class="col-xs-6">
<label class="control-label checkbox" for="sales_invoice_enable">
<?php echo form_checkbox(array('name'=>'sales_invoice_enable', 'id'=>'sales_invoice_enable', 'value'=>1, 'checked'=>$invoice_number_enabled)); ?>
<?php echo $this->lang->line('sales_invoice_enable');?>
</label>
</div>
<div class="col-xs-6">
<div class="input-group input-group-sm">
<span class="input-group-addon input-sm">#</span>
<?php echo form_input(array('name'=>'sales_invoice_number', 'id'=>'sales_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number));?>
<div class="col-xs-6">
<div class="input-group input-group-sm">
<span class="input-group-addon input-sm">#</span>
<?php echo form_input(array('name'=>'sales_invoice_number', 'id'=>'sales_invoice_number', 'class'=>'form-control input-sm', 'value'=>$invoice_number));?>
</div>
</div>
</div>
</div>
<?php
}
?>
</div
</div>
<?php
}
?>

4
css/ospos.css
View File

@@ -167,6 +167,8 @@ label.required
overflow-y: auto;
}
.no-gutter [class*="-1"] {
.no-gutter [class*="-1"]
{
padding-right:0;
padding-left: 0;
}

3
dist/opensourcepos.js vendored
View File

@@ -20580,6 +20580,9 @@ return jQuery;
}
if ($.inArray(row[params.field], params.values) !== -1) {
this.options.data.splice(i, 1);
if (this.options.sidePagination === 'server') {
this.options.totalRows -= 1;
}
}
}

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
dist/opensourcepos.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
docker-cloud.yml
View File

@@ -1,10 +1,26 @@
web:
image: jekkos/opensourcepos
image: jekkos/opensourcepos:master
links:
- mysql
ports:
- "80:80"
roles:
- global
volumes:
- ospos:/var/www/html
- ospos:/app
environment:
- MYSQL_USERNAME=admin
- MYSQL_PASSWORD=pointofsale
- MYSQL_DB_NAME=ospos
- MYSQL_HOST_NAME=mysql
mysql:
image: mysql
image: mysql:5.6
environment:
- MYSQL_ROOT_PASSWORD=pointofsale
- MYSQL_DATABASE=ospos
- MYSQL_USER=admin
- MYSQL_PASSWORD=pointofsale
ports:
- 3306:3306

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

@@ -69,11 +69,11 @@
<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/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=0a2ee6807c"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=725a0444ad"/>
<!-- 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=ac39c5dc2e" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=7f178569bd" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>