Merge branch 'development' into 'master'

Update number of packages per page

See merge request saburly/wiaas/new-wiaas!94

backend/app/plugins/wiaas/assets/css/menu.css

@@ -62,3 +62,122 @@
 .gravityflow-dicussion-item-value {
     padding: 10px;
 }
+
+.woocommerce-help-tip{
+    color:#666;
+    display:inline-block;
+    font-size:1.1em;
+    font-style:normal;
+    height:16px;
+    line-height:16px;
+    position:relative;
+    vertical-align:middle;
+    width:16px}
+
+.woocommerce-help-tip::after{
+    font-family:Dashicons;
+    speak:none;
+    font-weight:400;
+    font-variant:normal;
+    text-transform:none;
+    line-height:1;
+    -webkit-font-smoothing:antialiased;
+    margin:0;
+    text-indent:0;
+    position:absolute;
+    top:0;
+    left:0;
+    width:100%;
+    height:100%;
+    text-align:center;
+    content:"";
+    cursor:help
+}
+
+h2 .woocommerce-help-tip{
+    margin-top:-5px;
+    margin-left:.25em
+}
+
+/**
+  * Tooltips
+  */
+.tips {
+    cursor: help;
+    text-decoration: none;
+}
+
+img.tips {
+    padding: 5px 0 0;
+}
+
+#tiptip_holder {
+    display: none;
+    z-index: 8675309;
+    position: absolute;
+    top: 0;
+    /*rtl:ignore*/
+    left: 0;
+}
+#tiptip_holder.tip_top {
+    padding-bottom: 5px;
+}
+#tiptip_holder.tip_top #tiptip_arrow_inner {
+    margin-top: -7px;
+    margin-left: -6px;
+    border-top-color: #333;
+}
+#tiptip_holder.tip_bottom {
+    padding-top: 5px;
+}
+#tiptip_holder.tip_bottom #tiptip_arrow_inner {
+    margin-top: -5px;
+    margin-left: -6px;
+    border-bottom-color: #333;
+}
+#tiptip_holder.tip_right {
+    padding-left: 5px;
+}
+#tiptip_holder.tip_right #tiptip_arrow_inner {
+    margin-top: -6px;
+    margin-left: -5px;
+    border-right-color: #333;
+}
+#tiptip_holder.tip_left {
+    padding-right: 5px;
+}
+#tiptip_holder.tip_left #tiptip_arrow_inner {
+    margin-top: -6px;
+    margin-left: -7px;
+    border-left-color: #333;
+}
+
+#tiptip_content,
+.chart-tooltip,
+.wc_error_tip {
+    color: #fff;
+    font-size: 0.8em;
+    max-width: 150px;
+    background: #333;
+    text-align: center;
+    border-radius: 3px;
+    padding: 0.618em 1em;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+#tiptip_content code,
+.chart-tooltip code,
+.wc_error_tip code {
+    padding: 1px;
+    background: #888;
+}
+
+#tiptip_arrow,
+#tiptip_arrow_inner {
+    position: absolute;
+    border-color: transparent;
+    border-style: solid;
+    border-width: 6px;
+    height: 0;
+    width: 0;
+}
+

backend/app/plugins/wiaas/assets/css/wiaas-admin-dashboard.css

@@ -0,0 +1,25 @@
+.wiaas-dashboard-table {
+    width: 100%;
+}
+
+.wiaas-dashboard-table thead td {
+    padding: .5em 1em
+}
+
+.wiaas-dashboard-table tbody td {
+    border-top: 1px solid #f5f5f5;
+    vertical-align: middle;
+    padding: 1em
+}
+
+.wiaas-dashboard-table-empty {
+    width: 100%;
+}
+
+.wiaas-dashboard-table-empty p {
+    text-align: center;
+}
+
+time.wiaas-order-date {
+    color: #999;
+}

backend/app/plugins/wiaas/assets/css/wiaas-admin-delivery-process.css

@@ -0,0 +1,90 @@
+#wiaas_delivery_process_order_notes .note_content {
+    background: #a7cedc;
+    padding: 10px;
+    position: relative;
+}
+
+#wiaas_delivery_process_order_notes .note_content:after {
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: -10px;
+    left: 20px;
+    width: 0;
+    height: 0;
+    border-width: 10px 10px 0 0;
+    border-style: solid;
+    border-color: #a7cedc transparent;
+}
+
+#wiaas_delivery_process_order_notes .note_content p {
+    margin: 0;
+    padding: 0;
+    word-wrap: break-word;
+}
+
+#wiaas_delivery_process_order_notes p.meta {
+    padding: 10px;
+    color: #999;
+    margin: 0;
+    font-size: 11px;
+}
+
+#wiaas_delivery_process_order_notes .add-note {
+    border-top: 1px solid #ddd;
+    padding: 10px 10px 0;
+}
+
+#wiaas_delivery_process_order_notes .add-note textarea {
+    width: 100%;
+    height: 50px;
+}
+
+.wiaas-delivery-process-timeline-note {
+    margin: 20px 0 30px;
+    clear: both;
+    width: 100%;
+}
+
+.wiaas-delivery-process-timeline-note > div.wiaas-delivery-process-timeline-note-body-wrap {
+    border: 1px solid #E0E0E0;
+    margin-left: 100px;
+    padding: 10px;
+    display: block;
+}
+
+.wiaas-delivery-process-timeline-note > div .wiaas-delivery-process-timeline-note-body {
+
+    overflow-y: hidden;
+    display: block;
+    line-height: 1.3em;
+    width: 100%;
+    word-wrap: break-word;
+}
+
+.wiaas-delivery-process-timeline-note-title {
+    float: left;
+    margin-bottom: 0.5em;
+    font-size: 1.2em;
+    color: #939FA5;
+}
+
+.wiaas-delivery-process-timeline-note-date {
+    color: #939FA5;
+    float: right;
+    font-size: 11px;
+    text-align: right;
+    display: block;
+}
+
+.wiaas-delivery-process-timeline-note-avatar {
+    float: left;
+    width: 84px;
+    text-align: center;
+    padding-right: 10px;
+}
+
+.wiaas-delivery-process-step-instructions {
+    padding: 10px 50px;
+    border-bottom: 1px solid #eee;
+}

backend/app/plugins/wiaas/assets/css/wiaas-admin.css

@@ -0,0 +1,37 @@
+mark.wiaas-order-status {
+    display: inline-flex;
+    padding: 0 1em;
+    line-height: 2.5em;
+    color: #777;
+    background: #e5e5e5;
+    border-radius: 4px;
+    border-bottom: 1px solid rgba(0, 0, 0, .05);
+    margin: -.5em 0;
+    cursor: inherit !important;
+    font-size: 13px;
+}
+
+mark.wiaas-order-status-completed {
+    background: #c8d7e1;
+    color: #2e4453
+}
+
+mark.wiaas-order-status-on-hold {
+    background: #f8dda7;
+    color: #94660c
+}
+
+mark.wiaas-order-status-failed {
+    background: #eba3a3;
+    color: #761919
+}
+
+mark.wiaas-order-status-processing {
+    background: #c6e1c6;
+    color: #5b841b
+}
+
+mark.wiaas-order-status-trash {
+    background: #eba3a3;
+    color: #761919
+}

backend/app/plugins/wiaas/assets/js/datatables.min.js

