From d096028eb63001617b6ee9cf117929cecc81e26b Mon Sep 17 00:00:00 2001 From: objecttothis Date: Fri, 5 Jul 2013 20:07:34 +0000 Subject: [PATCH] These commits affect the various controllers. They all have dependencies on other commits. git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@60 c3eb156b-1dc0-44e1-88ae-e38439141b53 --- application/controllers/config.php | 13 +- application/controllers/giftcards.php | 15 +- application/controllers/items.php | 135 +++++++++++++++++- application/controllers/person_controller.php | 11 +- 4 files changed, 163 insertions(+), 11 deletions(-) diff --git a/application/controllers/config.php b/application/controllers/config.php index 836e6b7df..028c4bff5 100644 --- a/application/controllers/config.php +++ b/application/controllers/config.php @@ -26,10 +26,21 @@ class Config extends Secure_area 'default_tax_2_rate'=>$this->input->post('default_tax_2_rate'), 'default_tax_2_name'=>$this->input->post('default_tax_2_name'), 'currency_symbol'=>$this->input->post('currency_symbol'), + 'currency_side'=>$this->input->post('currency_side'),/**GARRISON ADDED 4/20/2013**/ 'return_policy'=>$this->input->post('return_policy'), 'language'=>$this->input->post('language'), 'timezone'=>$this->input->post('timezone'), - 'print_after_sale'=>$this->input->post('print_after_sale') + 'print_after_sale'=>$this->input->post('print_after_sale'), + 'custom1_name'=>$this->input->post('custom1_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom2_name'=>$this->input->post('custom2_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom3_name'=>$this->input->post('custom3_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom4_name'=>$this->input->post('custom4_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom5_name'=>$this->input->post('custom5_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom6_name'=>$this->input->post('custom6_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom7_name'=>$this->input->post('custom7_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom8_name'=>$this->input->post('custom8_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom9_name'=>$this->input->post('custom9_name'),/**GARRISON ADDED 4/20/2013**/ + 'custom10_name'=>$this->input->post('custom10_name')/**GARRISON ADDED 4/20/2013**/ ); if( $this->Appconfig->batch_save( $batch_save_data ) ) diff --git a/application/controllers/giftcards.php b/application/controllers/giftcards.php index eadde440b..2c97f6d5e 100644 --- a/application/controllers/giftcards.php +++ b/application/controllers/giftcards.php @@ -37,7 +37,16 @@ class Giftcards extends Secure_area implements iData_controller $suggestions = $this->Giftcard->get_search_suggestions($this->input->post('q'),$this->input->post('limit')); echo implode("\n",$suggestions); } - +/** GARRISON ADDED 5/3/2013 **/ + /* + Gives search suggestions for person_id based on what is being searched for + */ + function suggest_person() + { + $suggestions = $this->Giftcard->get_person_search_suggestions($this->input->post('q'),$this->input->post('limit')); + echo implode("\n",$suggestions); + } +/** END GARRISON ADDED **/ function get_row() { $giftcard_id = $this->input->post('row_id'); @@ -56,7 +65,8 @@ class Giftcards extends Secure_area implements iData_controller { $giftcard_data = array( 'giftcard_number'=>$this->input->post('giftcard_number'), - 'value'=>$this->input->post('value') + 'value'=>$this->input->post('value'), + 'person_id'=>$this->input->post('person_id')/**GARRISON ADDED 4/22/2013**/ ); if( $this->Giftcard->save( $giftcard_data, $giftcard_id ) ) @@ -79,7 +89,6 @@ class Giftcards extends Secure_area implements iData_controller echo json_encode(array('success'=>false,'message'=>$this->lang->line('giftcards_error_adding_updating').' '. $giftcard_data['giftcard_number'],'giftcard_id'=>-1)); } - } function delete() diff --git a/application/controllers/items.php b/application/controllers/items.php index 5e1c1a63e..b04a9bd37 100644 --- a/application/controllers/items.php +++ b/application/controllers/items.php @@ -27,14 +27,16 @@ class Items extends Secure_area implements iData_controller $low_inventory=$this->input->post('low_inventory'); $is_serialized=$this->input->post('is_serialized'); $no_description=$this->input->post('no_description'); + $search_custom=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013 $data['search_section_state']=$this->input->post('search_section_state'); $data['low_inventory']=$this->input->post('low_inventory'); $data['is_serialized']=$this->input->post('is_serialized'); $data['no_description']=$this->input->post('no_description'); + $data['search_custom']=$this->input->post('search_custom');//GARRISON ADDED 4/13/2013 $data['controller_name']=strtolower(get_class()); - $data['form_width']=$this->get_form_width(); - $data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description),$this); + $data['form_width']=$this->get_form_width(); + $data['manage_table']=get_items_manage_table($this->Item->get_all_filtered($low_inventory,$is_serialized,$no_description,$search_custom),$this);//GARRISON MODIFIED 4/13/2013 $this->load->view('items/manage',$data); } @@ -75,6 +77,107 @@ class Items extends Secure_area implements iData_controller echo implode("\n",$suggestions); } +/**GARRISON ADDED 5/18/2013**/ + /* + Gives search suggestions based on what is being searched for + */ + function suggest_location() + { + $suggestions = $this->Item->get_location_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom1() + { + $suggestions = $this->Item->get_custom1_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom2() + { + $suggestions = $this->Item->get_custom2_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom3() + { + $suggestions = $this->Item->get_custom3_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom4() + { + $suggestions = $this->Item->get_custom4_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom5() + { + $suggestions = $this->Item->get_custom5_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom6() + { + $suggestions = $this->Item->get_custom6_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom7() + { + $suggestions = $this->Item->get_custom7_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom8() + { + $suggestions = $this->Item->get_custom8_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom9() + { + $suggestions = $this->Item->get_custom9_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } + + /* + Gives search suggestions based on what is being searched for + */ + function suggest_custom10() + { + $suggestions = $this->Item->get_custom10_suggestions($this->input->post('q')); + echo implode("\n",$suggestions); + } +/**END GARRISON ADDED**/ + function get_row() { $item_id = $this->input->post('row_id'); @@ -163,7 +266,17 @@ class Items extends Secure_area implements iData_controller 'reorder_level'=>$this->input->post('reorder_level'), 'location'=>$this->input->post('location'), 'allow_alt_description'=>$this->input->post('allow_alt_description'), - 'is_serialized'=>$this->input->post('is_serialized') + 'is_serialized'=>$this->input->post('is_serialized'), + 'custom1'=>$this->input->post('custom1'), /**GARRISON ADDED 4/21/2013**/ + 'custom2'=>$this->input->post('custom2'),/**GARRISON ADDED 4/21/2013**/ + 'custom3'=>$this->input->post('custom3'),/**GARRISON ADDED 4/21/2013**/ + 'custom4'=>$this->input->post('custom4'),/**GARRISON ADDED 4/21/2013**/ + 'custom5'=>$this->input->post('custom5'),/**GARRISON ADDED 4/21/2013**/ + 'custom6'=>$this->input->post('custom6'),/**GARRISON ADDED 4/21/2013**/ + 'custom7'=>$this->input->post('custom7'),/**GARRISON ADDED 4/21/2013**/ + 'custom8'=>$this->input->post('custom8'),/**GARRISON ADDED 4/21/2013**/ + 'custom9'=>$this->input->post('custom9'),/**GARRISON ADDED 4/21/2013**/ + 'custom10'=>$this->input->post('custom10')/**GARRISON ADDED 4/21/2013**/ ); $employee_id=$this->Employee->get_logged_in_employee_info()->person_id; @@ -332,7 +445,7 @@ class Items extends Secure_area implements iData_controller fgetcsv($handle); $i=1; - while (($data = fgetcsv($handle)) !== FALSE) + while (($data = fgetcsv($handle)) !== FALSE) { $item_data = array( 'name' => $data[1], @@ -344,8 +457,18 @@ class Items extends Secure_area implements iData_controller 'quantity' => $data[10], 'reorder_level' => $data[11], 'supplier_id' => $this->Supplier->exists($data[3]) ? $data[3] : null, - 'allow_alt_description'=> $data[14] != '' ? '1' : '0', - 'is_serialized'=>$data[15] != '' ? '1' : '0' + 'allow_alt_description' => $data[14] != '' ? '1' : '0', + 'is_serialized' => $data[15] != '' ? '1' : '0', + 'custom1' => $data[16], /** GARRISON ADDED 5/6/2013 **/ + 'custom2' => $data[17], /** GARRISON ADDED 5/6/2013 **/ + 'custom3' => $data[18], /** GARRISON ADDED 5/6/2013 **/ + 'custom4' => $data[19], /** GARRISON ADDED 5/6/2013 **/ + 'custom5' => $data[20], /** GARRISON ADDED 5/6/2013 **/ + 'custom6' => $data[21], /** GARRISON ADDED 5/6/2013 **/ + 'custom7' => $data[22], /** GARRISON ADDED 5/6/2013 **/ + 'custom8' => $data[23], /** GARRISON ADDED 5/6/2013 **/ + 'custom9' => $data[24], /** GARRISON ADDED 5/6/2013 **/ + 'custom10' => $data[25] /** GARRISON ADDED 5/6/2013 **/ ); $item_number = $data[0]; diff --git a/application/controllers/person_controller.php b/application/controllers/person_controller.php index 1cdbd48cf..32a9bbeac 100644 --- a/application/controllers/person_controller.php +++ b/application/controllers/person_controller.php @@ -30,7 +30,16 @@ abstract class Person_controller extends Secure_area implements iPerson_controll } echo '#'; } - +/** GARRISON ADDED 4/25/2013 IN PROGRESS **/ + /* + Gives search suggestions based on what is being searched for + */ + function suggest() + { + $suggestions = $this->Person->get_search_suggestions($this->input->post('q'),$this->input->post('limit')); + echo implode("\n",$suggestions); + } + /* Gets one row for a person manage table. This is called using AJAX to update one row. */