Enable bootstrap tables localisation and integrate with ospos scripts

(#293)
Fix item bulk update (all items are updated now) (#507)
Stop click event propagation when opening modal dialog on a table row
(caused row to be selected/deselected)

application/controllers/Items.php

@@ -492,7 +492,8 @@ class Items extends Secure_area implements iData_controller
 		}
 
 		//Item data could be empty if tax information is being updated
-		if(empty($item_data) || $this->Item->update_multiple($item_data, $items_to_update))
+		$item_ids = explode(",", $items_to_update);
+		if(empty($item_data) || $this->Item->update_multiple($item_data, $item_ids))
 		{
 			$items_taxes_data = array();
 			$tax_names = $this->input->post('tax_names');
@@ -514,7 +515,7 @@ class Items extends Secure_area implements iData_controller
 				$this->Item_taxes->save_multiple($items_taxes_data, $items_to_update);
 			}
 
-			echo json_encode(array('success'=>true,'message'=>$this->lang->line('items_successful_bulk_edit')));
+			echo json_encode(array('success'=>true,'message'=>$this->lang->line('items_successful_bulk_edit'), 'id'=>$item_ids));
 		}
 		else
 		{

application/language/de-CH/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Lade, bitte warten...";
+$lang["tables_rows_per_page"] = "{0} Einträge pro Seite";
+$lang["tables_page_from_to"] = "Zeige {0} bis {1} von {2} Zeile(n)";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Umschalten";
+$lang["tables_columns"] = "Spalten";
+$lang["tables_all"] = "All";

application/language/en/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Loading, please wait...";
+$lang["tables_rows_per_page"] = "{0} rows per page";
+$lang["tables_page_from_to"] = "Showing {0} to {1} of {2} rows";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Toggle";
+$lang["tables_columns"] = "Columns";
+$lang["tables_all"] = "All";

application/language/es/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Por favor espere...";
+$lang["tables_rows_per_page"] = "{0} resultados por página";
+$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} - En total {2} resultados";
+$lang["tables_hide_show_pagination"] = "Ocultar/Mostrar paginación";
+$lang["tables_refresh"] = "Refrescar";
+$lang["tables_toggle"] = "Ocultar/Mostrar";
+$lang["tables_columns"] = "Columnas";
+$lang["tables_all"] = "Todos";

application/language/fr/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Chargement en cours, patientez, s?il vous pla?t ...";
+$lang["tables_rows_per_page"] = "{0} lignes par page";
+$lang["tables_page_from_to"] = "Affichage des lignes {0} à {1} sur {2} lignes au total";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Rafra?chir";
+$lang["tables_toggle"] = "Alterner";
+$lang["tables_columns"] = "Colonnes";
+$lang["tables_all"] = "Tous";

application/language/hr-HR/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Molimo pričekajte ...";
+$lang["tables_rows_per_page"] = "{0} broj zapisa po stranici";
+$lang["tables_page_from_to"] = "Prikazujem {0}. - {1} od ukupnog broja zapisa {2}";
+$lang["tables_hide_show_pagination"] = "Prikaži/sakrij stranice";
+$lang["tables_refresh"] = "Osvježi";
+$lang["tables_toggle"] = "Promijeni prikaz";
+$lang["tables_columns"] = "Kolone";
+$lang["tables_all"] = "Sve";

application/language/hu-HU/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Betöltés, kérem várjon...";
+$lang["tables_rows_per_page"] = "{0} rekord per oldal";
+$lang["tables_page_from_to"] = "Megjelenítve  {0}  {1} / {2} összesen";
+$lang["tables_hide_show_pagination"] = "Lapozó elrejtése/megjelenítése";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Toggle";
+$lang["tables_columns"] = "Columns";
+$lang["tables_all"] = "All";

application/language/id/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Loading, please wait...";
+$lang["tables_rows_per_page"] = "{0} rows per page";
+$lang["tables_page_from_to"] = "Showing {0} to {1} of {2} rows";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Toggle";
+$lang["tables_columns"] = "Columns";
+$lang["tables_all"] = "All";

application/language/nl-BE/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Laden, even geduld...";
+$lang["tables_rows_per_page"] = "{0} records per pagina";
+$lang["tables_page_from_to"] = "Toon {0}  tot {1} van {2} record(s)";
+$lang["tables_hide_show_pagination"] = "Toon %s record(s)";
+$lang["tables_refresh"] = "Vernieuwen";
+$lang["tables_toggle"] = "Omschakelen";
+$lang["tables_columns"] = "Kolommen";
+$lang["tables_all"] = "Alle";