@@ -0,0 +1,180 @@
+/*
+ * This combined file was created by the DataTables downloader builder:
+ *   https://datatables.net/download
+ *
+ * To rebuild or modify this file with the latest versions of the included
+ * software please visit:
+ *   https://datatables.net/download/#dt/dt-1.10.18
+ *
+ * Included libraries:
+ *   DataTables 1.10.18
+ */
+
+/*!
+ DataTables 1.10.18
+ ©2008-2018 SpryMedia Ltd - datatables.net/license
+*/
+(function(h){"function"===typeof define&&define.amd?define(["jquery"],function(E){return h(E,window,document)}):"object"===typeof exports?module.exports=function(E,H){E||(E=window);H||(H="undefined"!==typeof window?require("jquery"):require("jquery")(E));return h(H,E,E.document)}:h(jQuery,window,document)})(function(h,E,H,k){function Z(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),
+d[c]=e,"o"===b[1]&&Z(a[e])});a._hungarianMap=d}function J(a,b,c){a._hungarianMap||Z(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==k&&(c||b[d]===k))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),J(a[d],b[d],c)):b[d]=b[e]})}function Ca(a){var b=n.defaults.oLanguage,c=b.sDecimal;c&&Da(c);if(a){var d=a.sZeroRecords;!a.sEmptyTable&&(d&&"No data available in table"===b.sEmptyTable)&&F(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(d&&"Loading..."===b.sLoadingRecords)&&F(a,
+a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&c!==a&&Da(a)}}function eb(a){A(a,"ordering","bSort");A(a,"orderMulti","bSortMulti");A(a,"orderClasses","bSortClasses");A(a,"orderCellsTop","bSortCellsTop");A(a,"order","aaSorting");A(a,"orderFixed","aaSortingFixed");A(a,"paging","bPaginate");A(a,"pagingType","sPaginationType");A(a,"pageLength","iDisplayLength");A(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":
+"");"boolean"===typeof a.scrollX&&(a.scrollX=a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&J(n.models.oSearch,a[b])}function fb(a){A(a,"orderable","bSortable");A(a,"orderData","aDataSort");A(a,"orderSequence","asSorting");A(a,"orderDataType","sortDataType");var b=a.aDataSort;"number"===typeof b&&!h.isArray(b)&&(a.aDataSort=[b])}function gb(a){if(!n.__browser){var b={};n.__browser=b;var c=h("<div/>").css({position:"fixed",top:0,left:-1*h(E).scrollLeft(),height:1,width:1,
+overflow:"hidden"}).append(h("<div/>").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(h("<div/>").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}h.extend(a.oBrowser,n.__browser);a.oScroll.iBarWidth=n.__browser.barWidth}
+function hb(a,b,c,d,e,f){var g,j=!1;c!==k&&(g=c,j=!0);for(;d!==e;)a.hasOwnProperty(d)&&(g=j?b(g,a[d],d,a):a[d],j=!0,d+=f);return g}function Ea(a,b){var c=n.defaults.column,d=a.aoColumns.length,c=h.extend({},n.models.oColumn,c,{nTh:b?b:H.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=h.extend({},n.models.oSearch,c[d]);ka(a,d,h(b).data())}function ka(a,b,c){var b=a.aoColumns[b],
+d=a.oClasses,e=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var f=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(fb(c),J(n.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),c.sClass&&e.addClass(c.sClass),h.extend(b,c),F(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),F(b,c,"aDataSort"));var g=b.mData,j=S(g),i=b.mRender?
+S(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b._setter=null;b.fnGetData=function(a,b,c){var d=j(a,b,k,c);return i&&b?i(d,b,a,c):d};b.fnSetData=function(a,b,c){return N(g)(a,b,c)};"number"!==typeof g&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=d.sSortableNone,
+b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI)}function $(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Fa(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;(""!==b.sY||""!==b.sX)&&la(a);r(a,null,"column-sizing",[a])}function aa(a,b){var c=ma(a,"bVisible");return"number"===
+typeof c[b]?c[b]:null}function ba(a,b){var c=ma(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}function V(a){var b=0;h.each(a.aoColumns,function(a,d){d.bVisible&&"none"!==h(d.nTh).css("display")&&b++});return b}function ma(a,b){var c=[];h.map(a.aoColumns,function(a,e){a[b]&&c.push(e)});return c}function Ga(a){var b=a.aoColumns,c=a.aoData,d=n.ext.type.detect,e,f,g,j,i,h,l,q,t;e=0;for(f=b.length;e<f;e++)if(l=b[e],t=[],!l.sType&&l._sManualType)l.sType=l._sManualType;else if(!l.sType){g=0;for(j=d.length;g<
+j;g++){i=0;for(h=c.length;i<h;i++){t[i]===k&&(t[i]=B(a,i,e,"type"));q=d[g](t[i],a);if(!q&&g!==d.length-1)break;if("html"===q)break}if(q){l.sType=q;break}}l.sType||(l.sType="string")}}function ib(a,b,c,d){var e,f,g,j,i,m,l=a.aoColumns;if(b)for(e=b.length-1;0<=e;e--){m=b[e];var q=m.targets!==k?m.targets:m.aTargets;h.isArray(q)||(q=[q]);f=0;for(g=q.length;f<g;f++)if("number"===typeof q[f]&&0<=q[f]){for(;l.length<=q[f];)Ea(a);d(q[f],m)}else if("number"===typeof q[f]&&0>q[f])d(l.length+q[f],m);else if("string"===
+typeof q[f]){j=0;for(i=l.length;j<i;j++)("_all"==q[f]||h(l[j].nTh).hasClass(q[f]))&&d(j,m)}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}function O(a,b,c,d){var e=a.aoData.length,f=h.extend(!0,{},n.models.oRow,{src:c?"dom":"data",idx:e});f._aData=b;a.aoData.push(f);for(var g=a.aoColumns,j=0,i=g.length;j<i;j++)g[j].sType=null;a.aiDisplayMaster.push(e);b=a.rowIdFn(b);b!==k&&(a.aIds[b]=f);(c||!a.oFeatures.bDeferRender)&&Ha(a,e,c,d);return e}function na(a,b){var c;b instanceof h||(b=h(b));return b.map(function(b,
+e){c=Ia(a,e);return O(a,c.data,e,c.cells)})}function B(a,b,c,d){var e=a.iDraw,f=a.aoColumns[c],g=a.aoData[b]._aData,j=f.sDefaultContent,i=f.fnGetData(g,d,{settings:a,row:b,col:c});if(i===k)return a.iDrawError!=e&&null===j&&(K(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b+", column "+c,4),a.iDrawError=e),j;if((i===g||null===i)&&null!==j&&d!==k)i=j;else if("function"===typeof i)return i.call(g);return null===i&&"display"==d?"":i}function jb(a,
+b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d,{settings:a,row:b,col:c})}function Ja(a){return h.map(a.match(/(\\.|[^\.])+/g)||[""],function(a){return a.replace(/\\\./g,".")})}function S(a){if(h.isPlainObject(a)){var b={};h.each(a,function(a,c){c&&(b[a]=S(c))});return function(a,c,f,g){var j=b[c]||b._;return j!==k?j(a,c,f,g):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,c,f,g){return a(b,c,f,g)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||
+-1!==a.indexOf("("))){var c=function(a,b,f){var g,j;if(""!==f){j=Ja(f);for(var i=0,m=j.length;i<m;i++){f=j[i].match(ca);g=j[i].match(W);if(f){j[i]=j[i].replace(ca,"");""!==j[i]&&(a=a[j[i]]);g=[];j.splice(0,i+1);j=j.join(".");if(h.isArray(a)){i=0;for(m=a.length;i<m;i++)g.push(c(a[i],b,j))}a=f[0].substring(1,f[0].length-1);a=""===a?g:g.join(a);break}else if(g){j[i]=j[i].replace(W,"");a=a[j[i]]();continue}if(null===a||a[j[i]]===k)return k;a=a[j[i]]}}return a};return function(b,e){return c(b,e,a)}}return function(b){return b[a]}}
+function N(a){if(h.isPlainObject(a))return N(a._);if(null===a)return function(){};if("function"===typeof a)return function(b,d,e){a(b,"set",d,e)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var b=function(a,d,e){var e=Ja(e),f;f=e[e.length-1];for(var g,j,i=0,m=e.length-1;i<m;i++){g=e[i].match(ca);j=e[i].match(W);if(g){e[i]=e[i].replace(ca,"");a[e[i]]=[];f=e.slice();f.splice(0,i+1);g=f.join(".");if(h.isArray(d)){j=0;for(m=d.length;j<m;j++)f={},b(f,d[j],g),
+a[e[i]].push(f)}else a[e[i]]=d;return}j&&(e[i]=e[i].replace(W,""),a=a[e[i]](d));if(null===a[e[i]]||a[e[i]]===k)a[e[i]]={};a=a[e[i]]}if(f.match(W))a[f.replace(W,"")](d);else a[f.replace(ca,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Ka(a){return D(a.aoData,"_aData")}function oa(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0;a.aIds={}}function pa(a,b,c){for(var d=-1,e=0,f=a.length;e<f;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===k&&a.splice(d,
+1)}function da(a,b,c,d){var e=a.aoData[b],f,g=function(c,d){for(;c.childNodes.length;)c.removeChild(c.firstChild);c.innerHTML=B(a,b,d,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=Ia(a,e,d,d===k?k:e._aData).data;else{var j=e.anCells;if(j)if(d!==k)g(j[d],d);else{c=0;for(f=j.length;c<f;c++)g(j[c],c)}}e._aSortData=null;e._aFilterData=null;g=a.aoColumns;if(d!==k)g[d].sType=null;else{c=0;for(f=g.length;c<f;c++)g[c].sType=null;La(a,e)}}function Ia(a,b,c,d){var e=[],f=b.firstChild,g,
+j,i=0,m,l=a.aoColumns,q=a._rowReadObject,d=d!==k?d:q?{}:[],t=function(a,b){if("string"===typeof a){var c=a.indexOf("@");-1!==c&&(c=a.substring(c+1),N(a)(d,b.getAttribute(c)))}},G=function(a){if(c===k||c===i)j=l[i],m=h.trim(a.innerHTML),j&&j._bAttrSrc?(N(j.mData._)(d,m),t(j.mData.sort,a),t(j.mData.type,a),t(j.mData.filter,a)):q?(j._setter||(j._setter=N(j.mData)),j._setter(d,m)):d[i]=m;i++};if(f)for(;f;){g=f.nodeName.toUpperCase();if("TD"==g||"TH"==g)G(f),e.push(f);f=f.nextSibling}else{e=b.anCells;
+f=0;for(g=e.length;f<g;f++)G(e[f])}if(b=b.firstChild?b:b.nTr)(b=b.getAttribute("id"))&&N(a.rowId)(d,b);return{data:d,cells:e}}function Ha(a,b,c,d){var e=a.aoData[b],f=e._aData,g=[],j,i,m,l,q;if(null===e.nTr){j=c||H.createElement("tr");e.nTr=j;e.anCells=g;j._DT_RowIndex=b;La(a,e);l=0;for(q=a.aoColumns.length;l<q;l++){m=a.aoColumns[l];i=c?d[l]:H.createElement(m.sCellType);i._DT_CellIndex={row:b,column:l};g.push(i);if((!c||m.mRender||m.mData!==l)&&(!h.isPlainObject(m.mData)||m.mData._!==l+".display"))i.innerHTML=
+B(a,b,l,"display");m.sClass&&(i.className+=" "+m.sClass);m.bVisible&&!c?j.appendChild(i):!m.bVisible&&c&&i.parentNode.removeChild(i);m.fnCreatedCell&&m.fnCreatedCell.call(a.oInstance,i,B(a,b,l),f,b,l)}r(a,"aoRowCreatedCallback",null,[j,f,b,g])}e.nTr.setAttribute("role","row")}function La(a,b){var c=b.nTr,d=b._aData;if(c){var e=a.rowIdFn(d);e&&(c.id=e);d.DT_RowClass&&(e=d.DT_RowClass.split(" "),b.__rowc=b.__rowc?qa(b.__rowc.concat(e)):e,h(c).removeClass(b.__rowc.join(" ")).addClass(d.DT_RowClass));
+d.DT_RowAttr&&h(c).attr(d.DT_RowAttr);d.DT_RowData&&h(c).data(d.DT_RowData)}}function kb(a){var b,c,d,e,f,g=a.nTHead,j=a.nTFoot,i=0===h("th, td",g).length,m=a.oClasses,l=a.aoColumns;i&&(e=h("<tr/>").appendTo(g));b=0;for(c=l.length;b<c;b++)f=l[b],d=h(f.nTh).addClass(f.sClass),i&&d.appendTo(e),a.oFeatures.bSort&&(d.addClass(f.sSortingClass),!1!==f.bSortable&&(d.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),Ma(a,f.nTh,b))),f.sTitle!=d[0].innerHTML&&d.html(f.sTitle),Na(a,"header")(a,d,
+f,m);i&&ea(a.aoHeader,g);h(g).find(">tr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(m.sHeaderTH);h(j).find(">tr>th, >tr>td").addClass(m.sFooterTH);if(null!==j){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=l[b],f.nTf=a[b].cell,f.sClass&&h(f.nTf).addClass(f.sClass)}}function fa(a,b,c){var d,e,f,g=[],j=[],i=a.aoColumns.length,m;if(b){c===k&&(c=!1);d=0;for(e=b.length;d<e;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=i-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);j.push([])}d=
+0;for(e=g.length;d<e;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(m=i=1,j[d][f]===k){a.appendChild(g[d][f].cell);for(j[d][f]=1;g[d+i]!==k&&g[d][f].cell==g[d+i][f].cell;)j[d+i][f]=1,i++;for(;g[d][f+m]!==k&&g[d][f].cell==g[d][f+m].cell;){for(c=0;c<i;c++)j[d+c][f+m]=1;m++}h(g[d][f].cell).attr("rowspan",i).attr("colspan",m)}}}}function P(a){var b=r(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))C(a,!1);else{var b=[],c=0,d=a.asStripeClasses,e=
+d.length,f=a.oLanguage,g=a.iInitDisplayStart,j="ssp"==y(a),i=a.aiDisplay;a.bDrawing=!0;g!==k&&-1!==g&&(a._iDisplayStart=j?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);var g=a._iDisplayStart,m=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(j){if(!a.bDestroying&&!lb(a))return}else a.iDraw++;if(0!==i.length){f=j?a.aoData.length:m;for(j=j?0:g;j<f;j++){var l=i[j],q=a.aoData[l];null===q.nTr&&Ha(a,l);var t=q.nTr;if(0!==e){var G=d[c%e];q._sRowStripe!=G&&(h(t).removeClass(q._sRowStripe).addClass(G),
+q._sRowStripe=G)}r(a,"aoRowCallback",null,[t,q._aData,c,j,l]);b.push(t);c++}}else c=f.sZeroRecords,1==a.iDraw&&"ajax"==y(a)?c=f.sLoadingRecords:f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=h("<tr/>",{"class":e?d[0]:""}).append(h("<td />",{valign:"top",colSpan:V(a),"class":a.oClasses.sRowEmpty}).html(c))[0];r(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Ka(a),g,m,i]);r(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],Ka(a),g,m,i]);d=h(a.nTBody);d.children().detach();
+d.append(h(b));r(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function T(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&mb(a);d?ga(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;P(a);a._drawHold=!1}function nb(a){var b=a.oClasses,c=h(a.nTable),c=h("<div/>").insertBefore(c),d=a.oFeatures,e=h("<div/>",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=
+a.nTable.nextSibling;for(var f=a.sDom.split(""),g,j,i,m,l,q,k=0;k<f.length;k++){g=null;j=f[k];if("<"==j){i=h("<div/>")[0];m=f[k+1];if("'"==m||'"'==m){l="";for(q=2;f[k+q]!=m;)l+=f[k+q],q++;"H"==l?l=b.sJUIHeader:"F"==l&&(l=b.sJUIFooter);-1!=l.indexOf(".")?(m=l.split("."),i.id=m[0].substr(1,m[0].length-1),i.className=m[1]):"#"==l.charAt(0)?i.id=l.substr(1,l.length-1):i.className=l;k+=q}e.append(i);e=h(i)}else if(">"==j)e=e.parent();else if("l"==j&&d.bPaginate&&d.bLengthChange)g=ob(a);else if("f"==j&&
+d.bFilter)g=pb(a);else if("r"==j&&d.bProcessing)g=qb(a);else if("t"==j)g=rb(a);else if("i"==j&&d.bInfo)g=sb(a);else if("p"==j&&d.bPaginate)g=tb(a);else if(0!==n.ext.feature.length){i=n.ext.feature;q=0;for(m=i.length;q<m;q++)if(j==i[q].cFeature){g=i[q].fnInit(a);break}}g&&(i=a.aanFeatures,i[j]||(i[j]=[]),i[j].push(g),e.append(g))}c.replaceWith(e);a.nHolding=null}function ea(a,b){var c=h(b).children("tr"),d,e,f,g,j,i,m,l,q,k;a.splice(0,a.length);f=0;for(i=c.length;f<i;f++)a.push([]);f=0;for(i=c.length;f<
+i;f++){d=c[f];for(e=d.firstChild;e;){if("TD"==e.nodeName.toUpperCase()||"TH"==e.nodeName.toUpperCase()){l=1*e.getAttribute("colspan");q=1*e.getAttribute("rowspan");l=!l||0===l||1===l?1:l;q=!q||0===q||1===q?1:q;g=0;for(j=a[f];j[g];)g++;m=g;k=1===l?!0:!1;for(j=0;j<l;j++)for(g=0;g<q;g++)a[f+g][m+j]={cell:e,unique:k},a[f+g].nTr=d}e=e.nextSibling}}}function ra(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],ea(c,b)));for(var b=0,e=c.length;b<e;b++)for(var f=0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||
+!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function sa(a,b,c){r(a,"aoServerParams","serverParams",[b]);if(b&&h.isArray(b)){var d={},e=/(.*?)\[\]$/;h.each(b,function(a,b){var c=b.name.match(e);c?(c=c[0],d[c]||(d[c]=[]),d[c].push(b.value)):d[b.name]=b.value});b=d}var f,g=a.ajax,j=a.oInstance,i=function(b){r(a,null,"xhr",[a,b,a.jqXHR]);c(b)};if(h.isPlainObject(g)&&g.data){f=g.data;var m="function"===typeof f?f(b,a):f,b="function"===typeof f&&m?m:h.extend(!0,b,m);delete g.data}m={data:b,success:function(b){var c=
+b.error||b.sError;c&&K(a,0,c);a.json=b;i(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,c){var d=r(a,null,"xhr",[a,null,a.jqXHR]);-1===h.inArray(!0,d)&&("parsererror"==c?K(a,0,"Invalid JSON response",1):4===b.readyState&&K(a,0,"Ajax error",7));C(a,!1)}};a.oAjaxData=b;r(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(j,a.sAjaxSource,h.map(b,function(a,b){return{name:b,value:a}}),i,a):a.sAjaxSource||"string"===typeof g?a.jqXHR=h.ajax(h.extend(m,{url:g||a.sAjaxSource})):
+"function"===typeof g?a.jqXHR=g.call(j,b,i,a):(a.jqXHR=h.ajax(h.extend(m,g)),g.data=f)}function lb(a){return a.bAjaxDataGet?(a.iDraw++,C(a,!0),sa(a,ub(a),function(b){vb(a,b)}),!1):!0}function ub(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,f=a.aoPreSearchCols,g,j=[],i,m,l,k=X(a);g=a._iDisplayStart;i=!1!==d.bPaginate?a._iDisplayLength:-1;var t=function(a,b){j.push({name:a,value:b})};t("sEcho",a.iDraw);t("iColumns",c);t("sColumns",D(b,"sName").join(","));t("iDisplayStart",g);t("iDisplayLength",
+i);var G={draw:a.iDraw,columns:[],order:[],start:g,length:i,search:{value:e.sSearch,regex:e.bRegex}};for(g=0;g<c;g++)m=b[g],l=f[g],i="function"==typeof m.mData?"function":m.mData,G.columns.push({data:i,name:m.sName,searchable:m.bSearchable,orderable:m.bSortable,search:{value:l.sSearch,regex:l.bRegex}}),t("mDataProp_"+g,i),d.bFilter&&(t("sSearch_"+g,l.sSearch),t("bRegex_"+g,l.bRegex),t("bSearchable_"+g,m.bSearchable)),d.bSort&&t("bSortable_"+g,m.bSortable);d.bFilter&&(t("sSearch",e.sSearch),t("bRegex",
+e.bRegex));d.bSort&&(h.each(k,function(a,b){G.order.push({column:b.col,dir:b.dir});t("iSortCol_"+a,b.col);t("sSortDir_"+a,b.dir)}),t("iSortingCols",k.length));b=n.ext.legacy.ajax;return null===b?a.sAjaxSource?j:G:b?j:G}function vb(a,b){var c=ta(a,b),d=b.sEcho!==k?b.sEcho:b.draw,e=b.iTotalRecords!==k?b.iTotalRecords:b.recordsTotal,f=b.iTotalDisplayRecords!==k?b.iTotalDisplayRecords:b.recordsFiltered;if(d){if(1*d<a.iDraw)return;a.iDraw=1*d}oa(a);a._iRecordsTotal=parseInt(e,10);a._iRecordsDisplay=parseInt(f,
+10);d=0;for(e=c.length;d<e;d++)O(a,c[d]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;P(a);a._bInitComplete||ua(a,b);a.bAjaxDataGet=!0;C(a,!1)}function ta(a,b){var c=h.isPlainObject(a.ajax)&&a.ajax.dataSrc!==k?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?S(c)(b):b}function pb(a){var b=a.oClasses,c=a.sTableId,d=a.oLanguage,e=a.oPreviousSearch,f=a.aanFeatures,g='<input type="search" class="'+b.sFilterInput+'"/>',j=d.sSearch,j=j.match(/_INPUT_/)?j.replace("_INPUT_",
+g):j+g,b=h("<div/>",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("<label/>").append(j)),f=function(){var b=!this.value?"":this.value;b!=e.sSearch&&(ga(a,{sSearch:b,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive}),a._iDisplayStart=0,P(a))},g=null!==a.searchDelay?a.searchDelay:"ssp"===y(a)?400:0,i=h("input",b).val(e.sSearch).attr("placeholder",d.sSearchPlaceholder).on("keyup.DT search.DT input.DT paste.DT cut.DT",g?Oa(f,g):f).on("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",
+c);h(a.nTable).on("search.dt.DT",function(b,c){if(a===c)try{i[0]!==H.activeElement&&i.val(e.sSearch)}catch(d){}});return b[0]}function ga(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};Ga(a);if("ssp"!=y(a)){wb(a,b.sSearch,c,b.bEscapeRegex!==k?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<e.length;b++)xb(a,e[b].sSearch,b,e[b].bEscapeRegex!==k?!e[b].bEscapeRegex:e[b].bRegex,
+e[b].bSmart,e[b].bCaseInsensitive);yb(a)}else f(b);a.bFiltered=!0;r(a,null,"search",[a])}function yb(a){for(var b=n.ext.search,c=a.aiDisplay,d,e,f=0,g=b.length;f<g;f++){for(var j=[],i=0,m=c.length;i<m;i++)e=c[i],d=a.aoData[e],b[f](a,d._aFilterData,e,d._aData,i)&&j.push(e);c.length=0;h.merge(c,j)}}function xb(a,b,c,d,e,f){if(""!==b){for(var g=[],j=a.aiDisplay,d=Pa(b,d,e,f),e=0;e<j.length;e++)b=a.aoData[j[e]]._aFilterData[c],d.test(b)&&g.push(j[e]);a.aiDisplay=g}}function wb(a,b,c,d,e,f){var d=Pa(b,
+d,e,f),f=a.oPreviousSearch.sSearch,g=a.aiDisplayMaster,j,e=[];0!==n.ext.search.length&&(c=!0);j=zb(a);if(0>=b.length)a.aiDisplay=g.slice();else{if(j||c||f.length>b.length||0!==b.indexOf(f)||a.bSorted)a.aiDisplay=g.slice();b=a.aiDisplay;for(c=0;c<b.length;c++)d.test(a.aoData[b[c]]._sFilterRow)&&e.push(b[c]);a.aiDisplay=e}}function Pa(a,b,c,d){a=b?a:Qa(a);c&&(a="^(?=.*?"+h.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(a){if('"'===a.charAt(0))var b=a.match(/^"(.*)"$/),a=b?b[1]:a;return a.replace('"',
+"")}).join(")(?=.*?")+").*$");return RegExp(a,d?"i":"")}function zb(a){var b=a.aoColumns,c,d,e,f,g,j,i,h,l=n.ext.type.search;c=!1;d=0;for(f=a.aoData.length;d<f;d++)if(h=a.aoData[d],!h._aFilterData){j=[];e=0;for(g=b.length;e<g;e++)c=b[e],c.bSearchable?(i=B(a,d,e,"filter"),l[c.sType]&&(i=l[c.sType](i)),null===i&&(i=""),"string"!==typeof i&&i.toString&&(i=i.toString())):i="",i.indexOf&&-1!==i.indexOf("&")&&(va.innerHTML=i,i=Wb?va.textContent:va.innerText),i.replace&&(i=i.replace(/[\r\n]/g,"")),j.push(i);
+h._aFilterData=j;h._sFilterRow=j.join("  ");c=!0}return c}function Ab(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}function Bb(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function sb(a){var b=a.sTableId,c=a.aanFeatures.i,d=h("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Cb,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),h(a.nTable).attr("aria-describedby",
+b+"_info"));return d[0]}function Cb(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,d=a._iDisplayStart+1,e=a.fnDisplayEnd(),f=a.fnRecordsTotal(),g=a.fnRecordsDisplay(),j=g?c.sInfo:c.sInfoEmpty;g!==f&&(j+=" "+c.sInfoFiltered);j+=c.sInfoPostFix;j=Db(a,j);c=c.fnInfoCallback;null!==c&&(j=c.call(a.oInstance,a,d,e,f,g,j));h(b).html(j)}}function Db(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,f=a.fnRecordsDisplay(),g=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,
+c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,f)).replace(/_PAGE_/g,c.call(a,g?1:Math.ceil(d/e))).replace(/_PAGES_/g,c.call(a,g?1:Math.ceil(f/e)))}function ha(a){var b,c,d=a.iInitDisplayStart,e=a.aoColumns,f;c=a.oFeatures;var g=a.bDeferLoading;if(a.bInitialised){nb(a);kb(a);fa(a,a.aoHeader);fa(a,a.aoFooter);C(a,!0);c.bAutoWidth&&Fa(a);b=0;for(c=e.length;b<c;b++)f=e[b],f.sWidth&&(f.nTh.style.width=v(f.sWidth));r(a,null,"preInit",[a]);T(a);e=
+y(a);if("ssp"!=e||g)"ajax"==e?sa(a,[],function(c){var f=ta(a,c);for(b=0;b<f.length;b++)O(a,f[b]);a.iInitDisplayStart=d;T(a);C(a,!1);ua(a,c)},a):(C(a,!1),ua(a))}else setTimeout(function(){ha(a)},200)}function ua(a,b){a._bInitComplete=!0;(b||a.oInit.aaData)&&$(a);r(a,null,"plugin-init",[a,b]);r(a,"aoInitComplete","init",[a,b])}function Ra(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Sa(a);r(a,null,"length",[a,c])}function ob(a){for(var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=h.isArray(d[0]),f=
+e?d[0]:d,d=e?d[1]:d,e=h("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),g=0,j=f.length;g<j;g++)e[0][g]=new Option("number"===typeof d[g]?a.fnFormatNumber(d[g]):d[g],f[g]);var i=h("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(i[0].id=c+"_length");i.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));h("select",i).val(a._iDisplayLength).on("change.DT",function(){Ra(a,h(this).val());P(a)});h(a.nTable).on("length.dt.DT",function(b,c,d){a===
+c&&h("select",i).val(d)});return i[0]}function tb(a){var b=a.sPaginationType,c=n.ext.pager[b],d="function"===typeof c,e=function(a){P(a)},b=h("<div/>").addClass(a.oClasses.sPaging+b)[0],f=a.aanFeatures;d||c.fnInit(a,b,e);f.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,i=a._iDisplayLength,h=a.fnRecordsDisplay(),l=-1===i,b=l?0:Math.ceil(b/i),i=l?1:Math.ceil(h/i),h=c(b,i),k,l=0;for(k=f.p.length;l<k;l++)Na(a,"pageButton")(a,f.p[l],l,h,b,i)}else c.fnUpdate(a,
+e)},sName:"pagination"}));return b}function Ta(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===e?d=0:"number"===typeof b?(d=b*e,d>f&&(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e<f&&(d+=e):"last"==b?d=Math.floor((f-1)/e)*e:K(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=d;b&&(r(a,null,"page",[a]),c&&P(a));return b}function qb(a){return h("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}
+function C(a,b){a.oFeatures.bProcessing&&h(a.aanFeatures.r).css("display",b?"block":"none");r(a,null,"processing",[a,b])}function rb(a){var b=h(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,f=a.oClasses,g=b.children("caption"),j=g.length?g[0]._captionSide:null,i=h(b[0].cloneNode(!1)),m=h(b[0].cloneNode(!1)),l=b.children("tfoot");l.length||(l=null);i=h("<div/>",{"class":f.sScrollWrapper}).append(h("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",
+position:"relative",border:0,width:d?!d?null:v(d):"100%"}).append(h("<div/>",{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",width:c.sXInner||"100%"}).append(i.removeAttr("id").css("margin-left",0).append("top"===j?g:null).append(b.children("thead"))))).append(h("<div/>",{"class":f.sScrollBody}).css({position:"relative",overflow:"auto",width:!d?null:v(d)}).append(b));l&&i.append(h("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:d?!d?null:v(d):"100%"}).append(h("<div/>",
+{"class":f.sScrollFootInner}).append(m.removeAttr("id").css("margin-left",0).append("bottom"===j?g:null).append(b.children("tfoot")))));var b=i.children(),k=b[0],f=b[1],t=l?b[2]:null;if(d)h(f).on("scroll.DT",function(){var a=this.scrollLeft;k.scrollLeft=a;l&&(t.scrollLeft=a)});h(f).css(e&&c.bCollapse?"max-height":"height",e);a.nScrollHead=k;a.nScrollBody=f;a.nScrollFoot=t;a.aoDrawCallback.push({fn:la,sName:"scrolling"});return i[0]}function la(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY,b=b.iBarWidth,
+f=h(a.nScrollHead),g=f[0].style,j=f.children("div"),i=j[0].style,m=j.children("table"),j=a.nScrollBody,l=h(j),q=j.style,t=h(a.nScrollFoot).children("div"),n=t.children("table"),o=h(a.nTHead),p=h(a.nTable),s=p[0],r=s.style,u=a.nTFoot?h(a.nTFoot):null,x=a.oBrowser,U=x.bScrollOversize,Xb=D(a.aoColumns,"nTh"),Q,L,R,w,Ua=[],y=[],z=[],A=[],B,C=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};L=j.scrollHeight>j.clientHeight;if(a.scrollBarVis!==
+L&&a.scrollBarVis!==k)a.scrollBarVis=L,$(a);else{a.scrollBarVis=L;p.children("thead, tfoot").remove();u&&(R=u.clone().prependTo(p),Q=u.find("tr"),R=R.find("tr"));w=o.clone().prependTo(p);o=o.find("tr");L=w.find("tr");w.find("th, td").removeAttr("tabindex");c||(q.width="100%",f[0].style.width="100%");h.each(ra(a,w),function(b,c){B=aa(a,b);c.style.width=a.aoColumns[B].sWidth});u&&I(function(a){a.style.width=""},R);f=p.outerWidth();if(""===c){r.width="100%";if(U&&(p.find("tbody").height()>j.offsetHeight||
+"scroll"==l.css("overflow-y")))r.width=v(p.outerWidth()-b);f=p.outerWidth()}else""!==d&&(r.width=v(d),f=p.outerWidth());I(C,L);I(function(a){z.push(a.innerHTML);Ua.push(v(h(a).css("width")))},L);I(function(a,b){if(h.inArray(a,Xb)!==-1)a.style.width=Ua[b]},o);h(L).height(0);u&&(I(C,R),I(function(a){A.push(a.innerHTML);y.push(v(h(a).css("width")))},R),I(function(a,b){a.style.width=y[b]},Q),h(R).height(0));I(function(a,b){a.innerHTML='<div class="dataTables_sizing">'+z[b]+"</div>";a.childNodes[0].style.height=
+"0";a.childNodes[0].style.overflow="hidden";a.style.width=Ua[b]},L);u&&I(function(a,b){a.innerHTML='<div class="dataTables_sizing">'+A[b]+"</div>";a.childNodes[0].style.height="0";a.childNodes[0].style.overflow="hidden";a.style.width=y[b]},R);if(p.outerWidth()<f){Q=j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")?f+b:f;if(U&&(j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")))r.width=v(Q-b);(""===c||""!==d)&&K(a,1,"Possible column misalignment",6)}else Q="100%";q.width=v(Q);
+g.width=v(Q);u&&(a.nScrollFoot.style.width=v(Q));!e&&U&&(q.height=v(s.offsetHeight+b));c=p.outerWidth();m[0].style.width=v(c);i.width=v(c);d=p.height()>j.clientHeight||"scroll"==l.css("overflow-y");e="padding"+(x.bScrollbarLeft?"Left":"Right");i[e]=d?b+"px":"0px";u&&(n[0].style.width=v(c),t[0].style.width=v(c),t[0].style[e]=d?b+"px":"0px");p.children("colgroup").insertBefore(p.children("thead"));l.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)j.scrollTop=0}}function I(a,b,c){for(var d=0,e=0,
+f=b.length,g,j;e<f;){g=b[e].firstChild;for(j=c?c[e].firstChild:null;g;)1===g.nodeType&&(c?a(g,j,d):a(g,d),d++),g=g.nextSibling,j=c?j.nextSibling:null;e++}}function Fa(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,e=d.sY,f=d.sX,g=d.sXInner,j=c.length,i=ma(a,"bVisible"),m=h("th",a.nTHead),l=b.getAttribute("width"),k=b.parentNode,t=!1,n,o,p=a.oBrowser,d=p.bScrollOversize;(n=b.style.width)&&-1!==n.indexOf("%")&&(l=n);for(n=0;n<i.length;n++)o=c[i[n]],null!==o.sWidth&&(o.sWidth=Eb(o.sWidthOrig,k),t=!0);if(d||
+!t&&!f&&!e&&j==V(a)&&j==m.length)for(n=0;n<j;n++)i=aa(a,n),null!==i&&(c[i].sWidth=v(m.eq(n).width()));else{j=h(b).clone().css("visibility","hidden").removeAttr("id");j.find("tbody tr").remove();var s=h("<tr/>").appendTo(j.find("tbody"));j.find("thead, tfoot").remove();j.append(h(a.nTHead).clone()).append(h(a.nTFoot).clone());j.find("tfoot th, tfoot td").css("width","");m=ra(a,j.find("thead")[0]);for(n=0;n<i.length;n++)o=c[i[n]],m[n].style.width=null!==o.sWidthOrig&&""!==o.sWidthOrig?v(o.sWidthOrig):
+"",o.sWidthOrig&&f&&h(m[n]).append(h("<div/>").css({width:o.sWidthOrig,margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(n=0;n<i.length;n++)t=i[n],o=c[t],h(Fb(a,t)).clone(!1).append(o.sContentPadding).appendTo(s);h("[name]",j).removeAttr("name");o=h("<div/>").css(f||e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(j).appendTo(k);f&&g?j.width(g):f?(j.css("width","auto"),j.removeAttr("width"),j.width()<k.clientWidth&&l&&j.width(k.clientWidth)):e?j.width(k.clientWidth):
+l&&j.width(l);for(n=e=0;n<i.length;n++)k=h(m[n]),g=k.outerWidth()-k.width(),k=p.bBounding?Math.ceil(m[n].getBoundingClientRect().width):k.outerWidth(),e+=k,c[i[n]].sWidth=v(k-g);b.style.width=v(e);o.remove()}l&&(b.style.width=v(l));if((l||f)&&!a._reszEvt)b=function(){h(E).on("resize.DT-"+a.sInstance,Oa(function(){$(a)}))},d?setTimeout(b,1E3):b(),a._reszEvt=!0}function Eb(a,b){if(!a)return 0;var c=h("<div/>").css("width",v(a)).appendTo(b||H.body),d=c[0].offsetWidth;c.remove();return d}function Fb(a,
+b){var c=Gb(a,b);if(0>c)return null;var d=a.aoData[c];return!d.nTr?h("<td/>").html(B(a,c,b,"display"))[0]:d.anCells[b]}function Gb(a,b){for(var c,d=-1,e=-1,f=0,g=a.aoData.length;f<g;f++)c=B(a,f,b,"display")+"",c=c.replace(Yb,""),c=c.replace(/&nbsp;/g," "),c.length>d&&(d=c.length,e=f);return e}function v(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function X(a){var b,c,d=[],e=a.aoColumns,f,g,j,i;b=a.aaSortingFixed;c=h.isPlainObject(b);var m=[];f=function(a){a.length&&
+!h.isArray(a[0])?m.push(a):h.merge(m,a)};h.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<m.length;a++){i=m[a][0];f=e[i].aDataSort;b=0;for(c=f.length;b<c;b++)g=f[b],j=e[g].sType||"string",m[a]._idx===k&&(m[a]._idx=h.inArray(m[a][1],e[g].asSorting)),d.push({src:i,col:g,dir:m[a][1],index:m[a]._idx,type:j,formatter:n.ext.type.order[j+"-pre"]})}return d}function mb(a){var b,c,d=[],e=n.ext.type.order,f=a.aoData,g=0,j,i=a.aiDisplayMaster,h;Ga(a);h=X(a);b=0;for(c=h.length;b<
+c;b++)j=h[b],j.formatter&&g++,Hb(a,j.col);if("ssp"!=y(a)&&0!==h.length){b=0;for(c=i.length;b<c;b++)d[i[b]]=b;g===h.length?i.sort(function(a,b){var c,e,g,j,i=h.length,k=f[a]._aSortData,n=f[b]._aSortData;for(g=0;g<i;g++)if(j=h[g],c=k[j.col],e=n[j.col],c=c<e?-1:c>e?1:0,0!==c)return"asc"===j.dir?c:-c;c=d[a];e=d[b];return c<e?-1:c>e?1:0}):i.sort(function(a,b){var c,g,j,i,k=h.length,n=f[a]._aSortData,o=f[b]._aSortData;for(j=0;j<k;j++)if(i=h[j],c=n[i.col],g=o[i.col],i=e[i.type+"-"+i.dir]||e["string-"+i.dir],
+c=i(c,g),0!==c)return c;c=d[a];g=d[b];return c<g?-1:c>g?1:0})}a.bSorted=!0}function Ib(a){for(var b,c,d=a.aoColumns,e=X(a),a=a.oLanguage.oAria,f=0,g=d.length;f<g;f++){c=d[f];var j=c.asSorting;b=c.sTitle.replace(/<.*?>/g,"");var i=c.nTh;i.removeAttribute("aria-sort");c.bSortable&&(0<e.length&&e[0].col==f?(i.setAttribute("aria-sort","asc"==e[0].dir?"ascending":"descending"),c=j[e[0].index+1]||j[0]):c=j[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);i.setAttribute("aria-label",b)}}function Va(a,
+b,c,d){var e=a.aaSorting,f=a.aoColumns[b].asSorting,g=function(a,b){var c=a._idx;c===k&&(c=h.inArray(a[1],f));return c+1<f.length?c+1:b?null:0};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=h.inArray(b,D(e,"0")),-1!==c?(b=g(e[c],!0),null===b&&1===e.length&&(b=0),null===b?e.splice(c,1):(e[c][1]=f[b],e[c]._idx=b)):(e.push([b,f[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=g(e[0]),e.length=1,e[0][1]=f[b],e[0]._idx=b):(e.length=0,e.push([b,f[0]]),e[0]._idx=0);T(a);"function"==
+typeof d&&d(a)}function Ma(a,b,c,d){var e=a.aoColumns[c];Wa(b,{},function(b){!1!==e.bSortable&&(a.oFeatures.bProcessing?(C(a,!0),setTimeout(function(){Va(a,c,b.shiftKey,d);"ssp"!==y(a)&&C(a,!1)},0)):Va(a,c,b.shiftKey,d))})}function wa(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,d=X(a),e=a.oFeatures,f,g;if(e.bSort&&e.bSortClasses){e=0;for(f=b.length;e<f;e++)g=b[e].src,h(D(a.aoData,"anCells",g)).removeClass(c+(2>e?e+1:3));e=0;for(f=d.length;e<f;e++)g=d[e].src,h(D(a.aoData,"anCells",g)).addClass(c+
+(2>e?e+1:3))}a.aLastSort=d}function Hb(a,b){var c=a.aoColumns[b],d=n.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,ba(a,b)));for(var f,g=n.ext.type.order[c.sType+"-pre"],j=0,i=a.aoData.length;j<i;j++)if(c=a.aoData[j],c._aSortData||(c._aSortData=[]),!c._aSortData[b]||d)f=d?e[j]:B(a,j,b,"sort"),c._aSortData[b]=g?g(f):f}function xa(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:h.extend(!0,[],a.aaSorting),search:Ab(a.oPreviousSearch),
+columns:h.map(a.aoColumns,function(b,d){return{visible:b.bVisible,search:Ab(a.aoPreSearchCols[d])}})};r(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=b;a.fnStateSaveCallback.call(a.oInstance,a,b)}}function Jb(a,b,c){var d,e,f=a.aoColumns,b=function(b){if(b&&b.time){var g=r(a,"aoStateLoadParams","stateLoadParams",[a,b]);if(-1===h.inArray(!1,g)&&(g=a.iStateDuration,!(0<g&&b.time<+new Date-1E3*g)&&!(b.columns&&f.length!==b.columns.length))){a.oLoadedState=h.extend(!0,{},b);b.start!==k&&
+(a._iDisplayStart=b.start,a.iInitDisplayStart=b.start);b.length!==k&&(a._iDisplayLength=b.length);b.order!==k&&(a.aaSorting=[],h.each(b.order,function(b,c){a.aaSorting.push(c[0]>=f.length?[0,c[1]]:c)}));b.search!==k&&h.extend(a.oPreviousSearch,Bb(b.search));if(b.columns){d=0;for(e=b.columns.length;d<e;d++)g=b.columns[d],g.visible!==k&&(f[d].bVisible=g.visible),g.search!==k&&h.extend(a.aoPreSearchCols[d],Bb(g.search))}r(a,"aoStateLoaded","stateLoaded",[a,b])}}c()};if(a.oFeatures.bStateSave){var g=
+a.fnStateLoadCallback.call(a.oInstance,a,b);g!==k&&b(g)}else c()}function ya(a){var b=n.settings,a=h.inArray(a,D(b,"nTable"));return-1!==a?b[a]:null}function K(a,b,c,d){c="DataTables warning: "+(a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+d);if(b)E.console&&console.log&&console.log(c);else if(b=n.ext,b=b.sErrMode||b.errMode,a&&r(a,null,"error",[a,d,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==
+typeof b&&b(a,d,c)}}function F(a,b,c,d){h.isArray(c)?h.each(c,function(c,d){h.isArray(d)?F(a,b,d[0],d[1]):F(a,b,d)}):(d===k&&(d=c),b[c]!==k&&(a[d]=b[c]))}function Xa(a,b,c){var d,e;for(e in b)b.hasOwnProperty(e)&&(d=b[e],h.isPlainObject(d)?(h.isPlainObject(a[e])||(a[e]={}),h.extend(!0,a[e],d)):a[e]=c&&"data"!==e&&"aaData"!==e&&h.isArray(d)?d.slice():d);return a}function Wa(a,b,c){h(a).on("click.DT",b,function(b){h(a).blur();c(b)}).on("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).on("selectstart.DT",
+function(){return!1})}function z(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function r(a,b,c,d){var e=[];b&&(e=h.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,d)}));null!==c&&(b=h.Event(c+".dt"),h(a.nTable).trigger(b,d),e.push(b.result));return e}function Sa(a){var b=a._iDisplayStart,c=a.fnDisplayEnd(),d=a._iDisplayLength;b>=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Na(a,b){var c=a.renderer,d=n.ext.renderer[b];return h.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===
+typeof c?d[c]||d._:d._}function y(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function ia(a,b){var c=[],c=Kb.numbers_length,d=Math.floor(c/2);b<=c?c=Y(0,b):a<=d?(c=Y(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-d?c=Y(b-(c-2),b):(c=Y(a-d+2,a+d-1),c.push("ellipsis"),c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function Da(a){h.each({num:function(b){return za(b,a)},"num-fmt":function(b){return za(b,a,Ya)},"html-num":function(b){return za(b,
+a,Aa)},"html-num-fmt":function(b){return za(b,a,Aa,Ya)}},function(b,c){x.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(x.type.search[b+a]=x.type.search.html)})}function Lb(a){return function(){var b=[ya(this[n.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return n.ext.internal[a].apply(this,b)}}var n=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new s(ya(this[x.iApiIndex])):new s(this)};
+this.fnAddData=function(a,b){var c=this.api(!0),d=h.isArray(a)&&(h.isArray(a[0])||h.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===k||b)&&c.draw();return d.flatten().toArray()};this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===k||a?b.draw(!1):(""!==d.sX||""!==d.sY)&&la(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===k||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,
+b,c){var d=this.api(!0),a=d.rows(a),e=a.settings()[0],h=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,h);(c===k||c)&&d.draw();return h};this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,d,e,h){e=this.api(!0);null===b||b===k?e.search(a,c,d,h):e.column(b).search(a,c,d,h);e.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==k){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==k||"td"==d||"th"==d?c.cell(a,b).data():
+c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==k?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};
+this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===k||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===k||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return ya(this[x.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var h=this.api(!0);c===k||null===c?h.row(b).data(a):h.cell(b,c).data(a);(e===k||e)&&h.columns.adjust();
+(d===k||d)&&h.draw();return 0};this.fnVersionCheck=x.fnVersionCheck;var b=this,c=a===k,d=this.length;c&&(a={});this.oApi=this.internal=x.internal;for(var e in n.ext.internal)e&&(this[e]=Lb(e));this.each(function(){var e={},g=1<d?Xa(e,a,!0):a,j=0,i,e=this.getAttribute("id"),m=!1,l=n.defaults,q=h(this);if("table"!=this.nodeName.toLowerCase())K(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{eb(l);fb(l.column);J(l,l,!0);J(l.column,l.column,!0);J(l,h.extend(g,q.data()));var t=n.settings,
+j=0;for(i=t.length;j<i;j++){var o=t[j];if(o.nTable==this||o.nTHead&&o.nTHead.parentNode==this||o.nTFoot&&o.nTFoot.parentNode==this){var s=g.bRetrieve!==k?g.bRetrieve:l.bRetrieve;if(c||s)return o.oInstance;if(g.bDestroy!==k?g.bDestroy:l.bDestroy){o.oInstance.fnDestroy();break}else{K(o,0,"Cannot reinitialise DataTable",3);return}}if(o.sTableId==this.id){t.splice(j,1);break}}if(null===e||""===e)this.id=e="DataTables_Table_"+n.ext._unique++;var p=h.extend(!0,{},n.models.oSettings,{sDestroyWidth:q[0].style.width,
+sInstance:e,sTableId:e});p.nTable=this;p.oApi=b.internal;p.oInit=g;t.push(p);p.oInstance=1===b.length?b:q.dataTable();eb(g);Ca(g.oLanguage);g.aLengthMenu&&!g.iDisplayLength&&(g.iDisplayLength=h.isArray(g.aLengthMenu[0])?g.aLengthMenu[0][0]:g.aLengthMenu[0]);g=Xa(h.extend(!0,{},l),g);F(p.oFeatures,g,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));F(p,g,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod",
+"aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback","renderer","searchDelay","rowId",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"]]);F(p.oScroll,g,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);F(p.oLanguage,g,"fnInfoCallback");
+z(p,"aoDrawCallback",g.fnDrawCallback,"user");z(p,"aoServerParams",g.fnServerParams,"user");z(p,"aoStateSaveParams",g.fnStateSaveParams,"user");z(p,"aoStateLoadParams",g.fnStateLoadParams,"user");z(p,"aoStateLoaded",g.fnStateLoaded,"user");z(p,"aoRowCallback",g.fnRowCallback,"user");z(p,"aoRowCreatedCallback",g.fnCreatedRow,"user");z(p,"aoHeaderCallback",g.fnHeaderCallback,"user");z(p,"aoFooterCallback",g.fnFooterCallback,"user");z(p,"aoInitComplete",g.fnInitComplete,"user");z(p,"aoPreDrawCallback",
+g.fnPreDrawCallback,"user");p.rowIdFn=S(g.rowId);gb(p);var u=p.oClasses;h.extend(u,n.ext.classes,g.oClasses);q.addClass(u.sTable);p.iInitDisplayStart===k&&(p.iInitDisplayStart=g.iDisplayStart,p._iDisplayStart=g.iDisplayStart);null!==g.iDeferLoading&&(p.bDeferLoading=!0,e=h.isArray(g.iDeferLoading),p._iRecordsDisplay=e?g.iDeferLoading[0]:g.iDeferLoading,p._iRecordsTotal=e?g.iDeferLoading[1]:g.iDeferLoading);var v=p.oLanguage;h.extend(!0,v,g.oLanguage);v.sUrl&&(h.ajax({dataType:"json",url:v.sUrl,success:function(a){Ca(a);
+J(l.oLanguage,a);h.extend(true,v,a);ha(p)},error:function(){ha(p)}}),m=!0);null===g.asStripeClasses&&(p.asStripeClasses=[u.sStripeOdd,u.sStripeEven]);var e=p.asStripeClasses,x=q.children("tbody").find("tr").eq(0);-1!==h.inArray(!0,h.map(e,function(a){return x.hasClass(a)}))&&(h("tbody tr",this).removeClass(e.join(" ")),p.asDestroyStripes=e.slice());e=[];t=this.getElementsByTagName("thead");0!==t.length&&(ea(p.aoHeader,t[0]),e=ra(p));if(null===g.aoColumns){t=[];j=0;for(i=e.length;j<i;j++)t.push(null)}else t=
+g.aoColumns;j=0;for(i=t.length;j<i;j++)Ea(p,e?e[j]:null);ib(p,g.aoColumnDefs,t,function(a,b){ka(p,a,b)});if(x.length){var w=function(a,b){return a.getAttribute("data-"+b)!==null?b:null};h(x[0]).children("th, td").each(function(a,b){var c=p.aoColumns[a];if(c.mData===a){var d=w(b,"sort")||w(b,"order"),e=w(b,"filter")||w(b,"search");if(d!==null||e!==null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:k,type:d!==null?a+".@data-"+d:k,filter:e!==null?a+".@data-"+e:k};ka(p,a)}}})}var U=p.oFeatures,
+e=function(){if(g.aaSorting===k){var a=p.aaSorting;j=0;for(i=a.length;j<i;j++)a[j][1]=p.aoColumns[j].asSorting[0]}wa(p);U.bSort&&z(p,"aoDrawCallback",function(){if(p.bSorted){var a=X(p),b={};h.each(a,function(a,c){b[c.src]=c.dir});r(p,null,"order",[p,a,b]);Ib(p)}});z(p,"aoDrawCallback",function(){(p.bSorted||y(p)==="ssp"||U.bDeferRender)&&wa(p)},"sc");var a=q.children("caption").each(function(){this._captionSide=h(this).css("caption-side")}),b=q.children("thead");b.length===0&&(b=h("<thead/>").appendTo(q));
+p.nTHead=b[0];b=q.children("tbody");b.length===0&&(b=h("<tbody/>").appendTo(q));p.nTBody=b[0];b=q.children("tfoot");if(b.length===0&&a.length>0&&(p.oScroll.sX!==""||p.oScroll.sY!==""))b=h("<tfoot/>").appendTo(q);if(b.length===0||b.children().length===0)q.addClass(u.sNoFooter);else if(b.length>0){p.nTFoot=b[0];ea(p.aoFooter,p.nTFoot)}if(g.aaData)for(j=0;j<g.aaData.length;j++)O(p,g.aaData[j]);else(p.bDeferLoading||y(p)=="dom")&&na(p,h(p.nTBody).children("tr"));p.aiDisplay=p.aiDisplayMaster.slice();
+p.bInitialised=true;m===false&&ha(p)};g.bStateSave?(U.bStateSave=!0,z(p,"aoDrawCallback",xa,"state_save"),Jb(p,g,e)):e()}});b=null;return this},x,s,o,u,Za={},Mb=/[\r\n]/g,Aa=/<.*?>/g,Zb=/^\d{2,4}[\.\/\-]\d{1,2}[\.\/\-]\d{1,2}([T ]{1}\d{1,2}[:\.]\d{2}([\.:]\d{2})?)?$/,$b=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Ya=/[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi,M=function(a){return!a||!0===a||"-"===a?!0:!1},Nb=function(a){var b=parseInt(a,10);return!isNaN(b)&&
+isFinite(a)?b:null},Ob=function(a,b){Za[b]||(Za[b]=RegExp(Qa(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,"").replace(Za[b],"."):a},$a=function(a,b,c){var d="string"===typeof a;if(M(a))return!0;b&&d&&(a=Ob(a,b));c&&d&&(a=a.replace(Ya,""));return!isNaN(parseFloat(a))&&isFinite(a)},Pb=function(a,b,c){return M(a)?!0:!(M(a)||"string"===typeof a)?null:$a(a.replace(Aa,""),b,c)?!0:null},D=function(a,b,c){var d=[],e=0,f=a.length;if(c!==k)for(;e<f;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<
+f;e++)a[e]&&d.push(a[e][b]);return d},ja=function(a,b,c,d){var e=[],f=0,g=b.length;if(d!==k)for(;f<g;f++)a[b[f]][c]&&e.push(a[b[f]][c][d]);else for(;f<g;f++)e.push(a[b[f]][c]);return e},Y=function(a,b){var c=[],d;b===k?(b=0,d=a):(d=b,b=a);for(var e=b;e<d;e++)c.push(e);return c},Qb=function(a){for(var b=[],c=0,d=a.length;c<d;c++)a[c]&&b.push(a[c]);return b},qa=function(a){var b;a:{if(!(2>a.length)){b=a.slice().sort();for(var c=b[0],d=1,e=b.length;d<e;d++){if(b[d]===c){b=!1;break a}c=b[d]}}b=!0}if(b)return a.slice();
+b=[];var e=a.length,f,g=0,d=0;a:for(;d<e;d++){c=a[d];for(f=0;f<g;f++)if(b[f]===c)continue a;b.push(c);g++}return b};n.util={throttle:function(a,b){var c=b!==k?b:200,d,e;return function(){var b=this,g=+new Date,j=arguments;d&&g<d+c?(clearTimeout(e),e=setTimeout(function(){d=k;a.apply(b,j)},c)):(d=g,a.apply(b,j))}},escapeRegex:function(a){return a.replace($b,"\\$1")}};var A=function(a,b,c){a[b]!==k&&(a[c]=a[b])},ca=/\[.*?\]$/,W=/\(\)$/,Qa=n.util.escapeRegex,va=h("<div>")[0],Wb=va.textContent!==k,Yb=
+/<.*?>/g,Oa=n.util.throttle,Rb=[],w=Array.prototype,ac=function(a){var b,c,d=n.settings,e=h.map(d,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=h.inArray(a,e),-1!==b?[d[b]]:null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?c=h(a):a instanceof h&&(c=a)}else return[];if(c)return c.map(function(){b=h.inArray(this,e);return-1!==b?d[b]:null}).toArray()};s=function(a,b){if(!(this instanceof
+s))return new s(a,b);var c=[],d=function(a){(a=ac(a))&&(c=c.concat(a))};if(h.isArray(a))for(var e=0,f=a.length;e<f;e++)d(a[e]);else d(a);this.context=qa(c);b&&h.merge(this,b);this.selector={rows:null,cols:null,opts:null};s.extend(this,this,Rb)};n.Api=s;h.extend(s.prototype,{any:function(){return 0!==this.count()},concat:w.concat,context:[],count:function(){return this.flatten().length},each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=
+this.context;return b.length>a?new s(b[a],this[a]):null},filter:function(a){var b=[];if(w.filter)b=w.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new s(this.context,b)},flatten:function(){var a=[];return new s(this.context,a.concat.apply(a,this.toArray()))},join:w.join,indexOf:w.indexOf||function(a,b){for(var c=b||0,d=this.length;c<d;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c,d){var e=[],f,g,j,h,m,l=this.context,
+n,o,u=this.selector;"string"===typeof a&&(d=c,c=b,b=a,a=!1);g=0;for(j=l.length;g<j;g++){var r=new s(l[g]);if("table"===b)f=c.call(r,l[g],g),f!==k&&e.push(f);else if("columns"===b||"rows"===b)f=c.call(r,l[g],this[g],g),f!==k&&e.push(f);else if("column"===b||"column-rows"===b||"row"===b||"cell"===b){o=this[g];"column-rows"===b&&(n=Ba(l[g],u.opts));h=0;for(m=o.length;h<m;h++)f=o[h],f="cell"===b?c.call(r,l[g],f.row,f.column,g,h):c.call(r,l[g],f,g,h,n),f!==k&&e.push(f)}}return e.length||d?(a=new s(l,a?
+e.concat.apply([],e):e),b=a.selector,b.rows=u.rows,b.cols=u.cols,b.opts=u.opts,a):this},lastIndexOf:w.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(w.map)b=w.map.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new s(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:w.pop,push:w.push,reduce:w.reduce||function(a,b){return hb(this,a,b,0,this.length,
+1)},reduceRight:w.reduceRight||function(a,b){return hb(this,a,b,this.length-1,-1,-1)},reverse:w.reverse,selector:null,shift:w.shift,slice:function(){return new s(this.context,this)},sort:w.sort,splice:w.splice,toArray:function(){return w.slice.call(this)},to$:function(){return h(this)},toJQuery:function(){return h(this)},unique:function(){return new s(this.context,qa(this))},unshift:w.unshift});s.extend=function(a,b,c){if(c.length&&b&&(b instanceof s||b.__dt_wrapper)){var d,e,f,g=function(a,b,c){return function(){var d=
+b.apply(a,arguments);s.extend(d,d,c.methodExt);return d}};d=0;for(e=c.length;d<e;d++)f=c[d],b[f.name]="function"===typeof f.val?g(a,f.val,f):h.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,s.extend(a,b[f.name],f.propExt)}};s.register=o=function(a,b){if(h.isArray(a))for(var c=0,d=a.length;c<d;c++)s.register(a[c],b);else for(var e=a.split("."),f=Rb,g,j,c=0,d=e.length;c<d;c++){g=(j=-1!==e[c].indexOf("()"))?e[c].replace("()",""):e[c];var i;a:{i=0;for(var m=f.length;i<m;i++)if(f[i].name===g){i=
+f[i];break a}i=null}i||(i={name:g,val:{},methodExt:[],propExt:[]},f.push(i));c===d-1?i.val=b:f=j?i.methodExt:i.propExt}};s.registerPlural=u=function(a,b,c){s.register(a,c);s.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof s?a.length?h.isArray(a[0])?new s(a.context,a[0]):a[0]:k:a})};o("tables()",function(a){var b;if(a){b=s;var c=this.context;if("number"===typeof a)a=[c[a]];else var d=h.map(c,function(a){return a.nTable}),a=h(d).filter(a).map(function(){var a=h.inArray(this,
+d);return c[a]}).toArray();b=new b(a)}else b=this;return b});o("table()",function(a){var a=this.tables(a),b=a.context;return b.length?new s(b[0]):a});u("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable},1)});u("tables().body()","table().body()",function(){return this.iterator("table",function(a){return a.nTBody},1)});u("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});u("tables().footer()",
+"table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot},1)});u("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});o("draw()",function(a){return this.iterator("table",function(b){"page"===a?P(b):("string"===typeof a&&(a="full-hold"===a?!1:!0),T(b,!1===a))})});o("page()",function(a){return a===k?this.page.info().page:this.iterator("table",function(b){Ta(b,a)})});o("page.info()",function(){if(0===
+this.context.length)return k;var a=this.context[0],b=a._iDisplayStart,c=a.oFeatures.bPaginate?a._iDisplayLength:-1,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d,serverSide:"ssp"===y(a)}});o("page.len()",function(a){return a===k?0!==this.context.length?this.context[0]._iDisplayLength:k:this.iterator("table",function(b){Ra(b,a)})});var Sb=function(a,b,c){if(c){var d=new s(a);
+d.one("draw",function(){c(d.ajax.json())})}if("ssp"==y(a))T(a,b);else{C(a,!0);var e=a.jqXHR;e&&4!==e.readyState&&e.abort();sa(a,[],function(c){oa(a);for(var c=ta(a,c),d=0,e=c.length;d<e;d++)O(a,c[d]);T(a,b);C(a,!1)})}};o("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});o("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});o("ajax.reload()",function(a,b){return this.iterator("table",function(c){Sb(c,!1===b,a)})});o("ajax.url()",function(a){var b=
+this.context;if(a===k){if(0===b.length)return k;b=b[0];return b.ajax?h.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){h.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});o("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Sb(c,!1===b,a)})});var ab=function(a,b,c,d,e){var f=[],g,j,i,m,l,n;i=typeof b;if(!b||"string"===i||"function"===i||b.length===k)b=[b];i=0;for(m=b.length;i<m;i++){j=b[i]&&b[i].split&&!b[i].match(/[\[\(:]/)?b[i].split(","):
+[b[i]];l=0;for(n=j.length;l<n;l++)(g=c("string"===typeof j[l]?h.trim(j[l]):j[l]))&&g.length&&(f=f.concat(g))}a=x.selector[a];if(a.length){i=0;for(m=a.length;i<m;i++)f=a[i](d,e,f)}return qa(f)},bb=function(a){a||(a={});a.filter&&a.search===k&&(a.search=a.filter);return h.extend({search:"none",order:"current",page:"all"},a)},cb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Ba=function(a,b){var c,
+d,e,f=[],g=a.aiDisplay;e=a.aiDisplayMaster;var j=b.search;c=b.order;d=b.page;if("ssp"==y(a))return"removed"===j?[]:Y(0,e.length);if("current"==d){c=a._iDisplayStart;for(d=a.fnDisplayEnd();c<d;c++)f.push(g[c])}else if("current"==c||"applied"==c)if("none"==j)f=e.slice();else if("applied"==j)f=g.slice();else{if("removed"==j){var i={};c=0;for(d=g.length;c<d;c++)i[g[c]]=null;f=h.map(e,function(a){return!i.hasOwnProperty(a)?a:null})}}else if("index"==c||"original"==c){c=0;for(d=a.aoData.length;c<d;c++)"none"==
+j?f.push(c):(e=h.inArray(c,g),(-1===e&&"removed"==j||0<=e&&"applied"==j)&&f.push(c))}return f};o("rows()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=bb(b),c=this.iterator("table",function(c){var e=b,f;return ab("row",a,function(a){var b=Nb(a),i=c.aoData;if(b!==null&&!e)return[b];f||(f=Ba(c,e));if(b!==null&&h.inArray(b,f)!==-1)return[b];if(a===null||a===k||a==="")return f;if(typeof a==="function")return h.map(f,function(b){var c=i[b];return a(b,c._aData,c.nTr)?b:null});if(a.nodeName){var b=
+a._DT_RowIndex,m=a._DT_CellIndex;if(b!==k)return i[b]&&i[b].nTr===a?[b]:[];if(m)return i[m.row]&&i[m.row].nTr===a?[m.row]:[];b=h(a).closest("*[data-dt-row]");return b.length?[b.data("dt-row")]:[]}if(typeof a==="string"&&a.charAt(0)==="#"){b=c.aIds[a.replace(/^#/,"")];if(b!==k)return[b.idx]}b=Qb(ja(c.aoData,f,"nTr"));return h(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()},c,e)},1);c.selector.rows=a;c.selector.opts=b;return c});o("rows().nodes()",function(){return this.iterator("row",
+function(a,b){return a.aoData[b].nTr||k},1)});o("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return ja(a.aoData,b,"_aData")},1)});u("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData:d._aSortData},1)});u("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,c){da(b,c,a)})});u("rows().indexes()","row().index()",function(){return this.iterator("row",
+function(a,b){return b},1)});u("rows().ids()","row().id()",function(a){for(var b=[],c=this.context,d=0,e=c.length;d<e;d++)for(var f=0,g=this[d].length;f<g;f++){var h=c[d].rowIdFn(c[d].aoData[this[d][f]]._aData);b.push((!0===a?"#":"")+h)}return new s(c,b)});u("rows().remove()","row().remove()",function(){var a=this;this.iterator("row",function(b,c,d){var e=b.aoData,f=e[c],g,h,i,m,l;e.splice(c,1);g=0;for(h=e.length;g<h;g++)if(i=e[g],l=i.anCells,null!==i.nTr&&(i.nTr._DT_RowIndex=g),null!==l){i=0;for(m=
+l.length;i<m;i++)l[i]._DT_CellIndex.row=g}pa(b.aiDisplayMaster,c);pa(b.aiDisplay,c);pa(a[d],c,!1);0<b._iRecordsDisplay&&b._iRecordsDisplay--;Sa(b);c=b.rowIdFn(f._aData);c!==k&&delete b.aIds[c]});this.iterator("table",function(a){for(var c=0,d=a.aoData.length;c<d;c++)a.aoData[c].idx=c});return this});o("rows.add()",function(a){var b=this.iterator("table",function(b){var c,f,g,h=[];f=0;for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?h.push(na(b,c)[0]):h.push(O(b,c));return h},
+1),c=this.rows(-1);c.pop();h.merge(c,b);return c});o("row()",function(a,b){return cb(this.rows(a,b))});o("row().data()",function(a){var b=this.context;if(a===k)return b.length&&this.length?b[0].aoData[this[0]]._aData:k;var c=b[0].aoData[this[0]];c._aData=a;h.isArray(a)&&c.nTr.id&&N(b[0].rowId)(a,c.nTr.id);da(b[0],this[0],"data");return this});o("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||null:null});o("row.add()",function(a){a instanceof h&&
+a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?na(b,a)[0]:O(b,a)});return this.row(b[0])});var db=function(a,b){var c=a.context;if(c.length&&(c=c[0].aoData[b!==k?b:a[0]])&&c._details)c._details.remove(),c._detailsShow=k,c._details=k},Tb=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];if(d._details){(d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach();var e=c[0],f=new s(e),g=e.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");
+0<D(g,"_details").length&&(f.on("draw.dt.DT_details",function(a,b){e===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(e===b)for(var c,d=V(b),f=0,h=g.length;f<h;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",d)}),f.on("destroy.dt.DT_details",function(a,b){if(e===b)for(var c=0,d=g.length;c<d;c++)g[c]._details&&db(f,c)}))}}};o("row().child()",function(a,b){var c=
+this.context;if(a===k)return c.length&&this.length?c[0].aoData[this[0]]._details:k;if(!0===a)this.child.show();else if(!1===a)db(this);else if(c.length&&this.length){var d=c[0],c=c[0].aoData[this[0]],e=[],f=function(a,b){if(h.isArray(a)||a instanceof h)for(var c=0,k=a.length;c<k;c++)f(a[c],b);else a.nodeName&&"tr"===a.nodeName.toLowerCase()?e.push(a):(c=h("<tr><td/></tr>").addClass(b),h("td",c).addClass(b).html(a)[0].colSpan=V(d),e.push(c[0]))};f(a,b);c._details&&c._details.detach();c._details=h(e);
+c._detailsShow&&c._details.insertAfter(c.nTr)}return this});o(["row().child.show()","row().child().show()"],function(){Tb(this,!0);return this});o(["row().child.hide()","row().child().hide()"],function(){Tb(this,!1);return this});o(["row().child.remove()","row().child().remove()"],function(){db(this);return this});o("row().child.isShown()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var bc=/^([^:]+):(name|visIdx|visible)$/,Ub=function(a,b,
+c,d,e){for(var c=[],d=0,f=e.length;d<f;d++)c.push(B(a,e[d],b));return c};o("columns()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=bb(b),c=this.iterator("table",function(c){var e=a,f=b,g=c.aoColumns,j=D(g,"sName"),i=D(g,"nTh");return ab("column",e,function(a){var b=Nb(a);if(a==="")return Y(g.length);if(b!==null)return[b>=0?b:g.length+b];if(typeof a==="function"){var e=Ba(c,f);return h.map(g,function(b,f){return a(f,Ub(c,f,0,0,e),i[f])?f:null})}var k=typeof a==="string"?a.match(bc):
+"";if(k)switch(k[2]){case "visIdx":case "visible":b=parseInt(k[1],10);if(b<0){var n=h.map(g,function(a,b){return a.bVisible?b:null});return[n[n.length+b]]}return[aa(c,b)];case "name":return h.map(j,function(a,b){return a===k[1]?b:null});default:return[]}if(a.nodeName&&a._DT_CellIndex)return[a._DT_CellIndex.column];b=h(i).filter(a).map(function(){return h.inArray(this,i)}).toArray();if(b.length||!a.nodeName)return b;b=h(a).closest("*[data-dt-column]");return b.length?[b.data("dt-column")]:[]},c,f)},
+1);c.selector.cols=a;c.selector.opts=b;return c});u("columns().header()","column().header()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});u("columns().footer()","column().footer()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});u("columns().data()","column().data()",function(){return this.iterator("column-rows",Ub,1)});u("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},
+1)});u("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,f){return ja(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});u("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return ja(a.aoData,e,"anCells",b)},1)});u("columns().visible()","column().visible()",function(a,b){var c=this.iterator("column",function(b,c){if(a===k)return b.aoColumns[c].bVisible;var f=b.aoColumns,g=f[c],j=b.aoData,
+i,m,l;if(a!==k&&g.bVisible!==a){if(a){var n=h.inArray(!0,D(f,"bVisible"),c+1);i=0;for(m=j.length;i<m;i++)l=j[i].nTr,f=j[i].anCells,l&&l.insertBefore(f[c],f[n]||null)}else h(D(b.aoData,"anCells",c)).detach();g.bVisible=a;fa(b,b.aoHeader);fa(b,b.aoFooter);b.aiDisplay.length||h(b.nTBody).find("td[colspan]").attr("colspan",V(b));xa(b)}});a!==k&&(this.iterator("column",function(c,e){r(c,null,"column-visibility",[c,e,a,b])}),(b===k||b)&&this.columns.adjust());return c});u("columns().indexes()","column().index()",
+function(a){return this.iterator("column",function(b,c){return"visible"===a?ba(b,c):c},1)});o("columns.adjust()",function(){return this.iterator("table",function(a){$(a)},1)});o("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return aa(c,b);if("fromData"===a||"toVisible"===a)return ba(c,b)}});o("column()",function(a,b){return cb(this.columns(a,b))});o("cells()",function(a,b,c){h.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));
+h.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=bb(c),f=b.aoData,g=Ba(b,e),j=Qb(ja(f,g,"anCells")),i=h([].concat.apply([],j)),l,m=b.aoColumns.length,n,o,u,s,r,v;return ab("cell",d,function(a){var c=typeof a==="function";if(a===null||a===k||c){n=[];o=0;for(u=g.length;o<u;o++){l=g[o];for(s=0;s<m;s++){r={row:l,column:s};if(c){v=f[l];a(r,B(b,l,s),v.anCells?v.anCells[s]:null)&&n.push(r)}else n.push(r)}}return n}if(h.isPlainObject(a))return a.column!==
+k&&a.row!==k&&h.inArray(a.row,g)!==-1?[a]:[];c=i.filter(a).map(function(a,b){return{row:b._DT_CellIndex.row,column:b._DT_CellIndex.column}}).toArray();if(c.length||!a.nodeName)return c;v=h(a).closest("*[data-dt-row]");return v.length?[{row:v.data("dt-row"),column:v.data("dt-column")}]:[]},b,e)});var d=this.columns(b),e=this.rows(a),f,g,j,i,m;this.iterator("table",function(a,b){f=[];g=0;for(j=e[b].length;g<j;g++){i=0;for(m=d[b].length;i<m;i++)f.push({row:e[b][g],column:d[b][i]})}},1);var l=this.cells(f,
+c);h.extend(l.selector,{cols:b,rows:a,opts:c});return l});u("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b])&&a.anCells?a.anCells[c]:k},1)});o("cells().data()",function(){return this.iterator("cell",function(a,b,c){return B(a,b,c)},1)});u("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]},1)});u("cells().render()","cell().render()",
+function(a){return this.iterator("cell",function(b,c,d){return B(b,c,d,a)},1)});u("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:ba(a,c)}},1)});u("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,d){da(b,c,a,d)})});o("cell()",function(a,b,c){return cb(this.cells(a,b,c))});o("cell().data()",function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?B(b[0],
+c[0].row,c[0].column):k;jb(b[0],c[0].row,c[0].column,a);da(b[0],c[0].row,"data",c[0].column);return this});o("order()",function(a,b){var c=this.context;if(a===k)return 0!==c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:a.length&&!h.isArray(a[0])&&(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});o("order.listener()",function(a,b,c){return this.iterator("table",function(d){Ma(d,a,b,c)})});o("order.fixed()",function(a){if(!a){var b=
+this.context,b=b.length?b[0].aaSortingFixed:k;return h.isArray(b)?{pre:b}:b}return this.iterator("table",function(b){b.aaSortingFixed=h.extend(!0,{},a)})});o(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];h.each(b[d],function(b,c){e.push([c,a])});c.aaSorting=e})});o("search()",function(a,b,c,d){var e=this.context;return a===k?0!==e.length?e[0].oPreviousSearch.sSearch:k:this.iterator("table",function(e){e.oFeatures.bFilter&&ga(e,
+h.extend({},e.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),1)})});u("columns().search()","column().search()",function(a,b,c,d){return this.iterator("column",function(e,f){var g=e.aoPreSearchCols;if(a===k)return g[f].sSearch;e.oFeatures.bFilter&&(h.extend(g[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),ga(e,e.oPreviousSearch,1))})});o("state()",function(){return this.context.length?this.context[0].oSavedState:
+null});o("state.clear()",function(){return this.iterator("table",function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});o("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});o("state.save()",function(){return this.iterator("table",function(a){xa(a)})});n.versionCheck=n.fnVersionCheck=function(a){for(var b=n.version.split("."),a=a.split("."),c,d,e=0,f=a.length;e<f;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};n.isDataTable=
+n.fnIsDataTable=function(a){var b=h(a).get(0),c=!1;if(a instanceof n.Api)return!0;h.each(n.settings,function(a,e){var f=e.nScrollHead?h("table",e.nScrollHead)[0]:null,g=e.nScrollFoot?h("table",e.nScrollFoot)[0]:null;if(e.nTable===b||f===b||g===b)c=!0});return c};n.tables=n.fnTables=function(a){var b=!1;h.isPlainObject(a)&&(b=a.api,a=a.visible);var c=h.map(n.settings,function(b){if(!a||a&&h(b.nTable).is(":visible"))return b.nTable});return b?new s(c):c};n.camelToHungarian=J;o("$()",function(a,b){var c=
+this.rows(b).nodes(),c=h(c);return h([].concat(c.filter(a).toArray(),c.find(a).toArray()))});h.each(["on","one","off"],function(a,b){o(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0]=h.map(a[0].split(/\s/),function(a){return!a.match(/\.dt\b/)?a+".dt":a}).join(" ");var d=h(this.tables().nodes());d[b].apply(d,a);return this})});o("clear()",function(){return this.iterator("table",function(a){oa(a)})});o("settings()",function(){return new s(this.context,this.context)});o("init()",function(){var a=
+this.context;return a.length?a[0].oInit:null});o("data()",function(){return this.iterator("table",function(a){return D(a.aoData,"_aData")}).flatten()});o("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,f=b.nTBody,g=b.nTHead,j=b.nTFoot,i=h(e),f=h(f),k=h(b.nTableWrapper),l=h.map(b.aoData,function(a){return a.nTr}),o;b.bDestroying=!0;r(b,"aoDestroyCallback","destroy",[b]);a||(new s(b)).columns().visible(!0);k.off(".DT").find(":not(tbody *)").off(".DT");
+h(E).off(".DT-"+b.sInstance);e!=g.parentNode&&(i.children("thead").detach(),i.append(g));j&&e!=j.parentNode&&(i.children("tfoot").detach(),i.append(j));b.aaSorting=[];b.aaSortingFixed=[];wa(b);h(l).removeClass(b.asStripeClasses.join(" "));h("th, td",g).removeClass(d.sSortable+" "+d.sSortableAsc+" "+d.sSortableDesc+" "+d.sSortableNone);f.children().detach();f.append(l);g=a?"remove":"detach";i[g]();k[g]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),i.css("width",b.sDestroyWidth).removeClass(d.sTable),
+(o=b.asDestroyStripes.length)&&f.children().each(function(a){h(this).addClass(b.asDestroyStripes[a%o])}));c=h.inArray(b,n.settings);-1!==c&&n.settings.splice(c,1)})});h.each(["column","row","cell"],function(a,b){o(b+"s().every()",function(a){var d=this.selector.opts,e=this;return this.iterator(b,function(f,g,h,i,m){a.call(e[b](g,"cell"===b?h:d,"cell"===b?d:k),g,h,i,m)})})});o("i18n()",function(a,b,c){var d=this.context[0],a=S(a)(d.oLanguage);a===k&&(a=b);c!==k&&h.isPlainObject(a)&&(a=a[c]!==k?a[c]:
+a._);return a.replace("%d",c)});n.version="1.10.18";n.settings=[];n.models={};n.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};n.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};n.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,
+sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};n.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,
+bSort:!0,bSortMulti:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+
+a.sInstance+"_"+location.pathname))}catch(b){}},fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},
+oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},
+n.models.oSearch),sAjaxDataProp:"data",sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null,rowId:"DT_RowId"};Z(n.defaults);n.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};
+Z(n.defaults.column);n.models.oSettings={oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1,barWidth:0},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],
+aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",
+iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,json:k,oAjaxData:k,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==y(this)?1*this._iRecordsTotal:
+this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==y(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};n.ext=x={buttons:{},
+classes:{},build:"dt/dt-1.10.18",errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:n.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:n.version};h.extend(x,{afnFiltering:x.search,aTypes:x.type.detect,ofnSearch:x.type.search,oSort:x.type.order,afnSortData:x.order,aoFeatures:x.feature,oApi:x.internal,oStdClasses:x.classes,oPagination:x.pager});
+h.extend(n.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",
+sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",
+sJUIHeader:"",sJUIFooter:""});var Kb=n.ext.pager;h.extend(Kb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},numbers:function(a,b){return[ia(a,b)]},simple_numbers:function(a,b){return["previous",ia(a,b),"next"]},full_numbers:function(a,b){return["first","previous",ia(a,b),"next","last"]},first_last_numbers:function(a,b){return["first",ia(a,b),"last"]},_numbers:ia,numbers_length:7});h.extend(!0,n.ext.renderer,{pageButton:{_:function(a,b,c,d,e,
+f){var g=a.oClasses,j=a.oLanguage.oPaginate,i=a.oLanguage.oAria.paginate||{},m,l,n=0,o=function(b,d){var k,s,u,r,v=function(b){Ta(a,b.data.action,true)};k=0;for(s=d.length;k<s;k++){r=d[k];if(h.isArray(r)){u=h("<"+(r.DT_el||"div")+"/>").appendTo(b);o(u,r)}else{m=null;l="";switch(r){case "ellipsis":b.append('<span class="ellipsis">&#x2026;</span>');break;case "first":m=j.sFirst;l=r+(e>0?"":" "+g.sPageButtonDisabled);break;case "previous":m=j.sPrevious;l=r+(e>0?"":" "+g.sPageButtonDisabled);break;case "next":m=
+j.sNext;l=r+(e<f-1?"":" "+g.sPageButtonDisabled);break;case "last":m=j.sLast;l=r+(e<f-1?"":" "+g.sPageButtonDisabled);break;default:m=r+1;l=e===r?g.sPageButtonActive:""}if(m!==null){u=h("<a>",{"class":g.sPageButton+" "+l,"aria-controls":a.sTableId,"aria-label":i[r],"data-dt-idx":n,tabindex:a.iTabIndex,id:c===0&&typeof r==="string"?a.sTableId+"_"+r:null}).html(m).appendTo(b);Wa(u,{action:r},v);n++}}}},s;try{s=h(b).find(H.activeElement).data("dt-idx")}catch(u){}o(h(b).empty(),d);s!==k&&h(b).find("[data-dt-idx="+
+s+"]").focus()}}});h.extend(n.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return $a(a,c)?"num"+c:null},function(a){if(a&&!(a instanceof Date)&&!Zb.test(a))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||M(a)?"date":null},function(a,b){var c=b.oLanguage.sDecimal;return $a(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Pb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Pb(a,c,!0)?"html-num-fmt"+c:null},function(a){return M(a)||
+"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);h.extend(n.ext.type.search,{html:function(a){return M(a)?a:"string"===typeof a?a.replace(Mb," ").replace(Aa,""):""},string:function(a){return M(a)?a:"string"===typeof a?a.replace(Mb," "):a}});var za=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Ob(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};h.extend(x.type.order,{"date-pre":function(a){a=Date.parse(a);return isNaN(a)?-Infinity:a},"html-pre":function(a){return M(a)?
+"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return M(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,b){return a<b?1:a>b?-1:0}});Da("");h.extend(!0,n.ext.renderer,{header:{_:function(a,b,c,d){h(a.nTable).on("order.dt.DT",function(e,f,g,h){if(a===f){e=c.idx;b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:
+c.sSortingClass)}})},jqueryui:function(a,b,c,d){h("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(h("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);h(a.nTable).on("order.dt.DT",function(e,f,g,h){if(a===f){e=c.idx;b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass);b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass(h[e]==
+"asc"?d.sSortJUIAsc:h[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});var Vb=function(a){return"string"===typeof a?a.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;"):a};n.render={number:function(a,b,c,d,e){return{display:function(f){if("number"!==typeof f&&"string"!==typeof f)return f;var g=0>f?"-":"",h=parseFloat(f);if(isNaN(h))return Vb(f);h=h.toFixed(c);f=Math.abs(h);h=parseInt(f,10);f=c?b+(f-h).toFixed(c).substring(2):"";return g+(d||"")+h.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
+a)+f+(e||"")}}},text:function(){return{display:Vb}}};h.extend(n.ext.internal,{_fnExternApiFunc:Lb,_fnBuildAjax:sa,_fnAjaxUpdate:lb,_fnAjaxParameters:ub,_fnAjaxUpdateDraw:vb,_fnAjaxDataSrc:ta,_fnAddColumn:Ea,_fnColumnOptions:ka,_fnAdjustColumnSizing:$,_fnVisibleToColumnIndex:aa,_fnColumnIndexToVisible:ba,_fnVisbleColumns:V,_fnGetColumns:ma,_fnColumnTypes:Ga,_fnApplyColumnDefs:ib,_fnHungarianMap:Z,_fnCamelToHungarian:J,_fnLanguageCompat:Ca,_fnBrowserDetect:gb,_fnAddData:O,_fnAddTr:na,_fnNodeToDataIndex:function(a,
+b){return b._DT_RowIndex!==k?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return h.inArray(c,a.aoData[b].anCells)},_fnGetCellData:B,_fnSetCellData:jb,_fnSplitObjNotation:Ja,_fnGetObjectDataFn:S,_fnSetObjectDataFn:N,_fnGetDataMaster:Ka,_fnClearTable:oa,_fnDeleteIndex:pa,_fnInvalidate:da,_fnGetRowElements:Ia,_fnCreateTr:Ha,_fnBuildHead:kb,_fnDrawHead:fa,_fnDraw:P,_fnReDraw:T,_fnAddOptionsHtml:nb,_fnDetectHeader:ea,_fnGetUniqueThs:ra,_fnFeatureHtmlFilter:pb,_fnFilterComplete:ga,_fnFilterCustom:yb,
+_fnFilterColumn:xb,_fnFilter:wb,_fnFilterCreateSearch:Pa,_fnEscapeRegex:Qa,_fnFilterData:zb,_fnFeatureHtmlInfo:sb,_fnUpdateInfo:Cb,_fnInfoMacros:Db,_fnInitialise:ha,_fnInitComplete:ua,_fnLengthChange:Ra,_fnFeatureHtmlLength:ob,_fnFeatureHtmlPaginate:tb,_fnPageChange:Ta,_fnFeatureHtmlProcessing:qb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:rb,_fnScrollDraw:la,_fnApplyToChildren:I,_fnCalculateColumnWidths:Fa,_fnThrottle:Oa,_fnConvertToWidth:Eb,_fnGetWidestNode:Fb,_fnGetMaxLenString:Gb,_fnStringToCss:v,
+_fnSortFlatten:X,_fnSort:mb,_fnSortAria:Ib,_fnSortListener:Va,_fnSortAttachListener:Ma,_fnSortingClasses:wa,_fnSortData:Hb,_fnSaveState:xa,_fnLoadState:Jb,_fnSettingsFromNode:ya,_fnLog:K,_fnMap:F,_fnBindAction:Wa,_fnCallbackReg:z,_fnCallbackFire:r,_fnLengthOverflow:Sa,_fnRenderer:Na,_fnDataSource:y,_fnRowAttributes:La,_fnExtend:Xa,_fnCalculateEnd:function(){}});h.fn.dataTable=n;n.$=h;h.fn.dataTableSettings=n.settings;h.fn.dataTableExt=n.ext;h.fn.DataTable=function(a){return h(this).dataTable(a).api()};
+h.each(n,function(a,b){h.fn.DataTable[a]=b});return h.fn.dataTable});
+
+

