From 0d87fc51d9dd65f9853bc4a53ccda3d8bb0fdede Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Wed, 14 Oct 2015 11:40:59 +0100 Subject: [PATCH] #169 Add a date time picker to sales/form such user can edit transaction date not in a manual manner Needs more testing with different date & time formats and sorting out of min.js --- application/helpers/dateformat_helper.php | 16 +- application/views/sales/form.php | 79 +- css/jquery-ui-timepicker-addon.css | 27 + css/ospos.css | 1 + js/jquery-ui-timepicker-addon.js | 2245 +++++++++++++++++++++ 5 files changed, 2317 insertions(+), 51 deletions(-) create mode 100644 css/jquery-ui-timepicker-addon.css create mode 100644 js/jquery-ui-timepicker-addon.js diff --git a/application/helpers/dateformat_helper.php b/application/helpers/dateformat_helper.php index db5039338..b403cb4c0 100644 --- a/application/helpers/dateformat_helper.php +++ b/application/helpers/dateformat_helper.php @@ -31,15 +31,15 @@ function dateformat_jquery($php_format) 'Y' => 'yy', 'y' => 'y', // Time - 'a' => '', - 'A' => '', + 'a' => 'tt', + 'A' => 'TT', 'B' => '', - 'g' => '', - 'G' => '', - 'h' => '', - 'H' => '', - 'i' => '', - 's' => '', + 'g' => 'h', + 'G' => 'H', + 'h' => 'hh', + 'H' => 'HH', + 'i' => 'mm', + 's' => 'ss', 'u' => '' ); $jqueryui_format = ""; diff --git a/application/views/sales/form.php b/application/views/sales/form.php index 527d12c0c..89c496b34 100755 --- a/application/views/sales/form.php +++ b/application/views/sales/form.php @@ -14,8 +14,8 @@
- lang->line('sales_date').':', 'date', array('class'=>'required')); ?> -
'date','value'=>date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($sale_info['sale_time'])), 'class'=>'date'));?> + 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'));?>
@@ -24,10 +24,10 @@
- 'invoice_number','size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?> + 'invoice_number', 'size'=>10, 'value'=>$sale_info['invoice_number'], 'id'=>'invoice_number'));?> 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'));?>
@@ -49,7 +49,7 @@
lang->line('sales_comment').':', 'comment'); ?>
- 'comment','value'=>$sale_info['comment'],'rows'=>'4','cols'=>'23', 'id'=>'comment'));?> + 'comment', 'value'=>$sale_info['comment'], 'rows'=>'4','cols'=>'23', 'id'=>'comment'));?>
@@ -76,20 +76,19 @@