diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index 61ef62993..ba871d3e8 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -39,15 +39,15 @@ class Sale_lib public function sort_and_filter_cart($cart) { - - if (empty($cart)) + if(empty($cart)) { return $cart; } $filtered_cart = array(); - foreach($cart as $k=>$v) { + foreach($cart as $k=>$v) + { if($v['print_option'] == '0') { $filtered_cart[] = $v; @@ -58,7 +58,8 @@ class Sale_lib if($this->CI->config->item('line_sequence') == '0') { $sort = array(); - foreach($filtered_cart as $k=>$v) { + foreach($filtered_cart as $k=>$v) + { $sort['line'][$k] = $v['line']; } array_multisort($sort['line'], SORT_ASC, $filtered_cart); @@ -67,7 +68,8 @@ class Sale_lib elseif($this->CI->config->item('line_sequence') == '1') { $sort = array(); - foreach($filtered_cart as $k=>$v) { + foreach($filtered_cart as $k=>$v) + { $sort['stock_type'][$k] = $v['stock_type']; $sort['description'][$k] = $v['description']; $sort['name'][$k] = $v['name']; @@ -78,7 +80,8 @@ class Sale_lib elseif($this->CI->config->item('line_sequence') == '2') { $sort = array(); - foreach($filtered_cart as $k=>$v) { + foreach($filtered_cart as $k=>$v) + { $sort['category'][$k] = $v['stock_type']; $sort['description'][$k] = $v['description']; $sort['name'][$k] = $v['name']; @@ -89,7 +92,8 @@ class Sale_lib else { $sort = array(); - foreach($filtered_cart as $k=>$v) { + foreach($filtered_cart as $k=>$v) + { $sort['line'][$k] = $v['line']; } array_multisort($sort['line'], SORT_ASC, $filtered_cart); @@ -316,10 +320,17 @@ class Sale_lib public function is_payment_covering_total() { - $amount_due = $this->get_amount_due(); // 0 decimal -> 1 / 2 = 0.5, 1 decimals -> 0.1 / 2 = 0.05, 2 decimals -> 0.01 / 2 = 0.005 $threshold = bcpow(10, -$this->CI->config->item('currency_decimals')) / 2; - return ($amount_due > -$threshold && $amount_due < $threshold); + + if($this->get_mode() == 'return') + { + return ($this->get_amount_due() > -$threshold); + } + else + { + return ($this->get_amount_due() < $threshold); + } } public function get_customer() diff --git a/application/views/partial/header.php b/application/views/partial/header.php index 5cbe18bc0..0cc576c79 100644 --- a/application/views/partial/header.php +++ b/application/views/partial/header.php @@ -74,7 +74,7 @@ - + diff --git a/database/database.sql b/database/database.sql index 38a15c3f0..8a974bd9f 100644 --- a/database/database.sql +++ b/database/database.sql @@ -88,7 +88,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('statistics', '1'), ('language', 'english'), ('language_code', 'en'), -('date_or_time_format',''); +('date_or_time_format',''), +('customer_reward_enable',''); -- -------------------------------------------------------- @@ -103,6 +104,8 @@ CREATE TABLE `ospos_customers` ( `account_number` varchar(255) DEFAULT NULL, `taxable` int(1) NOT NULL DEFAULT '1', `discount_percent` decimal(15,2) NOT NULL DEFAULT '0', + `package_id` int(11) DEFAULT NULL, + `points` int(11) DEFAULT NULL, `deleted` int(1) NOT NULL DEFAULT '0', UNIQUE KEY `account_number` (`account_number`), KEY `person_id` (`person_id`) @@ -774,6 +777,49 @@ INSERT INTO `ospos_dinner_tables` (`dinner_table_id`, `name`, `status`, `deleted (1, 'Delivery', 0, 0), (2, 'Take Away', 0, 0); +-- +-- Table structure for table `ospos_customer_packages` +-- + +CREATE TABLE IF NOT EXISTS `ospos_customers_packages` ( + `package_id` int(11) NOT NULL AUTO_INCREMENT, + `package_name` varchar(255) DEFAULT NULL, + `points_percent` float NOT NULL DEFAULT '0', + `deleted` int(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`package_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +INSERT INTO `ospos_customers_packages` (`package_id`, `package_name`, `points_percent`, `deleted`) VALUES +(1, 'Default', 0, 0), +(2, 'Bronze', 10, 0), +(3, 'Silver', 20, 0), +(4, 'Gold', 30, 0), +(5, 'Premium', 50, 0); + +-- +-- Table structure for table `ospos_customer_points` +-- + +CREATE TABLE IF NOT EXISTS `ospos_customers_points` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `person_id` int(11) NOT NULL, + `package_id` int(11) NOT NULL, + `sale_id` int(11) NOT NULL, + `points_earned` int(11) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- +-- Table structure for table `ospos_sales_reward_points` +-- + +CREATE TABLE IF NOT EXISTS `ospos_sales_reward_points` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sale_id` int(11) NOT NULL, + `earned` float NOT NULL, + `used` float NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Constraints for dumped tables diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index f27f8a0de..2538c00fd 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -16,6 +16,7 @@ CREATE TABLE `ospos_app_config` ( INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('address', '123 Nowhere street'), ('company', 'Open Source Point of Sale'), +('default_register_mode', 'sale'), ('default_tax_rate', '8'), ('email', 'changeme@example.com'), ('fax', ''), @@ -44,9 +45,12 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('receipt_show_description', '1'), ('receipt_show_serialnumber', '1'), ('invoice_enable', '1'), +('last_used_invoice_number', '0'), +('last_used_quote_number', '0'), ('line_sequence', '0'), ('recv_invoice_format', '$CO'), ('sales_invoice_format', '$CO'), +('sales_quote_format', 'Q%y{QSEQ:6}'), ('invoice_email_message', 'Dear $CU, In attachment the receipt for sale $INV'), ('invoice_default_comments', 'This is a default comment'), ('print_silently', '1'), @@ -84,7 +88,8 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('statistics', '1'), ('language', 'english'), ('language_code', 'en'), -('date_or_time_format',''); +('date_or_time_format',''), +('customer_reward_enable',''); -- -------------------------------------------------------- @@ -99,6 +104,8 @@ CREATE TABLE `ospos_customers` ( `account_number` varchar(255) DEFAULT NULL, `taxable` int(1) NOT NULL DEFAULT '1', `discount_percent` decimal(15,2) NOT NULL DEFAULT '0', + `package_id` int(11) DEFAULT NULL, + `points` int(11) DEFAULT NULL, `deleted` int(1) NOT NULL DEFAULT '0', UNIQUE KEY `account_number` (`account_number`), KEY `person_id` (`person_id`) @@ -610,12 +617,13 @@ CREATE TABLE `ospos_sales_suspended` ( `employee_id` int(10) NOT NULL DEFAULT '0', `comment` text NOT NULL, `invoice_number` varchar(32) DEFAULT NULL, + `quote_number` varchar(32) DEFAULT NULL, `sale_id` int(10) NOT NULL AUTO_INCREMENT, `dinner_table_id` int(11) NULL, PRIMARY KEY (`sale_id`), KEY `customer_id` (`customer_id`), KEY `employee_id` (`employee_id`), - KEY `dinner_table_id` (`dinner_table_id`), + KEY `dinner_table_id` (`dinner_table_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ; -- @@ -769,6 +777,49 @@ INSERT INTO `ospos_dinner_tables` (`dinner_table_id`, `name`, `status`, `deleted (1, 'Delivery', 0, 0), (2, 'Take Away', 0, 0); +-- +-- Table structure for table `ospos_customer_packages` +-- + +CREATE TABLE IF NOT EXISTS `ospos_customers_packages` ( + `package_id` int(11) NOT NULL AUTO_INCREMENT, + `package_name` varchar(255) DEFAULT NULL, + `points_percent` float NOT NULL DEFAULT '0', + `deleted` int(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`package_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +INSERT INTO `ospos_customers_packages` (`package_id`, `package_name`, `points_percent`, `deleted`) VALUES +(1, 'Default', 0, 0), +(2, 'Bronze', 10, 0), +(3, 'Silver', 20, 0), +(4, 'Gold', 30, 0), +(5, 'Premium', 50, 0); + +-- +-- Table structure for table `ospos_customer_points` +-- + +CREATE TABLE IF NOT EXISTS `ospos_customers_points` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `person_id` int(11) NOT NULL, + `package_id` int(11) NOT NULL, + `sale_id` int(11) NOT NULL, + `points_earned` int(11) NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- +-- Table structure for table `ospos_sales_reward_points` +-- + +CREATE TABLE IF NOT EXISTS `ospos_sales_reward_points` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `sale_id` int(11) NOT NULL, + `earned` float NOT NULL, + `used` float NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- This migration script should be run after creating tables with the regular database script and before applying the constraints. @@ -941,8 +992,6 @@ SELECT `person_id`, `company_name`, `account_number`, `deleted` FROM `phppos`.ph INSERT INTO `ospos_dinner_tables` (`dinner_table_id`, `name`, `status`, `deleted`) SELECT `dinner_table_id`, `name`, `status`, `deleted` FROM `phppos`.phppos_dinner_tables; - - -- -- Constraints for dumped tables -- diff --git a/public/dist/opensourcepos.min.js b/public/dist/opensourcepos.min.js index e8298cdf8..9ec19c567 100644 --- a/public/dist/opensourcepos.min.js +++ b/public/dist/opensourcepos.min.js @@ -1,4 +1,4 @@ -/*! opensourcepos 11-02-2017 */ +/*! opensourcepos 12-03-2017 */ function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function number_sorter(a,b){return a=+a.replace(/[^\-0-9\.]+/g,""),b=+b.replace(/[^\-0-9\.]+/g,""),a>b?1:b>a?-1:0}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("