diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 7afa0e465..10d8539a5 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -59,9 +59,9 @@ class Reports extends Secure_area $report_data = $model->getDataBySaleId($sale_id); - $summary_data = array(anchor('sales/edit/'.$report_data['sale_id'] . '/width:'.FORM_WIDTH, + $summary_data = array(anchor('sales/edit/'.$report_data['sale_id'], 'POS '.$report_data['sale_id'], - array('class' => 'modal')), + array('class' => 'modal-dlg modal-btn-submit')), $report_data['sale_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' => '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']); + $summary_data[] = array(anchor('sales/edit/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class' => 'modal-dlg modal-btn-submit')), $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' => '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']); + $summary_data[] = array(anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], array('class' => 'modal-dlg modal-btn-submit')), $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/views/items/form.php b/application/views/items/form.php index 0dd6f54e1..0231c9c45 100644 --- a/application/views/items/form.php +++ b/application/views/items/form.php @@ -5,7 +5,7 @@
lang->line("items_basic_information"); ?> -
+
lang->line('items_item_number'), 'item_number',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_name'), 'name',array('class'=>'required control-label col-xs-3')); ?>
-
+
lang->line('items_category'), 'category',array('class'=>'required control-label col-xs-3')); ?>
-
+
lang->line('items_supplier'), 'supplier',array('class'=>'required control-label col-xs-3')); ?>
-
+
lang->line('items_cost_price'), 'cost_price',array('class'=>'required control-label col-xs-3')); ?>
-
+
config->item('currency_symbol'); ?> 'cost_price', @@ -65,10 +65,10 @@
-
+
lang->line('items_unit_price'), 'unit_price',array('class'=>'required control-label col-xs-3')); ?>
-
+
config->item('currency_symbol'); ?> 'unit_price', @@ -80,7 +80,7 @@
-
+
lang->line('items_tax_1'), 'tax_percent_1',array('class'=>'control-label col-xs-3')); ?>
-
+
'tax_percents[]', 'id'=>'tax_percent_name_1', @@ -104,7 +104,7 @@
-
+
lang->line('items_tax_2'), 'tax_percent_2',array('class'=>'control-label col-xs-3')); ?>
-
+
'tax_percents[]', 'class'=>'form-control', @@ -131,7 +131,7 @@ foreach($stock_locations as $key=>$location_detail) { ?> -
+
lang->line('items_quantity').' '.$location_detail['location_name'] , $key.'_quantity', array('class'=>'required control-label col-xs-3')); ?> @@ -148,7 +148,7 @@ } ?> -
+
lang->line('items_receiving_quantity'), 'receiving_quantity',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_reorder_level'), 'reorder_level',array('class'=>'required control-label col-xs-3')); ?>
-
+
lang->line('items_description'), 'description',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_image'), 'item_image',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_allow_alt_description'), 'allow_alt_description',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_is_serialized'), 'is_serialized',array('class'=>'control-label col-xs-3')); ?>
-
+
lang->line('items_is_deleted'), 'is_deleted',array('class'=>'control-label col-xs-3')); ?>
-
+
config->item('custom'.$i.'_name'), 'custom'.$i,array('class'=>'control-label col-xs-3')); ?>
- 'recvs_edit_form')); ?> + 'recvs_edit_form', 'class' => 'form-horizontal')); ?> lang->line("recvs_basic_information"); ?> -
- lang->line('recvs_receipt_number').':', 'supplier'); ?> -
+
+ lang->line('recvs_receipt_number'), 'supplier', array('class' => 'control-label col-xs-3')); ?> +
lang->line('recvs_receipt_number') .$receiving_info['receiving_id'], array('target' => '_blank'));?>
-
- lang->line('recvs_date').':', 'date'); ?> -
- 'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'readonly'=>'true'));?> +
+ lang->line('recvs_date'), 'date', array('class' => 'control-label col-xs-3')); ?> +
+ 'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])), 'id'=>'datetime', 'class' => 'form-control', 'readonly'=>'true'));?>
-
- lang->line('recvs_supplier').':', 'supplier'); ?> -
- 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id'));?> +
+ lang->line('recvs_supplier'), 'supplier', array('class' => 'control-label col-xs-3')); ?> +
+ 'supplier_id', 'value' => $selected_supplier, 'id' => 'supplier_id', 'class'=>'form-control'));?>
-
- lang->line('recvs_invoice_number').':', 'invoice_number'); ?> -
- 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number'));?> +
+ lang->line('recvs_invoice_number'), 'invoice_number', array('class' => 'control-label col-xs-3')); ?> +
+ 'invoice_number', 'value' => $receiving_info['invoice_number'], 'id' => 'invoice_number', 'class' => 'form-control'));?>
-
- lang->line('recvs_employee').':', 'employee'); ?> -
- +
+ lang->line('recvs_employee'), 'employee', array('class' => 'control-label col-xs-3')); ?> +
+
-
- lang->line('recvs_comments').':', 'comment'); ?> -
- 'comment','value'=>$receiving_info['comment'],'rows'=>'4','cols'=>'23', 'id'=>'comment'));?> +
+ lang->line('recvs_comments'), 'comment', array('class' => 'control-label col-xs-3')); ?> +
+ 'comment','value'=>$receiving_info['comment'], 'id'=>'comment', 'class' => 'form-control'));?>
- - 'submit', - 'value'=>$this->lang->line('common_submit'), - 'class'=> 'btn btn-primary btn-sm pull-right') - ); - ?> + 'recvs_delete_form')); ?> diff --git a/application/views/sales/form.php b/application/views/sales/form.php index 48b6ae5ab..8c37a7e69 100755 --- a/application/views/sales/form.php +++ b/application/views/sales/form.php @@ -3,63 +3,57 @@
    - 'sales_edit_form')); ?> + 'sales_edit_form', 'class' => 'form-horizontal')); ?> lang->line("sales_basic_information"); ?> -
    - lang->line('sales_receipt_number').':', 'customer'); ?> -
    +
    + lang->line('sales_receipt_number'), 'customer', array('class' => 'control-label col-xs-3')); ?> +
    lang->line('sales_receipt_number') .$sale_info['sale_id'], array('target' => '_blank'));?>
    -
    - lang->line('sales_date').':', 'date'); ?> -
    - 'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'readonly'=>'true'));?> +
    + lang->line('sales_date'), 'date', array('class' => 'control-label col-xs-3')); ?> +
    + 'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'id'=>'datetime', 'class' => 'form-control', 'readonly'=>'true'));?>
    -
    - lang->line('sales_invoice_number').':', 'invoice_number'); ?> -
    +
    + lang->line('sales_invoice_number'), 'invoice_number', array('class' => 'control-label col-xs-3')); ?> +
    - 'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?> + 'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control'));?> lang->line('sales_send_invoice')?> - 'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?> + 'invoice_number', 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number', 'class' => 'form-control'));?>
    -
    - lang->line('sales_customer').':', 'customer'); ?> -
    - 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id'));?> +
    + lang->line('sales_customer'), 'customer', array('class' => 'control-label col-xs-3')); ?> +
    + 'customer_id', 'value' => $selected_customer, 'id' => 'customer_id', 'class' => 'form-control'));?>
    -
    - lang->line('sales_employee').':', 'employee'); ?> -
    - +
    + lang->line('sales_employee'), 'employee', array('class' => 'control-label col-xs-3')); ?> +
    +
    -
    - lang->line('sales_comment').':', 'comment'); ?> -
    - 'comment', 'value'=>$sale_info['comment'], 'rows'=>'4', 'cols'=>'23', 'id'=>'comment'));?> +
    + lang->line('sales_comment'), 'comment',array('class' => 'control-label col-xs-3')); ?> +
    + 'comment', 'value'=>$sale_info['comment'], 'id'=>'comment', 'class' => 'form-control'));?>
    - 'submit', - 'value' => $this->lang->line('common_submit'), - 'class' => 'btn btn-primary btn-sm pull-right') - ); - ?> 'sales_delete_form')); ?> @@ -107,106 +101,7 @@ $(document).ready(function() }).responseText).success; }, 'lang->line("sales_invoice_number_duplicate"); ?>'); - // set the locale language for the datetime picker - $.fn.datetimepicker.dates['config->item("language"); ?>'] = { - days: ["lang->line("common_days_sunday"); ?>", - "lang->line("common_days_monday"); ?>", - "lang->line("common_days_tueday"); ?>", - "lang->line("common_days_wednesday"); ?>", - "lang->line("common_days_thursday"); ?>", - "lang->line("common_days_friday"); ?>", - "lang->line("common_days_saturday"); ?>", - "lang->line("common_days_sunday"); ?>"], - daysShort: ["lang->line("common_daysshort_sunday"); ?>", - "lang->line("common_daysshort_monday"); ?>", - "lang->line("common_daysshort_tueday"); ?>", - "lang->line("common_daysshort_wednesday"); ?>", - "lang->line("common_daysshort_thursday"); ?>", - "lang->line("common_daysshort_friday"); ?>", - "lang->line("common_daysshort_saturday"); ?>", - "lang->line("common_daysshort_sunday"); ?>"], - daysMin: ["lang->line("common_daysmin_sunday"); ?>", - "lang->line("common_daysmin_monday"); ?>", - "lang->line("common_daysmin_tueday"); ?>", - "lang->line("common_daysmin_wednesday"); ?>", - "lang->line("common_daysmin_thursday"); ?>", - "lang->line("common_daysmin_friday"); ?>", - "lang->line("common_daysmin_saturday"); ?>", - "lang->line("common_daysmin_sunday"); ?>"], - months: ["lang->line("common_months_january"); ?>", - "lang->line("common_months_february"); ?>", - "lang->line("common_months_march"); ?>", - "lang->line("common_months_april"); ?>", - "lang->line("common_months_may"); ?>", - "lang->line("common_months_june"); ?>", - "lang->line("common_months_july"); ?>", - "lang->line("common_months_august"); ?>", - "lang->line("common_months_september"); ?>", - "lang->line("common_months_october"); ?>", - "lang->line("common_months_november"); ?>", - "lang->line("common_months_december"); ?>"], - monthsShort: ["lang->line("common_monthsshort_january"); ?>", - "lang->line("common_monthsshort_february"); ?>", - "lang->line("common_monthsshort_march"); ?>", - "lang->line("common_monthsshort_april"); ?>", - "lang->line("common_monthsshort_may"); ?>", - "lang->line("common_monthsshort_june"); ?>", - "lang->line("common_monthsshort_july"); ?>", - "lang->line("common_monthsshort_august"); ?>", - "lang->line("common_monthsshort_september"); ?>", - "lang->line("common_monthsshort_october"); ?>", - "lang->line("common_monthsshort_november"); ?>", - "lang->line("common_monthsshort_december"); ?>"], - today: "lang->line("common_today"); ?>", - config->item('timeformat'), 'a') !== false ) - { - ?> - meridiem: ["am", "pm"], - config->item('timeformat'), 'A') !== false ) - { - ?> - meridiem: ["AM", "PM"], - - meridiem: [], - - weekStart: lang->line("common_weekstart"); ?>, - }; - - $('#datetime').datetimepicker({ - format: "config->item("dateformat")) . ' ' . dateformat_bootstrap($this->config->item("timeformat"));?>", - startDate: "config->item('dateformat') . ' ' . $this->config->item('timeformat'), mktime(0, 0, 0, 1, 1, 2010));?>", - config->item('timeformat'); - $m = $t[strlen($t)-1]; - if( strpos($this->config->item('timeformat'), 'a') !== false || strpos($this->config->item('timeformat'), 'A') !== false ) - { - ?> - showMeridian: true, - - showMeridian: false, - - minuteStep: 1, - autoclose: true, - todayBtn: true, - todayHighlight: true, - bootcssVer: 3, - language: "config->item('language'); ?>" - }); + load->view('partial/datepicker_locale'); ?> var format_item = function(row) {