application/language/pt-BR/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Carregando, aguarde...";
+$lang["tables_rows_per_page"] = "{0}  registros por página";
+$lang["tables_page_from_to"] = "Exibindo {0} até {1} de {2} linhas";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Recarregar";
+$lang["tables_toggle"] = "Ocultar/Exibir paginação";
+$lang["tables_columns"] = "Colunas";
+$lang["tables_all"] = "All";

application/language/ru/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Пожалуйста, подождите, идёт загрузка...";
+$lang["tables_rows_per_page"] = "{0} записей на страницу";
+$lang["tables_page_from_to"] = "Записи с {0} по {1} из {2}";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Обновить";
+$lang["tables_toggle"] = "Переключить";
+$lang["tables_columns"] = "Колонки";
+$lang["tables_all"] = "All";

application/language/th/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Loading, please wait...";
+$lang["tables_rows_per_page"] = "{0} rows per page";
+$lang["tables_page_from_to"] = "Showing {0} to {1} of {2} rows";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Toggle";
+$lang["tables_columns"] = "Columns";
+$lang["tables_all"] = "All";

application/language/tr/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "Loading, please wait...";
+$lang["tables_rows_per_page"] = "{0} rows per page";
+$lang["tables_page_from_to"] = "Showing {0} to {1} of {2} rows";
+$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
+$lang["tables_refresh"] = "Refresh";
+$lang["tables_toggle"] = "Toggle";
+$lang["tables_columns"] = "Columns";
+$lang["tables_all"] = "All";

application/language/zh/bootstrap_tables_lang.php

@@ -0,0 +1,10 @@
+<?php 
+
+$lang["tables_loading"] = "正在努力地加载数据中，请稍候……";
+$lang["tables_rows_per_page"] = "每页显示 {0} 条记录";
+$lang["tables_page_from_to"] = "显示第 {0} 到第 {1} 条记录，总共 {2} 条记录";
+$lang["tables_hide_show_pagination"] = "隐藏/显示分页";
+$lang["tables_refresh"] = "刷新";
+$lang["tables_toggle"] = "切换";
+$lang["tables_columns"] = "列";
+$lang["tables_all"] = "All";

application/views/giftcards/manage.php

@@ -2,6 +2,7 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
+	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
 	table_support.init({
 		resource: '<?php echo site_url($controller_name);?>',
 		headers: <?php echo $table_headers; ?>,

application/views/item_kits/manage.php

@@ -3,6 +3,8 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
+	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+
 	table_support.init({
 		resource: '<?php echo site_url($controller_name);?>',
 		headers: <?php echo $table_headers; ?>,

application/views/items/manage.php

@@ -31,6 +31,8 @@ $(document).ready(function()
        table_support.refresh();
     });
 
+    <?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+
     table_support.init({
         resource: '<?php echo site_url($controller_name);?>',
         headers: <?php echo $table_headers; ?>,

application/views/partial/bootstrap_tables_locale.php

@@ -0,0 +1,39 @@
+(function ($) {
+    'use strict';
+
+    $.fn.bootstrapTable.locales['<?php echo $this->config->item('language'); ?>'] = {
+    formatLoadingMessage: function () {
+        return '<?php echo $this->lang->line('tables_loading');?>';
+    },
+    formatRecordsPerPage: function (pageNumber) {
+        return '<?php echo $this->lang->line('tables_rows_per_page'); ?>'.replace('{0}', pageNumber);
+    },
+    formatShowingRows: function (pageFrom, pageTo, totalRows) {
+        return '<?php echo $this->lang->line('tables_page_from_to'); ?>'.replace('{0}', pageFrom).replace('{1}', pageTo).replace('{2}', totalRows);
+    },
+    formatSearch: function () {
+        return '<?php echo $this->lang->line('common_search'); ?>';
+    },
+    formatNoMatches: function () {
+        return '<?php echo $this->lang->line($controller_name . '_no_' . $controller_name .'_to_display'); ?>';
+    },
+    formatPaginationSwitch: function () {
+        return '<?php echo $this->lang->line('tables_hide_show_pagination'); ?>';
+    },
+    formatRefresh: function () {
+        return '<?php echo $this->lang->line('tables_refresh'); ?>';
+    },
+    formatToggle: function () {
+        return '<?php echo $this->lang->line('tables_toggle'); ?>';
+    },
+    formatColumns: function () {
+        return '<?php echo $this->lang->line('tables_columns'); ?>';
+    },
+    formatAllRows: function () {
+        return '<?php echo $this->lang->line('tables_all'); ?>';
+    }
+    };
+
+    $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['<?php echo $this->config->item('language');?>']);
+
+})(jQuery);

application/views/partial/header.php

@@ -64,7 +64,7 @@
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=52c16a3504"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=69f478f4e8" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=57782f0295" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 

application/views/people/manage.php

@@ -3,6 +3,8 @@
 <script type="text/javascript">
 $(document).ready(function()
 {
+	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+
 	table_support.init({
 		resource: '<?php echo site_url($controller_name);?>',
 		headers: <?php echo $table_headers; ?>,
@@ -13,18 +15,13 @@ $(document).ready(function()
 	});
 
 	$("#email").click(function(evvent)
-	{
-		do_email();
-	});
-
-	var do_email = function()
 	{
 		var recipients = $.map($("tr.selected a[href^='mailto:']"), function(element)
 		{
 			return $(element).attr('href').replace(/^mailto:/, '');
 		});
 		location.href = "mailto:" + recipients.join(",");
-	};
+	});
 
 });
 

application/views/sales/manage.php

@@ -19,6 +19,8 @@ $(document).ready(function()
 		table_support.refresh();
 	});
 
+	<?php $this->load->view('partial/bootstrap_tables_locale'); ?>
+
 	table_support.init({
 		resource: '<?php echo site_url($controller_name);?>',
 		headers: <?php echo $table_headers; ?>,

dist/opensourcepos.js

@@ -49355,7 +49355,8 @@ $.tablesorter.addWidget({
 					})
 				}, buttons.call(this, event)));
 
-				event.preventDefault();
+				//event.stopPropagation();
+				return false;
 			});
 		});
 	};