backend/app/plugins/wiaas/assets/js/wiaas-admin-cl-packages.js

@@ -1,5 +1,15 @@
 jQuery(document).ready(function ($) {
 
+    $( document.body ).on( 'init_tooltips', function() {
+        $( '.woocommerce-help-tip' ).tipTip( {
+            'attribute': 'data-tip',
+            'fadeIn': 50,
+            'fadeOut': 50,
+            'delay': 200,
+            'defaultPosition': 'top'
+        } );
+    } ).trigger( 'init_tooltips' );
+
     $('#tabs').each(function() {
         var disabled = $( this ).data('disabled') || '';
 

backend/app/plugins/wiaas/assets/js/wiaas-admin-dashboard.js

@@ -0,0 +1,14 @@
+jQuery(document).ready(function($) {
+    $('#wiaas_order_central_table').DataTable({
+        "paging":   false,
+        "info":     false,
+        "filter": false,
+        "order": [[ 0, "desc" ]]
+    });
+
+    $('#wiaas_next_actions_table').DataTable({
+        "info":     false,
+        "filter": false,
+        "order": [[ 0, "desc" ]]
+    });
+} );

backend/app/plugins/wiaas/assets/js/wiaas-admin-delivery-process.js

@@ -5,4 +5,34 @@ jQuery(document).ready(function ($) {
         $('#wiaas_delivery_process_navigation_action').val(action);
 
     });
+
+    $('#wiaas_delivery_process_add_note').click(function(e) {
+        if ( ! $( 'textarea#wiaas_add_order_note' ).val() ) {
+            return;
+        }
+
+        $( '#wiaas_delivery_process_order_notes' ).block({
+            message: null,
+            overlayCSS: {
+                background: '#fff',
+                opacity: 0.6
+            }
+        });
+
+        var data = {
+            action:    'wiaas_add_order_note',
+            post_id:   $( 'textarea#wiaas_add_order_note' ).data('order-id'),
+            note:      $( 'textarea#wiaas_add_order_note' ).val(),
+            security:  $( 'textarea#wiaas_add_order_note' ).data('nonce'),
+        };
+
+
+        $.post( ajaxurl, data, function( response ) {
+            $( '#delivery_process_order_notes_list' ).prepend( response );
+            $( '#wiaas_delivery_process_order_notes' ).unblock();
+            $( '#wiaas_add_order_note' ).val( '' );
+        });
+
+        return false;
+    });
 });

backend/app/plugins/wiaas/assets/js/wiaas-admin-product-quick-edit.js

@@ -0,0 +1,32 @@
+/*global inlineEditPost, woocommerce_admin, woocommerce_quick_edit */
+jQuery(function( $ ) {
+    $('#the-list').on('click', '.editinline', function(){
+
+        /**
+         * Extract metadata and put it as the value for the custom field form
+         */
+        inlineEditPost.revert();
+
+        var post_id = jQuery(this).closest('tr').attr('id');
+
+        post_id = post_id.replace("post-", "");
+
+        var $cfd_inline_data = jQuery('#package_additional_fields_inline_' + post_id),
+            $wc_inline_data = jQuery('#woocommerce_inline_' + post_id );
+
+        jQuery('textarea[name="_package_pricing"]', '.inline-edit-row').val($cfd_inline_data.find("#_package_prices").text());
+
+
+        /**
+         * Only show custom field for appropriate types of products (simple)
+         */
+        var product_type = $wc_inline_data.find('.product_type').text();
+
+        if (product_type==='bundle') {
+            jQuery('#wiaas_pricing_quick_edit', '.inline-edit-row').show();
+        } else {
+            jQuery('#wiaas_pricing_quick_edit', '.inline-edit-row').hide();
+        }
+
+    });
+});

backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-orders.php

@@ -78,12 +78,16 @@ class Wiaas_Admin_CL_Orders {
 	 * @return array
 	 */
 	public static function columns_for_list_table_orders($columns) {
-		$show_columns                     = array();
-		$show_columns['cb']               = $columns['cb'];
-		$show_columns['_wiaas_order_number']     = __( 'Order', 'woocommerce' );
-		$show_columns['order_date']       = __( 'Date', 'woocommerce' );
-		$show_columns['order_status']     = __( 'Status', 'woocommerce' );
-		$show_columns['order_total']      = __( 'Total', 'woocommerce' );
+		$show_columns                           =  array();
+		$show_columns['cb']                     =  $columns['cb'];
+		$show_columns['_wiaas_order_number']    =  __( 'Order', 'wiaas' );
+		$show_columns['order_date']             =  $columns['order_date'];
+		$show_columns['wiaas_reference']        =  __( 'Location', 'wiaas' );
+		$show_columns['wiaas_customer']         =  __( 'Customer', 'wiaas' );
+		$show_columns['order_status']           =  $columns['order_status'];
+		$show_columns['billing_address']        =  $columns['billing_address'];
+		$show_columns['shipping_address']       =  $columns['shipping_address'];
+		$show_columns['order_total']            =  $columns['order_total'];
 
 		return $show_columns;
 	}
@@ -114,10 +118,13 @@ class Wiaas_Admin_CL_Orders {
 
 			$order = wc_get_order($order_id);
 
-			echo '<strong>#' . esc_attr( $order->get_order_number() ) . '</strong>';
+			$order_url = $entry_url = admin_url('admin.php?page=wiaas-order-delivery&id=' . $order->get_id());
 
 			if ( $order->get_status() !== 'trash' ) {
+				echo '<strong><a href="' . esc_url($order_url) . '">#' . esc_attr( $order->get_order_number() ) . '</a></strong>';
 				echo '<a href="#" class="order-preview" data-order-id="' . absint( $order->get_id() ) . '" title="' . esc_attr( __( 'Preview', 'wiaas' ) ) . '">' . esc_html( __( 'Preview', 'wiaas' ) ) . '</a>';
+			} else {
+				echo '<strong>#' . esc_attr( $order->get_order_number() ) . '</strong>';
 			}
 		}
 	}

backend/app/plugins/wiaas/includes/admin/admin-cl/class-wiaas-admin-cl-packages.php

@@ -40,6 +40,7 @@ class Wiaas_Admin_CL_Packages {
 		$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
 
 		wp_enqueue_style( 'wiaas_admin_menu', $plugin_url . '/assets/css/menu.css' );
+
 	}
 
 	public static function add_cl_packages_menu() {

backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-details.php

@@ -149,25 +149,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 					<div class="inside">
 						<div class="panel-wrap">
 							<div class="panel">
-
-								<div class="wrap">
-									<div>
-										<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
-										<strong><?php esc_html_e('EPR', 'wiaas') ?></strong>
-										<span><?php esc_html_e('= Extra package recurrent commission', 'wiaas') ?></span>
-									</div>
-									<div>
-										<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
-										<strong><?php esc_html_e('ESR') ?></strong>
-										<span><?php esc_html_e('= Extra services and support recurrent commission', 'wiaas') ?></span>
-									</div>
-									<div>
-										<i style="vertical-align: middle;" class="dashicons dashicons-info"></i>
-										<strong><?php esc_html_e('Extra commission', 'wiaas') ?></strong>
-										<span><?php esc_html_e('= EPR + ESR', 'wiaas') ?></span>
-									</div>
-								</div>
-
 								<div id="tabs" data-disabled="<?php echo $has_default_cl_extras ? '' : '1' ; ?>">
 									<ul id="tabs-navigation">
 										<li><a href="#tabs-1"><?php esc_html_e('Default prices', 'wiaas') ?></a> | </li>

backend/app/plugins/wiaas/includes/admin/admin-cl/views/html-cl-package-prices.php

@@ -20,7 +20,13 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
 			?>
         </td>
 		<td><?php esc_html_e('Minimal sell price', 'wiaas') ?></td>
-		<td><?php esc_html_e('Extra commision', 'wiaas') ?></td>
+		<td><?php esc_html_e('Margin', 'wiaas') ?></td>
+        <td><?php esc_html_e('Margin services', 'wiaas') ?>
+            <?php echo wc_help_tip( __( 'Extra services and support recurrent commission', 'wiaas' ) );?>
+        </td>
+        <td><?php esc_html_e('Margin recurrent', 'wiaas') ?>
+            <?php echo wc_help_tip( __( 'Extra package recurrent commission', 'wiaas' ) );?>
+        </td>
 		<td><?php esc_html_e('Default price', 'wiaas') ?></td>
 		<td><?php esc_html_e('Visible?', 'wiaas') ?>
 			<?php
@@ -81,48 +87,81 @@ $id = isset($customer_id) ? 'extras_customer_'.$customer_id : 'extras_default';
 
 				</div>
 			</td>
-			<td class="form-group">
-				<div class="form-control">
-					<label>+</label>
-					<input
-                        class="wiaas-cl-extra-input"
-                        data-target="wiaas_cl_fixed_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
-                        data-type="fixed"
-						name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][fixed]"
-						value="<?php esc_attr_e($cl_extras[$extra_type]['fixed'], 'wiaas') ?>"
-						type="text"
-					>
-				</div>
-				<?php
-				if($configured_price['package_pay_period'] > 0) {
-					?>
-					<div class="form-control">
-						<label>+</label>
-						<input
+            <td class="form-group">
+                <div class="form-control">
+                    <label>+</label>
+                    <input
                             class="wiaas-cl-extra-input"
-                            data-target="wiaas_cl_recurrent_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
-                            data-type="recurrent"
-							name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][recurrent]"
-							value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>"
-							type="text"
-						>
-						<label><?php esc_html_e('(EPR)', 'wiaas') ?></label>
-					</div>
-					<?php
-				}
-				?>
-				<div class="form-control">
-					<label>+</label>
-					<input
-                        class="wiaas-cl-extra-input"
-                        data-target="wiaas_cl_monthly_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
-                        data-type="services"
-						name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][services]"
-						value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>"
-						type="text"
-					>
-                    <label><?php esc_html_e('(ESR)', 'wiaas') ?></label>
-				</div>
+                            data-target="wiaas_cl_fixed_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
+                            data-type="fixed"
+                            name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][fixed]"
+                            value="<?php esc_attr_e($cl_extras[$extra_type]['fixed'], 'wiaas') ?>"
+                            type="text"
+                    >
+                </div>
+                <div class="form-control">
+                    <label>+</label>
+                    <input
+                            class="wiaas-cl-extra-input"
+                            type="text"
+                            readonly
+                            value="0"
+                    >
+                </div>
+            </td>
+
+            <td class="form-group">
+                <div class="form-control">
+                    <label>+</label>
+                    <input
+                            class="wiaas-cl-extra-input"
+                            type="text"
+                            readonly
+                            value="0"
+                    >
+                </div>
+                <div class="form-control">
+                    <label>+</label>
+                    <input
+                            class="wiaas-cl-extra-input"
+                            data-target="wiaas_cl_monthly_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
+                            data-type="services"
+                            name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][services]"
+                            value="<?php esc_attr_e($cl_extras[$extra_type]['services'], 'wiaas') ?>"
+                            type="text"
+                    >
+                </div>
+            </td>
+
+			<td class="form-group">
+
+                <?php
+                if($configured_price['package_pay_period'] > 0) {
+                    ?>
+                    <div class="form-control">
+                        <label>+</label>
+                        <input
+                                class="wiaas-cl-extra-input"
+                                type="text"
+                                readonly
+                                value="0"
+                        >
+                    </div>
+                    <div class="form-control">
+                        <label>+</label>
+                        <input
+                                class="wiaas-cl-extra-input"
+                                data-target="wiaas_cl_recurrent_extra_<?php esc_attr_e($extra_type, 'wiaas') ?>"
+                                data-type="recurrent"
+                                name="cl_extras[<?php esc_attr_e($extra_type, 'wiaas')?>][recurrent]"
+                                value="<?php esc_attr_e($cl_extras[$extra_type]['recurrent'], 'wiaas') ?>"
+                                type="text"
+                        >
+                    </div>
+                    <?php
+                }
+                ?>
+
 			</td>
 			<td>
 				<div> =

