mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-04-04 23:24:16 -04:00
Add default jquery ui theme instead of smoothness theme (#328)
Remove obsolete ajax queue plugin (#328) Add image preview widget for avatar upload in items form (#372)
This commit is contained in:
jekkos
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
|
||||
destPrefix: 'dist'
|
||||
},
|
||||
files: {
|
||||
'jquery-ui.css': 'jquery-ui/themes/smoothness/jquery-ui.css',
|
||||
'jquery-ui.css': 'jquery-ui/themes/base/jquery-ui.css',
|
||||
'bootstrap.min.css': 'bootswatch-dist/css/bootstrap.min.css'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,12 +179,16 @@ class Items extends Secure_area implements iData_controller
|
||||
$suppliers[$row['person_id']] = $row['company_name'];
|
||||
}
|
||||
|
||||
$item_info = $this->Item->get_info($item_id);
|
||||
$data['suppliers'] = $suppliers;
|
||||
$data['selected_supplier'] = $this->Item->get_info($item_id)->supplier_id;
|
||||
$data['selected_supplier'] = $item_info->supplier_id;
|
||||
$data['default_tax_1_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_1_rate') : '';
|
||||
$data['default_tax_2_rate'] = ($item_id==-1) ? $this->Appconfig->get('default_tax_2_rate') : '';
|
||||
|
||||
$locations_data = $this->Stock_location->get_undeleted_all()->result_array();
|
||||
$data['logo_exists'] = $item_info->pic_id != '';
|
||||
$images = glob ("uploads/item_pics/" . $item_info->pic_id . ".*");
|
||||
$data['image_path'] = sizeof($images) > 0 ? base_url($images[0]) : '';
|
||||
|
||||
$locations_data = $this->Stock_location->get_undeleted_all()->result_array();
|
||||
foreach($locations_data as $location)
|
||||
{
|
||||
$quantity = $this->Item_quantity->get_item_quantity($item_id,$location['location_id'])->quantity;
|
||||
@@ -413,13 +417,20 @@ class Items extends Secure_area implements iData_controller
|
||||
'max_size' => '100',
|
||||
'max_width' => '640',
|
||||
'max_height' => '480',
|
||||
'file_name' => sizeof($map));
|
||||
'file_name' => sizeof($map) + 1);
|
||||
$this->load->library('upload', $config);
|
||||
$this->upload->do_upload('item_image');
|
||||
|
||||
return strlen($this->upload->display_errors()) == 0 || !strcmp($this->upload->display_errors(), '<p>'.$this->lang->line('upload_no_file_selected').'</p>');
|
||||
}
|
||||
|
||||
|
||||
public function remove_logo($item_id)
|
||||
{
|
||||
$item_data = array('pic_id' => null);
|
||||
$result = $this->Item->save($item_data, $item_id);;
|
||||
echo json_encode(array('success' => $result));
|
||||
}
|
||||
|
||||
function save_inventory($item_id=-1)
|
||||
{
|
||||
$employee_id=$this->Employee->get_logged_in_employee_info()->person_id;
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Datenbank";
|
||||
$lang["items_update"] = "Ändere Artikel";
|
||||
$lang["items_use_inventory_menu"] = "Verwende Bestandesmenu";
|
||||
$lang["items_import_items_excel"] = "Importiere Artikel mit Excel Datei";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database";
|
||||
$lang["items_update"] = "Update Item";
|
||||
$lang["items_use_inventory_menu"] = "Use Inv. Menu";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -37,7 +37,7 @@ $lang["sales_discount_short"] = "%";
|
||||
$lang["sales_edit"] = "Edit";
|
||||
$lang["sales_edit_item"] = "Edit Item";
|
||||
$lang["sales_edit_sale"] = "Edit Sale";
|
||||
$lang["sales_email_receipt"] = "Email Receipt";
|
||||
$lang["sales_email_receipt"] = "E-Mail Receipt";
|
||||
$lang["sales_employee"] = "Employee";
|
||||
$lang["sales_error_editing_item"] = "Error editing item";
|
||||
$lang["sales_find_or_scan_item"] = "Find/Scan Item";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de datos UPC";
|
||||
$lang["items_update"] = "Actualizar Artículo";
|
||||
$lang["items_use_inventory_menu"] = "Usar Menú de Inventario";
|
||||
$lang["items_import_items_excel"] = "Importar Artículos desde Excel";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Base de Données UPC";
|
||||
$lang["items_update"] = "Éditer Item";
|
||||
$lang["items_use_inventory_menu"] = "Utiliser Menu Inv.";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "Database UPC";
|
||||
$lang["items_update"] = "Ubah";
|
||||
$lang["items_use_inventory_menu"] = "Gunakan Inv. Menu";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -65,7 +65,7 @@ $lang["reports_requisition_related_item_unit_quantity"] = "Unit Item Barang";
|
||||
$lang["reports_requisitions"] = "Laporan Permintaan";
|
||||
$lang["reports_returns"] = "Retur";
|
||||
$lang["reports_revenue"] = "Pendapatan";
|
||||
$lang["reports_sale_id"] = "ID Penjualan";
|
||||
$lang["reports_sale_id"] = "ID Penjualan ";
|
||||
$lang["reports_sale_type"] = "Jenis Penjualan";
|
||||
$lang["reports_sales"] = "Penjualan";
|
||||
$lang["reports_sales_amount"] = "Jumlah Penjualan";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database";
|
||||
$lang["items_update"] = "Bewerk Product";
|
||||
$lang["items_use_inventory_menu"] = "Use Inv. Menu";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC база данных";
|
||||
$lang["items_update"] = "Обновить Товар";
|
||||
$lang["items_use_inventory_menu"] = "Используйте меню инвентаря";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC ฐานข้อมูล";
|
||||
$lang["items_update"] = "ปรับแต่งสินค้า";
|
||||
$lang["items_use_inventory_menu"] = "ใช้เมนูสินค้าคงเหลือ";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Veritabanı";
|
||||
$lang["items_update"] = "Ürün Güncelle";
|
||||
$lang["items_use_inventory_menu"] = "Stok Menüsünü Kullan";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -85,3 +85,6 @@ $lang["items_upc_database"] = "UPC Database";
|
||||
$lang["items_update"] = "更新產品";
|
||||
$lang["items_use_inventory_menu"] = "使用庫存清單";
|
||||
$lang["items_import_items_excel"] = "Import items from Excel sheet";
|
||||
$lang["items_select_image"] = "Select Image";
|
||||
$lang["items_change_image"] = "Change Image";
|
||||
$lang["items_remove_image"] = "Remove Image";
|
||||
|
||||
@@ -187,38 +187,27 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('items_image'), 'item_image', array('class'=>'control-label col-xs-3')); ?>
|
||||
<div class='col-xs-8'>
|
||||
<div class="fileinput fileinput-new input-group" data-provides="fileinput">
|
||||
<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i><span class="fileinput-filename"></span></div>
|
||||
<span class="input-group-addon input-sm btn btn-default btn-file"><span class="fileinput-new"><?php echo $this->lang->line("common_import_select_file"); ?></span><span class="fileinput-exists"><?php echo $this->lang->line("common_import_change_file"); ?></span><input type="file" id="item_image" name="item_image" accept="image/*"></span>
|
||||
<a href="#" class="input-group-addon input-sm btn btn-default fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("common_import_remove_file"); ?></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php /*
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('items_image'), 'items_image', array('class'=>'control-label col-xs-3')); ?>
|
||||
<div class='col-xs-6'>
|
||||
<div class="fileinput fileinput-new" data-provides="fileinput">
|
||||
<div class="fileinput-new thumbnail" style="width: 100px; height: 100px;">
|
||||
<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('items_image'); ?>"
|
||||
src="<?php if($item_info->pic_id != null) echo base_url('uploads/item_pics/') . '/' . $item_info->pic_id . '.png'; else echo '';?>"
|
||||
style="max-height: 100%; max-width: 100%;">
|
||||
<div class='col-xs-8'>
|
||||
<div class="fileinput <?php echo $logo_exists ? 'fileinput-exists' : 'fileinput-new'; ?>" data-provides="fileinput">
|
||||
<div class="fileinput-new thumbnail" style="width: 100px; height: 100px;"></div>
|
||||
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 100px; max-height: 100px;">
|
||||
<img data-src="holder.js/100%x100%" alt="<?php echo $this->lang->line('items_image'); ?>"
|
||||
src="<?php echo $image_path; ?>"
|
||||
style="max-height: 100%; max-width: 100%;">
|
||||
</div>
|
||||
<div class="fileinput-preview fileinput-exists thumbnail" style="max-width: 100px; max-height: 100px;"></div>
|
||||
<div>
|
||||
<span class="btn btn-default btn-sm btn-file">
|
||||
<span class="fileinput-new"><?php echo $this->lang->line("config_company_select_image"); ?></span>
|
||||
<span class="fileinput-exists"><?php echo $this->lang->line("config_company_change_image"); ?></span>
|
||||
<input type="file" name="items_image">
|
||||
</span>
|
||||
<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("config_company_remove_image"); ?></a>
|
||||
<span class="btn btn-default btn-sm btn-file">
|
||||
<span class="fileinput-new"><?php echo $this->lang->line("items_select_image"); ?></span>
|
||||
<span class="fileinput-exists"><?php echo $this->lang->line("items_change_image"); ?></span>
|
||||
<input type="file" name="item_image" accept="image/*">
|
||||
</span>
|
||||
<a href="#" class="btn btn-default btn-sm fileinput-exists" data-dismiss="fileinput"><?php echo $this->lang->line("items_remove_image"); ?></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
*/ ?>
|
||||
|
||||
<div class="form-group form-group-sm">
|
||||
<?php echo form_label($this->lang->line('items_allow_alt_description'), 'allow_alt_description', array('class'=>'control-label col-xs-3')); ?>
|
||||
<div class='col-xs-1'>
|
||||
@@ -335,6 +324,14 @@
|
||||
}).responseText).success;
|
||||
}, '<?php echo $this->lang->line("items_item_number_duplicate"); ?>');
|
||||
|
||||
$("a.fileinput-exists").click(function() {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: "<?php echo site_url("$controller_name/remove_logo/$item_info->item_id"); ?>",
|
||||
dataType: "json"
|
||||
})
|
||||
});
|
||||
|
||||
$('#item_form').validate($.extend({
|
||||
submitHandler: function(form, event) {
|
||||
$(form).ajaxSubmit({
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
|
||||
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
|
||||
<!-- bower:css -->
|
||||
<link rel="stylesheet" href="bower_components/jquery-ui/themes/smoothness/jquery-ui.css" />
|
||||
<link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.css" />
|
||||
<link rel="stylesheet" href="bower_components/tablesorter/dist/css/theme.blue.min.css" />
|
||||
<link rel="stylesheet" href="bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
|
||||
<link rel="stylesheet" href="bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
|
||||
@@ -49,7 +49,6 @@
|
||||
<script src="bower_components/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
<!-- endbower -->
|
||||
<!-- start js template tags -->
|
||||
<script type="text/javascript" src="js/jquery.ajax_queue.js" language="javascript"></script>
|
||||
<script type="text/javascript" src="js/jquery.jkey-1.1.js" language="javascript"></script>
|
||||
<script type="text/javascript" src="js/jquery.tablesorter.staticrow.js" language="javascript"></script>
|
||||
<script type="text/javascript" src="js/common.js" language="javascript"></script>
|
||||
@@ -65,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=a7d8e4b2d7"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=4beaa785e7"/>
|
||||
<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=979821bd66" language="javascript"></script>
|
||||
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=1bff9ada8f" language="javascript"></script>
|
||||
<!-- end minjs template tags -->
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
},
|
||||
"jquery-ui": {
|
||||
"main": [
|
||||
"themes/smoothness/jquery-ui.css",
|
||||
"themes/base/jquery-ui.css",
|
||||
"jquery-ui.js"
|
||||
]
|
||||
}
|
||||
|
||||
100
dist/jquery-ui.css
vendored
100
dist/jquery-ui.css
vendored
@@ -1,8 +1,8 @@
|
||||
/*! jQuery UI - v1.11.4 - 2015-03-11
|
||||
/*! jQuery UI - v1.11.3 - 2015-02-12
|
||||
* http://jqueryui.com
|
||||
* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
|
||||
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
|
||||
* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
|
||||
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px
|
||||
* Copyright jQuery Foundation and other contributors; Licensed MIT */
|
||||
|
||||
/* Layout helpers
|
||||
----------------------------------*/
|
||||
@@ -830,8 +830,8 @@ body .ui-tooltip {
|
||||
/* Component containers
|
||||
----------------------------------*/
|
||||
.ui-widget {
|
||||
font-family: Verdana,Arial,sans-serif;
|
||||
font-size: 1.1em;
|
||||
font-family: Arial,Helvetica,sans-serif;
|
||||
font-size: 1em;
|
||||
}
|
||||
.ui-widget .ui-widget {
|
||||
font-size: 1em;
|
||||
@@ -840,25 +840,25 @@ body .ui-tooltip {
|
||||
.ui-widget select,
|
||||
.ui-widget textarea,
|
||||
.ui-widget button {
|
||||
font-family: Verdana,Arial,sans-serif;
|
||||
font-family: Arial,Helvetica,sans-serif;
|
||||
font-size: 1em;
|
||||
}
|
||||
.ui-widget-content {
|
||||
border: 1px solid #aaaaaa;
|
||||
background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
|
||||
color: #222222;
|
||||
border: 1px solid #dddddd;
|
||||
background: #ffffff;
|
||||
color: #333333;
|
||||
}
|
||||
.ui-widget-content a {
|
||||
color: #222222;
|
||||
color: #333333;
|
||||
}
|
||||
.ui-widget-header {
|
||||
border: 1px solid #aaaaaa;
|
||||
background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
|
||||
color: #222222;
|
||||
border: 1px solid #dddddd;
|
||||
background: #e9e9e9;
|
||||
color: #333333;
|
||||
font-weight: bold;
|
||||
}
|
||||
.ui-widget-header a {
|
||||
color: #222222;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
/* Interaction states
|
||||
@@ -866,15 +866,15 @@ body .ui-tooltip {
|
||||
.ui-state-default,
|
||||
.ui-widget-content .ui-state-default,
|
||||
.ui-widget-header .ui-state-default {
|
||||
border: 1px solid #d3d3d3;
|
||||
background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
|
||||
border: 1px solid #c5c5c5;
|
||||
background: #f6f6f6;
|
||||
font-weight: normal;
|
||||
color: #555555;
|
||||
color: #454545;
|
||||
}
|
||||
.ui-state-default a,
|
||||
.ui-state-default a:link,
|
||||
.ui-state-default a:visited {
|
||||
color: #555555;
|
||||
color: #454545;
|
||||
text-decoration: none;
|
||||
}
|
||||
.ui-state-hover,
|
||||
@@ -883,10 +883,10 @@ body .ui-tooltip {
|
||||
.ui-state-focus,
|
||||
.ui-widget-content .ui-state-focus,
|
||||
.ui-widget-header .ui-state-focus {
|
||||
border: 1px solid #999999;
|
||||
background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
|
||||
border: 1px solid #cccccc;
|
||||
background: #ededed;
|
||||
font-weight: normal;
|
||||
color: #212121;
|
||||
color: #2b2b2b;
|
||||
}
|
||||
.ui-state-hover a,
|
||||
.ui-state-hover a:hover,
|
||||
@@ -896,21 +896,21 @@ body .ui-tooltip {
|
||||
.ui-state-focus a:hover,
|
||||
.ui-state-focus a:link,
|
||||
.ui-state-focus a:visited {
|
||||
color: #212121;
|
||||
color: #2b2b2b;
|
||||
text-decoration: none;
|
||||
}
|
||||
.ui-state-active,
|
||||
.ui-widget-content .ui-state-active,
|
||||
.ui-widget-header .ui-state-active {
|
||||
border: 1px solid #aaaaaa;
|
||||
background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
|
||||
border: 1px solid #003eff;
|
||||
background: #007fff;
|
||||
font-weight: normal;
|
||||
color: #212121;
|
||||
color: #ffffff;
|
||||
}
|
||||
.ui-state-active a,
|
||||
.ui-state-active a:link,
|
||||
.ui-state-active a:visited {
|
||||
color: #212121;
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@@ -919,31 +919,31 @@ body .ui-tooltip {
|
||||
.ui-state-highlight,
|
||||
.ui-widget-content .ui-state-highlight,
|
||||
.ui-widget-header .ui-state-highlight {
|
||||
border: 1px solid #fcefa1;
|
||||
background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
|
||||
color: #363636;
|
||||
border: 1px solid #dad55e;
|
||||
background: #fffa90;
|
||||
color: #777620;
|
||||
}
|
||||
.ui-state-highlight a,
|
||||
.ui-widget-content .ui-state-highlight a,
|
||||
.ui-widget-header .ui-state-highlight a {
|
||||
color: #363636;
|
||||
color: #777620;
|
||||
}
|
||||
.ui-state-error,
|
||||
.ui-widget-content .ui-state-error,
|
||||
.ui-widget-header .ui-state-error {
|
||||
border: 1px solid #cd0a0a;
|
||||
background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
|
||||
color: #cd0a0a;
|
||||
border: 1px solid #f1a899;
|
||||
background: #fddfdf;
|
||||
color: #5f3f3f;
|
||||
}
|
||||
.ui-state-error a,
|
||||
.ui-widget-content .ui-state-error a,
|
||||
.ui-widget-header .ui-state-error a {
|
||||
color: #cd0a0a;
|
||||
color: #5f3f3f;
|
||||
}
|
||||
.ui-state-error-text,
|
||||
.ui-widget-content .ui-state-error-text,
|
||||
.ui-widget-header .ui-state-error-text {
|
||||
color: #cd0a0a;
|
||||
color: #5f3f3f;
|
||||
}
|
||||
.ui-priority-primary,
|
||||
.ui-widget-content .ui-priority-primary,
|
||||
@@ -978,27 +978,27 @@ body .ui-tooltip {
|
||||
}
|
||||
.ui-icon,
|
||||
.ui-widget-content .ui-icon {
|
||||
background-image: url("images/ui-icons_222222_256x240.png");
|
||||
background-image: url("images/ui-icons_444444_256x240.png");
|
||||
}
|
||||
.ui-widget-header .ui-icon {
|
||||
background-image: url("images/ui-icons_222222_256x240.png");
|
||||
background-image: url("images/ui-icons_444444_256x240.png");
|
||||
}
|
||||
.ui-state-default .ui-icon {
|
||||
background-image: url("images/ui-icons_888888_256x240.png");
|
||||
background-image: url("images/ui-icons_777777_256x240.png");
|
||||
}
|
||||
.ui-state-hover .ui-icon,
|
||||
.ui-state-focus .ui-icon {
|
||||
background-image: url("images/ui-icons_454545_256x240.png");
|
||||
background-image: url("images/ui-icons_555555_256x240.png");
|
||||
}
|
||||
.ui-state-active .ui-icon {
|
||||
background-image: url("images/ui-icons_454545_256x240.png");
|
||||
background-image: url("images/ui-icons_ffffff_256x240.png");
|
||||
}
|
||||
.ui-state-highlight .ui-icon {
|
||||
background-image: url("images/ui-icons_2e83ff_256x240.png");
|
||||
background-image: url("images/ui-icons_777620_256x240.png");
|
||||
}
|
||||
.ui-state-error .ui-icon,
|
||||
.ui-state-error-text .ui-icon {
|
||||
background-image: url("images/ui-icons_cd0a0a_256x240.png");
|
||||
background-image: url("images/ui-icons_cc0000_256x240.png");
|
||||
}
|
||||
|
||||
/* positioning */
|
||||
@@ -1188,37 +1188,37 @@ body .ui-tooltip {
|
||||
.ui-corner-top,
|
||||
.ui-corner-left,
|
||||
.ui-corner-tl {
|
||||
border-top-left-radius: 4px;
|
||||
border-top-left-radius: 3px;
|
||||
}
|
||||
.ui-corner-all,
|
||||
.ui-corner-top,
|
||||
.ui-corner-right,
|
||||
.ui-corner-tr {
|
||||
border-top-right-radius: 4px;
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
.ui-corner-all,
|
||||
.ui-corner-bottom,
|
||||
.ui-corner-left,
|
||||
.ui-corner-bl {
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
.ui-corner-all,
|
||||
.ui-corner-bottom,
|
||||
.ui-corner-right,
|
||||
.ui-corner-br {
|
||||
border-bottom-right-radius: 4px;
|
||||
border-bottom-right-radius: 3px;
|
||||
}
|
||||
|
||||
/* Overlays */
|
||||
.ui-widget-overlay {
|
||||
background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
|
||||
background: #aaaaaa;
|
||||
opacity: .3;
|
||||
filter: Alpha(Opacity=30); /* support: IE8 */
|
||||
}
|
||||
.ui-widget-shadow {
|
||||
margin: -8px 0 0 -8px;
|
||||
padding: 8px;
|
||||
background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
|
||||
margin: 0px 0 0 0px;
|
||||
padding: 5px;
|
||||
background: #666666;
|
||||
opacity: .3;
|
||||
filter: Alpha(Opacity=30); /* support: IE8 */
|
||||
border-radius: 8px;
|
||||
|
||||
128
dist/opensourcepos.js
vendored
128
dist/opensourcepos.js
vendored
File diff suppressed because one or more lines are too long
19
dist/opensourcepos.min.css
vendored
19
dist/opensourcepos.min.css
vendored
File diff suppressed because one or more lines are too long
14
dist/opensourcepos.min.js
vendored
14
dist/opensourcepos.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -1,116 +0,0 @@
|
||||
/**
|
||||
* Ajax Queue Plugin
|
||||
*
|
||||
* Homepage: http://jquery.com/plugins/project/ajaxqueue
|
||||
* Documentation: http://docs.jquery.com/AjaxQueue
|
||||
*/
|
||||
|
||||
/**
|
||||
|
||||
<script>
|
||||
$(function(){
|
||||
jQuery.ajaxQueue({
|
||||
url: "test.php",
|
||||
success: function(html){ jQuery("ul").append(html); }
|
||||
});
|
||||
jQuery.ajaxQueue({
|
||||
url: "test.php",
|
||||
success: function(html){ jQuery("ul").append(html); }
|
||||
});
|
||||
jQuery.ajaxSync({
|
||||
url: "test.php",
|
||||
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
|
||||
});
|
||||
jQuery.ajaxSync({
|
||||
url: "test.php",
|
||||
success: function(html){ jQuery("ul").append("<b>"+html+"</b>"); }
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<ul style="position: absolute; top: 5px; right: 5px;"></ul>
|
||||
|
||||
*/
|
||||
/*
|
||||
* Queued Ajax requests.
|
||||
* A new Ajax request won't be started until the previous queued
|
||||
* request has finished.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Synced Ajax requests.
|
||||
* The Ajax request will happen as soon as you call this method, but
|
||||
* the callbacks (success/error/complete) won't fire until all previous
|
||||
* synced requests have been completed.
|
||||
*/
|
||||
|
||||
|
||||
(function($) {
|
||||
|
||||
var ajax = $.ajax;
|
||||
|
||||
var pendingRequests = {};
|
||||
|
||||
var synced = [];
|
||||
var syncedData = [];
|
||||
|
||||
$.ajax = function(settings) {
|
||||
// create settings for compatibility with ajaxSetup
|
||||
settings = jQuery.extend(settings, jQuery.extend({}, jQuery.ajaxSettings, settings));
|
||||
|
||||
var port = settings.port;
|
||||
|
||||
switch(settings.mode) {
|
||||
case "abort":
|
||||
if ( pendingRequests[port] ) {
|
||||
pendingRequests[port].abort();
|
||||
}
|
||||
return pendingRequests[port] = ajax.apply(this, arguments);
|
||||
case "queue":
|
||||
var _old = settings.complete;
|
||||
settings.complete = function(){
|
||||
if ( _old )
|
||||
_old.apply( this, arguments );
|
||||
jQuery([ajax]).dequeue("ajax" + port );;
|
||||
};
|
||||
|
||||
jQuery([ ajax ]).queue("ajax" + port, function(){
|
||||
ajax( settings );
|
||||
});
|
||||
return;
|
||||
case "sync":
|
||||
var pos = synced.length;
|
||||
|
||||
synced[ pos ] = {
|
||||
error: settings.error,
|
||||
success: settings.success,
|
||||
complete: settings.complete,
|
||||
done: false
|
||||
};
|
||||
|
||||
syncedData[ pos ] = {
|
||||
error: [],
|
||||
success: [],
|
||||
complete: []
|
||||
};
|
||||
|
||||
settings.error = function(){ syncedData[ pos ].error = arguments; };
|
||||
settings.success = function(){ syncedData[ pos ].success = arguments; };
|
||||
settings.complete = function(){
|
||||
syncedData[ pos ].complete = arguments;
|
||||
synced[ pos ].done = true;
|
||||
|
||||
if ( pos == 0 || !synced[ pos-1 ] )
|
||||
for ( var i = pos; i < synced.length && synced[i].done; i++ ) {
|
||||
if ( synced[i].error ) synced[i].error.apply( jQuery, syncedData[i].error );
|
||||
if ( synced[i].success ) synced[i].success.apply( jQuery, syncedData[i].success );
|
||||
if ( synced[i].complete ) synced[i].complete.apply( jQuery, syncedData[i].complete );
|
||||
|
||||
synced[i] = null;
|
||||
syncedData[i] = null;
|
||||
}
|
||||
};
|
||||
}
|
||||
return ajax.apply(this, arguments);
|
||||
};
|
||||
|
||||
})(jQuery);
|
||||
@@ -7,7 +7,7 @@
|
||||
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
|
||||
<?php if ($this->input->cookie('debug') == "true" || $this->input->get("debug") == "true") : ?>
|
||||
<!-- bower:css -->
|
||||
<link rel="stylesheet" href="../bower_components/jquery-ui/themes/smoothness/jquery-ui.css" />
|
||||
<link rel="stylesheet" href="../bower_components/jquery-ui/themes/base/jquery-ui.css" />
|
||||
<link rel="stylesheet" href="../bower_components/tablesorter/dist/css/theme.blue.min.css" />
|
||||
<link rel="stylesheet" href="../bower_components/bootstrap3-dialog/dist/css/bootstrap-dialog.min.css" />
|
||||
<link rel="stylesheet" href="../bower_components/jasny-bootstrap/dist/css/jasny-bootstrap.css" />
|
||||
@@ -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=a7d8e4b2d7"/>
|
||||
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=4beaa785e7"/>
|
||||
<!-- 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=979821bd66" language="javascript"></script>
|
||||
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=1bff9ada8f" language="javascript"></script>
|
||||
<!-- end minjs template tags -->
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
@@ -84,3 +84,6 @@ items_upc_database,UPC Datenbank,UPC Database,Base de datos UPC,UPC Database,Bas
|
||||
items_update,Ändere Artikel,Bewerk Product,Actualizar Artículo,Update Item,Éditer Item,更新產品,Обновить Товар,ปรับแต่งสินค้า,Ürün Güncelle,Ubah
|
||||
items_use_inventory_menu,Verwende Bestandesmenu,Use Inv. Menu,Usar Menú de Inventario,Use Inv. Menu,Utiliser Menu Inv.,使用庫存清單,Используйте меню инвентаря,ใช้เมนูสินค้าคงเหลือ,Stok Menüsünü Kullan,Gunakan Inv. Menu
|
||||
items_import_items_excel,Importiere Artikel mit Excel Datei,Import items from Excel sheet,Importar Artículos desde Excel,Import items from Excel sheet,Import items from Excel sheet,Import items from Excel sheet,Import items from Excel sheet,Import items from Excel sheet,Import items from Excel sheet,Import items from Excel sheet
|
||||
items_select_image,Select Image,Select Image,Select Image,Select Image,Select Image,Select Image,Select Image,Select Image,Select Image,Select Image
|
||||
items_change_image,Change Image,Change Image,Change Image,Change Image,Change Image,Change Image,Change Image,Change Image,Change Image,Change Image
|
||||
items_remove_image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image,Remove Image
|
||||
|
Reference in New Issue
Block a user