[Fmsystem-commits] [14056]

[Nelson Guerra]

Revision: 14056
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14056
Author:   nelson224
Date:     2015-09-29 20:44:10 +0000 (Tue, 29 Sep 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php

Modified: branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php       
2015-09-29 20:43:53 UTC (rev 14055)
+++ branches/dev-syncromind/rental/inc/class.uiprice_item.inc.php       
2015-09-29 20:44:10 UTC (rev 14056)
@@ -504,7 +504,7 @@
         * @param $key ?
         * @param $params [price_item.id, type of query, editable]
         */
-       public function add_actions(&$value, $key, $params)
+       /*public function add_actions(&$value, $key, $params)
        {
                $value['actions'] = array();
                $value['labels'] = array();
@@ -547,7 +547,7 @@
                                }
                                break;
                }
-       }
+       }*/
        
        public function manual_adjustment()
        {
@@ -609,11 +609,16 @@
                        (
                                'my_name'               => 'delete',
                                'text'                  => lang('delete'),
-                               'action'                => self::link(array(
-                                               'menuaction'    => 
'rental.uiadjustment.delete'
-                               )),
                                'confirm_msg'   => lang('do you really want to 
delete this entry'),
-                               'parameters'    => json_encode($parameters)
+                               'type'                  => 'custom',
+                               'custom_code'   => "
+                                       var oArgs = ".json_encode(array(
+                                                       'menuaction'            
=> 'rental.uiadjustment.delete', 
+                                                       'phpgw_return_as'       
=> 'json'
+                                               )).";
+                                       var parameters = 
".json_encode($parameters).";
+                                       removePrice(oArgs, parameters);
+                               "       
                        );
                        
                $datatable_def[] = array
@@ -746,33 +751,21 @@
                                else{
                                        $message = "Ingen kontrakter er 
oppdatert";
                                }
-                               /*$data = array
-                               (
-                                       'price_item_id' => $id,
-                                       'message' => $message
-                               );*/
                                $receipt['message'][] = array('msg'=>$message);
-                               
//self::set_active_menu('rental::contracts::price_item_list::manual_adjustment');
       
-                               
//$this->render('admin_price_item_manual_adjustment.php', $data);
+                                                       
+                               $types_options[] = array('id'=>'', 
'name'=>'Velg priselement');
+                               $types = 
rental_soprice_item::get_instance()->get_manual_adjustable();
+                               foreach($types as $id => $label)
+                               {
+                                       $types_options[] = array('id'=>$id, 
'name'=>lang($label));
+                               }
+                               $receipt['types_options'] = $types_options;
+                               
                        } else {
-                               /*$data = array
-                               (
-                                       'price_item_id' => $id,
-                                       'error' => $error
-                               );
-                               
self::set_active_menu('rental::contracts::price_item_list::manual_adjustment'); 
*/
-                               
//$this->render('admin_price_item_manual_adjustment.php', $data);
                                $receipt['error'][] = array('msg'=>'error');
                        }
                }
                else{
-                       /*$data = array
-                       (
-                               'price_item_id' => $id,
-                               'error' => lang('price_not_numeric')
-                       );
-                       
self::set_active_menu('rental::contracts::price_item_list::manual_adjustment'); 
*/
-                       
//$this->render('admin_price_item_manual_adjustment.php', $data);
                        $receipt['error'][] = 
array('msg'=>lang('price_not_numeric'));
                }