backend/app/plugins/wiaas/includes/admin/admin-supplier/class-wiaas-admin-supplier-orders.php

@@ -21,11 +21,15 @@ class Wiaas_Admin_Supplier_Orders {
 
         add_filter('woocommerce_admin_order_preview_actions', array(__CLASS__, 'remove_actions_from_order_preview'));
 
-        add_filter('woocommerce_admin_order_preview_line_items', array(__CLASS__, 'filter_order_items_for_order_preview'), 10, 2);
+        add_filter('woocommerce_admin_order_preview_line_items', array(__CLASS__, 'filter_order_items_for_order_preview'), 999, 2);
+
+	    add_filter( 'woocommerce_admin_order_preview_line_item_columns', array(__CLASS__, 'customize_order_preview_columns'), 999);
+
+	    add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_simple_product_bundle', array(__CLASS__, 'render_bundled_item_bundle'), 10, 4);
 
         add_filter('manage_shop_order_posts_columns', array(__CLASS__, 'columns_for_list_table_orders'), 999);
 
-        add_filter('manage_edit-shop_order_sortable_columns', array(__CLASS__, 'define_sortable_columns_for_list_table_orders'));
+        add_filter('manage_edit-shop_order_sortable_columns', array(__CLASS__, 'define_sortable_columns_for_list_table_orders'), 999);
 
         add_action('manage_shop_order_posts_custom_column', array(__CLASS__, 'render_columns_for_list_table_orders'), 999, 2);
     }