js/manage_tables.js

@@ -76,7 +76,8 @@
 					})
 				}, buttons.call(this, event)));
 
-				event.preventDefault();
+				//event.stopPropagation();
+				return false;
 			});
 		});
 	};

templates/spacelab/views/partial/header.php

@@ -65,7 +65,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=69f478f4e8" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=57782f0295" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 

translations/bootstrap_tables_lang.csv

@@ -0,0 +1,9 @@
+label,hu-HU,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id,pt-BR,hr-HR
+tables_loading,"Betöltés, kérem várjon...","Lade, bitte warten...","Laden, even geduld...",Por favor espere...,"Loading, please wait...","Chargement en cours, patientez, s?il vous pla?t ...",正在努力地加载数据中，请稍候……,"Пожалуйста, подождите, идёт загрузка...","Loading, please wait...","Loading, please wait...","Loading, please wait...","Carregando, aguarde...",Molimo pričekajte ...
+tables_rows_per_page,{0} rekord per oldal,{0} Einträge pro Seite,{0} records per pagina,{0} resultados por página,{0} rows per page,{0} lignes par page,每页显示 {0} 条记录,{0} записей на страницу,{0} rows per page,{0} rows per page,{0} rows per page,{0}  registros por página,{0} broj zapisa po stranici
+tables_page_from_to,Megjelenítve  {0}  {1} / {2} összesen,Zeige {0} bis {1} von {2} Zeile(n),Toon {0}  tot {1} van {2} record(s),Mostrando desde {0} hasta {1} - En total {2} resultados,Showing {0} to {1} of {2} rows,Affichage des lignes {0} à {1} sur {2} lignes au total,显示第 {0} 到第 {1} 条记录，总共 {2} 条记录,Записи с {0} по {1} из {2},Showing {0} to {1} of {2} rows,Showing {0} to {1} of {2} rows,Showing {0} to {1} of {2} rows,Exibindo {0} até {1} de {2} linhas,Prikazujem {0}. - {1} od ukupnog broja zapisa {2}
+tables_hide_show_pagination,Lapozó elrejtése/megjelenítése,Hide/Show pagination,Toon %s record(s),Ocultar/Mostrar paginación,Hide/Show pagination,Hide/Show pagination,隐藏/显示分页,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Prikaži/sakrij stranice
+tables_refresh,Refresh,Refresh,Vernieuwen,Refrescar,Refresh,Rafra?chir,刷新,Обновить,Refresh,Refresh,Refresh,Recarregar,Osvježi
+tables_toggle,Toggle,Umschalten,Omschakelen,Ocultar/Mostrar,Toggle,Alterner,切换,Переключить,Toggle,Toggle,Toggle,Ocultar/Exibir paginação,Promijeni prikaz
+tables_columns,Columns,Spalten,Kolommen,Columnas,Columns,Colonnes,列,Колонки,Columns,Columns,Columns,Colunas,Kolone
+tables_all,All,All,Alle,Todos,All,Tous,All,All,All,All,All,All,Sve

translations/common_lang.csv

@@ -59,4 +59,4 @@ common_export_excel,Excel Export,Excel Export,Excel Export,Excel Export,Excel Ex
 common_export_excel_yes,Igen,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Sim,Da
 common_export_excel_no,Nem,No,No,No,No,No,No,No,No,No,No,Não,Ne
 common_required,Kötelező,Erforderlich,Required,Requerido,Required,Required,Required,Required,ต้องกรอก,Required,Required,Requerido,Potreban
-common_id,ID,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id
+common_id,ID,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id