From 6e14dfb6d5857021a8bef5cd48427cfcedefd099 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 27 May 2016 18:39:00 +0100 Subject: [PATCH] Sanity checked SQL insert and update, minor fixes (#598) --- application/controllers/Config.php | 4 +++- application/controllers/Items.php | 3 ++- application/models/Appconfig.php | 24 +++++++++++++----------- application/models/Customer.php | 7 +++---- application/models/Employee.php | 14 ++++++-------- application/models/Giftcard.php | 2 +- application/models/Inventory.php | 7 ++++--- application/models/Item.php | 2 ++ application/models/Item_kit_items.php | 2 +- application/models/Item_quantity.php | 6 +----- application/models/Item_taxes.php | 3 ++- application/models/Person.php | 4 ++-- application/models/Receiving.php | 2 +- application/models/Sale.php | 4 ++-- application/models/Sale_suspended.php | 6 +++--- application/models/Stock_location.php | 11 +++++++---- application/models/Supplier.php | 11 +++++++---- 17 files changed, 60 insertions(+), 52 deletions(-) diff --git a/application/controllers/Config.php b/application/controllers/Config.php index 02132ba47..12535f7ad 100644 --- a/application/controllers/Config.php +++ b/application/controllers/Config.php @@ -161,7 +161,9 @@ class Config extends Secure_area $this->Stock_location->delete($location_id); } - $success = $this->db->trans_complete(); + $this->db->trans_complete(); + + $success = $this->db->trans_status(); echo json_encode(array('success'=>$success, 'message'=>$this->lang->line('config_saved_' . ($success ? '' : 'un') . 'successfully'))); } diff --git a/application/controllers/Items.php b/application/controllers/Items.php index f841bca2e..31fc7ee7b 100644 --- a/application/controllers/Items.php +++ b/application/controllers/Items.php @@ -692,7 +692,8 @@ class Items extends Secure_area implements iData_controller 'trans_location'=>$location_id, 'trans_inventory'=>0 ); - $this->db->insert('inventory',$excel_data); + + $this->Inventory->insert($excel_data); } } else //insert or update item failure diff --git a/application/models/Appconfig.php b/application/models/Appconfig.php index 6f0879148..d9d3b2e59 100644 --- a/application/models/Appconfig.php +++ b/application/models/Appconfig.php @@ -31,40 +31,42 @@ class Appconfig extends CI_Model } - function save($key,$value) + function save($key, $value) { - $config_data=array( - 'key'=>$key, - 'value'=>$value + $config_data = array( + 'key'=>$key, + 'value'=>$value ); if (!$this->exists($key)) { - return $this->db->insert('app_config',$config_data); + return $this->db->insert('app_config', $config_data); } $this->db->where('key', $key); - return $this->db->update('app_config',$config_data); + + return $this->db->update('app_config', $config_data); } function batch_save($data) { - $success=true; + $success = true; //Run these queries as a transaction, we want to make sure we do all or nothing $this->db->trans_start(); + foreach($data as $key=>$value) { - if(!$this->save($key,$value)) + if(!$this->save($key, $value)) { - $success=false; + $success = false; break; } } - $this->db->trans_complete(); - return $success; + $this->db->trans_complete(); + return $success; } function delete($key) diff --git a/application/models/Customer.php b/application/models/Customer.php index c05b88ac0..e8b895e5f 100644 --- a/application/models/Customer.php +++ b/application/models/Customer.php @@ -115,7 +115,6 @@ class Customer extends Person */ function save_customer(&$person_data, &$customer_data, $customer_id=false) { - $success=false; //Run these queries as a transaction, we want to make sure we do all or nothing $this->db->trans_start(); @@ -124,18 +123,18 @@ class Customer extends Person if (!$customer_id or !$this->exists($customer_id)) { $customer_data['person_id'] = $person_data['person_id']; - $success = $this->db->insert('customers', $customer_data); + $this->db->insert('customers', $customer_data); } else { $this->db->where('person_id', $customer_id); - $success = $this->db->update('customers', $customer_data); + $this->db->update('customers', $customer_data); } } $this->db->trans_complete(); - return $success; + return $this->db->trans_status(); } /* diff --git a/application/models/Employee.php b/application/models/Employee.php index f356fde41..d577a02e5 100644 --- a/application/models/Employee.php +++ b/application/models/Employee.php @@ -93,36 +93,34 @@ class Employee extends Person if (!$employee_id or !$this->exists($employee_id)) { $employee_data['person_id'] = $employee_id = $person_data['person_id']; - $success = $this->db->insert('employees',$employee_data); + $success = $this->db->insert('employees', $employee_data); } else { $this->db->where('person_id', $employee_id); - $success = $this->db->update('employees',$employee_data); + $success = $this->db->update('employees', $employee_data); } //We have either inserted or updated a new employee, now lets set permissions. if($success) { //First lets clear out any grants the employee currently has. - $success=$this->db->delete('grants', array('person_id' => $employee_id)); + $success = $this->db->delete('grants', array('person_id' => $employee_id)); //Now insert the new grants if($success) { foreach($grants_data as $permission_id) { - $success = $this->db->insert('grants', - array( - 'permission_id'=>$permission_id, - 'person_id'=>$employee_id)); + $success = $this->db->insert('grants', array('permission_id' => $permission_id, 'person_id' => $employee_id)); } } } } - $this->db->trans_complete(); + $this->db->trans_complete(); + return $success; } diff --git a/application/models/Giftcard.php b/application/models/Giftcard.php index 77dfc303d..6dfdb2ef6 100644 --- a/application/models/Giftcard.php +++ b/application/models/Giftcard.php @@ -118,7 +118,7 @@ class Giftcard extends CI_Model $this->db->where('giftcard_id', $giftcard_id); - return $this->db->update('giftcards',$giftcard_data); + return $this->db->update('giftcards', $giftcard_data); } /* diff --git a/application/models/Inventory.php b/application/models/Inventory.php index d6e8b5f74..3017aceef 100644 --- a/application/models/Inventory.php +++ b/application/models/Inventory.php @@ -3,18 +3,19 @@ class Inventory extends CI_Model { function insert($inventory_data) { - return $this->db->insert('inventory',$inventory_data); + return $this->db->insert('inventory', $inventory_data); } function get_inventory_data_for_item($item_id, $location_id=false) { $this->db->from('inventory'); - $this->db->where('trans_items',$item_id); + $this->db->where('trans_items', $item_id); if($location_id != false) { - $this->db->where('trans_location',$location_id); + $this->db->where('trans_location', $location_id); } $this->db->order_by("trans_date", "desc"); + return $this->db->get(); } } diff --git a/application/models/Item.php b/application/models/Item.php index 065c3fdb0..e7e4c967f 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -223,8 +223,10 @@ class Item extends CI_Model if($this->db->insert('items', $item_data)) { $item_data['item_id'] = $this->db->insert_id(); + return TRUE; } + return FALSE; } diff --git a/application/models/Item_kit_items.php b/application/models/Item_kit_items.php index 284b5b98d..34013be23 100644 --- a/application/models/Item_kit_items.php +++ b/application/models/Item_kit_items.php @@ -31,7 +31,7 @@ class Item_kit_items extends CI_Model $this->db->trans_complete(); - return true; + return $this->db->trans_status(); } /* diff --git a/application/models/Item_quantity.php b/application/models/Item_quantity.php index 9bebaed2e..24d9b733d 100644 --- a/application/models/Item_quantity.php +++ b/application/models/Item_quantity.php @@ -15,11 +15,7 @@ class Item_quantity extends CI_Model { if (!$this->exists($item_id, $location_id)) { - if($this->db->insert('item_quantities', $location_detail)) - { - return true; - } - return false; + return $this->db->insert('item_quantities', $location_detail); } $this->db->where('item_id', $item_id); diff --git a/application/models/Item_taxes.php b/application/models/Item_taxes.php index 298775ef4..e7f52ac14 100644 --- a/application/models/Item_taxes.php +++ b/application/models/Item_taxes.php @@ -25,10 +25,11 @@ class Item_taxes extends CI_Model foreach ($items_taxes_data as $row) { $row['item_id'] = $item_id; - $result &= $this->db->insert('items_taxes',$row); + $result &= $this->db->insert('items_taxes', $row); } $this->db->trans_complete(); + return $result; } diff --git a/application/models/Person.php b/application/models/Person.php index 20f39e73c..2198e7504 100644 --- a/application/models/Person.php +++ b/application/models/Person.php @@ -72,9 +72,9 @@ class Person extends CI_Model { if (!$person_id or !$this->exists($person_id)) { - if ($this->db->insert('people',$person_data)) + if ($this->db->insert('people', $person_data)) { - $person_data['person_id']=$this->db->insert_id(); + $person_data['person_id'] = $this->db->insert_id(); return true; } diff --git a/application/models/Receiving.php b/application/models/Receiving.php index 5f8783e3d..c70750348 100644 --- a/application/models/Receiving.php +++ b/application/models/Receiving.php @@ -67,7 +67,7 @@ class Receiving extends CI_Model //Run these queries as a transaction, we want to make sure we do all or nothing $this->db->trans_start(); - $this->db->insert('receivings',$receivings_data); + $this->db->insert('receivings', $receivings_data); $receiving_id = $this->db->insert_id(); foreach($items as $line=>$item) diff --git a/application/models/Sale.php b/application/models/Sale.php index 21e0fd4d4..01b8e06ad 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -310,7 +310,7 @@ class Sale extends CI_Model 'payment_type' => $payment['payment_type'], 'payment_amount'=> $payment['payment_amount'] ); - $this->db->insert('sales_payments',$sales_payments_data); + $this->db->insert('sales_payments', $sales_payments_data); } foreach($items as $line=>$item) @@ -330,7 +330,7 @@ class Sale extends CI_Model 'item_location' => $item['item_location'] ); - $this->db->insert('sales_items',$sales_items_data); + $this->db->insert('sales_items', $sales_items_data); // Update stock quantity $item_quantity = $this->Item_quantity->get_item_quantity($item['item_id'], $item['item_location']); diff --git a/application/models/Sale_suspended.php b/application/models/Sale_suspended.php index 933f867d1..7c21c3ac9 100644 --- a/application/models/Sale_suspended.php +++ b/application/models/Sale_suspended.php @@ -63,7 +63,7 @@ class Sale_suspended extends CI_Model //Run these queries as a transaction, we want to make sure we do all or nothing $this->db->trans_start(); - $this->db->insert('sales_suspended',$sales_data); + $this->db->insert('sales_suspended', $sales_data); $sale_id = $this->db->insert_id(); foreach($payments as $payment_id=>$payment) @@ -74,7 +74,7 @@ class Sale_suspended extends CI_Model 'payment_type'=>$payment['payment_type'], 'payment_amount'=>$payment['payment_amount'] ); - $this->db->insert('sales_suspended_payments',$sales_payments_data); + $this->db->insert('sales_suspended_payments', $sales_payments_data); } foreach($items as $line=>$item) @@ -95,7 +95,7 @@ class Sale_suspended extends CI_Model 'item_location'=>$item['item_location'] ); - $this->db->insert('sales_suspended_items',$sales_items_data); + $this->db->insert('sales_suspended_items', $sales_items_data); $customer = $this->Customer->get_info($customer_id); if ($customer_id == -1 or $customer->taxable) diff --git a/application/models/Stock_location.php b/application/models/Stock_location.php index f355ad612..f024e723b 100644 --- a/application/models/Stock_location.php +++ b/application/models/Stock_location.php @@ -85,11 +85,12 @@ class Stock_location extends CI_Model function save(&$location_data,$location_id) { $location_name = $location_data['location_name']; + if (!$this->exists($location_name)) { $this->db->trans_start(); - $location_data = array('location_name'=>$location_name,'deleted'=>0); - $this->db->insert('stock_locations',$location_data); + $location_data = array('location_name'=>$location_name, 'deleted'=>0); + $this->db->insert('stock_locations', $location_data); $location_id = $this->db->insert_id(); $this->_insert_new_permission('items', $location_id, $location_name); @@ -105,10 +106,13 @@ class Stock_location extends CI_Model $this->db->insert('item_quantities', $quantity_data); } $this->db->trans_complete(); + + return $this->db->trans_status(); } else { $this->db->where('location_id', $location_id); + return $this->db->update('stock_locations',$location_data); } } @@ -117,7 +121,7 @@ class Stock_location extends CI_Model { // insert new permission for stock location $permission_id = $module."_".$location_name; - $permission_data = array('permission_id'=>$permission_id,'module_id'=>$module,'location_id' => $location_id); + $permission_data = array('permission_id'=>$permission_id, 'module_id'=>$module, 'location_id' => $location_id); $this->db->insert('permissions', $permission_data); // insert grants for new permission @@ -127,7 +131,6 @@ class Stock_location extends CI_Model $grants_data = array('permission_id' => $permission_id, 'person_id' => $employee['person_id']); $this->db->insert('grants', $grants_data); } - } /* diff --git a/application/models/Supplier.php b/application/models/Supplier.php index ca8a233ef..7ba625bf0 100644 --- a/application/models/Supplier.php +++ b/application/models/Supplier.php @@ -84,7 +84,8 @@ class Supplier extends Person $this->db->join('people', 'people.person_id = suppliers.person_id'); $this->db->where_in('suppliers.person_id',$suppliers_ids); $this->db->order_by("last_name", "asc"); - return $this->db->get(); + + return $this->db->get(); } /* @@ -93,6 +94,7 @@ class Supplier extends Person function save_supplier(&$person_data, &$supplier_data,$supplier_id=false) { $success=false; + //Run these queries as a transaction, we want to make sure we do all or nothing $this->db->trans_start(); @@ -101,17 +103,18 @@ class Supplier extends Person if (!$supplier_id or !$this->exists($supplier_id)) { $supplier_data['person_id'] = $person_data['person_id']; - $success = $this->db->insert('suppliers',$supplier_data); + $success = $this->db->insert('suppliers', $supplier_data); } else { $this->db->where('person_id', $supplier_id); - $success = $this->db->update('suppliers',$supplier_data); + $success = $this->db->update('suppliers', $supplier_data); } } - $this->db->trans_complete(); + $this->db->trans_complete(); + return $success; }