mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable bootstrap tables localisation and integrate with ospos scripts

Browse Source 
(#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)
This commit is contained in:
jekkos
2016-04-28 22:10:47 +02:00
parent c568c08595
commit e7a22e4e41
27 changed files with 199 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Items.php
View File

@@ -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
{