@@ -53,7 +57,7 @@ class Wiaas_Admin_Supplier_Orders {
      * Show only simple products from this supplier on order preview
      *
      * @param $order_items
-     * @param $order
+     * @param WC_Order $order
      *
      * @return array
      */
@@ -61,26 +65,51 @@ class Wiaas_Admin_Supplier_Orders {
 
         $user_organisation_id = Wiaas_User_Organization::get_user_organization_id(wp_get_current_user()->ID);
 
+	    $order_items = $order->get_items();
         $items = array();
         
         foreach ($order_items as $key => $order_item) {
 
-            $product = wc_get_product($order_item->get_product_id());
+            if (wc_pb_is_bundled_order_item($order_item)) {
 
-            if ($product->get_type() == 'simple') {
+	            $item_supplier_organization_id = absint($order_item['wiaas_supplier_organization_id']);
 
-                $supplier_organisation_id = Wiaas_Product_Supplier
-                    ::get_supplier_organisation_id_from_product($order_item->get_product_id());
+	            if ($item_supplier_organization_id === $user_organisation_id) {
 
-                if ($supplier_organisation_id === $user_organisation_id) {
-                    $items[$key] = $order_item;
-                }
+		            $items[] = $order_item;
+	            }
             }
         }
 
         return $items;
     }
 
+    public static function customize_order_preview_columns() {
+
+	    return array(
+		    'product' => __('Product', 'wiaas'),
+		    'quantity' => __( 'Quantity', 'wiaas' ),
+		    'wiaas_simple_product_bundle' => __( '', 'wiaas' )
+	    );
+    }
+
+    public static function render_bundled_item_bundle($empty, $item, $item_id, $order) {
+
+    	$html = '';
+
+    	if (wc_pb_is_bundled_order_item($item) ) {
+
+    		$container_order_item = wc_pb_get_bundled_order_item_container($item, $order);
+
+    		if ( ! empty($container_order_item) ) {
+
+    			return $container_order_item->get_name();
+		    }
+	    }
+
+	    return $html;
+    }
+
     /**
      * Override default table columns so only supplier specific columns are visible
      *
@@ -89,11 +118,14 @@ class Wiaas_Admin_Supplier_Orders {
      * @return array
      */
     public static function columns_for_list_table_orders($columns) {
-        $show_columns                     = array();
-        $show_columns['cb']               = $columns['cb'];
-        $show_columns['_wiaas_order_number']     = __( 'Order', 'woocommerce' );
-        $show_columns['order_date']       = __( 'Date', 'woocommerce' );
-        $show_columns['order_status']     = __( 'Status', 'woocommerce' );
+        $show_columns                           =  array();
+        $show_columns['cb']                     =  $columns['cb'];
+        $show_columns['_wiaas_order_number']    =  __( 'Order', 'wiaas' );
+	    $show_columns['order_date']             =  $columns['order_date'];
+        $show_columns['wiaas_reference']        =  __( 'Location', 'wiaas' );
+	    $show_columns['wiaas_customer']         =  __( 'Customer', 'wiaas' );
+        $show_columns['order_status']           =  $columns['order_status'];
+        $show_columns['shipping_address']       =  $columns['shipping_address'];
 
         return $show_columns;
     }
@@ -124,11 +156,14 @@ class Wiaas_Admin_Supplier_Orders {
 
             $order = wc_get_order($order_id);
 
-            echo '<strong>#' . esc_attr($order->get_order_number()) . '</strong>';
+	        $order_url = $entry_url = admin_url('admin.php?page=wiaas-order-delivery&id=' . $order->get_id());
 
-            if ($order->get_status() !== 'trash') {
-                echo '<a href="#" class="order-preview" data-order-id="' . absint($order->get_id()) . '" title="' . esc_attr(__('Preview', 'wiaas')) . '">' . esc_html(__('Preview', 'wiaas')) . '</a>';
-            }
+	        if ( $order->get_status() !== 'trash' ) {
+		        echo '<strong><a href="' . esc_url($order_url) . '">#' . esc_attr( $order->get_order_number() ) . '</a></strong>';
+		        echo '<a href="#" class="order-preview" data-order-id="' . absint( $order->get_id() ) . '" title="' . esc_attr( __( 'Preview', 'wiaas' ) ) . '">' . esc_html( __( 'Preview', 'wiaas' ) ) . '</a>';
+	        } else {
+		        echo '<strong>#' . esc_attr( $order->get_order_number() ) . '</strong>';
+	        }
         }
     }
 }

backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-cl.php

@@ -37,6 +37,7 @@ class Wiaas_Admin_CL {
 		$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
 
 		wp_enqueue_script( 'wiaas_admin_cl_packages', $plugin_url . '/assets/js/wiaas-admin-cl-packages.js' );
+		wp_enqueue_script('jquery-tiptip');
 
 		wp_enqueue_style( 'wiaas_admin_cl', $plugin_url . '/assets/css/wiaas-admin-cl.css' );
 	}

backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-dashboard.php

@@ -0,0 +1,172 @@
+<?php
+
+class Wiaas_Admin_Dashboard {
+
+	public static function init() {
+
+		add_action( 'wp_dashboard_setup', array( __CLASS__, 'setup_dashboard' ) );
+
+	}
+
+	public static function setup_dashboard() {
+
+		wp_add_dashboard_widget( 'wiaas_orders', __( 'Order Central', 'wiaas' ), array( __CLASS__, 'orders_widget' ) );
+		wp_add_dashboard_widget( 'wiaas_next_actions', __( 'Next Actions', 'wiaas' ), array( __CLASS__, 'next_actions_widget' ) );
+
+		add_action( 'admin_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'), 100 );
+	}
+
+	public static function enqueue_scripts() {
+		$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
+
+		wp_enqueue_style( 'wiaas_admin_dashboard', $plugin_url . '/assets/css/wiaas-admin-dashboard.css' );
+		wp_enqueue_script( 'wiaas_admin_dashboard', $plugin_url . '/assets/js/wiaas-admin-dashboard.js' );
+    }
+
+	public static function orders_widget() {
+
+		$orders = wc_get_orders(array(
+			'limit' => 5,
+			'status' => array('open', 'processing')
+		));
+
+		if (empty($orders)) {
+
+			?>
+            <div class="wiaas-dashboard-table-empty">
+                <p>
+					<?php esc_html_e( 'No new orders', 'wiaas' ); ?>
+                </p>
+            </div>
+			<?php
+
+			return;
+		}
+
+		?>
+
+		<table id="wiaas_order_central_table" class="wiaas-dashboard-table wiaas-orders-table">
+			<thead>
+			<tr>
+				<th><?php esc_html_e( 'Order', 'wiaas' ); ?></th>
+				<th><?php esc_html_e( 'Status', 'wiaas' ); ?></th>
+				<th><?php esc_html_e( 'Total', 'wiaas' ); ?></th>
+			</tr>
+			</thead>
+			<tbody id="wiaas-orders-tbody">
+
+			<?php
+				foreach ($orders as $order) {
+
+					// format date
+					$order_timestamp = $order->get_date_created() ? $order->get_date_created()->getTimestamp() : '';
+					$show_date = '&ndash;';
+
+					if ( $order_timestamp ) {
+
+						if ( $order_timestamp > strtotime( '-1 day', current_time( 'timestamp', true ) ) && $order_timestamp <= current_time( 'timestamp', true ) ) {
+							$show_date = sprintf(
+							/* translators: %s: human-readable time difference */
+								_x( '%s ago', '%s = human-readable time difference', 'wiaas' ),
+								human_time_diff( $order->get_date_created()->getTimestamp(), current_time( 'timestamp', true ) )
+							);
+						} else {
+							$show_date = $order->get_date_created()->date_i18n( __( 'M j, Y', 'wiaas' ) );
+						}
+					}
+
+					?>
+					<tr>
+						<td>
+							<strong>
+                                <?php
+
+                                if (current_user_can('edit_others_shop_orders')) {
+	                                $order_edit_url = admin_url( 'post.php?post=' . absint( $order->get_id() ) . '&action=edit' );
+                                } else {
+	                                $order_edit_url = admin_url('admin.php?page=wiaas-order-delivery&id=' . absint( $order->get_id() ) );
+                                }
+
+                                echo '<a href="'. $order_edit_url . '">#' .
+                                     esc_html($order->get_order_number()) .
+                                     '</a>';
+                                ?>
+							</strong>
+                            <br>
+                            <time
+                                    class="wiaas-order-date"
+                                    datetime="<?php esc_attr_e( $order->get_date_created()->date( 'c' ), 'wiaas' ) ?>"
+                                    title="<?php esc_html_e( $order->get_date_created()->date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ), 'wiaas' ) ?>"
+                            >
+								<?php esc_html_e($show_date, 'wiaas') ?>
+                            </time>
+						</td>
+						<td>
+							<mark class="wiaas-order-status <?php esc_attr_e( sanitize_html_class( 'wiaas-order-status-' . $order->get_status() ), 'wiaas' ) ?>">
+								<span>
+									<?php esc_html_e( wc_get_order_status_name( $order->get_status() ) ) ?>
+								</span>
+							</mark>
+						</td>
+						<td><?php echo $order->get_formatted_order_total() ?></td>
+					</tr>
+					<?php
+				}
+			?>
+			</tbody>
+		</table>
+
+		<?php
+	}
+
+	public static function next_actions_widget() {
+
+		$next_actions = Wiaas_Delivery_Process::get_next_actions_for_current_user();
+
+		if (empty($next_actions)) {
+
+		    ?>
+            <div class="wiaas-dashboard-table-empty">
+                <p>
+		            <?php esc_html_e( 'No pending actions', 'wiaas' ); ?>
+                </p>
+            </div>
+            <?php
+
+            return;
+        }
+
+		?>
+		<table id="wiaas_next_actions_table" class="wiaas-dashboard-table">
+			<thead>
+			<tr>
+				<th><?php esc_html_e( 'Order', 'wiaas' ); ?></th>
+				<th><?php esc_html_e( 'Action', 'wiaas' ); ?></th>
+			</tr>
+			</thead>
+			<tbody>
+				<?php
+				foreach ($next_actions as $action) {
+					?>
+					<tr>
+						<td>
+                            <a href="<?php echo esc_url(admin_url('admin.php?page=wiaas-order-delivery&id=' . absint( $action['order_id'] ) )) ?>">
+                                <strong>#<?php esc_html_e($action['order_number'], 'wiaas')?></strong>
+                            </a>
+						</td>
+						<td>
+							<a href="<?php echo $action['url'] ?>">
+								<?php esc_html_e($action['action_title'], 'wiaas')?>
+							</a>
+						</td>
+					</tr>
+					<?php
+				}
+				?>
+			</tbody>
+		</table>
+		<?php
+	}
+}
+
+Wiaas_Admin_Dashboard::init();

backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-delivery-process.php

@@ -16,7 +16,9 @@ class Wiaas_Admin_Delivery_Process {
 
 		$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
 
-		wp_enqueue_script( 'wiaas_admin_delivery_process', $plugin_url . '/assets/js/wiaas-admin-delivery-process.js' );
+		wp_enqueue_script( 'wiaas_admin_delivery_process', $plugin_url . '/assets/js/wiaas-admin-delivery-process.js', array( 'jquery-blockui' ) );
+
+		wp_enqueue_style( 'wiaas_admin_delivery_process', $plugin_url . '/assets/css/wiaas-admin-delivery-process.css' );
 	}
 }
 

backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-orders.php

@@ -0,0 +1,314 @@
+<?php
+
+class Wiaas_Admin_Orders {
+
+    public static function init() {
+
+        // Orders list customization
+
+        add_filter( 'manage_shop_order_posts_columns', array(__CLASS__, 'add_additional_columns_to_orders_list'), 11 );
+
+        add_action( 'manage_shop_order_posts_custom_column', array(__CLASS__, 'render_orders_list_additional_columns') );
+
+        add_filter('default_hidden_columns', array(__CLASS__, 'filter_orders_list_default_hidden_columns'), 11, 2);
+
+        // Order preview customization
+
+        add_filter( 'woocommerce_admin_order_preview_get_order_details', array(__CLASS__, 'add_custom_data_to_order_preview') );
+
+        add_filter( 'woocommerce_admin_order_preview_start', array(__CLASS__, 'show_custom_data_before_order_preview') );
+
+        add_filter( 'woocommerce_admin_order_preview_line_items', array(__CLASS__, 'remove_simple_items_from_preview'));
+
+	    add_filter( 'woocommerce_admin_order_preview_line_item_columns', array(__CLASS__, 'order_preview_order_item_columns'));
+
+	    add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_order_item_price', array(__CLASS__, 'render_order_item_preview_price_column'), 10, 4);
+
+	    // Order item metadata customization
+
+	    add_action('woocommerce_before_order_itemmeta', array(__CLASS__, 'render_order_details_order_item_custom_info'), 10, 3);
+
+	    add_filter('woocommerce_order_item_get_formatted_meta_data', array(__CLASS__, 'filter_order_item_formatted_meta_data'), 10, 2);
+
+	    add_filter('woocommerce_order_item_display_meta_key', array(__CLASS__, 'order_item_display_meta_key'), 10, 3);
+
+	    add_filter('woocommerce_order_item_display_meta_value', array(__CLASS__, 'order_item_display_meta_value'), 10, 3);
+
+    }
+
+	/**
+     * Add columns to orders list with wiaas specific informations
+	 * @param array $columns
+	 *
+	 * @return array
+	 */
+    public static function add_additional_columns_to_orders_list( $columns ) {
+
+        $new_columns = array();
+
+        $new_columns['wiaas_reference']             = __('Location', 'wiaas');
+        $new_columns['wiaas_commercial_lead']       = __('Commercial lead', 'wiaas');
+        $new_columns['wiaas_customer']              = __('Customer', 'wiaas');
+        $new_columns['taxonomy-shop_order_project'] = __('Project', 'wiaas');
+
+        $columns = array_merge(
+                array_slice($columns,0,3),
+                $new_columns,
+                array_slice($columns,3)
+        );
+
+        return $columns;
+
+    }
+
+	/**
+     * Display data for custom wiaas columns in orders list
+     *
+	 * @param string $column
+	 */
+    public static function render_orders_list_additional_columns( $column ) {
+
+        global $post;
+        $column_content = '';
+
+        switch ($column){
+            case 'wiaas_reference':
+                $column_content = Wiaas_Order::get_order_reference($post->ID);
+                break;
+
+            case 'wiaas_commercial_lead':
+                $column_content = Wiaas_Order::get_order_commercial_lead_name($post->ID);
+                break;
+
+            case 'wiaas_customer':
+                $column_content = Wiaas_Order::get_order_customer_full_name($post->ID);
+
+                $customer_organization_info = Wiaas_Order::get_customer_organization_info($post->ID);
+
+                if ( ! empty($customer_organization_info) ) {
+
+	                $column_content .= '<br>';
+	                $column_content .= '<small>' . $customer_organization_info['name'] . '</small>';
+                }
+                break;
+        }
+
+        echo $column_content;
+    }
+
+	/**
+     * Filter default hidden columns for orders list
+     *
+	 * @param array $hidden
+	 * @param object $screen
+	 *
+	 * @return array
+	 */
+    public static function filter_orders_list_default_hidden_columns($hidden, $screen) {
+
+        if (isset($screen->id) && $screen->id === 'edit-shop_order') {
+
+            $hidden = array( 'wc_actions' );
+        }
+
+        return $hidden;
+    }
+
+	/**
+     * Add custom information to order preview data
+     *
+	 * @param array $order
+	 *
+	 * @return array
+	 */
+    public static function add_custom_data_to_order_preview ($order) {
+
+        $order['wiaas_commercial_lead_name'] = Wiaas_Order::get_order_commercial_lead_name( $order['data']['id'] );
+        $order['needs_shipping'] = true;
+
+        return $order;
+    }
+
+	/**
+	 * Display custom information in order preview
+     *
+	 */
+    public static function show_custom_data_before_order_preview () {
+
+        echo    '<div class="wc-order-preview-addresses">
+                    <div class="wc-order-preview-address">
+                        <h3>Commercial lead</h3>
+                        <strong>{{data.wiaas_commercial_lead_name}}</strong>
+                    </div>
+                  </div>';
+    }
+
+	/**
+     * Display only bundles (not simple products)
+     *
+     * This will also not display options and addons
+     *
+	 * @param array $order_items
+	 *
+	 * @return array
+	 */
+    public static function remove_simple_items_from_preview( $order_items){
+
+        $items =  array();
+
+        foreach ($order_items as $order_item) {
+
+            if ( Wiaas_Order_Item::is_standard_bundle($order_item) ) {
+                $items[] = $order_item;
+            }
+        }
+
+        return $items;
+    }
+
+	/**
+     * Columns for order preview order items table
+     *
+	 * @return array
+	 */
+    public static function order_preview_order_item_columns( ) {
+
+        return array(
+                'product' => __('Product', 'wiaas'),
+                'quantity' => __( 'Quantity', 'wiaas' ),
+        	    'wiaas_order_item_price' => __( 'Price', 'wiaas' )
+        );
+
+    }
+
+	/**
+	 * @param $empty
+	 * @param WC_Order_Item $item
+	 * @param int $item_id
+	 * @param WC_Order $order
+     *
+     * @return string
+	 */
+    public static function render_order_item_preview_price_column($empty, $item, $item_id, $order) {
+
+    	if (Wiaas_Order_Item::is_standard_bundle($item)) {
+
+		    $total_price = wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
+
+		    $monthly_price = wc_price(
+			    Wiaas_Order_Item::get_monthly_recurring_total($item),
+			    array( 'currency' => $order->get_currency() )
+		    );
+
+		    return sprintf('<strong>On Delivery:</strong> %s <br> <strong>Monthly:</strong> %s',
+			    $total_price,
+			    $monthly_price);
+	    }
+
+	    return '';
+    }
+
+	/**
+     * Render order item payment info with order item metadata on order details page
+     *
+	 * @param $item_id
+	 * @param WC_Order_Item $item
+	 * @param $product
+	 */
+    public static function render_order_details_order_item_custom_info($item_id, $item, $product) {
+
+    	if (Wiaas_Order_Item::is_standard_bundle($item)) {
+
+    		$order = $item->get_order();
+
+		    $total_price = wc_price( $item->get_total(), array( 'currency' => $order->get_currency() ) );
+
+		    $monthly_price = wc_price(
+		            Wiaas_Order_Item::get_monthly_recurring_total($item),
+                    array( 'currency' => $order->get_currency() )
+            );
+
+		    ?>
+                <br><br>
+		        <strong>On Delivery:</strong> <?php echo $total_price ?>
+		        <br>
+		        <strong>Monthly:</strong> <?php echo $monthly_price ?>
+		    <?php
+	    }
+    }
+
+	/**
+	 * @param array $formatted_meta
+	 * @param WC_Order_Item $order_item
+	 *
+	 * @return array
+	 */
+	public static function filter_order_item_formatted_meta_data($formatted_meta, $order_item) {
+
+		if (Wiaas_Order_Item::is_standard_bundle($order_item)) {
+
+			return $formatted_meta;
+		}
+
+		return array();
+	}
+
+	/**
+	 * @param string $display_key
+	 * @param object $meta
+	 * @param WC_Order_Item $item
+	 *
+	 * @return string
+	 */
+	public static function order_item_display_meta_key($display_key, $meta, $item) {
+
+		switch ($meta->key) {
+			case '_wiaas_payment_type':
+				return 'Payment type';
+
+			case '_wiaas_services_extra':
+				return 'Services and support price';
+
+			case '_wiaas_recurrent_extra':
+				return 'Recurrent price';
+
+			default:
+				return $display_key;
+		}
+	}
+
+	/**
+	 * @param string $display_value
+	 * @param object $meta
+	 * @param WC_Order_Item $item
+	 *
+	 * @return string
+	 */
+	public static function order_item_display_meta_value($display_value, $meta, $item) {
+
+		switch ($meta->key) {
+
+			case '_wiaas_services_extra':
+				$order = $item->get_order();
+
+				return wc_price(
+					Wiaas_Order_Item::get_services_total($item),
+					array( 'currency' => $order->get_currency())
+				);
+
+			case '_wiaas_recurrent_extra':
+				$order = $item->get_order();
+
+				return wc_price(
+					Wiaas_Order_Item::get_recurrent_total($item),
+					array( 'currency' => $order->get_currency())
+				);
+
+			default:
+				return $display_value;
+		}
+	}
+
+}
+
+Wiaas_Admin_Orders::init();

backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-organization.php

@@ -141,7 +141,7 @@ class Wiaas_Admin_Organization {
      * @param $admin_bar
      */
     public static function add_role_switcher_menu($admin_bar) {
-        if (is_super_admin()) {
+        if (get_current_user_id() === Wiaas_Authentication::SUPER_ADMIN_USER_ID) {
             $roles = array( 'administrator' );
         } else {
             $organization_id = wiaas_get_current_user_organization_id();

backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-flow.php

@@ -4,135 +4,62 @@ class Wiaas_Admin_Order_Process_Flow {
 
 	public static function init() {
 
+		add_action( 'admin_menu', array(__CLASS__, 'add_delivery_process_page') );
+
 		add_action( 'gravityflow_entry_detail', array( __CLASS__, 'display_process_steps_details' ), 10, 3 );
-
-		//add_action( 'gravityflow_title_entry_detail', array( __CLASS__, 'process_title' ), 10, 3 );
-
-		add_action('gravityflow_entry_detail', array(__CLASS__, 'add_delivery_dates_box'), 9, 3);
-
-		add_action('gravityflow_entry_detail', array(__CLASS__, 'maybe_display_delivery_process_navigation'), 9, 3);
-
-		add_action('gravityflow_workflow_detail_sidebar', array(__CLASS__, 'render_procurement_order_download_link'), 10, 3);
-
-		add_filter('gravityflow_admin_action_feedback', array(__CLASS__, 'maybe_process_admin_step_change_action'), 10, 4);
-
-		add_filter('gravityflow_admin_actions_workflow_detail', array(__CLASS__, 'filter_workflow_admin_actions'), 10, 5);
 	}
 
-	/**
-     * Filter workflow admin actions
-     *
-	 * @param $admin_actions
-	 * @param $current_step
-	 * @param $steps
-	 * @param $form
-	 * @param $entry
-	 *
-	 * @return array
-	 */
-	public static function filter_workflow_admin_actions($admin_actions, $current_step, $steps, $form, $entry) {
-
-	    $allowed_actions = array();
-
-	    // allow basic admin actions for step action workflow
-	    if (Wiaas_Delivery_Process_Action::is_action_form($form)) {
-
-		    $allowed_actions = array( 'cancel_workflow', 'restart_workflow', 'restart_step');
-        }
-
-        $filtered_admin_actions = array();
-
-		foreach ( $admin_actions as $admin_action ) {
-
-		    if (in_array($admin_action['value'], $allowed_actions)) {
-		        $filtered_admin_actions[] = $admin_action;
-            }
-	    }
-
-	    return $filtered_admin_actions;
+	public static function add_delivery_process_page() {
+		add_submenu_page(
+			'edit.php?post_type=shop_order',
+			__( 'Order Delivery', 'wiaas' ),
+			null,
+			'read',
+			'wiaas-order-delivery',
+			array(__CLASS__, 'output_delivery_process')
+		);
     }
 
-	public static function render_procurement_order_download_link($form, $entry, $current_step) {
+    public static function output_delivery_process() {
+	    $order_id = absint( $_GET['id'] );
 
-		if(! GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' ) ||
-		   empty( $current_step ) ||
-		   Wiaas_Delivery_Process_Action::is_action_form($form) )  {
-			return;
-		}
+	    $has_access = Wiaas_Access_Management::can_current_user_read_order($order_id);
 
-		$order_id = $entry['wiaas_delivery_order_id'];
+	    if (! $has_access) {
 
-		?>
+		    echo "<h2>You don't have permission to view this order.</h2>";
 
-		<div class="postbox">
-			<h3 class="hndle">
-				<?php esc_html_e('Procurement report', 'wiaas') ?>
-			</h3>
-			<div style="padding: 10px;">
-				<a
-					id="wiaas_download_procurement_order_btn"
-					href="<?php echo admin_url() . '?wiaas-procurement-order-id=' . $order_id ?>"
-					download
-					class="button"
-				>
-					<span><?php esc_html_e('Download procurement report', 'wiaas') ?></span>
-				</a>
-			</div>
-		</div>
-		<?php
+		    return;
+	    }
 
-	}
+	    $order = wc_get_order($order_id);
 
-	public static function add_delivery_dates_box($form, $entry, $current_step) {
+	    if ( !$order ) {
+	        return;
+        }
 
-		if(! GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' ) ||
-		   empty( $current_step ) || Wiaas_Delivery_Process_Action::is_action_form($form) )  {
-			return;
-		}
+	    $delivery_process = Wiaas_Delivery_Process::get_order_delivery_process_entry($order->get_id());
 
-		$workflow_api = new Gravity_Flow_API($form['id']);
-		$steps = $workflow_api->get_steps();
+	    if ($delivery_process &&
+            wp_verify_nonce($_POST['wiaas_delivery_process_navigation_nonce'], 'wiaas_delivery_process_navigation') &&
+            GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
 
-		/**
-		 * Disable if:
-		 *  - actions for customer config validation is not done
-		 * - action for customer acceptance is active or completed
-		 */
-		$is_disabled = false;
-		foreach ($steps as $step) {
+	        self::_maybe_process_admin_step_change_action($delivery_process);
 
-			if (Wiaas_Delivery_Process_Action::process_step_has_customer_validate_questionnaires_action($step) &&
-			    $step->get_status() !== 'complete') {
+	        // refresh order
+            $order = wc_get_order($order_id);
+        }
 
-				$is_disabled = true;
-				break;
-			}
+        require 'views/html-admin-delivery-process-page.php';
+    }
 
-			if (Wiaas_Delivery_Process_Action::process_step_has_customer_acceptance_action($step) &&
-			    ($step->get_id() === $current_step->get_id() || $step->get_status() === 'complete')) {
-
-				$is_disabled = true;
-				break;
-			}
-		}
-
-		$order_id = $entry['wiaas_delivery_order_id'];
-
-		$suppliers = Wiaas_Order::get_suppliers($order_id);
-		$final_estimated_date = Wiaas_Order::get_final_estimated_date($order_id);
-		$final_confirmed_date = Wiaas_Order::get_final_confirmed_date($order_id);
-		$earliest_installation_date = Wiaas_Order::get_earliest_installation_date($order_id);
-
-		require 'views/html-order-suppliers-delivery-dates.php';
-	}
-
-	public static function maybe_process_admin_step_change_action($feedback, $admin_action, $form, $entry) {
+	private static function _maybe_process_admin_step_change_action($entry) {
 
 		$admin_action = rgpost( 'wiaas_delivery_process_navigation_action' );
 
 		if ($admin_action === 'complete') {
 
-			$api = new Gravity_Flow_API( $form['id'] );
+			$api = new Gravity_Flow_API( $entry['form_id'] );
 
 			$current_step = $api->get_current_step($entry);
 
@@ -142,294 +69,15 @@ class Wiaas_Admin_Order_Process_Flow {
 			}
 
 			$api->process_workflow($entry['id']);
-
-			$feedback = esc_html__( 'Workflow Complete',  'wiaas' );
-
-			return $feedback;
         }
 
 		list( $base_admin_action, $action_id ) = rgexplode( '|', $admin_action, 2 );
 
 		if ( $base_admin_action == 'send_to_step' ) {
 			$step_id = $action_id;
-			$api = new Gravity_Flow_API( $form['id'] );
+			$api = new Gravity_Flow_API( $entry['form_id'] );
 			$api->send_to_step( $entry, $step_id );
-			$entry = GFAPI::get_entry( $entry['id'] );
-			$new_step = $api->get_current_step( $entry );
-			$feedback = $new_step ?
-				sprintf( esc_html__( 'Sent to step: %s',  'wiaas' ), $new_step->get_name() ) :
-				esc_html__( 'Workflow Complete',  'wiaas' );
 		}
-
-		return $feedback;
-	}
-
-	public static function maybe_display_delivery_process_navigation($form, $entry, $current_step) {
-
-		if(! GFAPI::current_user_can_any( 'gravityflow_workflow_detail_admin_actions' ) ||
-		   empty( $current_step ) ||
-		   Wiaas_Delivery_Process_Action::is_action_form($form) )  {
-			return;
-		}
-
-		$steps = gravity_flow()->get_steps($form['id'], $entry);
-
-		// get next step id
-		$next_step = gravity_flow()->get_next_step($current_step, $entry, $form);
-		$next_step_id = empty($next_step) ? null : $next_step->get_id();
-
-		// get previous step id
-		foreach ($steps as $step) {
-
-			$next = gravity_flow()->get_next_step($step, $entry, $form);
-			if ($next && $next->get_id() === $current_step->get_id()) {
-				$previous_step = $step;
-			}
-		}
-		$previous_step_id = empty($previous_step) ? null : $previous_step->get_id();
-
-		// bail out if none exist
-		if ( empty($next_step_id) && empty($previous_step_id) ) {
-
-			return;
-		}
-
-		/**
-		 * @reference Gravity_Flow::maybe_process_admin_action for used field names
-		 *            which are being checked there
-		 *
-		 */
-
-		?>
-
-		<div style="padding:10px; height:40px">
-
-			<input id="wiaas_delivery_process_navigation_action" type="hidden" name="wiaas_delivery_process_navigation_action">
-			<input type="hidden" name="_gravityflow_admin_action" value="1">
-
-			<input
-				data-step="<?php echo empty($next_step_id) ? 'complete' : 'send_to_step|'.$next_step_id ?>"
-				type="submit"
-				class="button button-primary wiaas_delivery_step_nav"
-				style="float:right; margin-left: 20px;"
-                value="<?php echo empty($next_step_id) ? 'COMPLETE' : 'NEXT STEP' ?>"
-            >
-
-			<input
-				data-step="send_to_step|<?php esc_attr_e($previous_step_id, 'wiaas') ?>"
-				type="submit"
-				<?php disabled(empty($previous_step_id), true, true) ?>
-				class="button button-primary wiaas_delivery_step_nav"
-				style="float:right;" value="PREV STEP">
-		</div>
-		<?php
-	}
-
-	public static function display_process_steps_details($form, $entry, $current_step) {
-
-		$delivery_settings = rgar($form, 'wiaas_delivery_process');
-
-		if ($delivery_settings['delivery_form_type'] === 'action') {
-			return;
-		}
-
-		// get process order ID
-		$order_id = absint($entry['wiaas_delivery_order_id']);
-
-		if (empty($order_id)) {
-
-			$order_field = GFCommon::get_fields_by_type($form, array( 'wiaas_order') )[0];
-
-			if ( ! empty($order_field)) {
-
-				$order_id = $entry[$order_field->id];
-			}
-		}
-
-		// display process steps
-
-		$workflow_api = new Gravity_Flow_API($form['id']);
-
-		$steps = $workflow_api->get_steps();
-
-		?>
-
-		<div class="postbox">
-			<h3>
-				<i class="fa fa-circle" style="font-size: 22px; margin-right: 10px;color: #34C388; "></i>
-				<span>Order placed </span>
-			</h3>
-		</div>
-
-		<div class="postbox">
-			<h3>
-				<i class="fa fa-circle" style="font-size: 22px; margin-right: 10px;color: #34C388; "></i>
-				<span> Assign process </span>
-			</h3>
-		</div>
-
-		<?php
-
-		foreach ($steps as $index => $step) {
-
-			if (! $step->is_active()) {
-				continue;
-			}
-
-			$is_step_completed = $step->get_status() === 'complete' || $step->get_status() === 'approved';
-			$is_current_step = $current_step && $step->get_id() === $current_step->get_id();
-
-			if ($is_current_step) {
-				$style = 'color: #FD8049;';
-			} else if ($is_step_completed) {
-				$style = 'color: #34C388;';
-			} else {
-				$style = 'opacity: 0.5; color: #CCC;';
-			}
-
-			?>
-
-			<div class="postbox">
-
-				<h3>
-					<i class="fa fa-circle" style="font-size: 22px; margin-right: 10px; <?php esc_attr_e($style, 'wiaas') ?>"></i>
-					<span><?php esc_html_e($step->get_name(), 'wiaas') ?></span>
-				</h3>
-
-				<?php
-				Gravity_Flow_Entry_Detail::maybe_show_instructions(true, true, $current_step, $form, $entry);
-
-				$action_form = GFAPI::get_form( $step->target_form_id );
-
-				if (empty($action_form)) {
-
-					echo '</div>';
-
-					continue;
-				}
-
-				$page_size       = 20;
-				$search_criteria = array(
-					'status'        => 'active',
-					'field_filters' => array(
-						array( 'key'   => 'wiaas_delivery_process_id',
-						       'value' => $entry['id']
-						),
-					),
-				);
-				$sorting         = array( 'key' => 'date_created', 'direction' => 'DESC' );
-				$paging          = array( 'offset' => 0, 'page_size' => $page_size );
-
-				$entries = GFAPI::get_entries( $action_form['id'], $search_criteria, $sorting, $paging );
-
-				if (empty($entries)) {
-
-				    echo '</div>';
-
-					continue;
-                }
-
-				?>
-
-                <div class="submitbox" style="padding: 10px;">
-
-                    <table>
-                        <tbody>
-						<?php
-						echo '<br><br><br>';
-
-
-						foreach ($entries as $action_entry) {
-							self::_display_step_action_entry($action_form, $action_entry);
-						}
-
-						?>
-                        </tbody>
-                    </table>
-
-
-
-                </div>
-
-				<?php
-				?>
-
-			</div>
-			<?php
-		}
-	}
-
-	private static function _display_step_action_entry($action_form, $action_entry) {
-		$workflow_api = new Gravity_Flow_API($action_entry['form_id']);
-
-		$current_action_step = $workflow_api->get_current_step($action_entry);
-
-		$entry_url = add_query_arg( array(
-			'page' => 'gravityflow-inbox',
-			'view' => 'entry',
-			'id' => $action_entry['form_id'],
-			'lid' => $action_entry['id']
-		), admin_url() );
-
-
-		?>
-		<table>
-
-			<?php
-			foreach ($action_form['fields'] as $field) {
-
-				if ($field->type === 'wiaas_order') {
-					continue;
-				}
-
-				if ($field->type === 'workflow_discussion') {
-
-					echo '<tr style="padding: 20px;"><td colspan="2">' . $field->format_discussion_value($action_entry[$field->id]) . '</td></tr>';
-
-					continue;
-				}
-
-				$value = $field->get_value_entry_detail($action_entry[$field->id]);
-				$label = $field->get_field_label(false, $action_entry[$field->id]);
-
-				echo '<tr>' .
-				     '<td><strong>' . $label . ' : </strong></td>' .
-				     '<td>' . $value . '</td>' .
-				     '</tr>';
-			}
-
-			?>
-
-			<tfoot>
-			<tr>
-				<td colspan="2" style="text-transform: uppercase;font-size: 11px; letter-spacing: 0.4px; margin:10px;">
-					<strong>
-
-						<?php
-
-						echo empty($current_action_step) ?
-                            $workflow_api->get_status($action_entry) :
-							$current_action_step->get_status_label($current_action_step->get_status()) . ': ' . $current_action_step->get_name();;
-
-						echo '<a target="_blank" href="' . $entry_url  . '">' .
-						     ' <i class="fa fa-external-link" style="font-size: 16px;"></i>' .
-						     '</a>';
-
-						?>
-
-					</strong>
-				</td>
-			</tr>
-			</tfoot>
-
-			<?php
-
-
-			?>
-		</table>
-
-		<hr />
-		<?php
 	}
 
 }

backend/app/plugins/wiaas/includes/admin/delivery-process/class-wiaas-admin-delivery-process-order.php

@@ -77,12 +77,7 @@ class Wiaas_Admin_Delivery_Process_Order {
 			<?php
 		}  else{
 
-			$entry_url = add_query_arg( array(
-				'page' => 'gravityflow-inbox',
-				'view' => 'entry',
-				'id' => $process_entry['form_id'],
-				'lid' => $process_entry['id']
-			), admin_url() );
+			$entry_url = admin_url('admin.php?page=wiaas-order-delivery&id=' . $order_id);
 
 			?>
 			<a href="<?php esc_attr_e($entry_url, 'wiaas') ?>"> Delivery Process </a>

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-admin-delivery-process-page.php

@@ -0,0 +1,208 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Order $order
+ *
+ */
+
+$delivery_process = Wiaas_Delivery_Process::get_order_delivery_process_entry($order->get_id());
+
+if ( ! empty($delivery_process)) {
+
+	$form_id = $delivery_process['form_id'];
+	$workflow_api = new Gravity_Flow_API($form_id);
+
+	$current_step = $workflow_api->get_current_step($delivery_process);
+
+	$steps = $workflow_api->get_steps();
+}
+
+?>
+
+<div class="wrap">
+	<form name="delivery" action="" method="post">
+		<input type="hidden" name="page" value="wiaas-order-delivery"/>
+		<input type="hidden" name="id" value="<?php echo esc_attr($order->get_id()) ?>"/>
+		<div id="poststuff">
+			<div id="post-body" class="metabox-holder columns-2">
+
+				<div id="postbox-container-1" class="postbox-container">
+					<div class="postbox">
+						<div class="inside">
+
+							<?php require 'html-order-notes.php' ?>
+
+						</div>
+					</div>
+				</div>
+
+				<div id="postbox-container-2" class="postbox-container">
+
+					<div class="postbox">
+						<div class="inside">
+							<div class="panel-wrap">
+								<div class="panel">
+									<h1>
+										Delivery Order
+										<?php
+											if (current_user_can('edit_others_shop_orders')) {
+												echo '<a href="' . esc_url( admin_url( 'post.php?post=' . absint( $order->get_id() ) ) . '&action=edit' ) . '">#' . esc_attr( $order->get_order_number() ) . '</a>';
+ 											} else {
+												echo '#' . esc_attr($order->get_order_number());
+											}
+										?>
+										&nbsp &nbsp
+										<mark class="wiaas-order-status <?php esc_attr_e( sanitize_html_class( 'wiaas-order-status-' . $order->get_status() ), 'wiaas' ) ?>">
+											<span>
+												<?php esc_html_e( wc_get_order_status_name( $order->get_status() ) ) ?>
+											</span>
+										</mark>
+									</h1>
+
+									<?php
+										if (GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
+
+											?>
+											<p>
+												<a
+													id="wiaas_download_procurement_order_btn"
+													href="<?php echo admin_url() . '?wiaas-procurement-order-id=' . $order->get_id() ?>"
+													download
+													class="button"
+												>
+													<span><?php esc_html_e('Download procurement report', 'wiaas') ?></span>
+												</a>
+											</p>
+											<?php
+										}
+									?>
+
+									<?php
+
+									if (empty($delivery_process)) {
+
+										echo '<h2>Delivery process has not been assigned.</h2>';
+									}
+
+									if (! empty($delivery_process)) {
+
+										$is_disabled = ! Wiaas_Delivery_Process::can_delivery_dates_be_set($order->get_id(), $delivery_process, $steps);
+
+										require 'html-order-suppliers-delivery-dates.php';
+									}
+
+									?>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<?php
+
+
+					if (! empty($delivery_process)) {
+
+						if ($current_step && GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
+
+							require 'html-delivery-process-navigation.php';
+						}
+
+						?>
+
+						<div class="postbox">
+							<h3>
+								<i class="dashicons dashicons-marker" style="font-size: 22px; margin-right: 10px;color: #34C388; "></i>
+								<span>Order placed </span>
+							</h3>
+						</div>
+
+						<div class="postbox">
+							<h3>
+								<i class="dashicons dashicons-marker" style="font-size: 22px; margin-right: 10px;color: #34C388; "></i>
+								<span> Assign process </span>
+							</h3>
+						</div>
+
+						<?php
+
+                        foreach ($steps as $step) {
+							$step = $workflow_api->get_step($step->get_id(), $delivery_process);
+
+							require 'html-delivery-process-step.php';
+						}
+
+						?>
+
+                        <div id="postbox-container-2" class="postbox-container">
+                            <div id="wiaas-delivery-process-timeline" class="postbox">
+                                <h3>
+                                    <label for="name"><?php esc_html_e( 'Timeline', 'gravityflow' ); ?></label>
+                                </h3>
+
+                                <div class="inside">
+									<?php
+
+									$notes = Gravity_Flow_Common::get_timeline_notes( $delivery_process );
+
+									foreach ( $notes as $note ) {
+										$user_id      = $note->user_id;
+										$step         = Gravity_Flow_Common::get_timeline_note_step( $note );
+										$display_name = Gravity_Flow_Common::get_timeline_note_display_name( $note, $step );
+										$step_type    = $step ? $step->get_type() : $display_name;
+
+										if ( $user_id ) {
+											$avatar = get_avatar( $user_id, 65 );
+										} else {
+											$step_icon = $step ? $step->get_icon_url() : gravity_flow()->get_base_url() . '/images/gravityflow-icon-blue.svg';
+
+											if ( strpos( $step_icon, 'http' ) !== false ) {
+												$avatar = sprintf( '<img class="avatar avatar-65 photo" src="%s" style="width:65px;height:65px;" />', $step_icon );
+											} else {
+												$avatar = sprintf( '<span class="avatar avatar-65 photo">%s</span>', $step_icon );
+											}
+										}
+
+										?>
+                                            <div class="wiaas-delivery-process-timeline-note">
+                                                <div class="wiaas-delivery-process-timeline-note-avatar">
+                                                    <?php echo $avatar ?>
+                                                </div>
+                                                <div class="wiaas-delivery-process-timeline-note-body-wrap">
+                                                    <div class="wiaas-delivery-process-timeline-note-body">
+                                                        <div>
+                                                            <div class="wiaas-delivery-process-timeline-note-title">
+                                                                <?php esc_html_e( $display_name, 'wiaas' ) ?>
+                                                            </div>
+                                                            <div class="wiaas-delivery-process-timeline-note-date">
+	                                                            <?php esc_html_e( Gravity_Flow_Common::format_date( $note->date_created ), 'wiaas' ) ?>
+                                                            </div>
+                                                        </div>
+                                                        <div class="wiaas-delivery-process-timeline-note-body">
+                                                            <?php echo nl2br( esc_html( $note->value ) ) ?>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        <?php
+									}
+
+                                    ?>
+                                </div>
+
+                            </div>
+                        </div>
+
+						<?php
+					}
+					?>
+
+				</div>
+
+			</div>
+		</div>
+	</form>
+</div>

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-navigation.php

@@ -0,0 +1,50 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$is_step_completed = $current_step->get_status() === 'complete' || $current_step->get_status() === 'approved';
+
+// get next step id
+$next_step = gravity_flow()->get_next_step($current_step, $current_step->get_entry(), $current_step->get_form());
+$next_step_id = empty($next_step) ? null : $next_step->get_id();
+
+// get previous step id
+foreach ($steps as $step) {
+
+	$next = gravity_flow()->get_next_step($step, $current_step->get_entry(), $current_step->get_form());
+	if ($next && $next->get_id() === $current_step->get_id()) {
+		$previous_step = $step;
+	}
+}
+$previous_step_id = empty($previous_step) ? null : $previous_step->get_id();
+
+// bail out if none exist
+if ( empty($next_step_id) && empty($previous_step_id) && $is_step_completed) {
+
+	return;
+}
+
+?>
+
+<div style="padding:10px; height:40px">
+
+	<input id="wiaas_delivery_process_navigation_action" type="hidden" name="wiaas_delivery_process_navigation_action">
+	<?php wp_nonce_field( 'wiaas_delivery_process_navigation', 'wiaas_delivery_process_navigation_nonce' ); ?>
+
+	<input
+		data-step="<?php echo empty($next_step_id) ? 'complete' : 'send_to_step|'.$next_step_id ?>"
+		type="submit"
+		class="button button-primary wiaas_delivery_step_nav"
+		style="float:right; margin-left: 20px;"
+		value="<?php echo empty($next_step_id) ? 'COMPLETE' : 'NEXT STEP' ?>"
+	>
+
+	<input
+		data-step="send_to_step|<?php esc_attr_e($previous_step_id, 'wiaas') ?>"
+		type="submit"
+		<?php disabled(empty($previous_step_id), true, true) ?>
+		class="button button-primary wiaas_delivery_step_nav"
+		style="float:right;" value="PREV STEP">
+</div>

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step-action.php

@@ -0,0 +1,77 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$workflow_api = new Gravity_Flow_API($action_entry['form_id']);
+
+$current_action_step = $workflow_api->get_current_step($action_entry);
+
+$entry_url = add_query_arg( array(
+	'page' => 'gravityflow-inbox',
+	'view' => 'entry',
+	'id' => $action_entry['form_id'],
+	'lid' => $action_entry['id']
+), admin_url() );
+
+?>
+
+<table style="padding: 10px;">
+
+	<?php
+	foreach ($action_form['fields'] as $field) {
+
+		if ($field->type === 'wiaas_order') {
+			continue;
+		}
+
+		if ($field->type === 'workflow_discussion') {
+
+			echo '<tr style="padding: 20px;"><td colspan="2">' . $field->format_discussion_value($action_entry[$field->id]) . '</td></tr>';
+
+			continue;
+		}
+
+		$value = $field->get_value_entry_detail($action_entry[$field->id]);
+		$label = $field->get_field_label(false, $action_entry[$field->id]);
+
+		echo '<tr>' .
+		     '<td><strong>' . $label . ' : </strong></td>' .
+		     '<td>' . $value . '</td>' .
+		     '</tr>';
+	}
+
+	?>
+
+	<tfoot>
+	<tr>
+		<td colspan="2" style="text-transform: uppercase;font-size: 11px; letter-spacing: 0.4px; margin:10px;">
+			<strong>
+
+				<?php
+
+				echo empty($current_action_step) ?
+					$workflow_api->get_status($action_entry) :
+					$current_action_step->get_status_label($current_action_step->get_status()) . ': ' . $current_action_step->get_name();;
+
+				echo '<a target="_blank" href="' . $entry_url  . '">' .
+				     ' <i class="dashicons dashicons-external" style="font-size: 16px;"></i>' .
+				     '</a>';
+
+				?>
+
+			</strong>
+		</td>
+	</tr>
+	</tfoot>
+
+	<?php
+
+
+	?>
+</table>
+
+<hr />
+
+

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php

@@ -0,0 +1,75 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$is_step_completed = $step->get_status() === 'complete' || $step->get_status() === 'approved';
+$is_current_step = $current_step && $step->get_id() === $current_step->get_id();
+
+if ($is_current_step) {
+	$style = 'color: #FD8049;';
+} else if ($is_step_completed) {
+	$style = 'color: #34C388;';
+} else {
+	$style = 'opacity: 0.5; color: #CCC;';
+}
+
+?>
+
+<div class="postbox">
+
+	<h3>
+		<i class="dashicons dashicons-marker" style="font-size: 22px; margin-right: 10px; <?php esc_attr_e($style, 'wiaas') ?>"></i>
+		<span><?php esc_html_e($step->get_name(), 'wiaas') ?></span>
+	</h3>
+
+	<?php
+
+	if ($step->instructionsEnable) {
+
+		$instructions = $step->instructionsValue;
+		$instructions = GFCommon::replace_variables( $instructions, $step->get_form(), $step->get_entry(), false, false, true );
+		$instructions = do_shortcode( $instructions );
+
+		echo '<div class="wiaas-delivery-process-step-instructions">' . $instructions . '</div>';
+	}
+
+	$action_form = GFAPI::get_form( $step->target_form_id );
+
+	if (! empty($action_form)) {
+
+		$page_size       = 20;
+		$search_criteria = array(
+			'status'        => 'active',
+			'field_filters' => array(
+				array( 'key'   => 'wiaas_delivery_process_id',
+				       'value' => $delivery_process['id']
+				),
+			),
+		);
+		$sorting         = array( 'key' => 'date_created', 'direction' => 'DESC' );
+		$paging          = array( 'offset' => 0, 'page_size' => $page_size );
+
+		$entries = GFAPI::get_entries( $action_form['id'], $search_criteria, $sorting, $paging );
+
+		$action_workflow = new Gravity_Flow_API($action_form['id']);
+		$current_assignee_key = $step->get_current_assignee_key();
+
+		foreach ($entries as $action_entry) {
+
+			$action_entry_step = $action_workflow->get_current_step($action_entry);
+
+			$show_entry = GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' ) ||
+			              ($action_entry_step &&
+			               $action_entry_step->is_assignee($current_assignee_key));
+
+			if ($show_entry) {
+				require 'html-delivery-process-step-action.php';
+			}
+		}
+	}
+
+	?>
+
+</div>

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-notes.php

@@ -0,0 +1,53 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+$notes = wc_get_order_notes( array( 'order_id' => $order->get_id(), 'type' => 'customer' ) );
+
+?>
+
+<div id="wiaas_delivery_process_order_notes" class="delivery-process-notes">
+
+	<div id="delivery_process_order_notes_list">
+		<?php
+		foreach ($notes as $note) {
+
+			?>
+			<div class="note_content">
+				<?php echo wpautop( wptexturize( wp_kses_post( $note->content ) ) ); ?>
+			</div>
+			<p class="meta">
+				<abbr class="exact-date" title="<?php echo $note->date_created->date( 'y-m-d h:i:s' ); ?>"><?php printf( __( 'added on %1$s at %2$s', 'woocommerce' ), $note->date_created->date_i18n( wc_date_format() ), $note->date_created->date_i18n( wc_time_format() ) ); ?></abbr>
+				<?php
+				if ( 'system' !== $note->added_by ) :
+					/* translators: %s: note author */
+					printf( ' ' . __( 'by %s', 'woocommerce' ), $note->added_by );
+				endif;
+				?>
+			</p>
+			<?php
+		}
+		?>
+	</div>
+
+	<div class="add-note">
+		<p>
+			<label for="add_order_note"><?php _e( 'Add note', 'woocommerce' ); ?> <?php echo wc_help_tip( __( 'Add a note for your reference, or add a customer note (the user will be notified).', 'woocommerce' ) ); ?></label>
+			<textarea
+				data-order-id="<?php esc_attr_e($order->get_id(), 'wiaas') ?>"
+				data-nonce="<?php  esc_attr_e( wp_create_nonce( 'wiaas-add-order-note' ), 'wiaas') ?>"
+				type="text"
+				name="order_note"
+				id="wiaas_add_order_note"
+				class="input-text"
+				cols="20" rows="5"></textarea>
+		</p>
+		<p>
+			<input type="hidden" name="order_note_type" value="customer"/>
+			<button type="button" id="wiaas_delivery_process_add_note" class="add_note button"><?php _e( 'Add', 'woocommerce' ); ?></button>
+		</p>
+	</div>
+
+</div>

backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-order-suppliers-delivery-dates.php

@@ -2,9 +2,16 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
+
+$suppliers = Wiaas_Order::get_suppliers($order_id);
+$final_estimated_date = Wiaas_Order::get_final_estimated_date($order_id);
+$final_confirmed_date = Wiaas_Order::get_final_confirmed_date($order_id);
+$earliest_installation_date = Wiaas_Order::get_earliest_installation_date($order_id);
+
 ?>
 
-<div style="margin-top: -20px;">
+<div>
+    <br>
     <table class="widefat" disabled="disabled">
     <tr style="background: #EAF2FA;">
         <th align="left"><strong>Suppliers</strong></th>
@@ -54,35 +61,50 @@ if ( ! defined( 'ABSPATH' ) ) {
                             <input id=<?php echo 'supplier_' . $supplier['id'] . '_tracking_url_' . $index ?>
                                    <?php disabled($is_disabled, true, true) ?>
                                    placeholder="Tracking URL" value="<?php echo $tracking_info['url'] ?>" />
-                            <input
-                                    type="button"
-	                                <?php disabled($is_disabled, true, true) ?>
-                                    class="button"
-                                    onClick="saveTrackingInfo(event, <?php echo $supplier['id'] . ',' . $index ?>)"
-                                    value="SAVE">
-                            <input
-                                    type="button"
-	                                <?php disabled($is_disabled, true, true) ?>
-                                    class="button"
-                                    onClick="deleteTrackingInfo(event, <?php echo $supplier['id'] . ',' . $index ?>)" value="REMOVE"
-                            >
+
+                            <?php
+                                if (! $is_disabled) {
+
+                                    ?>
+                                    <input
+                                            type="button"
+		                                <?php disabled($is_disabled, true, true) ?>
+                                            class="button"
+                                            onClick="saveTrackingInfo(event, <?php echo $supplier['id'] . ',' . $index ?>)"
+                                            value="SAVE">
+                                    <input
+                                            type="button"
+		                                <?php disabled($is_disabled, true, true) ?>
+                                            class="button"
+                                            onClick="deleteTrackingInfo(event, <?php echo $supplier['id'] . ',' . $index ?>)" value="REMOVE"
+                                    >
+                                    <?php
+
+                                }
+                            ?>
                         </td>
                         
                     </tr>
 
                     <?php
                 }
+
+                if (! $is_disabled) {
+
+                    ?>
+                    <tr>
+                        <td colspan="4">
+                            <input
+                                    type="button"
+				                <?php disabled($is_disabled, true, true) ?>
+                                    class="button"
+                                    id=<?php echo $supplier['id'] ?> onClick="addAdditionalTrackingInfo(event)"
+                                    value="Add new tracking info">
+                        </td>
+                    </tr>
+                    <?php
+                }
             ?>
-            <tr>
-                <td colspan="4">
-                    <input
-                            type="button"
-	                        <?php disabled($is_disabled, true, true) ?>
-                            class="button"
-                            id=<?php echo $supplier['id'] ?> onClick="addAdditionalTrackingInfo(event)"
-                            value="Add new tracking info">
-                </td>
-            </tr>
 
             <?php
         }

backend/app/plugins/wiaas/includes/admin/delivery-process/wiaas-admin-delivery-process-ajax.php

@@ -6,6 +6,7 @@ add_action( 'wp_ajax_wiaas_delete_tracking_info', 'wiaas_ajax_delete_tracking_in
 add_action( 'wp_ajax_wiaas_save_estimated_date_for_supplier', 'wiaas_ajax_save_estimated_date_for_supplier');
 add_action( 'wp_ajax_wiaas_save_confirmed_date_for_supplier', 'wiaas_ajax_save_confirmed_date_for_supplier');
 add_action( 'wp_ajax_wiaas_save_estimated_date_for_order', 'wiaas_ajax_save_estimated_date_for_order');
+add_action( 'wp_ajax_wiaas_add_order_note', 'wiaas_ajax_add_order_note');
 
 /**
  * Adds additional tracking info for supplier in order
@@ -27,6 +28,38 @@ function wiaas_ajax_add_additional_tracking_info_for_supplier_in_order(){
 	wp_send_json_error($error);
 }
 
+/**
+ * Add order note via ajax.
+ */
+function wiaas_ajax_add_order_note() {
+	check_ajax_referer( 'wiaas-add-order-note', 'security' );
+
+	if ( ! current_user_can( 'edit_shop_orders' ) ) {
+		wp_die( -1 );
+	}
+
+	$post_id   = absint( $_POST['post_id'] );
+	$note      = wp_kses_post( trim( wp_unslash( $_POST['note'] ) ) );
+
+	if ( $post_id > 0 ) {
+		$order      = wc_get_order( $post_id );
+		$comment_id = $order->add_order_note( $note, true, true );
+		$note       = wc_get_order_note( $comment_id );
+		?>
+		<div class="note_content">
+			<?php echo wpautop( wptexturize( wp_kses_post( $note->content ) ) ); ?>
+		</div>
+		<p class="meta">
+			<abbr class="exact-date" title="<?php echo $note->date_created->date( 'y-m-d h:i:s' ); ?>"><?php printf( __( 'added on %1$s at %2$s', 'woocommerce' ), $note->date_created->date_i18n( wc_date_format() ), $note->date_created->date_i18n( wc_time_format() ) ); ?></abbr>
+			<?php
+				printf( ' ' . __( 'by %s', 'wiaas' ), $note->added_by );
+			?>
+		</p>
+		<?php
+	}
+	wp_die();
+}
+
 function wiaas_ajax_save_tracking_info(){
 	check_ajax_referer('wiaas_save_tracking_info');
 	$error = new WP_Error('-1', 'Failed to save tracking info');

backend/app/plugins/wiaas/includes/admin/pricing/class-wiaas-admin-package-pricing.php

@@ -18,6 +18,9 @@ class Wiaas_Admin_Package_Pricing {
 		add_action('woocommerce_product_options_general_product_data', array(__CLASS__, 'render_edit_prices_link'));
 
 		add_filter('woocommerce_bundle_price_html',  array( __CLASS__, 'get_package_price_html' ), 10, 2);
+
+		add_filter('woocommerce_screen_ids', array(__CLASS__, 'add_package_pricing_page_to_woocommerce_screens'), 10, 1);
+
 	}
 
 	public static function get_package_price_html($price_html, $package) {
@@ -116,6 +119,10 @@ class Wiaas_Admin_Package_Pricing {
 		include 'views/html-package-pricing-page.php';
 	}
 
+	public static function add_package_pricing_page_to_woocommerce_screens( $screens ){
+	    $screens[] = 'product_page_wiaas-package_price_editor';
+	    return $screens;
+    }
 
 	// PRIVATE HELPERS
 

backend/app/plugins/wiaas/includes/admin/pricing/views/html-package-pricing-page.php

@@ -187,7 +187,9 @@ if ( ! defined( 'ABSPATH' ) ) {
                             <input type="hidden" name="id" value="<?php esc_attr_e($package->get_id(), 'wiaas') ?>">
 
                             <div class="form-field">
-                                <label><?php esc_html_e('Max cost margin:', 'wiaas') ?></label>
+                                    <label><?php esc_html_e('Max cost margin :', 'wiaas') ?>
+                                        <?php echo wc_help_tip('Product deactivation limit (total cost)') ?>
+                                    </label>
                                 <input
                                         id="wiaas_pricing_rules_max_cost_margin"
                                         name="wiaas_max_cost_margin"

backend/app/plugins/wiaas/includes/class-wiaas-access-management.php

@@ -22,6 +22,16 @@ class Wiaas_Access_Management {
         add_action('wiaas_order_item_installation_assigned', array(__CLASS__, 'assign_order_to_installation_organization'), 10, 3);
 	}
 
+	/**
+	 * @param int $order_id
+	 *
+	 * @return bool
+	 */
+	public static function can_current_user_read_order($order_id) {
+
+		return Groups_Post_Access::user_can_read_post($order_id);
+	}
+
 	/**
 	 * Automatize access control for product and packages
 	 *

backend/app/plugins/wiaas/includes/class-wiaas-admin.php

@@ -30,15 +30,25 @@ class Wiaas_Admin {
 
         require_once dirname(__FILE__) . '/admin/class-wiaas-admin-user-profile.php';
 
-		require_once dirname(__FILE__) . '/admin/class-wiaas-admin-countries.php';
+        require_once dirname(__FILE__) . '/admin/class-wiaas-admin-countries.php';
+        
+        require_once dirname(__FILE__) . '/admin/class-wiaas-admin-orders.php';
+
+		require_once dirname(__FILE__) . '/admin/class-wiaas-admin-dashboard.php';
 
         add_action( 'admin_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'), 100 );
 	}
 
 
     public static  function enqueue_scripts() {
+
         $plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
 
+	    wp_enqueue_script( 'wiaas_data_tables', $plugin_url . '/assets/js/datatables.min.js' );
+	    wp_enqueue_style( 'wiaas_data_tables', $plugin_url . '/assets/css/datatables.min.css' );
+
+	    wp_enqueue_style( 'wiaas_admin', $plugin_url . '/assets/css/wiaas-admin.css' );
+
         wp_enqueue_style( 'wiaas_admin_menu', $plugin_url . '/assets/css/menu.css' );
 
         wp_enqueue_style( 'wiaas_admin_packages', $plugin_url . '/assets/css/wiaas-admin-package.css' );

backend/app/plugins/wiaas/includes/class-wiaas-cart.php

@@ -21,8 +21,6 @@ class Wiaas_Cart {
 	public static function init() {
 		add_action( 'woocommerce_checkout_create_order_line_item', array( __CLASS__, 'add_order_item_meta' ), 10, 3 );
 
-		add_filter( 'woocommerce_hidden_order_itemmeta', array( __CLASS__, 'hidden_order_item_meta' ) );
-
 		add_action( 'woocommerce_before_calculate_totals', array( __CLASS__, 'on_calculate_totals' ), 99, 1);
 
 		add_action( 'woocommerce_cart_loaded_from_session', array( __CLASS__, 'on_calculate_totals' ), 99, 1);
@@ -444,40 +442,6 @@ class Wiaas_Cart {
 		return $order_item;
 	}
 
-	/**
-	 * Mark extended properties for order as hidden
-	 * @param $hidden
-	 *
-	 * @return array
-	 */
-	public static function hidden_order_item_meta( $hidden ) {
-
-		return array_merge( $hidden, array(
-			'_wiaas_payment_type',
-			'_wiaas_services_extra',
-			'_wiaas_service_contract_period',
-			'_wiaas_max_contract_period',
-			'_wiaas_period_unit',
-			'_wiaas_recurrent_extra',
-			'_wiaas_pay_period',
-			'_wiaas_addon_items',
-			'_wiaas_addon_for',
-			'_wiaas_option_items',
-			'_wiaas_option_for',
-			'_wiaas_option_group_name',
-			'_wiaas_standard_package',
-			'_wiaas_documents',
-			'_wiaas_category',
-			'_wiaas_manufacturer_product_no',
-			'_wiaas_supplier_product_no',
-			'_wiaas_supplier_organization_id',
-			'_wiaas_product_price',
-			'_wiaas_earliest_installation_additional_days',
-			'_wiaas_installation',
-			'_wiaas_installation_date'
-		) );
-	}
-
 	/**
 	 * Sets additional order data form cart after order is successfully created
 	 *

backend/app/plugins/wiaas/includes/class-wiaas-db-update.php

@@ -29,7 +29,8 @@ class Wiaas_DB_Update {
 		'20181106133553' => 'wiaas_db_update_add_installation_date_delivery_action_form',
 		'20181125133553' => 'wiaas_db_update_add_country_settings_ui_fields',
 		'20181125143553' => 'wiaas_db_migration_fix_user_profile_addresses', // remove after migration
-		'20181125153553' => 'wiaas_db_migration_fix_countries' // remove after migration
+		'20181125153553' => 'wiaas_db_migration_fix_countries', // remove after migration,
+		'20181203115826' => 'wiaas_db_update_add_administrator_delivery_process_capabilities'
 	);
 
 	public static function execute() {

backend/app/plugins/wiaas/includes/class-wiaas-delivery-process.php

@@ -88,6 +88,123 @@ class Wiaas_Delivery_Process {
 		return false;
 	}
 
+	/**
+	 * Delivery dates cannot be set if:
+	 * - user cannot edit delivery dates
+	 * - actions for customer config validation is not done
+	 * - action for customer acceptance is active or completed
+	 *
+	 * @param int $order_id
+	 * @param mixed $delivery_process_entry
+	 * @param array $steps
+	 *
+	 * @return bool
+	 */
+	public static function can_delivery_dates_be_set($order_id, $delivery_process_entry = null, $steps = null) {
+
+		if ( empty($delivery_process_entry) ) {
+
+			$delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+		}
+
+		if (empty($delivery_process_entry) || ! GFAPI::current_user_can_any( 'manage_wiaas_order_delivery_process' )) {
+
+			return false;
+		}
+
+		$workflow_api = new Gravity_Flow_API($delivery_process_entry['form_id']);
+		$current_step = $workflow_api->get_current_step($delivery_process_entry);
+
+		if ( empty($steps) ) {
+			$steps = $workflow_api->get_steps();
+		}
+
+		foreach ($steps as $step) {
+			$step = $workflow_api->get_step($step->get_id(), $delivery_process_entry);
+
+			// customer validation not done
+			if ($step && Wiaas_Delivery_Process_Action::process_step_has_customer_validate_questionnaires_action($step) &&
+			    $step->get_status() !== 'complete') {
+
+				return false;
+			}
+
+			// customer acceptance is active or completed
+			if ($step && Wiaas_Delivery_Process_Action::process_step_has_customer_acceptance_action($step) &&
+			    ($current_step && $step->get_id() === $current_step->get_id() || $step->get_status() === 'complete')) {
+
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public static function get_next_actions_for_current_user() {
+
+		$current_user = wp_get_current_user();
+
+		$field_filters   = array();
+		$field_filters[] = array(
+			'key'   => 'workflow_user_id_' . $current_user->ID,
+			'value' => 'pending',
+		);
+
+		$user_roles = gravity_flow()->get_user_roles();
+		foreach ( $user_roles as $user_role ) {
+			$field_filters[] = array(
+				'key'   => 'workflow_role_' . $user_role,
+				'value' => 'pending',
+			);
+		}
+
+		$field_filters['mode'] = 'any';
+
+		$search_criteria                  = array();
+		$search_criteria['field_filters'] = $field_filters;
+		$search_criteria['status']        = 'active';
+
+		$form_ids = gravity_flow()->get_workflow_form_ids();
+
+		$entries = GFAPI::get_entries(
+			$form_ids,
+			$search_criteria,
+			null,
+			null);
+
+		$actions = array();
+
+		foreach ($entries as $entry) {
+
+			$order_id = $entry['wiaas_delivery_order_id'];
+			$order = wc_get_order($order_id);
+
+			if (! $order) {
+				continue;
+			}
+
+			$step = gravity_flow()->get_step( $entry['workflow_step'] );
+
+			if (!$step) {
+				continue;
+			}
+
+			$action = array(
+				'order_id' => $order_id,
+				'order_number' => $order->get_order_number(),
+				'action_title' => $step->get_name()
+			);
+
+			if (is_admin()) {
+				$action['url'] = '?page=gravityflow-inbox&view=entry&id=' . $entry['form_id'] . '&lid=' . $entry['id'];
+			}
+
+			$actions[] = $action;
+		}
+
+		return $actions;
+	}
+
     /**
      * Maybe complete parent order for completed delivery process
      * @param $entry_id

backend/app/plugins/wiaas/includes/class-wiaas-order.php

@@ -19,6 +19,7 @@ class Wiaas_Order {
 
 		require_once dirname( __FILE__ ) . '/order/class-wiaas-order-project.php';
 		require_once dirname( __FILE__ ) . '/order/wiaas-order-functions.php';
+		require_once dirname( __FILE__ ) . '/order/class-wiaas-order-item.php';
 
 		add_filter('woocommerce_register_post_type_shop_order', array(__CLASS__, 'manage_order_settings'));
 
@@ -370,6 +371,25 @@ class Wiaas_Order {
 		return $response;
 	}
 
+	public static function get_order_customer_full_name($order_id){
+        $order = wc_get_order($order_id);
+
+        $customer_user_id = $order->get_customer_id();
+
+        $customer = get_userdata($customer_user_id);
+
+        return $customer->last_name . ' ' . $customer->first_name;
+    }
+
+    public static function get_order_commercial_lead_name($order_id){
+        $order = wc_get_order($order_id);
+
+        $commercial_lead_org_id = $order->get_meta('_wiaas_commercial_lead_id', true);
+        $commercial_lead_organization_info = wiaas_get_organization_info($commercial_lead_org_id);
+
+        return $commercial_lead_organization_info['name'];
+    }
+
 	public static function set_order_vat($order_id, $vat_code) {
 		add_post_meta($order_id, '_wiaas_vat_code', $vat_code);
 	}
@@ -417,6 +437,53 @@ class Wiaas_Order {
 		return $code;
 	}
 
+	/**
+	 * Retrieve customer organization id for order
+	 *
+	 * @param int $order_id
+	 *
+	 * @return int|null
+	 */
+	public static function get_order_customer_organization_id($order_id) {
+		$order = wc_get_order($order_id);
+
+		$customer_organization_id = $order->get_meta('_wiaas_customer_id', true);
+
+		if (empty($customer_organization_id)) {
+
+			$customer_organization_id = wiaas_get_user_organization_id($order->get_customer_id());
+		}
+
+		return $customer_organization_id;
+	}
+
+	/**
+	 * Retrieve customer organization info from order
+	 *
+	 * @param int $order_id
+	 *
+	 * @return array|null
+	 */
+	public static function get_customer_organization_info($order_id) {
+		$order = wc_get_order($order_id);
+
+		$customer_organization_info = $order->get_meta('_wiaas_customer_info', true);
+
+		$customer_organization_id = self::get_order_customer_organization_id($order_id);
+
+		if ( empty($customer_organization_info) && ! empty( $customer_organization_id) ) {
+
+			$customer_organization_info = wiaas_get_organization_info($customer_organization_id);
+		}
+
+		if ( ! empty($customer_organization_info) ) {
+
+			$customer_organization_info['id'] = $customer_organization_id;
+		}
+
+		return ! empty($customer_organization_info) ? $customer_organization_info : null;
+	}
+
 	/**
 	 * PRIVATE
 	 */

backend/app/plugins/wiaas/includes/class-wiaas-product.php

@@ -5,6 +5,8 @@ class Wiaas_Product {
 	public static function init() {
 		require_once dirname( __FILE__ ) . '/product/class-wiaas-product-category.php';
        	require_once dirname( __FILE__ ) . '/product/class-wiaas-product-supplier.php';
+        require_once dirname( __FILE__ ) . '/product/class-wiaas-product-quick-edit.php';
+
 
        	add_filter('woocommerce_register_post_type_product', array(__CLASS__, 'manage_product_settings'));
 

backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-roles.php

@@ -323,4 +323,9 @@ function wiaas_db_update_enable_workflow_inbox_for_roles() {
 	// add workflow inbox for commercial lead
 	wp_roles()->add_cap( 'commercial_lead', 'gravityflow_inbox' );
 
+}
+
+function wiaas_db_update_add_administrator_delivery_process_capabilities() {
+
+	wp_roles()->add_cap('administrator', 'manage_wiaas_order_delivery_process');
 }

backend/app/plugins/wiaas/includes/order/class-wiaas-order-item.php

@@ -0,0 +1,90 @@
+<?php
+
+class Wiaas_Order_Item {
+
+	public static function init() {
+
+		add_filter( 'woocommerce_hidden_order_itemmeta', array( __CLASS__, 'hidden_order_item_meta' ) );
+	}
+
+	/**
+	 * Mark extended properties for order as hidden
+	 *
+	 * @param array $hidden
+	 *
+	 * @return array
+	 */
+	public static function hidden_order_item_meta( $hidden ) {
+
+		return array_merge( $hidden, array(
+			//'_wiaas_payment_type',
+			//'_wiaas_services_extra',
+			'_wiaas_service_contract_period',
+			'_wiaas_max_contract_period',
+			'_wiaas_period_unit',
+			//'_wiaas_recurrent_extra',
+			'_wiaas_pay_period',
+			'_wiaas_addon_items',
+			'_wiaas_addon_for',
+			'_wiaas_option_items',
+			'_wiaas_option_for',
+			'_wiaas_option_group_name',
+			'_wiaas_standard_package',
+			'_wiaas_documents',
+			'_wiaas_category',
+			'_wiaas_manufacturer_product_no',
+			'_wiaas_supplier_product_no',
+			'_wiaas_supplier_organization_id',
+			'_wiaas_product_price',
+			'_wiaas_earliest_installation_additional_days',
+			'_wiaas_installation',
+			'_wiaas_installation_date'
+		) );
+	}
+
+	/**
+	 * @param WC_Order_Item $order_item
+	 *
+	 * @return bool
+	 */
+	public static function is_standard_bundle($order_item) {
+
+		$is_standard = $order_item->get_meta('_wiaas_standard_package');
+		return ! empty($is_standard);
+	}
+
+	/**
+	 * @param WC_Order_Item $order_item
+	 *
+	 * @return float
+	 */
+	public static function get_services_total($order_item) {
+		$quantity = $order_item->get_quantity();
+
+		return $quantity * floatval($order_item->get_meta('_wiaas_services_extra'));
+	}
+
+	/**
+	 * @param WC_Order_Item $order_item
+	 *
+	 * @return float
+	 */
+	public static function get_recurrent_total($order_item) {
+		$quantity = $order_item->get_quantity();
+
+		return $quantity * floatval($order_item->get_meta('_wiaas_recurrent_extra'));
+	}
+
+	/**
+	 * @param WC_Order_Item $order_item
+	 *
+	 * @return float
+	 */
+	public static function get_monthly_recurring_total($order_item) {
+
+		return self::get_services_total($order_item) + self::get_recurrent_total($order_item);
+	}
+
+}
+
+Wiaas_Order_Item::init();

backend/app/plugins/wiaas/includes/pricing/class-wiaas-package-pricing.php

@@ -15,7 +15,7 @@ class Wiaas_Package_Pricing {
 	 */
 	private static $pay_types = array(
 		'purchase' => array(
-			'title' => 'Purchase',
+			'title' => 'Purchase and monthly agreements',
 			'package_pay_period' => 0,
 			'services_contract_period' => 0,
 			'max_contract_period' => 36,
@@ -23,14 +23,14 @@ class Wiaas_Package_Pricing {
 			'labe'
 		),
 		'purchase_24' => array(
-			'title' => 'Purchase with 24M commitment',
+			'title' => 'Purchase and 36 month agreements',
 			'package_pay_period' => 0,
 			'services_contract_period' => 24,
 			'max_contract_period' => 36,
 			'period_unit' => 'month'
 		),
 		'managed_36' => array(
-			'title' => 'Managed service 36M rent',
+			'title' => '36 months financed rent and agreements',
 			'package_pay_period' => 36,
 			'services_contract_period'=> 36,
 			'max_contract_period' => 36,

backend/app/plugins/wiaas/includes/product/class-wiaas-product-quick-edit.php

@@ -0,0 +1,73 @@
+<?php
+
+
+class Wiaas_Product_Quick_Edit {
+
+    public static function init() {
+
+        add_action('init', array(__CLASS__, 'enqueue_scripts'));
+        add_action('woocommerce_product_quick_edit_end', array(__CLASS__, 'add_additional_fields_to_edit'));
+        add_action('manage_product_posts_custom_column', array(__CLASS__, 'add_additional_hidden_values_to_edit'), 99, 2);
+    }
+
+    public static function enqueue_scripts() {
+
+        $plugin_url = untrailingslashit(plugins_url('/', WIAAS_FILE));
+        wp_enqueue_script('wiaas_quick-edit', $plugin_url . '/assets/js/wiaas-admin-product-quick-edit.js', array('jquery', 'woocommerce_admin'));
+
+    }
+
+
+    public static function add_additional_fields_to_edit() {
+
+        ?>
+        <div id="wiaas_pricing_quick_edit" class="inline-edit-group">
+            <h4><?php esc_html_e('Pricing', 'woocommerce'); ?></h4>
+            <label class="alignleft">
+                <textarea style="height: 200px;width: 300px" type="text" name="_package_pricing" class="text"
+                          placeholder="<?php _e('Pricing', 'woocommerce'); ?>" value=""> </textarea>
+            </label>
+
+        </div>
+        <?php
+
+
+    }
+
+    public static function add_additional_hidden_values_to_edit($column, $post_id) {
+
+        switch ($column) {
+            case 'name' :
+                $pricing = Wiaas_Package_Pricing::get_package_prices(wc_get_product($post_id));
+                ?>
+                <div class="hidden"
+                     id="package_additional_fields_inline_<?php echo $post_id; ?>">
+                    <?php foreach ($pricing as $key => $price) {
+                        ?>
+                        <div id="_package_prices"><?php echo $price['payment_type'] . '&#13;&#10;' ?></div>
+                        <div id="_package_prices"><?php echo 'Minimal fixed price: ' . $price['minimal_fixed_price'] . '&#13;&#10;' ?></div>
+                        <div id="_package_prices"><?php echo 'Minimal recurrent price: ' . $price['minimal_recurrent_price'] . '&#13;&#10;' ?></div>
+                        <div id="_package_prices"><?php echo 'Minimal services and support price: ' . $price['minimal_services_price'] . '&#13;&#10;' ?></div>
+                        <div id="_package_prices"><?php echo 'Max contract period: ' . $price['max_contract_period'] . '&#13;&#10;' ?></div>
+                        <?php if ($key === 'managed_36') {
+                            ?>
+                            <div id="_package_prices"><?php echo 'Principal amount: ' . $price['principal_amount'] . '&#13;&#10;' ?></div><?php
+                        }
+                        ?>
+                        <div id="_package_prices"><?php echo ' &#13;&#10;' ?></div> <?php
+                    } ?>
+                </div>
+                <?php
+
+                break;
+
+            default :
+                break;
+        }
+
+    }
+
+
+}
+
+Wiaas_Product_Quick_Edit::init();

backend/app/plugins/wiaas/wiaas.php

@@ -61,6 +61,7 @@ include_once WIAAS_DIR . '/includes/wiaas-class-measurement-units.php';
 
 include_once WIAAS_DIR . '/includes/class-wiaas-validation.php';
 
+
 function wiaas_redirect_to_login() {
     wp_safe_redirect(get_site_url('', 'wp-login.php'));
 }

frontend/src/actions/coMarket/coMarketPackagesActions.js

@@ -5,9 +5,12 @@ import HtmlClient from '../../helpers/HtmlClient';
 import {
     REQUEST_SHOP_PACKAGES,
     RECIEVE_SHOP_PACKAGES,
+    SEARCH_SHOP_PACKAGES_REQUEST,
+    SEARCH_SHOP_PACKAGES_RESULT,
     REQUEST_SHOPS,
     RECEIVE_SHOPS,
-    SELECT_SHOP
+    SELECT_SHOP,
+    SHOP_PAGE_SIZE
 } from '../../constants/coMarketConstants';
 import { fromWCPackage } from '../../helpers/PackageHelper';
 
@@ -17,30 +20,60 @@ const requestShopPackages = () => ({
     type: REQUEST_SHOP_PACKAGES,
     isLoading: true
 });
-const recieveShopPackages = (json) => ({
+const recieveShopPackages = (packages, page = 1) => ({
     type: RECIEVE_SHOP_PACKAGES,
     isLoading: false,
-    shopPackages: json
+    shopPackages: packages,
+    page: page,
 });
 
-export const fetchShopPackages = (shop, search) => {
+export const fetchShopPackages = (shop, page = 1) => {
     return dispatch => {
         dispatch(requestShopPackages());
-        let searchParam = search ?  '?search=' +search : ''
 
         return client.fetch({
-            url: `${API_SERVER}/wp-json/wc/v2/products?shop_id=${shop.id}` + searchParam,
+            url: `${API_SERVER}/wp-json/wc/v2/products?shop_id=${shop.id}&page=${page}&per_page=${SHOP_PAGE_SIZE + 1}`,
         })
             .then(response => {
                 if (response.data) {
-                    dispatch(recieveShopPackages(response.data.map(wcPackage => fromWCPackage(wcPackage))))
+                    const packages = response.data.map(wcPackage => fromWCPackage(wcPackage));
+                    dispatch(recieveShopPackages(packages, page))
                 }
             })
             .catch(error => {
                 client.onError(error, dispatch);
             });
     }
-}
+};
+
+const searchShopPackagesRequest = () => ({
+    type: SEARCH_SHOP_PACKAGES_REQUEST,
+    isLoading: true
+});
+const searchShopPackagesResult = (packages) => ({
+    type: SEARCH_SHOP_PACKAGES_RESULT,
+    isLoading: false,
+    shopPackages: packages,
+});
+
+export const searchShopPackages = (shop, search) => {
+    return dispatch => {
+        dispatch(searchShopPackagesRequest());
+
+        return client.fetch({
+            url: `${API_SERVER}/wp-json/wc/v2/products?shop_id=${shop.id}&search=${search}`,
+        })
+            .then(response => {
+                if (response.data) {
+                    const packages = response.data.map(wcPackage => fromWCPackage(wcPackage));
+                    dispatch(searchShopPackagesResult(packages))
+                }
+            })
+            .catch(error => {
+                client.onError(error, dispatch);
+            });
+    }
+};
 
 const requestShops = () => ({
     type: REQUEST_SHOPS

frontend/src/config.js

@@ -1,4 +1,4 @@
-const APPLICATION_NAME = 'Co-Market';
+const APPLICATION_NAME = 'WIAAS Market';
 const API_VERSION = 'v2';
 
 const API_SERVER_BASE = process.env.REACT_APP_API_URL;

frontend/src/constants/coMarketConstants.js

@@ -2,6 +2,9 @@ const MODULE = 'CO_MARKET_';
 export const REQUEST_SHOP_PACKAGES = MODULE + 'REQUEST_SHOP_PACKAGES';
 export const RECIEVE_SHOP_PACKAGES = MODULE + 'RECIEVE_SHOP_PACKAGES';
 
+export const SEARCH_SHOP_PACKAGES_REQUEST = MODULE + 'SEARCH_SHOP_PACKAGES_REQUEST';
+export const SEARCH_SHOP_PACKAGES_RESULT = MODULE + 'SEARCH_SHOP_PACKAGES_RESULT';
+
 export const REQUEST_SHOPS = MODULE + 'REQUEST_SHOPS';
 export const RECEIVE_SHOPS = MODULE + 'RECEIVE_SHOPS';
 export const SELECT_SHOP = MODULE + 'SELECT_SHOP';
@@ -105,6 +108,9 @@ export const coMarketTexts = {
     },
     buttons: {
         ADD_TO_CART: 'Add to cart',
-        DETAILS: 'Details'
+        DETAILS: 'Details',
+        LOAD_MORE: 'Load more'
     }
 }
+
+export const SHOP_PAGE_SIZE = 12;

frontend/src/containers/coMarket/CoMarketNavContainer.jsx

@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import {Row, Col, Input} from 'reactstrap';
-import {fetchShopPackages} from '../../actions/coMarket/coMarketPackagesActions';
+import {searchShopPackages, fetchShopPackages} from '../../actions/coMarket/coMarketPackagesActions';
 import {coMarketTexts} from '../../constants/coMarketConstants';
 
 class CoMarketNavContainer extends Component {
@@ -15,9 +15,12 @@ class CoMarketNavContainer extends Component {
     }
 
     handleSearchChange(event) {
-        this.setState({searchValue: event.target.value});
-        if (this.props.selectedShop) {
-            this.props.dispatch(fetchShopPackages(this.props.selectedShop, event.target.value));
+        const s = event.target.value;
+        this.setState({searchValue: s});
+        if (this.props.selectedShop && s) {
+            this.props.dispatch(searchShopPackages(this.props.selectedShop, s));
+        } else if (this.props.selectedShop) {
+            this.props.dispatch(fetchShopPackages(this.props.selectedShop));
         }
     }
 
@@ -42,7 +45,8 @@ class CoMarketNavContainer extends Component {
 }
 
 const mapStateToProps = (state) => ({
-    selectedShop: state.coMarketPackagesReducer.selectedShop
+    selectedShop: state.coMarketPackagesReducer.selectedShop,
+    shopPage: state.coMarketPackagesReducer.shopPage,
 });
 
 export default connect(mapStateToProps)(CoMarketNavContainer);

frontend/src/containers/coMarket/CoMarketPackagesContainer.jsx

@@ -3,12 +3,14 @@ import {connect} from 'react-redux';
 import {
     Navbar,
     Row,
-    Col
+    Col,
+    Button
 } from 'reactstrap';
 import ShopItem from './components/ShopItem.jsx';
 import WiaasBox from '../../mainComponents/box/WiaasBox.jsx';
 import CoMarketNavContainer from './CoMarketNavContainer.jsx';
 import {fetchShopPackages} from '../../actions/coMarket/coMarketPackagesActions';
+import {coMarketTexts} from "../../constants/coMarketConstants";
 
 class CoMarketPackagesContainer extends Component {
     componentDidMount() {
@@ -17,8 +19,14 @@ class CoMarketPackagesContainer extends Component {
         }
     }
 
+    onLoadMore() {
+        if (this.props.selectedShop) {
+            this.props.dispatch(fetchShopPackages(this.props.selectedShop, this.props.shopPage + 1));
+        }
+    }
+
     render() {
-        const {shopPackages, selectedShop, isLoading} = this.props;
+        const {shopPackages, selectedShop, isLoading, shopHasMorePackages, shopSearch} = this.props;
 
         return (
             <div id="co-market-shop">
@@ -28,12 +36,12 @@ class CoMarketPackagesContainer extends Component {
                 <Row>
                     <Col xl="8" lg="8" md="8" sm="12" xs="12">
                         <WiaasBox id="co-market-big-commercial">
-                              <img className="description-photo" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_MAIN.jpg" alt="big-commercial"/>
+                              <img className="description-photo" src="/static/img/WIAAS_Market_banner.jpg" alt="big-commercial"/>
                         </WiaasBox>
                     </Col>
                     <Col xl="4" lg="4" md="4" sm="12" xs="12">
                         <WiaasBox id="co-market-commercials">
-                            <img alt="wiaas commercial" src="https://res.cloudinary.com/co-market/image/upload/v1524472688/Co-Market/CoMarketStartsida_OFFERCoor.jpg" className="commercial-photo"/>
+                            <img alt="wiaas commercial" src="/static/img/WIAAS_Market_SMO_infobox.jpg" className="commercial-photo"/>
                         </WiaasBox>
                     </Col>
                 </Row>
@@ -41,22 +49,34 @@ class CoMarketPackagesContainer extends Component {
                     <Col xl="8" lg="12" md="12">
                         <WiaasBox id="co-market-packages" customHeader={CoMarketNavContainer}>
                             <Row>
+                                {
+                                    (shopPackages) &&
+                                    shopPackages.map((shopPackage, mapKey) => <ShopItem key={shopPackage.id}
+                                                                                        shopId={selectedShop.id}
+                                                                                        shopPackage={shopPackage}/>)
+                                }
                                 {
                                     isLoading &&
                                     <Col xl="12" className="loader">
                                         <i className="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i>
                                     </Col>
                                 }
-                                {
-                                    (shopPackages && !isLoading) &&
-                                    shopPackages.map((shopPackage, mapKey) => <ShopItem key={shopPackage.id}
-                                                                                        shopId={selectedShop.id}
-                                                                                        shopPackage={shopPackage}/>)
-                                }
                             </Row>
                         </WiaasBox>
                     </Col>
                 </Row>
+                {
+                    shopHasMorePackages && !isLoading && !shopSearch && (
+                        <Row>
+                            <Col xl="8" lg="12" md="12">
+                                <Button
+                                    size="lg" block outline
+                                    className="shop-package-load-more-btn"
+                                    onClick={() => {this.onLoadMore()}}
+                                >{coMarketTexts.buttons.LOAD_MORE}</Button>
+                            </Col>
+                        </Row>)
+                }
             </div>
         );
     }
@@ -64,6 +84,9 @@ class CoMarketPackagesContainer extends Component {
 
 const mapStateToProps = (state) => ({
     shopPackages: state.coMarketPackagesReducer.shopPackages,
+    shopHasMorePackages: state.coMarketPackagesReducer.shopHasMorePackages,
+    shopPage: state.coMarketPackagesReducer.shopPage,
+    shopSearch: state.coMarketPackagesReducer.shopSearch,
     selectedShop: state.coMarketPackagesReducer.selectedShop,
     isLoading: state.coMarketPackagesReducer.isLoading
 });

frontend/src/containers/coMarket/components/CoMarketCatalogSelect.jsx

@@ -9,7 +9,6 @@ class CoMarketCatalogSelect extends Component {
         super(props);
 
         this.handleShopChange = this.handleShopChange.bind(this);
-        this.handleSearchChange = this.handleSearchChange.bind(this);
         this.state = {
             searchValue : ''
         };
@@ -41,14 +40,6 @@ class CoMarketCatalogSelect extends Component {
         this.props.dispatch(fetchShopPackages(shop));
     }
 
-    handleSearchChange(event) {
-        this.setState({searchValue: event.target.value});
-
-        if (this.props.selectedShop) {
-            this.props.dispatch(fetchShopPackages(this.props.selectedShop,  event.target.value));
-        }
-    }
-
     render() {
         const {shops, selectedShop, idPackage, activeSubmodule} = this.props;
         const isDisabled = (idPackage || this.props.activeModule === 'cart') ? true : false;

frontend/src/containers/coMarket/style/CoMarket.scss

@@ -89,6 +89,18 @@
         font-weight: $font-weight;
     }
 
+    .shop-package-load-more-btn {
+        border-radius: 0;
+        color: #e25c56;
+        font-size: 1rem;
+        border: 1px solid rgba(0, 0, 0, 0.125);
+
+        &:hover, &:active, &:focus {
+            background: $hoverColor;
+            box-shadow: none !important;
+        }
+    }
+
     .search-layer{
         display:flex;
         align-items:center;
@@ -131,7 +143,6 @@
 }
 
 #co-market-big-commercial{
-    background: $whiteColor;
     text-align: center;
 
     .ricoh-text {
@@ -144,13 +155,24 @@
 }
 
 #co-market-commercials {
-    background: $whiteColor;
-
     .commercial-photo {
         width: 100%;
     }
 }
 
+@media (min-width: 768px) {
+
+    #co-market-commercials {
+        position: relative;
+
+        .commercial-photo {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+
 #co-market-catalog {
     .filter-name {
         margin-top: 0.4rem;

frontend/src/reducers/coMarket/coMarketPackagesReducers.js

@@ -2,20 +2,74 @@ import {
     RECIEVE_SHOP_PACKAGES,
     RECEIVE_SHOPS,
     SELECT_SHOP,
-    REQUEST_SHOP_PACKAGES
+    REQUEST_SHOP_PACKAGES,
+    SHOP_PAGE_SIZE,
+    SEARCH_SHOP_PACKAGES_REQUEST,
+    SEARCH_SHOP_PACKAGES_RESULT,
 } from '../../constants/coMarketConstants';
 
 const moduleReducers = {};
 
 moduleReducers[REQUEST_SHOP_PACKAGES] = (state, action) => {
     return Object.assign({}, state, {
+        isLoading: action.isLoading,
+        shopSearch: false,
+    });
+};
+
+moduleReducers[RECIEVE_SHOP_PACKAGES] = (state = {}, action) => {
+
+    // implement paging
+    // paging is implemented in a way that requested number of packages is {page_size + 1}
+    // this way if retrieved number of packages is greater than page size there may be more packages
+
+    const shopPage = action.page || 1;
+    let shopPackages = [];
+    let shopPackagesDiff = [];
+    let retrievedShopPackages = action.shopPackages || [];
+
+    // append newly retrieved packages to existing ones if more packages are loaded
+    if (state.shopPage && shopPage > state.shopPage) {
+        shopPackages = state.loadedShopPackages || [];
+        // get ignored packages from previous request
+        const oldShopPackagesDiff = state.shopPackagesDiff || [];
+        // append packages ignored previous time to the beginning
+        retrievedShopPackages = oldShopPackagesDiff.concat(retrievedShopPackages);
+    }
+
+    // if number of packages is greater than page size there may be more of them to retrieve
+    const hasMorePages = retrievedShopPackages.length > SHOP_PAGE_SIZE;
+
+    // ignore all packages over limit of page size (they will be displayed at the beginning of the next request)
+    while (retrievedShopPackages.length > SHOP_PAGE_SIZE) {
+        shopPackagesDiff.push(retrievedShopPackages.pop());
+    }
+
+    // append packages from this page to existing ones
+    shopPackages = shopPackages.concat(retrievedShopPackages);
+
+    return Object.assign({}, state, {
+        shopPackages: shopPackages,
+        loadedShopPackages: shopPackages,
+        shopPackagesDiff: shopPackagesDiff,
+        shopPage: shopPage,
+        shopSearch: false,
+        shopHasMorePackages: hasMorePages,
         isLoading: action.isLoading
     });
 };
 
-moduleReducers[RECIEVE_SHOP_PACKAGES] = (state, action) => {
+moduleReducers[SEARCH_SHOP_PACKAGES_REQUEST] = (state, action) => {
     return Object.assign({}, state, {
-        shopPackages: action.shopPackages,
+        shopSearch: true,
+        isLoading: action.isLoading
+    });
+};
+
+moduleReducers[SEARCH_SHOP_PACKAGES_RESULT] = (state, action) => {
+    return Object.assign({}, state, {
+        shopPackages: action.shopPackages || [],
+        shopSearch: true,
         isLoading: action.isLoading
     });
 };