diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php
index 1778e6ece..7afa0e465 100644
--- a/application/controllers/Reports.php
+++ b/application/controllers/Reports.php
@@ -61,7 +61,7 @@ class Reports extends Secure_area
$summary_data = array(anchor('sales/edit/'.$report_data['sale_id'] . '/width:'.FORM_WIDTH,
'POS '.$report_data['sale_id'],
- array('class' => 'thickbox')),
+ array('class' => 'modal')),
$report_data['sale_date'],
$report_data['items_purchased'],
$report_data['employee_name'],
@@ -85,7 +85,7 @@ class Reports extends Secure_area
$summary_data = array(anchor('receivings/edit/'.$report_data['receiving_id'] . '/width:'.FORM_WIDTH,
'RECV '.$report_data['receiving_id'],
- array('class' => 'thickbox')),
+ array('class' => 'modal')),
$report_data['receiving_date'],
$report_data['items_purchased'],
$report_data['employee_name'],
@@ -872,7 +872,7 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
- $summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'thickbox')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
+ $summary_data[] = array(anchor('sales/edit/'.$row['sale_id'] . '/width:'.FORM_WIDTH, 'POS '.$row['sale_id'], array('class' => 'modal')), $row['sale_date'], $row['items_purchased'], $row['employee_name'], $row['customer_name'], to_currency($row['subtotal']), to_currency($row['total']), to_currency($row['tax']), to_currency($row['cost']), to_currency($row['profit']), $row['payment_type'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
@@ -915,7 +915,7 @@ class Reports extends Secure_area
foreach($report_data['summary'] as $key=>$row)
{
- $summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'].'/width:'.FORM_WIDTH, 'RECV '.$row['receiving_id'], array('class' => 'thickbox')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
+ $summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'].'/width:'.FORM_WIDTH, 'RECV '.$row['receiving_id'], array('class' => 'modal')), $row['receiving_date'], $row['items_purchased'], $row['employee_name'], $row['supplier_name'], to_currency($row['total']), $row['payment_type'], $row['invoice_number'], $row['comment']);
foreach($report_data['details'][$key] as $drow)
{
diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php
index 6387e4559..f1c17f59e 100644
--- a/application/helpers/table_helper.php
+++ b/application/helpers/table_helper.php
@@ -77,7 +77,7 @@ function get_sales_manage_sale_data_row($sale, $controller)
$table_data_row.='
'.$sale['payment_type'].' | ';
$table_data_row.=''.$sale['invoice_number'].' | ';
$table_data_row.='';
- $table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update')));
+ $table_data_row.=anchor($controller_name."/edit/" . $sale['sale_id'] . "/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal','title'=>$CI->lang->line($controller_name.'_update')));
$table_data_row.=' ';
$table_data_row.='' . $CI->lang->line('sales_show_receipt') . '';
$table_data_row.=' ';
@@ -174,8 +174,8 @@ function get_person_data_row($person,$controller)
$table_data_row.=' | '.character_limiter($person->last_name,13).' | ';
$table_data_row.=''.character_limiter($person->first_name,13).' | ';
$table_data_row.=''.mailto($person->email,character_limiter($person->email,22)).' | ';
- $table_data_row.=''.character_limiter($person->phone_number,13).' | ';
- $table_data_row.=''.anchor($controller_name."/view/$person->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
+ $table_data_row.=''.character_limiter($person->phone_number,13).' | ';
+ $table_data_row.=''.anchor($controller_name."/view/$person->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
$table_data_row.='';
return $table_data_row;
@@ -262,7 +262,7 @@ function get_supplier_data_row($supplier,$controller)
$table_data_row.=''.mailto($supplier->email,character_limiter($supplier->email,22)).' | ';
$table_data_row.=''.character_limiter($supplier->phone_number,13).' | ';
$table_data_row.=''.character_limiter($supplier->person_id,5).' | ';
- $table_data_row.=''.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
+ $table_data_row.=''.anchor($controller_name."/view/$supplier->person_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
$table_data_row.='';
return $table_data_row;
@@ -358,10 +358,10 @@ function get_item_data_row($item,$controller)
}
}
$table_data_row.='' . $image . ' | ';
- $table_data_row.=''.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'data-modal','data-toggle'=>'modal','data-target'=>'#ajaxModal','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
+ $table_data_row.=''.anchor($controller_name."/view/$item->item_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
- $table_data_row.=''.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_count')))./*' | ';//inventory count
- $table_data_row.=''*/' '.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_details_count'))).' | ';//inventory details
+ $table_data_row.=''.anchor($controller_name."/inventory/$item->item_id/width:$width", $CI->lang->line('common_inv'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_count')))./*' | ';//inventory count
+ $table_data_row.=''*/' '.anchor($controller_name."/count_details/$item->item_id/width:$width", $CI->lang->line('common_det'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_details_count'))).' | ';//inventory details
$table_data_row.='';
@@ -429,7 +429,7 @@ function get_giftcard_data_row($giftcard,$controller)
$table_data_row.=''.$giftcard->first_name.' | ';
$table_data_row.=''.$giftcard->giftcard_number.' | ';
$table_data_row.=''.to_currency($giftcard->value).' | ';
- $table_data_row.=''.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
+ $table_data_row.=''.anchor($controller_name."/view/$giftcard->giftcard_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
$table_data_row.='';
return $table_data_row;
@@ -498,7 +498,7 @@ function get_item_kit_data_row($item_kit, $controller)
$table_data_row.=''.character_limiter($item_kit->description, 25).' | ';
$table_data_row.=''.to_currency($item_kit->total_cost_price).' | ';
$table_data_row.=''.to_currency($item_kit->total_unit_price).' | ';
- $table_data_row.=''.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'thickbox','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
+ $table_data_row.=''.anchor($controller_name."/view/$item_kit->item_kit_id/width:$width", $CI->lang->line('common_edit'),array('class'=>'modal-dlg','title'=>$CI->lang->line($controller_name.'_update'))).' | ';
$table_data_row.='';
return $table_data_row;
diff --git a/application/views/customers/excel_import.php b/application/views/customers/excel_import.php
index 551ed4b86..324fd9da8 100644
--- a/application/views/customers/excel_import.php
+++ b/application/views/customers/excel_import.php
@@ -1,29 +1,25 @@
-'item_form')); ?>
+'item_form', 'class'=>'form-horizontal')); ?>
lang->line('customers_import_items_excel'); ?>
- lang->line('common_download_import_template'); ?>
+
+
+
+
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index 44bb1acac..84eb1e2e8 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -171,7 +171,7 @@ $(document).ready(function()
$(form).ajaxSubmit({
success:function(response)
{
- tb_remove();
+ dialog_support.hide();
post_bulk_form_submit(response);
},
dataType:'json'
diff --git a/application/views/items/inventory.php b/application/views/items/inventory.php
index 1df33347b..ff2dbe73e 100644
--- a/application/views/items/inventory.php
+++ b/application/views/items/inventory.php
@@ -3,15 +3,10 @@
item_id,array('id'=>'item_form')); ?>