diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 2ddf362fd..856656351 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -43,7 +43,7 @@ class Reports extends Secure_area $report_data = $model->getDataBySaleId($sale_id); - $summary_data = array(anchor('sales/edit/'.$report_data['sale_id'], + $summary_data = array(anchor('#', 'POS '.$report_data['sale_id'], array('class'=>'modal-dlg modal-btn-submit')), $report_data['sale_date'], @@ -68,9 +68,7 @@ class Reports extends Secure_area $report_data = $model->getDataByReceivingId($receiving_id); - $summary_data = array(anchor('receivings/edit/'.$report_data['receiving_id'], - 'RECV '.$report_data['receiving_id'], - array('class'=>'modal-dlg modal-btn-submit')), + $summary_data = array('RECV '.$report_data['receiving_id'], $report_data['receiving_date'], to_quantity_decimals($report_data['items_purchased']), $report_data['employee_name'], @@ -912,7 +910,7 @@ class Reports extends Secure_area foreach($report_data['summary'] as $key=>$row) { - $summary_data[] = array(anchor('sales/edit/'.$row['sale_id'], 'POS '.$row['sale_id'], array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')), $row['sale_date'], to_quantity_decimals($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('POS '.$row['sale_id'], $row['sale_date'], to_quantity_decimals($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) { @@ -958,9 +956,7 @@ class Reports extends Secure_area if($this->config->item('invoice_enable') == TRUE) { $summary_data[] = array( - anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], - array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['supplier_name'], @@ -973,9 +969,7 @@ class Reports extends Secure_area else { $summary_data[] = array( - anchor('receivings/edit/'.$row['receiving_id'], 'RECV '.$row['receiving_id'], - array('class'=>'modal-dlg modal-btn-delete modal-btn-submit')), $row['receiving_date'], to_quantity_decimals($row['items_purchased']), $row['employee_name'], $row['supplier_name'], diff --git a/application/helpers/table_helper.php b/application/helpers/table_helper.php index e10f84442..950799ed7 100644 --- a/application/helpers/table_helper.php +++ b/application/helpers/table_helper.php @@ -73,7 +73,7 @@ function get_sale_data_row($sale, $controller) ) ); - if($CI->config->item('invoice_enable') == TRUE) + if ($CI->config->item('invoice_enable')) { $row['invoice'] = anchor($controller_name."/invoice/$sale->sale_id", '', array('title'=>$CI->lang->line('sales_show_invoice')) @@ -111,10 +111,6 @@ function get_sales_manage_payments_summary($payments, $sales, $controller) } function transform_headers($array) - if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id'))) - { - $headers[] = ' '; - } { return json_encode(array_map(function($v) { return array('field' => key($v), 'title' => current($v), 'checkbox' => (key($v) == 'checkbox')); @@ -132,6 +128,11 @@ function get_people_manage_table_headers() array('email' => $CI->lang->line('common_email')), array('phone_number' => $CI->lang->line('common_phone_number')) ); + + if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id'))) + { + $headers[] = array('messages' => ''); + } return transform_headers($headers); } @@ -140,7 +141,7 @@ function get_person_data_row($person, $controller) { $CI =& get_instance(); $controller_name=strtolower(get_class($CI)); - $row = array ( + return array ( 'id' => $person->person_id, 'last_name' => character_limiter($person->last_name,13), 'first_name' => character_limiter($person->first_name,13), @@ -169,10 +170,6 @@ function get_detailed_data_row($row, $controller) } function get_suppliers_manage_table_headers() - if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id'))) - { - $headers[] = ' '; - } { $CI =& get_instance(); @@ -186,6 +183,11 @@ function get_suppliers_manage_table_headers() array('phone_number' => $CI->lang->line('common_phone_number')) ); + if($CI->Employee->has_grant('messages', $CI->session->userdata('person_id'))) + { + $headers[] = array('messages' => ''); + } + return transform_headers($headers); } diff --git a/application/views/messages/form_sms.php b/application/views/messages/form_sms.php index 94c416699..fef8f59ea 100644 --- a/application/views/messages/form_sms.php +++ b/application/views/messages/form_sms.php @@ -44,7 +44,7 @@ $(document).ready(function() success:function(response) { dialog_support.hide(); - post_person_form_submit(response); + table_support.handle_submit('', response); }, dataType:'json' }); diff --git a/application/views/partial/header.php b/application/views/partial/header.php index ac9f8c531..33594e680 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -64,7 +64,7 @@ - + diff --git a/application/views/people/manage.php b/application/views/people/manage.php index 1908facca..e18f4bfb8 100644 --- a/application/views/people/manage.php +++ b/application/views/people/manage.php @@ -9,8 +9,10 @@ $(document).ready(function() resource: '', headers: , confirmDeleteMessage : 'lang->line($controller_name."_confirm_delete")?>', - enableActions: function() { - // should only enable if email filed in + enableActions: function() + { + var email_disabled = $("tr.selected a[href^='mailto:']").length == 0; + $("#email").attr('disabled', email_disabled); } }); diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php index 1d57668d0..1c22affca 100644 --- a/application/views/reports/tabular_details.php +++ b/application/views/reports/tabular_details.php @@ -125,7 +125,8 @@ else if (isset($editable)) { ?> - function post_form_submit(response, row_id) + + table_support.handle_submit = function(resource, response) { if(!response.success) { @@ -142,7 +143,7 @@ else row.replaceWith(response); row = get_table_row(row_id).parent().parent(); update_sortable_table(); - animate_row(row); + highligh(row); row.find("a.expand").click(expand_handler).text(sign); dialog_support.init(row.find("a.modal")); }); diff --git a/application/views/sales/register.php b/application/views/sales/register.php index dc1c079f3..bb74604c2 100644 --- a/application/views/sales/register.php +++ b/application/views/sales/register.php @@ -659,7 +659,6 @@ $(document).ready(function() table_support.handle_submit = function(resource, response, stay_open) { - debugger;; if(response.success) { if (resource.match(/customers$/)) { diff --git a/dist/opensourcepos.js b/dist/opensourcepos.js index c6affc56e..91b6bf542 100644 --- a/dist/opensourcepos.js +++ b/dist/opensourcepos.js @@ -49384,9 +49384,11 @@ $.tablesorter.addWidget({ (function(table_support, $) { var enable_actions = function(callback) { - var selection_empty = selected_rows().length == 0; - $("#toolbar button:not(.dropdown-toggle)").attr('disabled', selection_empty); - typeof callback == 'function' && callback(); + return function() { + var selection_empty = selected_rows().length == 0; + $("#toolbar button:not(.dropdown-toggle)").attr('disabled', selection_empty); + typeof callback == 'function' && callback(); + } }; var table = function() { @@ -49417,7 +49419,7 @@ $.tablesorter.addWidget({ }; var highlight_row = function (id, color) { - var original = $(row_selector(id,true)).css('backgroundColor'); + var original = $(row_selector(id)).css('backgroundColor'); $(row_selector(id)).find("td").animate({backgroundColor: color || '#e1ffdd'}, "slow", "linear") .animate({backgroundColor: color || '#e1ffdd'}, 5000) .animate({backgroundColor: original}, "slow", "linear"); @@ -49435,7 +49437,6 @@ $.tablesorter.addWidget({ field: 'id', values: selected_ids() }); - //refresh(); enable_actions(); }); }); @@ -49462,6 +49463,7 @@ $.tablesorter.addWidget({ var init = function (_options) { options = _options; + enable_actions = enable_actions(options.enableActions); $('#table').bootstrapTable($.extend(options, { columns: options.headers, url: options.resource + '/search', @@ -49480,7 +49482,8 @@ $.tablesorter.addWidget({ onLoadSuccess: load_success(options.onLoadSuccess), queryParamsType: 'limit', iconSize: 'sm', - silentSort: true + silentSort: true, + paginationVAlign: 'bottom' })); enable_actions(); init_delete(); @@ -49511,7 +49514,6 @@ $.tablesorter.addWidget({ url: resource + '/get_row/' + id, success: function (response) { table().updateByUniqueId({id: id, row: response}); - dialog_support.init("a.modal-dlg"); enable_actions(); highlight_row(id); diff --git a/dist/opensourcepos.min.js b/dist/opensourcepos.min.js index d690fac56..b4c0701e0 100644 --- a/dist/opensourcepos.min.js +++ b/dist/opensourcepos.min.js @@ -1,4 +1,4 @@ -/*! opensourcepos 02-05-2016 */ +/*! opensourcepos 03-05-2016 */ function set_feedback(a,b,c){a?($("#feedback_bar").removeClass().addClass(b).html(a).css("opacity","1"),c||$("#feedback_bar").fadeTo(5e3,1).fadeTo("fast",0)):$("#feedback_bar").css("opacity","0")}function phpjsDate(a,b){var c,d,e=this,f=["Sun","Mon","Tues","Wednes","Thurs","Fri","Satur","January","February","March","April","May","June","July","August","September","October","November","December"],g=/\\?(.?)/gi,h=function(a,b){return d[a]?d[a]():b},i=function(a,b){for(a=String(a);a.length=b&&1==parseInt(a%100/10,10)&&(b=0),["st","nd","rd"][b-1]||"th"},w:function(){return c.getDay()},z:function(){var a=new Date(d.Y(),d.n()-1,d.j()),b=new Date(d.Y(),0,1);return Math.round((a-b)/864e5)},W:function(){var a=new Date(d.Y(),d.n()-1,d.j()-d.N()+3),b=new Date(a.getFullYear(),0,4);return i(1+Math.round((a-b)/864e5/7),2)},F:function(){return f[6+d.n()]},m:function(){return i(d.n(),2)},M:function(){return d.F().slice(0,3)},n:function(){return c.getMonth()+1},t:function(){return new Date(d.Y(),d.n(),0).getDate()},L:function(){var a=d.Y();return a%4===0&a%100!==0|a%400===0},o:function(){var a=d.n(),b=d.W(),c=d.Y();return c+(12===a&&9>b?1:1===a&&b>9?-1:0)},Y:function(){return c.getFullYear()},y:function(){return d.Y().toString().slice(-2)},a:function(){return c.getHours()>11?"pm":"am"},A:function(){return d.a().toUpperCase()},B:function(){var a=3600*c.getUTCHours(),b=60*c.getUTCMinutes(),d=c.getUTCSeconds();return i(Math.floor((a+b+d+3600)/86.4)%1e3,3)},g:function(){return d.G()%12||12},G:function(){return c.getHours()},h:function(){return i(d.g(),2)},H:function(){return i(d.G(),2)},i:function(){return i(c.getMinutes(),2)},s:function(){return i(c.getSeconds(),2)},u:function(){return i(1e3*c.getMilliseconds(),6)},e:function(){throw"Not supported (see source code of date() for timezone on how to add support)"},I:function(){var a=new Date(d.Y(),0),b=Date.UTC(d.Y(),0),c=new Date(d.Y(),6),e=Date.UTC(d.Y(),6);return a-b!==c-e?1:0},O:function(){var a=c.getTimezoneOffset(),b=Math.abs(a);return(a>0?"-":"+")+i(100*Math.floor(b/60)+b%60,4)},P:function(){var a=d.O();return a.substr(0,3)+":"+a.substr(3,2)},T:function(){return"UTC"},Z:function(){return 60*-c.getTimezoneOffset()},c:function(){return"Y-m-d\\TH:i:sP".replace(g,h)},r:function(){return"D, d M Y H:i:s O".replace(g,h)},U:function(){return c/1e3|0}},this.date=function(a,b){return e=this,c=void 0===b?new Date:new Date(b instanceof Date?b:1e3*b),a.replace(g,h)},this.date(a,b)}if(function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b=!!a&&"length"in a&&a.length,c=na.type(a);return"function"===c||na.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}function d(a,b,c){if(na.isFunction(b))return na.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return na.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(xa.test(b))return na.filter(b,a,c);b=na.filter(b,a)}return na.grep(a,function(a){return na.inArray(a,b)>-1!==c})}function e(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}function f(a){var b={};return na.each(a.match(Da)||[],function(a,c){b[c]=!0}),b}function g(){da.addEventListener?(da.removeEventListener("DOMContentLoaded",h),a.removeEventListener("load",h)):(da.detachEvent("onreadystatechange",h),a.detachEvent("onload",h))}function h(){(da.addEventListener||"load"===a.event.type||"complete"===da.readyState)&&(g(),na.ready())}function i(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(Ia,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:Ha.test(c)?na.parseJSON(c):c}catch(e){}na.data(a,b,c)}else c=void 0}return c}function j(a){var b;for(b in a)if(("data"!==b||!na.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function k(a,b,c,d){if(Ga(a)){var e,f,g=na.expando,h=a.nodeType,i=h?na.cache:a,j=h?a[g]:a[g]&&g;if(j&&i[j]&&(d||i[j].data)||void 0!==c||"string"!=typeof b)return j||(j=h?a[g]=ca.pop()||na.guid++:g),i[j]||(i[j]=h?{}:{toJSON:na.noop}),("object"==typeof b||"function"==typeof b)&&(d?i[j]=na.extend(i[j],b):i[j].data=na.extend(i[j].data,b)),f=i[j],d||(f.data||(f.data={}),f=f.data),void 0!==c&&(f[na.camelCase(b)]=c),"string"==typeof b?(e=f[b],null==e&&(e=f[na.camelCase(b)])):e=f,e}}function l(a,b,c){if(Ga(a)){var d,e,f=a.nodeType,g=f?na.cache:a,h=f?a[na.expando]:na.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){na.isArray(b)?b=b.concat(na.map(b,na.camelCase)):b in d?b=[b]:(b=na.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;for(;e--;)delete d[b[e]];if(c?!j(d):!na.isEmptyObject(d))return}(c||(delete g[h].data,j(g[h])))&&(f?na.cleanData([a],!0):la.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}function m(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return na.css(a,b,"")},i=h(),j=c&&c[3]||(na.cssNumber[b]?"":"px"),k=(na.cssNumber[b]||"px"!==j&&+i)&&Ka.exec(na.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,na.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}function n(a){var b=Sa.split("|"),c=a.createDocumentFragment();if(c.createElement)for(;b.length;)c.createElement(b.pop());return c}function o(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||na.nodeName(d,b)?f.push(d):na.merge(f,o(d,b));return void 0===b||b&&na.nodeName(a,b)?na.merge([a],f):f}function p(a,b){for(var c,d=0;null!=(c=a[d]);d++)na._data(c,"globalEval",!b||na._data(b[d],"globalEval"))}function q(a){Oa.test(a.type)&&(a.defaultChecked=a.checked)}function r(a,b,c,d,e){for(var f,g,h,i,j,k,l,m=a.length,r=n(b),s=[],t=0;m>t;t++)if(g=a[t],g||0===g)if("object"===na.type(g))na.merge(s,g.nodeType?[g]:g);else if(Ua.test(g)){for(i=i||r.appendChild(b.createElement("div")),j=(Pa.exec(g)||["",""])[1].toLowerCase(),l=Ta[j]||Ta._default,i.innerHTML=l[1]+na.htmlPrefilter(g)+l[2],f=l[0];f--;)i=i.lastChild;if(!la.leadingWhitespace&&Ra.test(g)&&s.push(b.createTextNode(Ra.exec(g)[0])),!la.tbody)for(g="table"!==j||Va.test(g)?""!==l[1]||Va.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;f--;)na.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k);for(na.merge(s,i.childNodes),i.textContent="";i.firstChild;)i.removeChild(i.firstChild);i=r.lastChild}else s.push(b.createTextNode(g));for(i&&r.removeChild(i),la.appendChecked||na.grep(o(s,"input"),q),t=0;g=s[t++];)if(d&&na.inArray(g,d)>-1)e&&e.push(g);else if(h=na.contains(g.ownerDocument,g),i=o(r.appendChild(g),"script"),h&&p(i),c)for(f=0;g=i[f++];)Qa.test(g.type||"")&&c.push(g);return i=null,r}function s(){return!0}function t(){return!1}function u(){try{return da.activeElement}catch(a){}}function v(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)v(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=t;else if(!e)return a;return 1===f&&(g=e,e=function(a){return na().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=na.guid++)),a.each(function(){na.event.add(this,b,e,d,c)})}function w(a,b){return na.nodeName(a,"table")&&na.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function x(a){return a.type=(null!==na.find.attr(a,"type"))+"/"+a.type,a}function y(a){var b=eb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function z(a,b){if(1===b.nodeType&&na.hasData(a)){var c,d,e,f=na._data(a),g=na._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)na.event.add(b,c,h[c][d])}g.data&&(g.data=na.extend({},g.data))}}function A(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!la.noCloneEvent&&b[na.expando]){e=na._data(b);for(d in e.events)na.removeEvent(b,d,e.handle);b.removeAttribute(na.expando)}"script"===c&&b.text!==a.text?(x(b).text=a.text,y(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),la.html5Clone&&a.innerHTML&&!na.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Oa.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}function B(a,b,c,d){b=fa.apply([],b);var e,f,g,h,i,j,k=0,l=a.length,m=l-1,n=b[0],p=na.isFunction(n);if(p||l>1&&"string"==typeof n&&!la.checkClone&&db.test(n))return a.each(function(e){var f=a.eq(e);p&&(b[0]=n.call(this,e,f.html())),B(f,b,c,d)});if(l&&(j=r(b,a[0].ownerDocument,!1,a,d),e=j.firstChild,1===j.childNodes.length&&(j=e),e||d)){for(h=na.map(o(j,"script"),x),g=h.length;l>k;k++)f=j,k!==m&&(f=na.clone(f,!0,!0),g&&na.merge(h,o(f,"script"))),c.call(a[k],f,k);if(g)for(i=h[h.length-1].ownerDocument,na.map(h,y),k=0;g>k;k++)f=h[k],Qa.test(f.type||"")&&!na._data(f,"globalEval")&&na.contains(i,f)&&(f.src?na._evalUrl&&na._evalUrl(f.src):na.globalEval((f.text||f.textContent||f.innerHTML||"").replace(fb,"")));j=e=null}return a}function C(a,b,c){for(var d,e=b?na.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||na.cleanData(o(d)),d.parentNode&&(c&&na.contains(d.ownerDocument,d)&&p(o(d,"script")),d.parentNode.removeChild(d));return a}function D(a,b){var c=na(b.createElement(a)).appendTo(b.body),d=na.css(c[0],"display");return c.detach(),d}function E(a){var b=da,c=jb[a];return c||(c=D(a,b),"none"!==c&&c||(ib=(ib||na("