Remove Co-Market from customer interface

Dashboard

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

.dockerignore

@@ -0,0 +1,6 @@
+# Added to prevent permission problems when building without using super user privileges
+
+./database/volume
+./docker/backend/uploads
+./log/backend
+./log/frontend

backend.dockerfile

@@ -18,6 +18,9 @@ ARG WP_SECURE_AUTH_SALT
 ARG WP_LOGGED_IN_SALT
 ARG WP_NONCE_SALT
 ARG WP_JWT_AUTH_SECRET_KEY
+ARG WP_SENDGRID_API_KEY
+ARG WP_SENDGRID_FROM_EMAIL
+ARG WP_SENDGRID_FROM_NAME
 
 ENV WP_ENV ${WP_ENV}
 ENV WP_HOME ${API_URL}
@@ -37,9 +40,13 @@ ENV WP_LOGGED_IN_SALT ${WP_LOGGED_IN_SALT}
 ENV WP_NONCE_SALT ${WP_NONCE_SALT}
 ENV WP_JWT_AUTH_SECRET_KEY ${WP_JWT_AUTH_SECRET_KEY}
 
+ENV WP_SENDGRID_API_KEY ${WP_SENDGRID_API_KEY}
+ENV WP_SENDGRID_FROM_EMAIL ${WP_SENDGRID_FROM_EMAIL}
+ENV WP_SENDGRID_FROM_NAME ${WP_SENDGRID_FROM_NAME}
+
 ENV WIAAS_CUSTOMER_INTERFACE ${WIAAS_CUSTOMER_INTERFACE}
 
-RUN apt-get update && apt-get install -y git unzip gnupg mysql-client sudo
+RUN apt-get update && apt-get install -y git unzip gnupg mysql-client sudo libpng-dev
 
 COPY docker/php/composer.phar /usr/local/bin/composer
 RUN chmod 755 /usr/local/bin/composer
@@ -50,8 +57,9 @@ RUN chmod +x /usr/local/bin/wp
 COPY docker/php/setup.sh /init-scripts/
 RUN chmod +x /init-scripts/setup.sh
 
-RUN docker-php-ext-install pdo pdo_mysql mysqli
-RUN a2enmod rewrite ssl
+RUN docker-php-ext-install pdo pdo_mysql mysqli opcache gd zip mbstring
+RUN a2enmod rewrite
+COPY docker/php/000-default.conf /etc/apache2/sites-available
 
 COPY backend /home/wiaas/backend
 
@@ -59,13 +67,17 @@ WORKDIR /home/wiaas/backend/
 RUN composer install --no-dev
 
 WORKDIR /home/wiaas
+RUN rm -rf backend/app/uploads
 RUN cp -r backend/* /var/www/html/
 
+WORKDIR home
+RUN rm -rf wiaas
 
 WORKDIR /var/www/html
 RUN ln -s ../html api
 
-COPY docker/php/.htaccess /var/www/html/ 
+COPY docker/php/.htaccess /var/www/html/
+COPY docker/backend/TaC.pdf /var/www/html/
 
 RUN chown -R www-data:www-data /var/www/html
 

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

@@ -19,3 +19,46 @@
 .wc-order-preview footer {
     display: none;
 }
+
+.gravityflow-discussion-item{
+    margin-bottom:10px;
+    padding: 6px;
+}
+
+.gravityflow-dicussion-item-name {
+    color:black;
+    font-weight:bold;
+}
+
+.gravityflow-dicussion-item-date {
+    color: #9b9b9b;
+    margin-left:8px;
+    font-size:90%;
+}
+
+.rtl .gravityflow-dicussion-item-date {
+    margin-right:8px;
+    margin-left: 0;
+}
+
+.gravityflow-dicussion-item-toggle-display {
+    float: right;
+}
+
+.rtl .gravityflow-dicussion-item-toggle-display {
+    float: left;
+}
+
+@media print {
+    .gravityflow-dicussion-item-hidden {
+        display:block !important;
+    }
+
+    .gravityflow-dicussion-item-toggle-display {
+        display: none;
+    }
+}
+
+.gravityflow-dicussion-item-value {
+    padding: 10px;
+}

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-supplier.css

@@ -0,0 +1,3 @@
+.wc-order-preview-address {
+    display: none;
+}

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-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

@@ -0,0 +1,38 @@
+jQuery(document).ready(function ($) {
+    $('.wiaas_delivery_step_nav').click(function (e) {
+        var action = $(this).data('step');
+
+        $('#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-package.js

@@ -8,4 +8,50 @@ jQuery(document).ready(function($) {
     $('#general_product_data').find('.pricing').addClass('hide_if_wiaastemplate hide_if_bundle');
     $('#general_product_data').find('.pricing').removeClass('show_if_bundle show_if_wiaastemplate');
 
+
+    $( '.wiaas-search-documents' ).each(function() {
+        var element = $( this );
+        var searchTarget = $('#' + element.data('target'));
+
+        element.autocomplete({
+            source: function(request, response) {
+                $.get( window.ajaxurl, {
+                    action: 'wiaas_json_search_documents',
+                    query: request.term,
+                    _ajax_nonce: element.data('search-nonce')
+                } ).done( function( documents ) {
+                        response( documents || []);
+                    }
+                );
+            },
+            select: function(event, ui) {
+                if (!searchTarget || $('#wiaas_attached_document_' + ui.item.id).length) {
+                    return;
+                }
+
+                $.get(window.ajaxurl, {
+                    action: 'wiaas_link_document',
+                    _ajax_nonce: element.data('link-nonce'),
+                    id: ui.item.id
+                }).done( function (document) {
+                    searchTarget.find('tbody').append(document);
+                });
+
+            }
+        })
+            .autocomplete( 'instance' )._renderItem = function( ul, item ) {
+            return $( '<li role="option" id="wiaas-document-autocomplete-' + item.id + '">' )
+                .text( item.name )
+                .appendTo( ul );
+        };
+    });
+
+    $('#wiaas_attached_documents').delegate('.wiaas-remove-attached-document', 'click', function (e) {
+        e.preventDefault();
+
+        var id = $(this).data('id');
+
+        $('#wiaas_attached_document_' + id).remove();
+    });
+
 });

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/assets/js/wiaas-admin-supplier.js

@@ -0,0 +1,7 @@
+jQuery(document).ready(function($) {
+    $( document.body )
+        .on( 'wc_backbone_modal_loaded', function () {
+                $(".wc-order-preview-address").remove();
+        } );
+
+});

backend/app/plugins/wiaas/assets/js/wiaas-form-editor.js

@@ -0,0 +1,14 @@
+jQuery(document).bind('gform_load_field_settings', function (event, field, form) {
+
+    var isBundleDoc = field.type === 'wiaas_order_bundle_document';
+
+    var isOrderDoc = field.type === 'wiaas_order_document';
+
+    if (isBundleDoc || isOrderDoc) {
+
+        jQuery('#wiaas-doc-type-filter').val(field.wiaasDocTypeFilter);
+    }
+
+    jQuery('#wiaas-installation-organization-filter').prop('checked', !!field.wiaasOnlyInstallationOrg);
+
+});

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-supplier/class-wiaas-admin-supplier-orders.php

@@ -0,0 +1,171 @@
+<?php
+
+/**
+ * Class Wiaas_Admin_Supplier_Orders
+ */
+class Wiaas_Admin_Supplier_Orders {
+
+    /**
+     * Displays list of orders from supplier
+     *
+     * Enables quick preview of each order
+     *
+     * This list of orders is achieved with customization of default order list for `shop_order` post
+     * by using hooks and filters to allow only data that suppliershould be able to see
+     *
+     */
+
+    public static function init() {
+
+        add_filter('bulk_actions-edit-shop_order', array(__CLASS__, 'remove_bulk_actions_for_list_table_orders'), 999);
+
+        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'), 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'), 999);
+
+        add_action('manage_shop_order_posts_custom_column', array(__CLASS__, 'render_columns_for_list_table_orders'), 999, 2);
+    }
+
+
+    /**
+     * Remove all bulk actions for supplier
+     *
+     * @return array
+     */
+    public static function remove_bulk_actions_for_list_table_orders() {
+        return array();
+    }
+
+    /**
+     * Remove actions from shop order preview modal so only data info is visible
+     *
+     * @return array
+     */
+    public static function remove_actions_from_order_preview() {
+        return array();
+    }
+
+    /**
+     * Show only simple products from this supplier on order preview
+     *
+     * @param $order_items
+     * @param WC_Order $order
+     *
+     * @return array
+     */
+    public static function filter_order_items_for_order_preview($order_items, $order) {
+
+        $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) {
+
+            if (wc_pb_is_bundled_order_item($order_item)) {
+
+	            $item_supplier_organization_id = absint($order_item['wiaas_supplier_organization_id']);
+
+	            if ($item_supplier_organization_id === $user_organisation_id) {
+
+		            $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
+     *
+     * @param $columns
+     *
+     * @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', '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;
+    }
+
+
+    /** Append supplier columns to table sortable columns
+     *
+     * @param $sortable_columns
+     *
+     * @return mixed
+     */
+    public static function define_sortable_columns_for_list_table_orders($sortable_columns) {
+
+        $sortable_columns['_wiaas_order_number'] = 'ID';
+
+        return $sortable_columns;
+    }
+
+    /**
+     * Render supplier specific columns
+     *
+     * @param $column
+     * @param $order_id
+     */
+    public static function render_columns_for_list_table_orders($column, $order_id) {
+
+        if ($column === '_wiaas_order_number') {
+
+            $order = wc_get_order($order_id);
+
+	        $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>';
+	        }
+        }
+    }
+}
+
+Wiaas_Admin_Supplier_Orders::init();

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

@@ -0,0 +1,71 @@
+<?php
+
+class Wiaas_Admin_Countries {
+
+	public static function init() {
+
+		// Add countries fields to countries list
+		add_filter( 'manage_edit-product_country_columns', array( __CLASS__, 'update_list_headers' ) );
+		add_filter( 'manage_product_country_custom_column', array( __CLASS__, 'update_list_column_content' ), 10, 3 );
+
+		// Validate country settings
+		add_filter('acf/load_field/name=_wiaas_country_code', array(__CLASS__, 'populate_country_codes'));
+		add_filter('acf/load_field/name=_wiaas_country_currency', array(__CLASS__, 'populate_country_currencies'));
+	}
+
+	public static function update_list_headers($columns) {
+		$columns['wiaas_code'] = __( 'Code', 'wiaas' );
+
+		$columns['wiaas_vat'] = __('VAT', 'wiaas');
+
+		$columns['wiaas_currency'] = __('Currency', 'wiaas');
+
+		return $columns;
+	}
+
+	public static function update_list_column_content($columns, $column, $id) {
+
+		if ($column === 'wiaas_code') {
+
+			$code = get_term_meta($id, '_wiaas_country_code', true);
+			$columns .= '<span>'. $code . '</span>';
+		}
+
+		if ($column === 'wiaas_vat') {
+
+			$vat = get_term_meta($id, '_wiaas_country_vat', true);
+			$columns .= '<span>'. $vat . '</span>';
+		}
+
+		if ($column === 'wiaas_currency') {
+
+			$currency = get_term_meta($id, '_wiaas_country_currency', true);
+			$columns .= '<span>'. $currency . '</span>';
+		}
+
+		return $columns;
+	}
+
+	public static function populate_country_codes($field) {
+		$countries_list = Wiaas_Countries::get_country_choices();
+
+		$countries_choices = array();
+		foreach ($countries_list as $code => $name) {
+
+			$countries_choices[$code] = $code . ' - ' . $name;
+		}
+
+		$field['choices'] = $countries_choices;
+
+		return $field;
+	}
+
+	public static function populate_country_currencies($field) {
+
+		$field['choices'] = Wiaas_Countries::get_currency_choices();
+
+		return $field;
+	}
+}
+
+Wiaas_Admin_Countries::init();

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

@@ -0,0 +1,25 @@
+<?php
+
+class Wiaas_Admin_Delivery_Process {
+
+	public static function init() {
+
+		require_once dirname( __FILE__ ) . '/delivery-process/wiaas-admin-delivery-process-ajax.php';
+		require_once dirname( __FILE__ ) . '/delivery-process/class-wiaas-admin-delivery-process-flow.php';
+		require_once dirname( __FILE__ ) . '/delivery-process/class-wiaas-admin-delivery-process-order.php';
+		require_once dirname( __FILE__ ) . '/delivery-process/class-wiaas-admin-delivery-process-list.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_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' );
+	}
+}
+
+Wiaas_Admin_Delivery_Process::init();

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

@@ -3,9 +3,6 @@
 class Wiaas_Admin_Order_Projects {
 
 	public static function init() {
-		// Add admin page and subpage since woocommerce orders have custom menu page
-		// so this will not be automatic
-		add_filter('admin_menu', array(__CLASS__, 'add_admin_page'));
 
 		// Add is available fields to create and edit forms
 		add_action( 'shop_order_project_add_form_fields', array( __CLASS__, 'add_is_available_field' ) );
@@ -18,18 +15,20 @@ class Wiaas_Admin_Order_Projects {
 		// Save is available field when creating and editing
 		add_action( 'created_term', array( __CLASS__, 'save_is_available_field' ), 10, 3 );
 		add_action( 'edit_term', array( __CLASS__, 'save_is_available_field' ), 10, 3 );
+
+		add_action( 'load-term.php',      array( __CLASS__, 'admin_menu_highlight' ) );
+		add_action( 'load-edit-tags.php', array( __CLASS__, 'admin_menu_highlight' ) );
 	}
 
 	/**
-	 * Add admin submenu page for order projects
+	 * Highlighting orders menu when shop orders page selected
 	 */
-	public static function add_admin_page() {
-		add_submenu_page( 'woocommerce',
-			esc_html__( 'Order projects', 'wiaas' ),
-			esc_html__( 'Order projects', 'wiaas' ),
-			'manage_woocommerce',
-			'edit-tags.php?taxonomy=shop_order_project'
-		);
+	public static function admin_menu_highlight() {
+		global $plugin_page;
+
+		if ( isset( $_GET['taxonomy'] ) && ( $_GET['taxonomy'] === 'shop_order_project' ) ) {
+			$plugin_page = 'edit.php?post_type=shop_order';
+		}
 	}
 
 	/**

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

@@ -226,7 +226,7 @@ class Wiaas_Admin_Organization {
                     // get current user
                     $current_user = wp_get_current_user();
 
-                    update_user_meta($current_user->ID, '_wiaas_current_user_admin_role', $role->name);
+                    update_user_meta($current_user->ID, '_wiaas_admin_role', $role->name);
 
                     // switch user role
                     $current_user->set_role($role->name);

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

@@ -11,9 +11,8 @@ class Wiaas_Admin_Package {
 		require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-linked-packages.php';
 		require_once dirname( __FILE__ ) . '/package/class-wiaas-admin-package-types.php';
 
-		add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ), 1 );
-
 		add_action( 'manage_product_posts_columns', array( __CLASS__, 'manage_list_table_products_columns' ), 999, 2 );
+		add_action( 'woocommerce_product_data_tabs', array( __CLASS__, 'package_data_tabs' ), 999);
 	}
 
 	/**
@@ -31,6 +30,7 @@ class Wiaas_Admin_Package {
 		unset($tabs['variations']);
 		unset($tabs['advanced']);
 		unset($tabs['shipping']);
+		unset($tabs['inventory']);
 
 		return $tabs;
 	}

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

@@ -4,12 +4,13 @@ class Wiaas_Admin_Product {
 
     public static function init() {
 
-        add_action('acf/save_post', array(__CLASS__, 'wiaas_my_save_post'), 20, 1);
+        add_action('acf/save_post', array(__CLASS__, 'save_initial_product_country_and_type'), 20, 1);
         add_action('woocommerce_after_register_post_type', array(__CLASS__, 'wiaas_register_product_status'));
         add_filter('woocommerce_register_post_type_product', array(__CLASS__, 'wiaas_modify_product'));
-        add_action('add_meta_boxes', array(__CLASS__, 'wiaas_maybe_remove_metaboxes'), 999);
+        add_action('add_meta_boxes', array(__CLASS__, 'maybe_remove_metaboxes'), 999);
         add_filter('wp_insert_post_data', array(__CLASS__, 'wiaas_maybe_set_no_country_status'), 999, 2);
-        add_action('acf/render_field/type=taxonomy', array(__CLASS__, 'wiaas_render_field'), 10, 1);
+
+        add_action('acf/render_field/type=group', array(__CLASS__, 'render_choose_button_for_new_product'), 10, 1);
 
     }
 
@@ -28,13 +29,12 @@ class Wiaas_Admin_Product {
         ));
     }
 
+    public static function render_choose_button_for_new_product($field) {
 
-    public static function wiaas_render_field($field) {
-
-        if ($field['_name'] === '_wiaas_product_country') {
+        if ($field['_name'] === '_wiaas_product_general') {
             ?>
-            <div id="submitpost" style="padding: 20px;">
-                <input style="float:right;" name="save" id="save-post" class="button" type="submit" value="Choose"/>
+            <div id="submitpost" style="padding: 20px 0;">
+                <input style="float:right;" name="publish" id="publish" class="button button-large button-primary" type="submit" value="Choose"/>
             </div>
             <?php
         }
@@ -42,7 +42,7 @@ class Wiaas_Admin_Product {
     }
 
 
-    public static function wiaas_maybe_remove_metaboxes() {
+    public static function maybe_remove_metaboxes() {
         $screen = get_current_screen();
         $screen_id = $screen ? $screen->id : '';
 
@@ -53,19 +53,14 @@ class Wiaas_Admin_Product {
 
         $post_id = $post->ID;
 
-        if ($post_id === 0 ||
-            ($post->post_status !== 'publish' && !(Wiaas_Countries::get_package_country(wc_get_product($post_id))))) {
+        if ($post_id === 0 || $post->post_status === '_wiaas_no_country') {
 
             remove_meta_box('woocommerce-product-data', 'product', 'normal');
-            remove_meta_box('submitdiv', 'product', 'side');
             remove_meta_box('slugdiv', 'product', 'normal');
-            remove_meta_box('wiaas_upload_and_link_document', 'product', 'normal');
             remove_meta_box('postexcerpt', 'product', 'normal');
             remove_meta_box('template_product_meta_box', 'product', 'normal');
-            remove_meta_box('postimagediv', 'product', 'normal');
-            remove_meta_box('woocommerce-product-images', 'product', 'normal');
-            remove_meta_box('wc-jetpack-product_by_user_role', 'product', 'normal');
 
+	        remove_meta_box('submitdiv', 'product', 'side');
 
             remove_meta_box('groups-permissions', 'product', 'side');
             remove_meta_box('tagsdiv-product_tag', 'product', 'side');
@@ -73,15 +68,16 @@ class Wiaas_Admin_Product {
             remove_meta_box('tagsdiv-supplier', 'product', 'side');
             remove_meta_box('postimagediv', 'product', 'side');
             remove_meta_box('woocommerce-product-images', 'product', 'side');
-            remove_meta_box('submitdiv', 'product', 'side');
             remove_meta_box('wiaas_upload_and_link_document', 'product', 'side');
-            remove_meta_box('radio-tagsdiv-product_country', 'product', 'side');
-            remove_meta_box('tagsdiv-_wiaas_shop_prices', 'product', 'side');
+            remove_meta_box('tagsdiv-product_country', 'product', 'side');
             remove_meta_box('tagsdiv-wiaas_units', 'product', 'side');
         }
 
         //Always hide product category, it is added wit advanced custom fields plugin for simple product
-        remove_meta_box('radio-product_catdiv', 'product', 'side');
+        remove_meta_box('product_catdiv', 'product', 'side');
+
+        // Always hide
+	    remove_meta_box('tagsdiv-product_country', 'product', 'side');
 
     }
 
@@ -99,28 +95,54 @@ class Wiaas_Admin_Product {
      * @param $post_id
      */
 
-    public static function wiaas_my_save_post($post_id) {
+    public static function save_initial_product_country_and_type($post_id) {
 
         global $post;
-        $status = get_post_status( $post->ID);
 
-        $value = get_field('_wiaas_product_country', $post_id, true);
-        $type = get_field('_wiaas_product_type', $post_id, true);
+        if ($post->post_type !== 'product') {
+            return;
+        }
 
-        error_log($status);
-        error_log($value);
+        $general = get_field('_wiaas_product_general', $post_id);
 
+        $country = $general['_wiaas_product_country'];
+        $type = $general['_wiaas_product_type'];
 
-        if (!empty($value) && $status === '_wiaas_no_country' ) {
+        /**
+         * If type is missing set status to no country
+         *
+         * If this is not template product type and country is missing set status to no country
+         *
+         */
+        if (empty($type) || ( empty($country) && $type !== 'wiaastemplate' )) {
+            wp_update_post(array(
+                'ID' => $post_id,
+                'post_status' => '_wiaas_no_country'
+            ));
 
-            wp_set_object_terms($post_id, $value, 'product_country', true);
-            wp_set_object_terms($post_id, $type, 'product_type', true);
+            return;
+        }
 
+        /**
+         * Country and type are selected for simple and bundle products so
+         * link them
+         */
+
+        wp_set_object_terms($post_id, $type, 'product_type', true);
+
+        if ($type !== 'wiaastemplate') {
+            wp_set_object_terms($post_id, $country, 'product_country', true);
+        }
+
+        /**
+         * If product had no country status change it to draft status
+         */
+
+        if ($post->post_status === '_wiaas_no_country') {
             wp_update_post(array(
                 'ID' => $post_id,
                 'post_status' => 'draft'
             ));
-
         }
     }
 

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

@@ -0,0 +1,34 @@
+<?php
+class Wiaas_Admin_Supplier {
+
+    public static function init() {
+
+        add_action('init', array(__CLASS__, 'init_admin_supplier'));
+    }
+
+    public static function init_admin_supplier() {
+
+        $current_user = wp_get_current_user();
+
+        $role = $current_user->roles[0];
+
+        $is_supplier = $role === 'supplier';
+
+        if ($is_supplier) {
+
+            require_once dirname( __FILE__ ) . '/admin-supplier/class-wiaas-admin-supplier-orders.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-admin-supplier', $plugin_url . '/assets/js/wiaas-admin-supplier.js' );
+
+        wp_enqueue_style( 'wiaas-admin-supplier', $plugin_url . '/assets/css/wiaas-admin-supplier.css' );
+    }
+}
+
+Wiaas_Admin_Supplier::init();

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

@@ -0,0 +1,31 @@
+<?php
+
+class Wiaas_Admin_Profile {
+
+    public static function init() {
+        add_filter( 'user_contactmethods', array(__CLASS__, 'modify_user_contact_methods') );
+
+        add_action( 'user_profile_update_errors', array(__CLASS__, 'crf_user_profile_update_errors'), 10, 3 );
+
+    }
+
+    public static function crf_user_profile_update_errors( $errors, $update, $user ) {
+
+        $phone = $_POST['phone'];
+
+        if (!Wiaas_Validation::is_phone($phone)){
+            $errors->add('phone_error', __( '<strong>ERROR</strong>: Enter valid phone number.', 'crf' ));
+        };
+
+    }
+
+    public static function modify_user_contact_methods($user_contact){
+        $user_contact['phone'] = __( 'Phone number' );
+
+        return $user_contact;
+    }
+
+
+}
+
+Wiaas_Admin_Profile::init();

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

@@ -0,0 +1,85 @@
+<?php
+
+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 );
+	}
+
+	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 output_delivery_process() {
+	    $order_id = absint( $_GET['id'] );
+
+	    $has_access = Wiaas_Access_Management::can_current_user_read_order($order_id);
+
+	    if (! $has_access) {
+
+		    echo "<h2>You don't have permission to view this order.</h2>";
+
+		    return;
+	    }
+
+	    $order = wc_get_order($order_id);
+
+	    if ( !$order ) {
+	        return;
+        }
+
+	    $delivery_process = Wiaas_Delivery_Process::get_order_delivery_process_entry($order->get_id());
+
+	    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' )) {
+
+	        self::_maybe_process_admin_step_change_action($delivery_process);
+
+	        // refresh order
+            $order = wc_get_order($order_id);
+        }
+
+        require 'views/html-admin-delivery-process-page.php';
+    }
+
+	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( $entry['form_id'] );
+
+			$current_step = $api->get_current_step($entry);
+
+			if ( $current_step ) {
+				$current_step->purge_assignees();
+				$current_step->update_step_status( 'complete' );
+			}
+
+			$api->process_workflow($entry['id']);
+        }
+
+		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( $entry['form_id'] );
+			$api->send_to_step( $entry, $step_id );
+		}
+	}
+
+}
+
+Wiaas_Admin_Order_Process_Flow::init();

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

@@ -0,0 +1,150 @@
+<?php
+
+class Wiaas_Admin_Delivery_Process_List {
+
+	public static function init() {
+
+		add_filter('gform_form_list_columns', array( __CLASS__, 'filter_gform_form_list_columns' ));
+
+		add_filter('gform_form_list_forms', array( __CLASS__, 'filter_gform_form_list_forms' ), 10, 6);
+
+		add_filter('gform_form_actions', array( __CLASS__, 'filter_gform_form_actions' ), 10, 2);
+
+		add_action('gform_form_list_column_wiaas_country', array( __CLASS__, 'render_gform_form_list_wiaas_country_column' ));
+
+		add_action('gform_form_list_column_wiaas_actions', array( __CLASS__, 'render_gform_form_list_wiaas_actions_column' ));
+
+	}
+
+	/**
+     * Hide not needed columns for delivery process list
+     * Add country column
+     * Add actions column
+     *
+	 * @param array $columns
+	 *
+	 * @return mixed
+	 */
+	public static function filter_gform_form_list_columns($columns) {
+
+		unset($columns['entry_count']);
+		unset($columns['conversion']);
+		unset($columns['view_count']);
+
+		$columns['wiaas_country'] =  esc_html__( 'Country', 'wiaas' );
+		$columns['wiaas_actions'] =  esc_html__( 'Actions', 'wiaas' );
+
+		return $columns;
+	}
+
+	/**
+     * Filter delivery process forms list with search query by title and country
+	 * @param array $forms
+	 * @param string $search_query
+	 * @param bool $active
+	 * @param string $sort_column
+	 * @param string $sort_direction
+	 * @param bool $trash
+	 *
+	 * @return array
+	 */
+	public static function filter_gform_form_list_forms($forms, $search_query, $active, $sort_column, $sort_direction, $trash) {
+
+		$forms = GFFormsModel::get_forms( $active, $sort_column, $sort_direction, $trash );
+
+		if ( ! rgblank( $search_query ) ) {
+
+			$filtered_forms = array();
+			$search_query = strtolower($search_query);
+
+			// filter forms
+			foreach ($forms as $form) {
+
+				$form_details = GFAPI::get_form( $form->id );
+
+				$title = strtolower($form_details['title']);
+
+				$delivery_settings = rgar($form_details, 'wiaas_delivery_process');
+				$country_code = ! empty($delivery_settings) ? $delivery_settings['delivery_country'] : '';
+				$country_name = Wiaas_Countries::get_available_country_name_by_code($country_code);
+				$country_name = strtolower($country_name);
+
+				if (strpos($title, $search_query) !== false || strpos($country_code, $search_query) !== false ||
+				    strpos($country_name, $search_query) !== false) {
+					$filtered_forms[] = $form;
+				}
+			}
+
+			return $filtered_forms;
+		}
+
+		return $forms;
+	}
+
+	/**
+     * Remove unused actions and add workflow action for delivery forms list
+     *
+	 * @param array $actions
+	 * @param int $form_id
+	 *
+	 * @return mixed
+	 */
+	public static function filter_gform_form_actions($actions, $form_id) {
+		unset($actions['entries']);
+		unset($actions['preview']);
+		unset($actions['edit']);
+
+		$actions['wiaas_workflow'] =  array(
+			'label'        => __( 'Workflow', 'wiaas' ),
+			'short_label'  => esc_html__( 'Workflow', 'wiaas' ),
+			'title'        => __( 'Edit workflow', 'wiaas' ),
+			'url'          => '?page=gf_edit_forms&view=settings&id=' . $form_id . '&subview=gravityflow',
+			'priority'     => 1000,
+		);
+
+		return $actions;
+	}
+
+	/**
+     * Render country column for delivery process forms list
+     *
+	 * @param mixed $form
+	 */
+	public static function render_gform_form_list_wiaas_country_column($form) {
+
+		$form_details = GFAPI::get_form($form->id);
+		$delivery_settings = rgar($form_details, 'wiaas_delivery_process');
+
+		$country_code = ! empty($delivery_settings) ? $delivery_settings['delivery_country'] : '';
+
+		$country_name = Wiaas_Countries::get_available_country_name_by_code($country_code);
+
+		echo '<strong>' . esc_html_e($country_name) . '</strong>';
+	}
+
+	/**
+     * Render actions column for delivery process forms list
+	 * @param mixed $form
+	 */
+	public static function render_gform_form_list_wiaas_actions_column($form) {
+
+		$form_details = GFAPI::get_form($form->id);
+		$delivery_settings = rgar($form_details, 'wiaas_delivery_process');
+
+		$form_type = ! empty($delivery_settings) ? $delivery_settings['delivery_form_type'] : '';
+
+		?>
+		<a href="<?php echo '?page=gf_edit_forms&view=settings&id=' . $form->id . '&subview=gravityflow' ?>">Workflow</a>
+		<?php
+
+		if ($form_type !== 'action') {
+
+			?>
+			<span style="margin: 0 10px; opacity: 0.3;"> | </span>
+			<a href="<?php echo '?page=gf_edit_forms&view=settings&id=' . $form->id . '&subview=wiaas_delivery_process' ?>">Change Country</a>
+			<?php
+		}
+	}
+}
+
+Wiaas_Admin_Delivery_Process_List::init();

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

@@ -0,0 +1,214 @@
+<?php
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+class Wiaas_Admin_Delivery_Process_Order {
+
+	public static function init() {
+
+		if (isset($_GET['wiaas-procurement-order-id'])) {
+
+			add_action('admin_init', array(__CLASS__, 'download_procurement_order'));
+		}
+
+		add_action('add_meta_boxes', array(__CLASS__, 'add_delivery_process_metabox'), 100 );
+
+		add_action('woocommerce_process_shop_order_meta', array(__CLASS__, 'maybe_assign_delivery_process'), 999);
+	}
+
+	/**
+	 * Assign delivery process for order
+	 *
+	 * @param int $order_id
+	 */
+	public static function maybe_assign_delivery_process($order_id) {
+
+		if (! empty($_POST['wiaas_order_delivery_process_id'])) {
+
+			$process_id = absint($_POST['wiaas_order_delivery_process_id']);
+
+			Wiaas_Delivery_Process::create_delivery_process_for_order($order_id, $process_id);
+		}
+	}
+
+	public static function add_delivery_process_metabox() {
+
+		add_meta_box(
+			'order_delivery_process_meta_box',
+			__('Delivery Process', 'cmb'),
+			array(__CLASS__, 'order_delivery_process_meta_box'),
+			'shop_order',
+			'side',
+			'high'
+		);
+	}
+
+	public static function order_delivery_process_meta_box() {
+
+		global $post;
+
+		$order_id = $post->ID;
+
+		$process_entry = Wiaas_Delivery_Process::get_order_delivery_process_entry($order_id);
+
+		if ( empty($process_entry) ) {
+
+			$country_code = Wiaas_Order::get_order_country_code($order_id);
+
+			$list_of_delivery_processes = Wiaas_Delivery_Process::get_available_process_list_for_country($country_code);
+
+			?>
+			<div>
+				<select name="wiaas_order_delivery_process_id" style="width: 100%;">
+					<option value="" disabled selected>Assign process to order ... </option>
+					<?php
+					foreach($list_of_delivery_processes as $index => $process){
+						echo '<option value=' . $process['id'] . '>' . $process['title'] . '</option>';
+					}
+					?>
+				</select>
+				<button type="submit" class="button" style="margin-top: 10px;">Assign</button>
+			</div>
+			<?php
+		}  else{
+
+			$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>
+			<?php
+		}
+	}
+
+	/**
+	 * Download procurement order report
+	 *
+	 * @throws \PhpOffice\PhpSpreadsheet\Exception
+	 * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
+	 *
+	 */
+	public static function download_procurement_order() {
+
+		if (!is_user_logged_in()) {
+			wp_die(	__( 'No Access.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 403 ) );
+		}
+
+		$order_id = $_GET['wiaas-procurement-order-id'];
+		$order = wc_get_order($order_id);
+
+		if (! $order) {
+			wp_die(	__( 'Invalid order.', 'wiaas' ), __( 'Download Error', 'wiaas' ), array( 'response' => 404 ) );
+		}
+
+		$customer_user_id = $order->get_customer_id();
+		$organization_id = wiaas_get_user_organization_id($customer_user_id);
+		$customer_organization_info = wiaas_get_organization_info($organization_id);
+
+		$delivery_address = $order->get_shipping_address_1() . ',' .
+		                    $order->get_shipping_city() . ',' .
+		                    $order->get_shipping_country() . ',' .
+		                    $order->get_shipping_postcode();
+		$billing_address = $order->get_billing_address_1() . ',' .
+		                   $order->get_billing_city() . ',' .
+		                   $order->get_billing_country() . ',' .
+		                   $order->get_billing_postcode();
+
+		$order_procurement_info = wiaas_get_order_procurement_info($order->get_id());
+
+		$spreadsheet = new Spreadsheet();
+		$spreadsheet->getProperties()->setCreator("RICOH")
+		            ->setLastModifiedBy("Ricoh Dash")
+		            ->setTitle("Order Procurement Report")
+		            ->setSubject("Order Procurement Report")
+		            ->setDescription("Order Procurement Report")
+		            ->setKeywords("office 2007 openxml php order procurement")
+		            ->setCategory("Procurement report file");
+
+		$spreadsheet->setActiveSheetIndex(0);
+		$sheet = $spreadsheet->getActiveSheet();
+		$sheet->setTitle('Order procurement');
+
+		$sheet->setCellValue('A1', 'Customer details');
+		$sheet->setCellValue('A2', 'Name');
+		$sheet->setCellValue('A3', 'Invoice address');
+		$sheet->setCellValue('A4', 'Invoice Full Name');
+		$sheet->setCellValue('A5', 'Invoice Email');
+		$sheet->setCellValue('A6', 'VAT Number');
+
+		$sheet->setCellValue('B2', ! empty($customer_organization_info) ? $customer_organization_info['name'] : '');
+		$sheet->setCellValue('B3', $billing_address);
+		$sheet->setCellValue('B4', $order->get_formatted_billing_full_name());
+		$sheet->setCellValue('B5', $order->get_billing_email());
+		$sheet->setCellValue('B6', ! empty($customer_organization_info) ? $customer_organization_info['vat_code'] : '');
+
+		$sheet->getStyle('A1')->getFont()->setBold(true);
+
+		$sheet->setCellValue('A9', 'OrderDetails');
+		$sheet->setCellValue('A10', 'Order number');
+		$sheet->setCellValue('A11', 'Project number');
+		$sheet->setCellValue('A12', 'Delivery addres');
+		$sheet->setCellValue('A13', 'Delivery Full Name');
+		$sheet->setCellValue('A14', 'Reference');
+		$sheet->setCellValue('B10', $order->get_order_number());
+		$sheet->setCellValue('B11', Wiaas_Order_Project::get_project_name_for_order($order->get_id()) );
+		$sheet->setCellValue('B12', $delivery_address);
+		$sheet->setCellValue('B13', $order->get_formatted_shipping_full_name());
+		$sheet->setCellValue('B14', $order->get_meta('_wiaas_reference'));
+
+		$sheet->getStyle('A9')->getFont()->setBold(true);
+
+		$row = 14;
+
+		foreach ($order_procurement_info as $category => $products) {
+
+			$col = 1; $row += 2;
+
+			$sheet->getColumnDimensionByColumn($col)->setAutoSize(true);
+			$sheet->getStyleByColumnAndRow($col, $row)->getFont()->setBold(true);
+
+			$sheet->setCellValueByColumnAndRow($col, $row, ucfirst(strtolower($category)));
+
+			$row += 2;
+
+			if (! empty($products)) {
+
+				$product_columns = array_keys($products[0]);
+
+				foreach ($product_columns as $product_column_index => $product_column) {
+
+					$sheet->getColumnDimensionByColumn($product_column_index + 1)->setAutoSize(true);
+					$sheet->getStyleByColumnAndRow($product_column_index + 1, $row)->getFont()->setBold(true);
+					$sheet->setCellValueByColumnAndRow($product_column_index + 1, $row, $product_column);
+				}
+			}
+
+			$row += 1;
+			foreach ($products as $product) {
+
+				$product_values = array_values($product);
+				foreach ($product_values as $product_value_index => $product_value) {
+
+					$sheet->setCellValueByColumnAndRow($product_value_index + 1, $row, $product_value);
+				}
+				$row += 1;
+			}
+		}
+
+		header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+		header('Content-Disposition: attachment;filename="Procurement Report '.$order->get_order_number().'.xlsx"');
+		header('Cache-Control: max-age=0');
+
+		$writer = new Xlsx($spreadsheet);
+		$writer->save('php://output');
+
+		exit;
+
+	}
+}
+
+Wiaas_Admin_Delivery_Process_Order::init();

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-delivery-date.php

@@ -0,0 +1,38 @@
+<?php
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>
+
+    <p class="form-field form-field-wide">
+    <label for="estimated-delivery-date">Estimated delivery date:</label>
+    <input id="estimated-delivery-date" name="estimated-delivery-date" 
+           type="date" value="<?php echo $order_estimated_delivery_date ? date("Y-m-d", $order_estimated_delivery_date) : ""; ?>"
+           onChange="onOrderEstimatedDeliveryDateChange(this.value)"/>
+	</p>
+
+<script type="text/javascript">
+function onOrderEstimatedDeliveryDateChange(date) {
+    var timestamp = parseInt((new Date(date).getTime() / 1000).toFixed(0));
+    
+    if (isNaN(timestamp)){
+        timestamp = '';
+    }
+    
+    var data = {
+            action: 'wiaas_save_estimated_date_for_order',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_save_estimated_date_for_order" ) ?>',
+            order: '<?php echo $order_id ?>',
+            date: timestamp
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    $.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+</script>

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

@@ -0,0 +1,247 @@
+<?php
+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>
+    <br>
+    <table class="widefat" disabled="disabled">
+    <tr style="background: #EAF2FA;">
+        <th align="left"><strong>Suppliers</strong></th>
+        <th align="left"><strong>Estimated date</strong></th>
+        <th align="left"><strong>Confirmed date</strong></th>
+    </tr>
+    <?php
+        foreach($suppliers as $supplier){
+            echo '<tr style="background: #f5f5f5;"><td><strong>' . $supplier['name'] . '</strong></td>';
+
+            $estimated_date = $supplier['estimated_date'] ? date("Y-m-d", $supplier['estimated_date']) : "";
+            $confirmed_date = $supplier['confirmed_date'] ? date("Y-m-d", $supplier['confirmed_date']) : "";
+
+            ?>
+            <td>
+                <input
+                        id=<?php echo 'estimate-date-' . $supplier['id'] ?>
+                        <?php disabled($is_disabled, true, true) ?>
+                        type="date"
+                        onChange="onEstimatedDeliveryDateChange(<?php echo $supplier['id'] ?>, this.value)"
+                        value="<?php echo $estimated_date ?>" />
+            </td>
+
+            <td>
+                <input
+                        id=<?php echo 'confirmed-date-' . $supplier['id'] ?>
+                        <?php disabled($is_disabled, true, true) ?>
+                        type="date" onChange="onConfirmedDeliveryDateChange(<?php echo $supplier['id'] ?>, this.value)"
+                        value="<?php echo $confirmed_date ?>" />
+            </td>
+            </tr>
+
+            <tr>
+                <td colspan="3">
+                    <span>Tracking:</span>
+                </td>
+            </tr>
+
+            <?php
+                foreach($supplier['tracking_info'] as $index => $tracking_info){
+                    ?>
+                    <tr>
+                        <td colspan="3">
+                            <input  id=<?php echo 'supplier_' . $supplier['id'] . '_tracking_num_' . $index ?>
+                                    <?php disabled($is_disabled, true, true) ?>
+                                   placeholder="Tracking number" value="<?php echo $tracking_info['number'] ?>" />
+                            <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'] ?>" />
+
+                            <?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
+                }
+            ?>
+
+            <?php
+        }
+    ?>
+
+    <tr>
+        <td><h4>Final dates : </h4></td>
+        <td><h4><?php echo $final_estimated_date ? date('Y-m-d', $final_estimated_date) : '-' ?></h4></td>
+        <td><h4><?php echo $final_confirmed_date ? date('Y-m-d', $final_confirmed_date) : '-' ?></h4></td>
+    </tr>
+
+    <tfoot>
+        <tr>
+            <td><h4>Earliest installation date : </h4></td>
+            <td colspan="2">
+                <h4><?php echo $earliest_installation_date ? date('Y-m-d', $earliest_installation_date) : '-' ?></h4>
+            </td>
+        </tr>
+    </tfoot>
+
+    </table>    
+</div>
+
+<script type="text/javascript">
+function onEstimatedDeliveryDateChange(supplierID, date) {
+    var timestamp = parseInt((new Date(date).getTime() / 1000).toFixed(0));
+    
+    if (isNaN(timestamp)){
+        timestamp = '';
+    }
+
+    var data = {
+            action: 'wiaas_save_estimated_date_for_supplier',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_save_estimated_date_for_supplier" ) ?>',
+            order: '<?php echo $order_id ?>',
+            supplier: supplierID,
+            date: timestamp
+
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    jQuery.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+
+function onConfirmedDeliveryDateChange(supplierID, date) {
+    var timestamp = parseInt((new Date(date).getTime() / 1000).toFixed(0));
+    
+    if (isNaN(timestamp)){
+        timestamp = '';
+    }
+
+    var data = {
+            action: 'wiaas_save_confirmed_date_for_supplier',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_save_confirmed_date_for_supplier" ) ?>',
+            order: '<?php echo $order_id ?>',
+            supplier: supplierID,
+            date: timestamp
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    jQuery.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+function addAdditionalTrackingInfo(e){
+    e.preventDefault();
+    
+    var data = {
+            action: 'wiaas_add_additional_tracking_info_for_supplier_in_order',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_add_additional_tracking_info_for_supplier_in_order" ) ?>',
+            order: '<?php echo $order_id ?>',
+            supplier: e.target.id
+
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    jQuery.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+function saveTrackingInfo(e, supplierID, index){
+    e.preventDefault();
+
+    var tracking_num = document.getElementById('supplier_' + supplierID + '_tracking_num_' + index).value;
+    var tracking_url = document.getElementById('supplier_' + supplierID + '_tracking_url_' + index).value;
+
+    var data = {
+            action: 'wiaas_save_tracking_info',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_save_tracking_info" ) ?>',
+            order: '<?php echo $order_id ?>',
+            supplier: supplierID,
+            index: index,
+            tracking_num: tracking_num,
+            tracking_url: tracking_url
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    jQuery.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+function deleteTrackingInfo(e, supplierID, index){
+    e.preventDefault();
+
+    var data = {
+            action: 'wiaas_delete_tracking_info',
+            _ajax_nonce: '<?php echo wp_create_nonce( "wiaas_delete_tracking_info" ) ?>',
+            order: '<?php echo $order_id ?>',
+            supplier: supplierID,
+            index: index
+        };
+
+    // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+    jQuery.post(ajaxurl, data, function(response) {
+        if (response.success){
+            location.reload();
+        }else{
+            alert(response.data[0].message);
+        }
+    });
+}
+</script>

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

@@ -0,0 +1,153 @@
+<?php
+
+add_action( 'wp_ajax_wiaas_add_additional_tracking_info_for_supplier_in_order', 'wiaas_ajax_add_additional_tracking_info_for_supplier_in_order' );
+add_action( 'wp_ajax_wiaas_save_tracking_info', 'wiaas_ajax_save_tracking_info');
+add_action( 'wp_ajax_wiaas_delete_tracking_info', 'wiaas_ajax_delete_tracking_info');
+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
+ */
+function wiaas_ajax_add_additional_tracking_info_for_supplier_in_order(){
+	check_ajax_referer('wiaas_add_additional_tracking_info_for_supplier_in_order');
+	$error = new WP_Error('-1', 'Failed to add additional tracking info');
+	
+	if (!isset($_POST['order']) || !isset($_POST['supplier'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$supplier_id = intval( $_POST['supplier'] );
+
+	if (Wiaas_Order::add_additional_tracking_info($order_id, $supplier_id)){
+		wp_send_json_success();
+	}
+	
+	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');
+	
+	if (!isset($_POST['order']) || !isset($_POST['supplier']) || !isset($_POST['index']) 
+								|| !isset($_POST['tracking_num']) || !isset($_POST['tracking_url'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$supplier_id = intval( $_POST['supplier'] );
+	$index = intval($_POST['index']);
+	$tracking_num = $_POST['tracking_num'];
+	$tracking_url = $_POST['tracking_url'];
+
+	if (Wiaas_Order::save_tracking_info($order_id, $supplier_id, $index, $tracking_num, $tracking_url)){
+		wp_send_json_success();
+	}
+	
+	wp_send_json_error($error);
+}
+
+function wiaas_ajax_delete_tracking_info(){
+	check_ajax_referer('wiaas_delete_tracking_info');
+	$error = new WP_Error('-1', 'Failed to save tracking info');
+	
+	if (!isset($_POST['order']) || !isset($_POST['supplier']) || !isset($_POST['index'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$supplier_id = intval( $_POST['supplier'] );
+	$index = intval($_POST['index']);
+
+	if (Wiaas_Order::delete_tracking_info($order_id, $supplier_id, $index)){
+		wp_send_json_success();
+	}
+	
+	wp_send_json_error($error);
+}
+
+function wiaas_ajax_save_estimated_date_for_supplier(){
+	check_ajax_referer('wiaas_save_estimated_date_for_supplier');
+	$error = new WP_Error('-1', 'Failed to save estimated date');
+	
+	if (!isset($_POST['order']) || !isset($_POST['supplier']) || !isset($_POST['date'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$supplier_id = intval( $_POST['supplier'] );
+	$date = intval($_POST['date']);
+
+	if (Wiaas_Order::save_estimated_date($order_id, $supplier_id, $date)){
+		wp_send_json_success();
+	}
+	
+	wp_send_json_error($error);
+}
+
+function wiaas_ajax_save_confirmed_date_for_supplier(){
+	check_ajax_referer('wiaas_save_confirmed_date_for_supplier');
+	$error = new WP_Error('-1', 'Failed to save confirmed date');
+	
+	if (!isset($_POST['order']) || !isset($_POST['supplier']) || !isset($_POST['date'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$supplier_id = intval( $_POST['supplier'] );
+	$date = intval($_POST['date']);
+
+	if (Wiaas_Order::save_confirmed_date($order_id, $supplier_id, $date)){
+		wp_send_json_success();
+	}
+	
+	wp_send_json_error($error);
+}
+
+function wiaas_ajax_save_estimated_date_for_order(){
+	check_ajax_referer('wiaas_save_estimated_date_for_order');
+	$error = new WP_Error('-1', 'Failed to save global estimated date for order');
+	
+	if (!isset($_POST['order']) || !isset($_POST['date'])){
+		wp_send_json_error($error);
+	}
+	$order_id = intval( $_POST['order'] );
+	$date = intval($_POST['date']);
+
+	if (Wiaas_Order::save_order_estimated_date($order_id, $date)){
+		wp_send_json_success();
+	}
+	
+	wp_send_json_error($error);
+}

backend/app/plugins/wiaas/includes/admin/documents/views/html-document-form.php

@@ -152,18 +152,29 @@ $insert_new_document = $post->post_type !== 'wiaas_doc';
 
             response = response.response;
 
+            var infoContainer = jQuery('#wiaas_upload_info');
+
             if (response.substring(0, 6) === 'ERROR:') {
-                jQuery('#wiaas_upload_errors').html('<span class="text-danger">' +
-                    '<i class="fa fa-exclamation-triangle"></i>' +
+                infoContainer.html('<span style="color: darkred;">' +
+                    '<i class="dashicons dashicons-warning"></i>' +
                     ' &nbsp; ' + response.substring(6, response.length) +
                     '</span>');
+
                 return;
             }
 
+            infoContainer.html('<span style="color: darkgreen;">' +
+                '<i class="dashicons dashicons-yes"></i>' +
+                ' &nbsp; ' + 'Document uploaded and linked' +
+                '</span>');
+
 	        <?php
                 if ($insert_new_document) {
                     ?>
                         $('#wiaas_attached_documents').find('tbody').append(response);
+
+                        $('.wiaas_documents_tab a').click();
+
                     <?php
                 } else {
                     ?>
@@ -252,7 +263,8 @@ $insert_new_document = $post->post_type !== 'wiaas_doc';
         </div>
     </div>
 
-    <div id="wiaas_upload_errors" style="color: darkred;">
+    <div id="wiaas_upload_info">
+
     </div>
 
 </div>

backend/app/plugins/wiaas/includes/admin/documents/views/html-product-documents.php

@@ -8,62 +8,17 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 ?>
 
-<script type="text/javascript">
-    jQuery(document).ready(function ($) {
-
-        $( '.wiaas-search-documents' ).each(function() {
-            var element = $( this );
-            var searchTarget = $('#' + element.data('target'));
-
-            element.autocomplete({
-                source: function(request, response) {
-                    $.get( window.ajaxurl, {
-                        action: 'wiaas_json_search_documents',
-                        query: request.term,
-                        _ajax_nonce: '<?php echo wp_create_nonce('wiaas_json_search_documents') ?>'
-                    } ).done( function( documents ) {
-                            response( documents || []);
-                        }
-                    );
-                },
-                select: function(event, ui) {
-                    if (!searchTarget || $('#wiaas_attached_document_' + ui.item.id).length) {
-                        return;
-                    }
-
-                    $.get(window.ajaxurl, {
-                        action: 'wiaas_link_document',
-                        _ajax_nonce: '<?php echo wp_create_nonce('wiaas_link_document') ?>',
-                        id: ui.item.id
-                    }).done( function (document) {
-                        searchTarget.find('tbody').append(document);
-                    });
-
-                }
-            })
-                .autocomplete( 'instance' )._renderItem = function( ul, item ) {
-                return $( '<li role="option" id="wiaas-document-autocomplete-' + item.id + '">' )
-                    .text( item.name )
-                    .appendTo( ul );
-            };
-        });
-
-        $('#wiaas_attached_documents').delegate('.wiaas-remove-attached-document', 'click', function (e) {
-            e.preventDefault();
-
-            var id = $(this).data('id');
-
-            $('#wiaas_attached_document_' + id).remove();
-        });
-
-    });
-</script>
-
 <div id="wiaas_documents" class="panel woocommerce_options_panel">
     <div class="options_group">
         <p class="form-field">
             <label style="font-weight: bold;" for="wiaas_addon_packages"><?php esc_html_e( 'Search documents:', 'wiaas' ); ?></label>
-            <input type="text" data-target="wiaas_attached_documents" class="wiaas-search-documents"/>
+            <input
+                    type="text"
+                    data-target="wiaas_attached_documents"
+                    data-search-nonce="<?php echo wp_create_nonce('wiaas_json_search_documents') ?>"
+                    data-link-nonce="<?php echo wp_create_nonce('wiaas_link_document') ?>"
+                    class="wiaas-search-documents"
+            />
         </p>
     </div>
     <div class="options_group">

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

@@ -21,24 +21,10 @@ class Wiaas_Admin_Package_Pricing {
 	}
 
 	public static function get_package_price_html($price_html, $package) {
-		$bundled_items = $package->get_bundled_items();
-
-		$recurring_price = 0;
-
-		foreach ($bundled_items as $bundled_item) {
-			$product = $bundled_item->product;
-			$product_price = Wiaas_Product_Pricing::get_product_price($product);
-			if ($product_price['is_recurring']) {
-				$recurring_price += $product_price['price'] * $bundled_item->get_quantity();
-			}
-		}
 
 		$edit_link = admin_url( 'edit.php?post_type=product&page=wiaas-package_price_editor&id=' . absint( $package->get_id() ) );
 
-		$price_html = 'Fixed: ' . $price_html . ' and ' . $recurring_price . ' / month' .
-                      ' <br> <a class="button button-link" href="' .  esc_url($edit_link) .'" target="_blank">Edit price<a>';
-
-		return $price_html;
+		return '<a class="button button-link" href="' .  esc_url($edit_link) .'" target="_blank">Edit price<a>';
 	}
 
 	public static function render_edit_prices_link() {
@@ -162,6 +148,8 @@ class Wiaas_Admin_Package_Pricing {
 			$pricing_rules,
 			$commission,
 			$max_cost_margin);
+
+		Wiaas_Access_Management::maybe_handle_product_access($package_id, get_post($package_id));
 	}
 }
 

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

@@ -121,8 +121,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
                                                 if ($cat === 'product') {
 
-	                                                $products_total_cost = wiaas_get_package_hardware_procurement_cost($package) +
-                                                                  wiaas_get_package_software_procurement_cost($package);
+	                                                $products_total_cost = wiaas_get_package_product_procurement_cost($package);
 
                                                     esc_html_e('Total: ' . $products_total_cost, 'wiaas');
                                                 }

backend/app/plugins/wiaas/includes/admin/simple-product/class-wiaas-admin-product-additional-info.php

@@ -44,6 +44,14 @@ class Wiaas_Admin_Product_Additional_Info {
         }
     }
 
+    /**
+     * This method filters search results by template country
+     * In addition it adds template category to label of every product
+     *
+     * @param $search_results array provided by filter
+     * @return mixed array of filtered search results
+     */
+
     public static function filter_product_by_country($search_results) {
 
         $url = wp_get_referer();
@@ -59,9 +67,14 @@ class Wiaas_Admin_Product_Additional_Info {
         if (!empty($search_results)) {
             $search_result_objects = array_map('wc_get_product', array_keys($search_results));
 
-            foreach ($search_result_objects as $result_id => $producta) {
-                if (Wiaas_Countries::get_product_country_term_id($producta) !== $country_id) {
-                    unset($search_results[$producta->get_id()]);
+            foreach ($search_result_objects as $result_id => $product_form_search) {
+                if (Wiaas_Countries::get_product_country_term_id($product_form_search) !== $country_id) {
+                    unset($search_results[$product_form_search->get_id()]);
+                } else {
+                    $template_category = wp_get_object_terms($product_form_search->get_id(), 'template_category', array('fields' => 'names'));
+                    if(!empty($template_category)){
+                        $search_results[$product_form_search->get_id()] =  $search_results[$product_form_search->get_id()].' ['.$template_category[0].']';
+                    }
                 }
             }
         }

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

@@ -56,10 +56,16 @@ class Wiaas_Admin_Template_Selection {
         <div id="wiaas_selected_template_items_container"><?php
         $template_products_data = self::show_template_products($value);
 
-        self::render_template_products($template_products_data['hardware']);
-        self::render_template_products($template_products_data['services']);
-        self::render_template_products($template_products_data['installation']);
-        self::render_template_products($template_products_data['software']);
+        $product  = wc_get_product( $post->ID );
+        if ($product->get_type() == 'bundle') {
+            $bundled_items = $product->get_bundled_items('view');
+            $categories_form_bundle = WC_Product_Template::extract_bundled_product_categories($bundled_items);
+
+            self::render_template_products($template_products_data['hardware'], $categories_form_bundle);
+            self::render_template_products($template_products_data['services'], $categories_form_bundle);
+            self::render_template_products($template_products_data['installation'], $categories_form_bundle);
+            self::render_template_products($template_products_data['software'], $categories_form_bundle);
+        }
         ?></div><?php
 
     }
@@ -132,17 +138,22 @@ class Wiaas_Admin_Template_Selection {
      * Render html of template categories
      *
      * @param $template_products array containing template category information
+     * @param $categories_form_bundle
      */
-    public static function render_template_products($template_products) {
+    public static function render_template_products($template_products, $categories_form_bundle = array()) {
+
         if (!empty($template_products)) {
 
 
             foreach ($template_products as $item) {
 
+                $connected_product = $categories_form_bundle[$item['template_category_id']] ?
+                    $categories_form_bundle[$item['template_category_id']]->product_name : '';
+
                 $product_id = $item['template_category_id'];
                 $title = $item['template_category_title'];
                 $quantity = $item['quantity'];
-
+                $connected_product_name = $connected_product;
                 include('views/html-wiaas-template-selection.php');
 
             }

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

@@ -83,7 +83,8 @@ class Wiaas_Template_Admin_Ajax {
         
         $terms = get_terms(array(
             'taxonomy' => 'template_category',
-            'name__like' => $term
+            'name__like' => $term,
+            'hide_empty' => false
         ));
 
         foreach ($terms as $t) {

backend/app/plugins/wiaas/includes/admin/template/views/html-wiaas-template-selection.php

@@ -9,5 +9,6 @@ if (!defined('ABSPATH')) {
     <h3>
     <strong class="item-title"><?php echo $title; ?></strong>
     <strong class="item-title">[<?php echo $quantity; ?>]</strong>
+        <strong class="item-title">[<?php echo $connected_product_name; ?>]</strong>
     </h3>
     </div><?php

backend/app/plugins/wiaas/includes/api/class-wiaas-document-api.php

@@ -5,7 +5,6 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 /**
- * TODO: This is temporary implemetation and will probably be changed during work on pending wiaas cart task
  * Class Wiaas_Document_API
  */
 class Wiaas_Document_API {
@@ -30,30 +29,26 @@ class Wiaas_Document_API {
 			)
 		) );
 
-		register_rest_route( self::$namespace, 'documents/order/(?P<id>\d+)/(?P<type>[\w-]+)', array(
+		register_rest_route( self::$namespace, 'order/(?P<id>\d+)/item/(?P<item_id>\d+)/document/(?P<key>[\w-]+)', array(
 			'args'   => array(
 				'id' => array(
 					'description' => __( 'Order ID.', 'wiaas' ),
 					'type'        => 'integer',
 					'sanitize_callback' => 'absint',
-				),
-				'type' => array(
-					'description' => __( 'Order document type.', 'wiaas' ),
-					'type'        => 'string',
-					'sanitize_callback' => 'sanitize_key',
-				),
+				)
 			),
 			array(
 				'methods' => 'GET',
 				'permission_callback' => 'is_user_logged_in',
-				'callback' => array(__CLASS__, 'download_order_document'),
+				'callback' => array(__CLASS__, 'download_order_item_document'),
 				'args' => array(
 					'item_id' => array(
 						'description' => __( 'Package Order Item ID.', 'wiaas' ),
 						'type' => 'integer',
 						'sanitize_callback' => 'absint',
+						'required' => true
 					),
-					'document_key' => array(
+					'key' => array(
 						'description' => __( 'Unique key identifier for order document.', 'wiaas' ),
 						'type'        => 'string',
 						'sanitize_callback' => 'sanitize_key',
@@ -62,6 +57,29 @@ class Wiaas_Document_API {
 				)
 			)
 		) );
+
+		register_rest_route(self::$namespace, 'order/(?P<id>\d+)/document/(?P<key>[\w-]+)', array(
+			'args' => array(
+				'id' => array(
+					'description' => __( 'Order ID.', 'wiaas' ),
+					'type'        => 'integer',
+					'sanitize_callback' => 'absint',
+				)
+			),
+			array(
+				'methods' => 'GET',
+				'permission_callback' => 'is_user_logged_in',
+				'callback' => array(__CLASS__, 'download_order_other_document'),
+				'args' => array(
+					'key' => array(
+						'description' => __( 'Unique key identifier for order document.', 'wiaas' ),
+						'type'        => 'string',
+						'sanitize_callback' => 'sanitize_key',
+						'required' => true
+					),
+				)
+			)
+		));
 	}
 
 	/**
@@ -76,14 +94,23 @@ class Wiaas_Document_API {
 	}
 
 	/**
-	 * Download order document
+	 * Download order item document
+	 *
 	 * @param WP_REST_Request $request
 	 */
-	public static function download_order_document($request) {
+	public static function download_order_item_document($request) {
 		Wiaas_Document_Download::download_order_item_document(
 			$request['id'],
 			$request['item_id'],
-			$request['type'],
-			$request['document_key']);
+			$request['key']);
+	}
+
+	/**
+	 * Download order document
+	 *
+	 * @param WP_REST_Request $request
+	 */
+	public static function download_order_other_document($request) {
+		Wiaas_Document_Download::download_order_other_document($request['id'], $request['key']);
 	}
 }

backend/app/plugins/wiaas/includes/api/class-wiaas-rest-customer.php

@@ -148,6 +148,10 @@ class Wiaas_REST_Customer_API {
 			return wiaas_api_notice('ADD_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
 		}
 
+        if (!Wiaas_Validation::is_phone($phone)){
+            return wiaas_api_notice('INVALID_PHONE_NUMBER', 'error', Wiaas_Customer::get_customer_info($customer_id));
+        };
+
 		if (!Wiaas_Customer::update_customer_profile_info($customer_id, $first_name, $last_name, $phone)){
 			return wiaas_api_notice('PROFILE_NOT_CHANGED', 'warning', Wiaas_Customer::get_customer_info($customer_id));
 		}

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

@@ -26,28 +26,44 @@ class Wiass_REST_Delivery_Process_API {
 	 */
 	private static $namespace = 'wiaas';
 
+	private static $rest_base = 'delivery';
+
 
 	public static function register_routes() {
-		register_rest_route( self::$namespace, 'next-delivery-steps', array(
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/next-actions', array(
 			'methods' => 'GET',
 			'callback' => array(__CLASS__, 'get_next_actions_for_user'),
+			'permission_callback' => 'is_user_logged_in'
 		) );
 
-		register_rest_route( self::$namespace, 'customer-acceptance/(?P<entry_id>\d+)', array(
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/(?P<order_id>\d+)/customer-acceptance', array(
 			'methods' => 'GET',
 			'callback' => array(__CLASS__, 'get_customer_acceptance'),
 			'permission_callback' => 'is_user_logged_in'
 		) );
 
-		register_rest_route( self::$namespace, 'customer-acceptance/(?P<entry_id>\d+)', array(
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/(?P<order_id>\d+)/customer-acceptance', array(
 			'methods' => 'POST',
 			'callback' => array(__CLASS__, 'submit_customer_acceptance'),
 			'permission_callback' => 'is_user_logged_in'
 		) );
 
-		register_rest_route( self::$namespace, 'customer-acceptance/(?P<entry_id>\d+)/upload-file' , array(
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/(?P<order_id>\d+)/customer-acceptance/upload' , array(
 			'methods' => 'POST',
-			'callback' => array(__CLASS__, 'upload_file'),
+			'callback' => array(__CLASS__, 'upload_customer_acceptance'),
+			'permission_callback' => 'is_user_logged_in'
+		) );
+
+
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/(?P<order_id>\d+)/customer-questionnaires', array(
+			'methods' => 'GET',
+			'callback' => array(__CLASS__, 'get_customer_questionnaires'),
+			'permission_callback' => 'is_user_logged_in'
+		) );
+
+		register_rest_route( self::$namespace, '/' . self::$rest_base . '/(?P<order_id>\d+)/customer-questionnaires/upload/(?P<action_entry_id>\d+)', array(
+			'methods' => 'POST',
+			'callback' => array(__CLASS__, 'upload_customer_questionnaire'),
 			'permission_callback' => 'is_user_logged_in'
 		) );
 	}
@@ -61,14 +77,6 @@ class Wiass_REST_Delivery_Process_API {
 			'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();
@@ -77,10 +85,11 @@ class Wiass_REST_Delivery_Process_API {
 
 		$form_ids = gravity_flow()->get_workflow_form_ids();
 
-		$total_count = 7;
-
-
-		$entries = GFAPI::get_entries( $form_ids, $search_criteria, null, null, $total_count );
+		$entries = GFAPI::get_entries(
+			$form_ids,
+			$search_criteria,
+			null,
+			null);
 
 		$data = array();
 		foreach ($entries as $entry) {
@@ -96,175 +105,73 @@ class Wiass_REST_Delivery_Process_API {
 		return rest_ensure_response($data);
 	}
 
-	public static function get_customer_acceptance(WP_REST_Request $request){
-		$entry = GFAPI::get_entry($request['entry_id']);
-		if (is_wp_error($entry)){
-			return wiaas_api_generate_error('Customer acceptance entry not found', 404);
-		}
+	public function get_customer_questionnaires(WP_REST_Request $request) {
 
-		$acceptance_documents = array();
-		$uploaded_files = json_decode($entry[self::UPLOADED_FILES_FIELD_ID]);
+		$order_id = absint($request['order_id']);
 
-		foreach($uploaded_files as $file_url){
-			//example of decoded url : 
-			//http://localhost/wp/index.php?gf-download=2018/08/rokovi-1535378841.docx&form-id=1&field-id=12&hash=1be6c30f0eeff93563b352d15fe459d5ded12ee06c2c8f36fed66b42dedf2534
-			
-			$decoded_url = urldecode($file_url);			
-			$url_parts = explode('?', $decoded_url);
-			$file_name_base_parts = explode('&', $url_parts[1]);
-			$file_name_parts = explode('/', $file_name_base_parts[0]);
-			$file_name_with_extension_parts = explode('.', $file_name_parts[2]);
+		$data = Wiaas_Delivery_Process::get_customer_questionnaires_data($order_id);
 
-			$acceptance_documents_entry = array(
-				'name' => $file_name_with_extension_parts[0],
-				'extension' => $file_name_with_extension_parts[1],
-				'url' => $file_url
-			);
-			array_push($acceptance_documents, $acceptance_documents_entry);
-		}
-
-		$acceptance_status = 0;
-		if ($entry[self::ACCEPTANCE_STATUS_FIELD_ID]){
-			$acceptance_status = ($entry[self::ACCEPTANCE_STATUS_FIELD_ID] === 'accept') ? 1 : -1;
-		}
-
-		return rest_ensure_response(array(
-			'documents' => $acceptance_documents,
-			'expiration' => $entry[self::EXPIRATION_DATE_FIELD_ID],
-			'status' => $acceptance_status,
-			'decline_reason' => $entry[self::DECLINE_REASON_FIELD_ID]
-		));
+		return rest_ensure_response($data);
 	}
 
-	public static function submit_customer_acceptance(WP_REST_Request $request){
-		$entry = GFAPI::get_entry($request['entry_id']);
-		if (is_wp_error($entry)){
-			return wiaas_api_generate_error('Customer acceptance entry not found', 404);
-		}
+	public function upload_customer_questionnaire(WP_REST_Request $request) {
 
-		$status = $request['actionType'];
-		$reason = $request['declineReason'];
+		$order_id = absint($request['order_id']);
+
+		$action_entry_id = absint($request['action_entry_id']);
+
+		Wiaas_Delivery_Process::upload_customer_questionnaire($order_id, $action_entry_id);
+
+		return wiaas_api_notice('INSTALLATION_ACCEPTED', 'success');
+	}
+
+	public static function get_customer_acceptance(WP_REST_Request $request){
+
+		$order_id = absint($request['order_id']);
+
+		$data = Wiaas_Delivery_Process::get_customer_acceptance_data($order_id);
+
+		return rest_ensure_response($data);
+	}
+
+	public static function submit_customer_acceptance(WP_REST_Request $request) {
+
+		$status = $request['action_type'];
+		$reason = $request['decline_reason'];
 
 		if (!in_array($status, self::ACCEPTABLE_STATUS)){
 			return wiaas_api_notice('ACCEPTANCE_STATUS_MISSING', 'error');
 		}
 
 		$installation_declined = ($status === self::DECLINE_STATUS_LABEL);
-
-		$uploaded_files = json_decode($entry[self::UPLOADED_FILES_FIELD_ID]);
-
 		if ($installation_declined && $reason === ''){
 			return wiaas_api_notice('DECLINE_REASON_EMPTY', 'error');
 		}
 
-		if (!$installation_declined && (count($uploaded_files)===0)){
+
+		$order_id = $request['order_id'];
+
+		if (! $installation_declined && ! Wiaas_Delivery_Process::is_customer_acceptance_uploaded($order_id)) {
 			return wiaas_api_notice('ACCEPTANCE_NOT_UPLOADED', 'error');
 		}
 
-		$entry[self::DECLINE_REASON_FIELD_ID] = $reason;
-		$entry[self::ACCEPTANCE_STATUS_FIELD_ID] = $status;
-
-		if (!GFAPI::update_entry( $entry )){
-			return wiaas_api_notice('INTERNAL_SERVER_ERROR', 'error');
-		}
-
-		//Check if step is already completed, to not submit again 
-		$gf_api = new Gravity_Flow_API($entry['form_id']);
-		$current_step = $gf_api->get_current_step($entry);
-		if ($current_step->get_name() !== self::USER_INPUT_STEP_NAME){
-			return wiaas_api_notice('ACCEPTANCE_STATUS_UPDATED', 'success');
-		}
-
-		if ( $current_step ) {
-			$current_step->purge_assignees();
-			$current_step->update_step_status( 'complete' );
-		}
-		$entry_id = $entry['id'];
-		$new_step_id = $current_step->get_id() + 1;
-		$new_step = $gf_api->get_step( $new_step_id, $entry );
-		$feedback = sprintf( esc_html__( 'Sent to step: %s', 'gravityflow' ), $new_step->get_name() );
-		$gf_api->add_timeline_note( $entry_id, $feedback );
-		$gf_api->log_activity( 'workflow', 'sent_to_step', $gf_api->form_id, $entry_id, $step_id );
-		gform_update_meta( $entry_id, 'workflow_final_status', 'pending' );
-		$new_step->start();
-		$gf_api->process_workflow( $entry_id );
-	
+		Wiaas_Delivery_Process::update_customer_acceptance_status($order_id, $status, $reason);
 
 		if ($installation_declined){
 			return wiaas_api_notice('INSTALLATION_DECLINED', 'success');
 		}
+
 		return wiaas_api_notice('INSTALLATION_ACCEPTED', 'success');
 	}
 
-	public static function upload_file(WP_REST_Request $request){
-		$files = $request->get_file_params();
-		if (!$files[self::FILE_KEY_NAME]){
-			return wiaas_api_notice('NO_FILES_UPLOADED', 'error');
-		}
+	public static function upload_customer_acceptance(WP_REST_Request $request){
 
-		$entry = GFAPI::get_entry($request['entry_id']);
-		if (is_wp_error($entry)){
-			return wiaas_api_generate_error('Customer acceptance entry not found', 404);
-		}
+		$order_id = $request['order_id'];
 
-		$form = GFAPI::get_form($entry['form_id']);
-		$form_upload_path = GFFormsModel::get_upload_path( $form['id'] );
+		$success = Wiaas_Delivery_Process::upload_customer_acceptance_document($order_id);
 
-		$target_path = $form_upload_path . '/' . date('Y') . '/' . date('m') . '/';
-		wp_mkdir_p( $target_path );
-		GFCommon::recursive_add_index_file( $target_path );
 
-		$upload_file_field = GFAPI::get_field($form['id'], self::UPLOADED_FILES_FIELD_ID);
-		$file_name = sanitize_file_name($files[self::FILE_KEY_NAME]['name']);
-		$file_path_details = pathinfo($file_name);
-		
-		if ( GFCommon::file_name_has_disallowed_extension( $file_name ) ) {
-			return wiaas_api_notice('INVALID_FILE_ACCEPTANCE', 'error');
-		}
-		$allowed_extensions = ! empty( $upload_file_field->allowedExtensions ) ? GFCommon::clean_extensions( explode( ',', strtolower( $upload_file_field->allowedExtensions ) ) ) : array();
-		if ( ! empty( $allowed_extensions ) ) {
-			if ( ! GFCommon::match_file_extension( $file_name, $allowed_extensions ) ) {
-				return wiaas_api_notice('INVALID_FILE_ACCEPTANCE', 'error');
-			}
-		}
-
-		$new_file_name = $file_path_details['filename'] . '-' . time() . '.' . $file_path_details['extension'];
-
-		// Bypasses security checks when running unit tests.
-		if ( defined( 'WP_TEST_IN_PROGRESS' ) && WP_TEST_IN_PROGRESS ) {
-			return wiaas_api_notice('FILE_UPLOADED', 'success');
-		}
-
-		if ( move_uploaded_file($files[self::FILE_KEY_NAME]['tmp_name'], $target_path . $new_file_name ) ) {
-			GFFormsModel::set_permissions( $target_path . $new_file_name );
-		} else {
-			return wiaas_api_notice('INTERNAL_SERVER_ERROR', 'error');
-		}
-
-		//Extract path relative to the root
-		//Last 6 strings (excluding last empty) are path relative to the root 
-		$path_parts = explode('/', $target_path);
-		
-		$relative_path = '';
-		$i = count($path_parts) - self::PATH_PARTS_TO_EXTRACT;
-		while($i < count($path_parts)-1){
-			$relative_path = $relative_path . $path_parts[$i] . '/';
-			$i++;
-		}
-
-		$file_url = self::BASE_NAME . $relative_path . $new_file_name;
-		$url_for_download = $upload_file_field->get_download_url($file_url);
-
-		$uploaded_files = json_decode($entry[self::UPLOADED_FILES_FIELD_ID]);
-		
-		if ($uploaded_files === NULL){
-			$uploaded_files = [];
-		}
-		array_push($uploaded_files, $url_for_download);
-
-		$entry[self::UPLOADED_FILES_FIELD_ID] = json_encode($uploaded_files);
-
-		if (GFAPI::update_entry( $entry )) {
+		if ($success) {
 			return wiaas_api_notice('FILE_UPLOADED','success');
 		}
 

backend/app/plugins/wiaas/includes/api/class-wiaas-rest-user-api.php

@@ -43,7 +43,7 @@ class Wiass_REST_User_API {
 	}
 
 	public static function get_countries(){
-		$countries = Wiaas_Countries::get_list_of_countries();
+		$countries = Wiaas_Countries::get_available_countries();
 
 		return rest_ensure_response($countries);
 	}

backend/app/plugins/wiaas/includes/api/class-wiaas-support-api.php

@@ -0,0 +1,68 @@
+<?php
+
+class Wiaas_Support_Api {
+
+    /**
+     * Endpoint namespace.
+     *
+     * @var string
+     */
+    private static $namespace = 'wiaas';
+
+    private static $rest_base = 'support';
+
+
+    public static function register_routes() {
+
+        register_rest_route(self::$namespace,  self::$rest_base . '/send-support-email', array(
+            'methods' => 'POST',
+            'callback' => array(__CLASS__, 'send_support_email'),
+            'permission_callback' => 'is_user_logged_in',
+            'args' => array(
+                'id' => array(
+                    'description' => __('Order ID.', 'wiaas'),
+                    'type' => 'integer',
+                    'required' => true,
+                    'sanitize_callback' => 'absint',
+                ),
+                'support_text' => array(
+                    'description' => __('Email text.', 'wiaas'),
+                    'type' => 'string',
+                    'required' => true
+                )
+            )
+        ));
+    }
+
+    /**
+     * Send support email and save massage to order notes
+     *
+     * @param WP_REST_Request $request Request data.
+     *
+     * @return WP_REST_Response
+     */
+    public static function send_support_email($request) {
+
+        $order_id = $request['id'];
+        $message = $request['support_text'];
+        $order = wc_get_order($order_id);
+        $customer_id =   $order->get_customer_id();
+        $customer = get_user_by('id', $customer_id);
+
+
+        $mailer = WC()->mailer();
+
+        $recipient = WIAAS_SUPPORT_EMAIL;
+        $subject = __('Customer: '.$customer->get('first_name').', '.''.$customer->get('last_name').' needs support for order number: '  .$order->get_order_number());
+
+        $headers = array();
+        $success = $mailer->send( $recipient, $subject, $message, $headers );
+
+        if ($success) {
+            wc_create_order_note($order_id , $message, true  );
+            return wiaas_api_notice('EMAIL_SENT', 'success');
+        }
+
+        return wiaas_api_notice('EMAIL_NOT_SENT', 'failed');
+    }
+}

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

@@ -16,7 +16,20 @@ class Wiaas_Access_Management {
 
 		add_action( 'save_post', array( __CLASS__, 'maybe_handle_product_access' ), 999, 2 );
 
-		add_action('woocommerce_new_order', array( __CLASS__, 'assign_order_to_organization' ));
+		add_action('woocommerce_checkout_order_processed', array( __CLASS__, 'assign_order_to_customer_organization' ));
+		add_action('woocommerce_checkout_order_processed', array( __CLASS__, 'assign_order_to_commercial_lead_organization' ));
+        add_action('woocommerce_checkout_order_processed', array( __CLASS__, 'assign_order_to_supplier_organizations'));
+        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);
 	}
 
 	/**
@@ -42,6 +55,7 @@ class Wiaas_Access_Management {
 		    empty(Wiaas_Package_Pricing::get_package_prices($product))) {
 
 			$access_group = Groups_Group::read_by_name('admin');
+
 		} else {
 
 			$access_group = Groups_Group::read_by_name('Registered');
@@ -63,19 +77,68 @@ class Wiaas_Access_Management {
 	 *
 	 * @param int $order_id
 	 */
-	public static function assign_order_to_organization($order_id) {
+	public static function assign_order_to_customer_organization($order_id) {
 		// assign order to customer organization
 		$customer_id = wiaas_get_current_user_organization_id();
 		Wiaas_User_Organization::assign_post_to_organization($order_id, $customer_id);
+	}
+
+	/**
+	 * Assign order to commercial lead organization
+	 *
+	 * @param int $order_id
+	 */
+	public static function assign_order_to_commercial_lead_organization($order_id) {
 		$order = wc_get_order($order_id);
 
-		// assign order to commercial lead organization
 		$commercial_lead_id = absint($order->get_meta('_wiaas_commercial_lead_id', true));
 		if ($commercial_lead_id) {
 			Wiaas_User_Organization::assign_post_to_organization($order_id, $commercial_lead_id);
 		}
 
 	}
+
+    /**
+     * Assignees order to supplier organizations extracted from ordered items except installation
+     *
+     * Order will be assigned to corresponding installation company during delivery process
+     *
+     * @param int $order_id
+     */
+	public static function assign_order_to_supplier_organizations($order_id) {
+
+		$order = wc_get_order($order_id);
+
+        $order_items = $order->get_items('line_item');
+
+        foreach ($order_items as $key => $order_item) {
+
+	        $supplier_organisation_id = $order_item->get_meta('_wiaas_supplier_organization_id');
+
+        	if (! empty($supplier_organisation_id) && $order_item->get_meta('_wiaas_category') !== 'installation') {
+
+		        Wiaas_User_Organization::assign_post_to_organization($order_id, $supplier_organisation_id);
+	        }
+        }
+
+    }
+
+	/**
+	 * Assign order to installation organization that handles installation of corresponding ordered bundle item
+	 *
+	 * @param WC_Order $order
+	 * @param WC_Order_Item $bundle_item
+	 * @param WC_Order_Item $installation_item
+	 */
+    public static function assign_order_to_installation_organization($order, $bundle_item, $installation_item) {
+
+	    $supplier_organisation_id = $installation_item->get_meta('_wiaas_supplier_organization_id');
+
+	    if (! empty($supplier_organisation_id) ) {
+
+		    Wiaas_User_Organization::assign_post_to_organization($order->get_id(), $supplier_organisation_id);
+	    }
+    }
 }
 
 Wiaas_Access_Management::init();

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

@@ -1,12 +1,9 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
 class Wiaas_Admin {
 
 	public static function init() {
+
 		require_once dirname( __FILE__ ) . '/admin/class-wiaas-admin-package.php';
 		require_once dirname( __FILE__ ) . '/admin/class-wiaas-admin-pricing.php';
         require_once dirname(__FILE__) . '/admin/template/class-wiaas-admin-template-selection.php';
@@ -20,18 +17,38 @@ class Wiaas_Admin {
 		require_once dirname(__FILE__) . '/admin/class-wiaas-admin-documents.php';
 		// Admin organization interface
         require_once dirname(__FILE__) . '/admin/class-wiaas-admin-organization.php';
+        // Admin order delivery process
+		require_once dirname(__FILE__) . '/admin/class-wiaas-admin-delivery-process.php';
 
         require_once dirname(__FILE__) . '/admin/class-wiaas-admin-cl.php';
 
         require_once dirname(__FILE__) . '/admin/class-wiaas-admin-product.php';
 
+		require_once dirname(__FILE__) . '/admin/class-wiaas-admin-delivery-process.php';
+
+        require_once dirname(__FILE__) . '/admin/class-wiaas-admin-supplier.php';
+
+        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-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-api.php

@@ -43,7 +43,8 @@ class Wiaas_API {
 
 		include_once dirname( __FILE__ ) . '/api/class-wiaas-order-projects-api.php';
 
-        include_once dirname( __FILE__ ) . '/api/class-wiaas-wc- package-api-integration.php';
+        include_once dirname( __FILE__ ) . '/api/class-wiaas-wc-package-api-integration.php';
+        include_once dirname( __FILE__ ) . '/api/class-wiaas-support-api.php';
 
 		// API functions
 		include_once dirname( __FILE__ ) . '/api/wiaas-api-functions.php';
@@ -58,6 +59,7 @@ class Wiaas_API {
 			'Wiass_REST_User_API',
 			'Wiaas_REST_Customer_API',
 			'Wiaas_Order_Projects_API',
+            'Wiaas_Support_Api',
 		);
 
 		foreach ( $controllers as $controller ) {

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

@@ -9,192 +9,177 @@
  */
 class Wiaas_Authentication {
 
-    const SUPER_ADMIN_USER_ID = 1;
+	const SUPER_ADMIN_USER_ID = 1;
 
-    public static function init() {
-        // authenticate current user
-        add_action('determine_current_user', array(__CLASS__, 'authenticate_current_user'), 999);
+	public static function init() {
+		// authenticate current user
+		add_action('determine_current_user', array(__CLASS__, 'authenticate_current_user'), 999);
 
-        // authenticates user on login
-        add_filter( 'authenticate', array( __CLASS__, 'authenticate_user_on_login' ), 999, 3);
+		// authenticates user on login
+		add_filter( 'authenticate', array( __CLASS__, 'authenticate_user_on_login' ), 999, 3);
 
-        // retrieve preferred user role for user
-        add_filter('get_user_metadata', array(__CLASS__, 'maybe_filter_user_roles'), 10, 3);
+		add_filter('jwt_auth_token_before_dispatch', array(__CLASS__, 'authenticate_rest_user_on_login'), 999, 2);
 
-        // redirect to dashboard after login
-        add_filter( 'login_redirect', array( __CLASS__, 'login_redirect' ) );
+		// redirect to dashboard after login
+		add_filter( 'login_redirect', array( __CLASS__, 'login_redirect' ) );
+	}
 
-        // add role selector to login form
-        add_action('login_form', array(__CLASS__, 'pick_role_on_login'));
-    }
-
-    /**
-     * Redirect admin user to dashboard
-     *
-     * @return string
-     */
-    public static function login_redirect() {
-        return  admin_url('index.php') ;
-    }
-
-    /**
-     * Add role selector to login form
-     */
-    public static function pick_role_on_login() {
-        ?>
-        <p>
-            <label for="user_role"><?php esc_html_e( 'Role' , 'wiaas'); ?><br />
-                <select id="user_role" class="input" name="role">
-                    <option value="administrator"><?php esc_html_e('Administrator', 'wiaas') ?></option>
-                    <option value="supplier"><?php esc_html_e('Supplier', 'wiaas') ?></option>
-                    <option value="commercial_lead"><?php esc_html_e('Commercial Lead', 'wiaas') ?></option>
-                </select>
-        </p>
-        <?php
-    }
+	/**
+	 * Redirect admin user to dashboard
+	 *
+	 * @return string
+	 */
+	public static function login_redirect() {
+		return  admin_url('index.php') ;
+	}
 
 
-    /**
-     * Authenticate current user based on roles assigned to organization
-     *
-     * @param int|false $user_id
-     * @return int|false|WP_Error
-     */
-    public static function authenticate_current_user($user_id) {
-        // do nothing if user not authenticated, user is super admin or this is REST API request
-        if (! $user_id || $user_id === self::SUPER_ADMIN_USER_ID) {
-            return $user_id;
-        }
+	/**
+	 * Authenticate current user based on roles assigned to organization
+	 *
+	 * If this is non admin request successfully validate user if he can have customer role.
+	 *
+	 * If this is admin panel request successfully validate user if has admin panel role selected
+	 * and also he still can have that role (role was not removed from his customer organization)
+	 *
+	 * @param int|false $user_id
+	 * @return int|false|WP_Error
+	 */
+	public static function authenticate_current_user($user_id) {
+		// do nothing if user not authenticated, user is super admin or this is REST API request
+		if (! $user_id || (int) $user_id === self::SUPER_ADMIN_USER_ID) {
+			return $user_id;
+		}
 
-        $is_rest_api = strpos($_SERVER['REQUEST_URI'], rest_get_url_prefix());
+		global $current_user;
 
-        $role = $is_rest_api ?
-            'customer' :
-            get_user_meta($user_id, '_wiaas_current_user_admin_role', true);
+		if (empty($current_user)) {
 
-        $result = self::_can_user_have_role($user_id, $role, $is_rest_api);
+			$current_user = new WP_User($user_id);
+		}
 
-        if (is_wp_error($result)) {
-            return false;
-        }
+		$rest_api_slug = rest_get_url_prefix();
+		$valid_api_uri = strpos($_SERVER['REQUEST_URI'], $rest_api_slug);
 
-        return $user_id;
-    }
+		if ($valid_api_uri) {
+			//for non admin request check if user has customer role
+			$role = 'customer';
+		} else {
+			// for admin panel request check if user has selected role
+			$role =  get_user_meta($user_id, '_wiaas_admin_role', true);
+		}
 
-    /**
-     * Authenticate wiaas user on login based on roles assigned to organization
-     *
-     * @param WP_User $user
-     * @return WP_User|WP_Error
-     */
-    public static function authenticate_user_on_login($user) {
-        // check if rest request
-        $is_rest_api = strpos($_SERVER['REQUEST_URI'], rest_get_url_prefix());
-        // do nothing if there is an error already,
-        // user is super admin or
-        // this is rest request
-        if (is_wp_error($user) || $user->ID === 1 || $is_rest_api) {
-            return $user;
-        }
+		if ( empty($role) || ! user_can($user_id, 'wiaas_' . $role)) {
+			// not available roles for user
+			$current_user->set_role('');
 
-        if (empty($_POST['role'])) {
-            return new WP_Error('error', 'You must selected role to login!');
-        }
+			return new WP_Error('wiaas_authentication_error', 'No set permissions!',  array(
+				'status' => 403,
+			));
+		}
 
-        // get selected role
-        $requested_role = sanitize_key($_POST['role']);
+		// authenticate valid admin panel user
+		$current_user->set_role($role);
 
-        // validate can user have requested role
-        $result = self::_can_user_have_role($user->ID, $requested_role, false);
+		return $user_id;
+	}
 
-        // if user organization has no requested role prevent access
-        if (is_wp_error($result)) {
-            return $result;
-        }
-
-        // remember role for user and continue
-        update_user_meta($user->ID, '_wiaas_current_user_admin_role', $requested_role);
-
-        return $user;
-    }
+	/**
+	 * Authenticate wiaas user on login based on roles assigned to organization
+	 *
+	 * If this is non admin panel request authenticate user if he can be customer.
+	 *
+	 * If this is admin panel login request user will be authenticated with previously selected or first available role
+	 * from his organization roles.
+	 *
+	 * @param WP_User $user
+	 * @return WP_User|WP_Error
+	 */
+	public static function authenticate_user_on_login($user) {
+		// do nothing if there is an error already,
+		// user is super admin
+		if (is_wp_error($user) || $user->ID === self::SUPER_ADMIN_USER_ID ) {
+			return $user;
+		}
 
 
-    /**
-     *
-     * Filters user roles retrieval so that selected user role is retrieved for admin panel
-     * and customer role is retrieved for JSON API request
-     *
-     * @param $null
-     * @param int $user_id
-     * @param string $meta_key
-     * @return array|null
-     */
-    public static function maybe_filter_user_roles($null, $user_id, $meta_key) {
-
-        global $wpdb;
-
-        if ($user_id !== 0 && $user_id !== self::SUPER_ADMIN_USER_ID && $meta_key === $wpdb->get_blog_prefix() . 'capabilities') {
-
-            $is_rest_api = strpos($_SERVER['REQUEST_URI'], rest_get_url_prefix());
-
-            $role = $is_rest_api ?
-                'customer' :
-                get_user_meta($user_id, '_wiaas_current_user_admin_role', true);
-
-            return array( array ( "$role" => true ));
-        }
-
-        return null;
-    }
+		$rest_api_slug = rest_get_url_prefix();
+		$valid_api_uri = strpos($_SERVER['REQUEST_URI'], $rest_api_slug);
 
 
+		/**
+		 * CUSTOMER API AUTHENTICATION
+		 */
+		// validate customer user login
+		if ($valid_api_uri) {
 
-    // PRIVATE
+			$role = user_can($user->ID, 'wiaas_customer') ? 'customer' : '';
+			$user->set_role($role);
 
-    /**
-     * Determines if user can have requested role based on his organization roles
-     *
-     * @param int $user_id
-     * @param string $user_role
-     * @param bool $is_rest_api
-     * @return bool|WP_Error
-     */
-    private static function _can_user_have_role($user_id, $user_role, $is_rest_api) {
-        // check if role valid for access
-        if (! wp_roles()->is_role($user_role)) {
-            return new WP_Error('error', 'Role is not valid!');
-        }
+			return empty($role) ?
+				new WP_Error('wiaas_authentication_error', 'No Customer permissions!',  array(
+					'status' => 403,
+				)) :
+				$user;
+		}
 
-        // only customer role can access API
-        if ($is_rest_api && $user_role !== 'customer') {
-            return new WP_Error('error', 'No access!');
-        }
+		/**
+		 * ADMIN PANEL AUTHENTICATION
+		 */
 
-        // customer role cannot access admin backend
-        if (! $is_rest_api && $user_role === 'customer') {
-            return new WP_Error('error', 'No access!');
-        }
+		// retrieve selected role for user
+		$role =  get_user_meta($user->ID, '_wiaas_admin_role', true);
+		// if user has selected role then use it
+		if (! empty($role) && user_can($user->ID, 'wiaas_' . $role)) {
+			return $user;
+		}
 
-        // import organization functions (during user authentication it is not yet loaded)
-        require_once dirname( __FILE__ ) . '/user/wiaas-organization-functions.php';
+		// user does not have selected role so try to assign one in order of access
+		if (user_can($user->ID, 'wiaas_administrator')) {
+			$role = 'administrator';
+		} else if (user_can($user->ID, 'wiaas_commercial_lead')) {
+			$role = 'commercial_lead';
+		} else if (user_can($user->ID, 'wiaas_supplier')) {
+			$role = 'supplier';
+		}
 
-        // get user organization
-        $organization_id = wiaas_get_user_organization_id($user_id);
+		if (empty($role)) {
+			return new WP_Error('wiaas_authentication_error', 'No permissions!',  array(
+				'status' => 403,
+			));
+		}
 
-        // validate if user has organization
-        if (empty( $organization_id)) {
-            return new WP_Error('error', 'Account not completed!');
-        }
-        // get organization roles
-        $roles = wiaas_get_organization_roles($organization_id);
+		update_user_meta($user->ID, '_wiaas_admin_role', $role);
 
-        // validate if user has organization roles
-        if (!in_array($user_role, $roles)) {
-            return new WP_Error( 'error', 'Your account is not authorized for requested role.  Please contact us for help.' );
-        }
+		$user->set_role($role);
+
+		return $user;
+	}
+
+	/**
+	 * validate that successfully logged in rest api user can be customer
+	 *
+	 * @param array $data
+	 * @param WP_User $user
+	 * @return array | WP_Error
+	 *
+	 */
+
+	public static function authenticate_rest_user_on_login($data, $user) {
+		// if admin do nothing
+		if ($user->ID === self::SUPER_ADMIN_USER_ID) {
+			return $data;
+		}
+		$role = user_can($user->ID, 'wiaas_customer') ? 'customer' : '';
+		$user->set_role($role);
+
+		return empty($role) ?
+			new WP_Error('wiaas_authentication_error', 'No Customer permissions!',  array(
+				'status' => 403,
+			)) :
+			$data;
+	}
 
-        return true;
-    }
 }
 
 Wiaas_Authentication::init();

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

@@ -21,13 +21,23 @@ 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);
 
 		add_action('woocommerce_checkout_create_order', array(__CLASS__, 'add_additional_order_data'), 99);
+
+		add_action('woocommerce_set_cart_cookies', array(__CLASS__, 'do_not_set_cart_cookies'));
+	}
+
+	/**
+	 * Do not set cart cookies
+	 */
+	public static function do_not_set_cart_cookies() {
+		if ( isset( $_COOKIE['woocommerce_items_in_cart'] ) ) {
+			wc_setcookie( 'woocommerce_items_in_cart', 0, time() - HOUR_IN_SECONDS );
+			wc_setcookie( 'woocommerce_cart_hash', '', time() - HOUR_IN_SECONDS );
+		}
 	}
 
 	/**
@@ -152,11 +162,35 @@ class Wiaas_Cart {
 				return false;
 			}
 
-			// TODO: Add validation that only packages from the same country can be added to cart at the same time
-			update_user_meta( get_current_user_id(), '_wiaas_cart_items_country', $country);
+			// Validate that order contains only stuff from single commercial lead / reseller / shop owner
+			if ( ! WC()->cart->is_empty() ) {
 
-			// TODO: Add validation that only packages from the same shop can be added to cart at the same time
-			update_user_meta( get_current_user_id(), '_wiaas_cart_shop_owner_id', $shop_owner_id);
+				$current_shop_owner_id = get_user_meta(get_current_user_id(), '_wiaas_cart_shop_owner_id', true);
+
+				if (absint($shop_owner_id) !== absint($current_shop_owner_id)) {
+
+					wc_add_notice('Only packages from one catalogue can be purchased at the same time!', 'error');
+					return false;
+				}
+			} else {
+
+				update_user_meta( get_current_user_id(), '_wiaas_cart_shop_owner_id', $shop_owner_id);
+			}
+
+			// Validate that order contains only items for single country
+			if ( ! WC()->cart->is_empty() ) {
+
+				$current_country = get_user_meta(get_current_user_id(), '_wiaas_cart_items_country', true);
+
+				if ($country !== $current_country) {
+
+					wc_add_notice('Only packages from one country can be purchased at the same time!', 'error');
+					return false;
+				}
+			} else {
+
+				update_user_meta( get_current_user_id(), '_wiaas_cart_items_country', $country);
+			}
 
             $customer_id = wiaas_get_current_user_organization_id();
 
@@ -236,6 +270,10 @@ class Wiaas_Cart {
 	 * @return bool
 	 */
 	public static function update_package_quantity($package_cart_item_key, $new_quantity) {
+		if ($new_quantity > 65000){
+			return false;
+		}
+		
 		$cart_item = WC()->cart->get_cart_item($package_cart_item_key);
 
 		if (!$cart_item) {
@@ -282,8 +320,12 @@ class Wiaas_Cart {
 	}
 
 	/**
-	 * Persist used payment type information for package in corresponding order line item.
-	 * Also for standard package type list of addons and options will be saved.
+	 * Persist additional metadata for every order item
+	 * This includes:
+	 *
+	 * 1. payment info
+	 * 2. relation info for addons and options
+	 * 3. prices for simple products
 	 *
 	 * @param $order_item
 	 * @param $cart_item_key
@@ -293,7 +335,11 @@ class Wiaas_Cart {
 	 * @return WC_Order_Item
 	 */
 	public static function add_order_item_meta( $order_item, $cart_item_key, $cart_item ) {
-		if (wc_pb_is_bundle_container_cart_item($cart_item) && isset($cart_item['_wiaas_payment'])) {
+
+		$is_bundle_item = wc_pb_is_bundle_container_cart_item($cart_item);
+		$is_bundled_item = wc_pb_is_bundled_cart_item($cart_item);
+
+		if ($is_bundle_item && isset($cart_item['_wiaas_payment'])) {
 
 			$payment = $cart_item['_wiaas_payment'];
 
@@ -362,36 +408,40 @@ class Wiaas_Cart {
 			$order_item->add_meta_data( '_wiaas_documents', $item_documents, true );
 		}
 
+		// save simple product information that needs to be available later on
+		// even if this data is changed or removed from product at that time
+		if($is_bundled_item) {
+
+			$product = wc_get_product($cart_item['product_id']);
+
+			$order_item->add_meta_data('_wiaas_category',  Wiaas_Product_Category::get_category($product), true);
+
+			$order_item->add_meta_data('_wiaas_manufacturer_product_no', $product->get_meta('_manufacturer_product_no'), true);
+			$order_item->add_meta_data('_wiaas_supplier_product_no',  $product->get_meta('_supplier_product_no'), true);
+
+			// get supplier
+			if ($supplier_organization_id = Wiaas_Product_Supplier::get_supplier_organisation_id_from_product($cart_item['product_id'])) {
+
+				$order_item->add_meta_data('_wiaas_supplier_organization_id',  $supplier_organization_id, true);
+			}
+
+			// save bundled product item total cost (price x period)
+			$product_price = Wiaas_Pricing::get_product_total_cost($product);
+			$order_item->add_meta_data('_wiaas_product_price',  $product_price, true);
+		}
+
+		// save number of days before earliest installation for bundles
+		if ($is_bundle_item) {
+			$order_item->add_meta_data(
+				'_wiaas_earliest_installation_additional_days',
+				Wiaas_Package::get_earliest_installation_additional_days($cart_item['product_id']),
+				true);
+		}
+
 
 		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',
-		) );
-	}
-
 	/**
 	 * Sets additional order data form cart after order is successfully created
 	 *
@@ -406,13 +456,93 @@ class Wiaas_Cart {
 		$country = get_user_meta(get_current_user_id(), '_wiaas_cart_items_country', true);
 		$currency = empty($country) ? get_woocommerce_currency() : $country['currency'];
 
+		$order->add_meta_data('_wiaas_country_code', $country['code']);
+
 		$order->set_currency($currency);
 
-		// set order commercial lead
+		// get order commercial lead
 		$shop_owner_id = get_user_meta(get_current_user_id(), '_wiaas_cart_shop_owner_id', true);
 		$shop_owner_id = absint($shop_owner_id);
 
+		// save commercial lead info in case it gets deleted
 		$order->add_meta_data('_wiaas_commercial_lead_id', $shop_owner_id);
+		$commercial_lead_organization_info = wiaas_get_organization_info($shop_owner_id);
+		$order->add_meta_data('_wiaas_commercial_lead_info', $commercial_lead_organization_info);
+
+		// save customer organization info in case it gets deleted
+		$customer_user_id = $order->get_customer_id();
+		$customer_organization_id = wiaas_get_user_organization_id($customer_user_id);
+		$order->add_meta_data('_wiaas_customer_id', $customer_organization_id);
+		$customer_organization_info = wiaas_get_organization_info($customer_organization_id);
+		$order->add_meta_data('_wiaas_customer_info', $customer_organization_info);
+
+
+
+		// add supplier organizations information to order in case supplier organizations are deleted
+		// save installation suppliers separately
+		$suppliers_info = array();
+		$installation_suppliers_info = array();
+
+		$items = $order->get_items('line_item');
+
+		foreach($items as $item) {
+
+			$supplier_organization_id = $item['wiaas_supplier_organization_id'];
+
+			if (! empty($supplier_organization_id) && $item['wiaas_category'] !== 'installation' &&
+			    empty($suppliers_info[$supplier_organization_id]) ) {
+
+				$suppliers_info[$supplier_organization_id] = array(
+					'id' => $supplier_organization_id,
+					'estimated_delivery_date' => null,
+					'confirmed_delivery_date' => null,
+					'tracking_info' => array(),
+				);
+
+				$supplier_organization_info = wiaas_get_organization_info($supplier_organization_id);
+				foreach ($supplier_organization_info as $key => $info) {
+					$suppliers_info[$supplier_organization_id][$key] = $info;
+				}
+			}
+
+			if (! empty($supplier_organization_id) && $item['wiaas_category'] === 'installation' &&
+			    empty($installation_suppliers_info[$supplier_organization_id]) ) {
+
+				$installation_suppliers_info[$supplier_organization_id] = array(
+					'id' => $supplier_organization_id,
+				);
+
+				$supplier_organization_info = wiaas_get_organization_info($supplier_organization_id);
+				foreach ($supplier_organization_info as $key => $info) {
+					$installation_suppliers_info[$supplier_organization_id][$key] = $info;
+				}
+			}
+		}
+
+		$order->add_meta_data('_wiaas_delivery_suppliers', $suppliers_info, true);
+		$order->add_meta_data('_wiaas_installation_suppliers', $installation_suppliers_info, true);
+
+		// add additional date fields to order
+		$order->add_meta_data('_wiaas_estimated_delivery_date', null, true);
+		$order->add_meta_data('_wiaas_final_estimated_delivery_date', null, true);
+		$order->add_meta_data('_wiaas_final_confirmed_delivery_date', null, true);
+		$order->add_meta_data('_wiaas_earliest_installation_date', null, true);
+
+		// calculate number of days before earlier installation for whole order
+		$earliest_installation_additional_days = 0;
+		$items = $order->get_items('line_item');
+
+		foreach($items as $item) {
+
+			if (! empty($item['_wiaas_earliest_installation_additional_days'])) {
+
+				$additional_days = absint($item['_wiaas_earliest_installation_additional_days']);
+				$earliest_installation_additional_days = max($additional_days, $earliest_installation_additional_days);
+			}
+		}
+		
+		$order->add_meta_data('_wiaas_order_additional_days_prior_installation', $earliest_installation_additional_days, true);
+
 	}
 
 	/**
@@ -576,6 +706,7 @@ class Wiaas_Cart {
 
 		$documents_ids = array();
 
+		// Retrieve all document ids attached to cart content
 		foreach ($items as $key => $item) {
 			if (!isset($item['_wiaas_standard_package'])) {
 				continue;
@@ -593,16 +724,19 @@ class Wiaas_Cart {
 			}
 		}
 
+		// Retrieve all customer visible template documents attached to cart content
 		$q = new WP_Query();
 		$retrieved_items = $q->query(array(
 			'post_status' => 'publish',
 			'post_type' => 'wiaas_doc',
 			'post__in' => array_keys($documents_ids),
+			'meta_key' => '_wiaas_doc_visible',
+			'meta_value' => 'yes', // visible to customer
 			'tax_query' => array(
 				array(
 					'taxonomy' => 'wiaas_doc_type',
 					'field'    => 'slug',
-					'terms'    => array_keys(self::$cart_doc_types),
+					'terms'    => array_keys(self::$cart_doc_types), // templates only
 				)
 			)
 		));

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

@@ -65,7 +65,8 @@ class Wiaas_Checkout {
 
 			do_action( 'woocommerce_checkout_order_processed', $order_id, array(), $order );
 
-			$order->payment_complete();
+			//Change order status from default 'Pending payment' to open (custom wiaas status)
+			$order->update_status('open');
 
 			WC()->cart->empty_cart( true );
 

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

@@ -12,28 +12,19 @@ if ( ! defined( 'ABSPATH' ) ) {
 class Wiaas_Countries {
 
 	/**
-	 * Available countries for wiaas
+	 * Default available countries for wiaas
 	 * @var array
 	 */
-	private static $available_countries = array(
-		'Sweden' => array(
-			'id' => 1,
-			'name' => 'Sweden',
-			'code' => 'se',
+	private static $default_countries = array(
+		'se' => array(
 			'vat' => 9 ,
 			'currency' => 'SEK'
 		),
-		'Denmark' => array(
-			'id' => 2,
-			'name' => 'Denmark',
-			'code' => 'dk',
+		'dk' => array(
 			'vat' => 9 ,
 			'currency' => 'DKK'
 		),
-		'Finland' => array(
-			'id' => 3,
-			'name' => 'Finland',
-			'code' => 'fi',
+		'fi' => array(
 			'vat' => 9 ,
 			'currency' => 'EUR'
 		),
@@ -44,22 +35,101 @@ class Wiaas_Countries {
 		add_action('woocommerce_after_register_taxonomy', array(__CLASS__, 'register_product_countries_taxonomy'));
 	}
 
-	public static function get_list_of_countries(){
-		$result = [];
-		foreach(self::$available_countries as $country){
-			array_push($result, array(
-				'country_id' => $country['id'],
-				'country_name' => $country['name']
-			));
+	/**
+	 * Retrieve all possible country choices
+	 *
+	 * @return array
+	 */
+	public static function get_country_choices() {
+		$countries = new WC_Countries();
+		$choices = array();
+
+		foreach ($countries->get_countries() as $code => $name) {
+			$choices[strtolower($code)] = $name;
 		}
-		return $result;
+
+		return $choices;
 	}
 
-	public static function get_country_name_by_id($id){
-		foreach(self::$available_countries as $country){
-			if ($country['id'] == $id) return $country['name'];
+	/**
+	 * Retrieve all possible currency choices
+	 *
+	 * @return array
+	 */
+	public static function get_currency_choices() {
+		return get_woocommerce_currencies();
+	}
+
+	/**
+	 * Retrieve list of available countries setup by administrator
+	 *
+	 * @return array
+	 */
+	public static function get_available_countries() {
+		$available_countries = [];
+
+		$available_country_terms = get_terms(array(
+			'taxonomy' => 'product_country',
+            'hide_empty' => false,
+		));
+
+		foreach($available_country_terms as $country_term) {
+			$code = get_term_meta($country_term->term_id, '_wiaas_country_code', true);
+			$currency  = get_term_meta($country_term->term_id, '_wiaas_country_currency', true);
+			$vat = get_term_meta($country_term->term_id, '_wiaas_country_vat', true);
+
+			$available_countries[] = array(
+				'id' => $country_term->term_id,
+				'name' => $country_term->name,
+				'code' => $code,
+				'currency' => $currency,
+				'vat' => $vat
+			);
 		}
-		return '';
+
+		return $available_countries;
+	}
+
+	/**
+	 * Retrieve country name by code for available country
+	 *
+	 * @param string $code
+	 *
+	 * @return string|null
+	 */
+	public static function get_available_country_name_by_code($code) {
+		$available_countries = self::get_available_countries();
+
+		foreach ($available_countries as $available_country) {
+
+			if ($available_country['code'] === $code) {
+
+				return $available_country['name'];
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Retrieve country code by currency for available country
+	 *
+	 * @param string $currency
+	 *
+	 * @return string|null
+	 */
+	public static function get_available_country_code_by_currency($currency) {
+		$available_countries = self::get_available_countries();
+
+		foreach ($available_countries as $available_country) {
+
+			if ($available_country['currency'] === $currency) {
+
+				return $available_country['code'];
+			}
+		}
+
+		return null;
 	}
 
 	/**
@@ -93,8 +163,27 @@ class Wiaas_Countries {
 
 		register_taxonomy( 'product_country', array( 'product' ), $args );
 
-		foreach (self::$available_countries as $available_country) {
-			wp_insert_term($available_country['name'], 'product_country');
+		$choices = self::get_country_choices();
+
+		foreach (self::$default_countries as $code => $info) {
+
+			$name = $choices[$code];
+
+			if (has_term($name)) {
+				// bail out
+				return;
+			}
+
+			$name = $choices[$code];
+			$result = wp_insert_term($name, 'product_country');
+
+			if (is_wp_error($result)) {
+				continue;
+			}
+
+			update_term_meta($result['term_id'], '_wiaas_country_code', $code);
+			update_term_meta($result['term_id'], '_wiaas_country_currency', $info['currency']);
+			update_term_meta($result['term_id'], '_wiaas_country_vat', $info['vat']);
 		}
 	}
 
@@ -115,10 +204,25 @@ class Wiaas_Countries {
 	 * @return array|null
 	 */
 	public static function   get_product_country($product) {
-		$product_country = get_the_terms($product->get_id(), 'product_country');
-		return  is_array($product_country) && isset($product_country[0]) ?
-			self::$available_countries[$product_country[0]->name] :
-			null;
+		$country_terms = get_the_terms($product->get_id(), 'product_country');
+
+		if (is_wp_error($country_terms) || empty($country_terms) || empty($country_terms[0])) {
+			return null;
+		}
+
+		$country_term = $country_terms[0];
+
+		$code = get_term_meta($country_term->term_id, '_wiaas_country_code', true);
+		$currency  = get_term_meta($country_term->term_id, '_wiaas_country_currency', true);
+		$vat = get_term_meta($country_term->term_id, '_wiaas_country_vat', true);
+
+		return  array(
+			'id' => $country_term->term_id,
+			'name' => $country_term->name,
+			'code' => $code,
+			'currency' => $currency,
+			'vat' => $vat
+		);
 	}
 
     /**

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

@@ -5,26 +5,32 @@ defined( 'ABSPATH' ) || exit;
 class Wiaas_DB_Update {
 
 	private static $db_updates = array(
-		'20180728222206' => 'wiaas_db_update_enable_product_by_user_role',
 		'20180801222206' => 'wiaas_db_update_setup_gravity',
-		'20180802222206' => 'wiaas_db_update_add_delivery_process_forms',
 		'20180811134511' => 'wiaas_db_update_enable_orders_access_management',
-		'20180813134511' => 'wiaas_db_update_enable_order_numbers',
-		'20180826153509' => 'wiaas_create_broker_access_group',
 		'20180911101010' => 'wiaas_db_setup_exclusive_taxonomies',
 		'20181003164100' => 'wiaas_db_setup_customer_capabilities',
-        '201810121644700' => 'wiaas_db_update_add_user_organization_ui_fields',
-		'201810171645700' => 'wiaas_db_update_create_default_roles',
-		'201810171745700' => 'wiaas_db_import_aam_role_settings',
-		'201810180145700' => 'wiaas_db_update_update_supplier_capabilities',
-		'201810180245700' => 'wiaas_db_update_update_admin_capabilities',
-		'201810180345700' => 'wiaas_create_role_access_groups',
-		'201810180444700' => 'wiaas_db_setup_create_customer_commercial_lead_table',
-		'201810180544702' => 'wiaas_db_update_update_commercial_lead_capabilities',
-		'201810180644703' => 'wiaas_db_update_add_organization_info_ui_fields',
-        '201910190145700' => 'wiaas_db_update_add_general_ui_fields',
-        '201910190146700' => 'wiaas_db_update_add_product_properties_ui_fields',
-		'201810190644704' => 'wiaas_db_update_add_reference_ui_field'
+		'20181012164450' => 'wiaas_db_update_add_user_organization_ui_fields',
+		'20181017164550' => 'wiaas_db_update_create_default_roles',
+		'20181017174550' => 'wiaas_db_import_aam_role_settings',
+		'20181018014550' => 'wiaas_db_update_update_supplier_capabilities',
+		'20181018024550' => 'wiaas_db_update_update_admin_capabilities',
+		'20181018034550' => 'wiaas_admin_create_role_access_groups',
+		'20181018044450' => 'wiaas_db_setup_create_customer_commercial_lead_table',
+		'20181018054450' => 'wiaas_db_update_update_commercial_lead_capabilities',
+		'20181018064450' => 'wiaas_db_update_add_organization_info_ui_fields',
+		'20181019014550' => 'wiaas_db_update_add_general_ui_fields',
+		'20181019014650' => 'wiaas_db_update_add_product_properties_ui_fields',
+		'20181020014650' => 'wiaas_create_organization_roles_capabilities',
+        '20181021162450' => 'wiaas_db_update_update_supplier_order_capabilities',
+        '20181102112451' => 'wiaas_disable_processing_order_email_delivery',
+		'20181103172850' => 'wiaas_db_update_update_delivery_forms',
+		'20181104182856' => 'wiaas_db_update_enable_workflow_inbox_for_roles',
+        '20181105133550' => 'wiaas_db_update_add_bundle_properties_ui_field',
+		'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,
+		'20181203115826' => 'wiaas_db_update_add_administrator_delivery_process_capabilities'
 	);
 
 	public static function execute() {

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

@@ -10,53 +10,199 @@ defined( 'ABSPATH' ) || exit;
 
 class Wiaas_Delivery_Process {
 
-	private static $process_form_title_prefix = 'DELIVERY PROCESS:';
-
 	public static function init() {
-		self::_register_delivery_process_step_type();
+		self::_register_delivery_process();
 
 		self::_init_hooks();
 	}
 
 	private static function _init_hooks() {
-		add_action('woocommerce_new_order', array( __CLASS__, 'create_delivery_process_for_order' ));
 
-		add_filter( 'gform_entry_meta', array(__CLASS__, 'extend_gravity_form_entry_meta'), 10, 2 );
-		add_action( 'gravityflow_workflow_complete', array(__CLASS__, 'maybe_complete_parent_process_step'), 5, 3 );
-
-        add_action( 'gravityflow_workflow_complete', array(__CLASS__, 'maybe_complete_parent_order'), 10, 3 );
-
-        // Some temporary functions to make inbox page prettier
-        add_filter('gravityflow_inbox_submitter_name', array(__CLASS__, 'display_step_name_in_inbox'), 10, 3);
-        add_filter('gravityflow_approve_label_workflow_detail', array(__CLASS__, 'approval_step_approval_label'), 10, 2);
-        add_filter('gravityflow_reject_label_workflow_detail', array(__CLASS__, 'approval_step_reject_label'), 10, 2);
+        add_action( 'gravityflow_workflow_complete', array(__CLASS__, 'maybe_complete_parent_order'), 10, 2 );
 	}
 
-	public static function approval_step_approval_label($label, $step) {
-	    if ($step->get_name() === 'Complete step') {
-            return esc_html__( 'Complete step', 'wiaas' );
-        }
-        return $label;
-    }
-
-    public static function approval_step_reject_label($label, $step) {
-        if ($step->get_name() === 'Complete step') {
-            return esc_html__( 'Cancel', 'wiaas' );
-        }
-        return $label;
-    }
-
-    public static function display_step_name_in_inbox($name, $entry, $form) {
-        return $entry['wiaas_delivery_step_name'];
-    }
-
 	/**
-	 * Registers our Delivery Process Step Type as available Gravity Flow Step Type
+	 *
+	 * Registers our Delivery Process Addons
+	 *
 	 */
-	private static function _register_delivery_process_step_type() {
+	private static function _register_delivery_process() {
+		require_once( 'delivery-process/class-wiaas-delivery-process-addon.php' );
+		require_once( 'delivery-process/class-wiaas-delivery-process-action.php' );
+		require_once( 'delivery-process/class-wiaas-delivery-process-step-assignee.php' );
 		require_once( 'delivery-process/class-wiaas-delivery-process-step.php' );
 
+		// order fields
+		require_once( 'delivery-process/class-wiaas-order-fields.php' );
+
+		require_once( 'delivery-process/class-wiaas-field-order-number.php' );
+		require_once( 'delivery-process/class-wiaas-field-order-bundle.php' );
+		require_once( 'delivery-process/class-wiaas-field-order-installation-select.php' );
+		require_once( 'delivery-process/class-wiaas-field-order-bundle-document.php' );
+		require_once( 'delivery-process/class-wiaas-field-order-document.php' );
+		require_once( 'delivery-process/class-wiaas-field-order-bundle-installation-date.php' );
+
+		// merge tags (for emails)
+		require_once( 'delivery-process/class-wiaas-merge-tag-customer-order-url.php' );
+
 		Gravity_Flow_Steps::register( new Wiaas_Delivery_Process_Step() );
+
+		GFAddOn::register( 'Wiaas_Delivery_Process_Addon' );
+	}
+
+
+	public static function create_delivery_process_for_order($order_id, $process_id) {
+
+		$process_form = null;
+		$process_form = GFAPI::get_form($process_id);
+
+		if( $process_form ) {
+
+			$new_process_entry = array(
+				'wiaas_delivery_order_id' => $order_id,
+				'form_id' => $process_id,
+			);
+
+			$order_fields = GFCommon::get_fields_by_type($process_form, array('wiaas_order'));
+
+
+			if (! empty($order_fields)) {
+
+				$order_field = $order_fields[0];
+
+				$new_process_entry[$order_field['id']] = $order_id;
+			}
+
+			$process_entry_id = GFAPI::add_entry( $new_process_entry );
+
+			update_post_meta($order_id, 'wiaas_delivery_process_id', $process_id);
+			update_post_meta($order_id, 'wiaas_delivery_process_entry_id', $process_entry_id);
+
+			$order = wc_get_order($order_id);
+
+            $order->set_status('processing', 'Started order delivery process.', true);
+            $order->save();
+
+			return $process_entry_id;
+		}
+		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;
 	}
 
     /**
@@ -65,9 +211,10 @@ class Wiaas_Delivery_Process {
      * @param $form
      */
 	public static function maybe_complete_parent_order($entry_id, $form) {
+
         $entry = GFAPI::get_entry($entry_id);
 
-        $order_id = $entry['wiaas_delivery_order_id'];
+		$order_id = $entry['wiaas_delivery_order_id'];
 
         if (!isset($order_id)) {
             return;
@@ -76,12 +223,170 @@ class Wiaas_Delivery_Process {
         $process_entry_id = get_post_meta($order_id, 'wiaas_delivery_process_entry_id', true);
 
         // order process entry completed, so complete order
-        if (absint($process_entry_id) === $entry_id) {
+        if (absint($process_entry_id) === absint($entry_id)) {
             $order = wc_get_order($order_id);
             $order->update_status('completed', 'Completed order delivery process.', true);
         }
     }
 
+    public static function get_available_process_list_for_country($country_code) {
+
+		$forms = GFAPI::get_forms();
+
+		$available_process_forms = array();
+
+		foreach ($forms as $form) {
+
+			$delivery_settings = rgar($form, 'wiaas_delivery_process');
+
+			if ($delivery_settings['delivery_form_type'] === 'process' &&
+			    $delivery_settings['delivery_country'] === $country_code) {
+
+				$available_process_forms[] = $form;
+			}
+		}
+
+		return $available_process_forms;
+    }
+
+
+    public static function get_customer_acceptance_data($order_id) {
+
+		$delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+
+	    $data = array();
+
+		if (! empty($delivery_process_entry)) {
+
+			$workflow = new Gravity_Flow_API($delivery_process_entry['form_id']);
+
+			$step = $workflow->get_current_step($delivery_process_entry);
+
+			if ($step && Wiaas_Delivery_Process_Action::process_step_has_customer_acceptance_action($step)) {
+
+				$action_entries = Wiaas_Delivery_Process_Action::get_process_step_action_entries($step);
+
+				$action_entry = $action_entries[0];
+
+				$data[]  = Wiaas_Delivery_Process_Action::get_customer_acceptance_action_data($action_entry['id']);
+			}
+		}
+
+		return empty( $data ) ? $data : $data[0];
+    }
+
+    public static function get_customer_questionnaires_data($order_id) {
+
+	    $data = array();
+
+	    $delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+
+	    if (! empty($delivery_process_entry)) {
+
+		    $workflow = new Gravity_Flow_API($delivery_process_entry['form_id']);
+
+		    $step = $workflow->get_current_step($delivery_process_entry);
+
+		    if ($step && Wiaas_Delivery_Process_Action::process_step_has_customer_validate_questionnaires_action($step)) {
+
+			    $action_entries = Wiaas_Delivery_Process_Action::get_process_step_action_entries($step);
+
+			    foreach ($action_entries as $action_entry) {
+
+				    $action_data = Wiaas_Delivery_Process_Action::get_customer_validate_questionnaires_action_data($action_entry['id']);
+
+				    if (! empty($action_data)) {
+
+					    $data[] = $action_data;
+				    }
+			    }
+		    }
+
+	    }
+
+	    return $data;
+    }
+
+    public static function update_customer_acceptance_status($order_id, $status, $reason) {
+
+	    $delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+
+	    if (! empty($delivery_process_entry) ) {
+
+		    $workflow = new Gravity_Flow_API($delivery_process_entry['form_id']);
+
+		    $step = $workflow->get_current_step($delivery_process_entry);
+
+		    $action_entries = Wiaas_Delivery_Process_Action::get_process_step_action_entries($step);
+
+		    $action_entry = $action_entries[0];
+
+		    Wiaas_Delivery_Process_Action::update_customer_acceptance_status($action_entry['id'], $status, $reason);
+	    }
+    }
+
+    public static function is_customer_acceptance_uploaded($order_id) {
+
+	    $delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+
+	    if (! empty($delivery_process_entry) ) {
+
+		    $workflow = new Gravity_Flow_API($delivery_process_entry['form_id']);
+
+		    $step = $workflow->get_current_step($delivery_process_entry);
+
+		    $action_entries = Wiaas_Delivery_Process_Action::get_process_step_action_entries($step);
+
+		    $action_entry = $action_entries[0];
+
+		    return Wiaas_Delivery_Process_Action::is_customer_acceptance_uploaded($action_entry['id']);
+	    }
+
+	    return false;
+    }
+
+    public static function upload_customer_questionnaire($order_id, $action_entry_id) {
+
+	    Wiaas_Delivery_Process_Action::upload_customer_questionnaire($action_entry_id);
+    }
+
+    public static function upload_customer_acceptance_document($order_id) {
+
+		$delivery_process_entry = self::get_order_delivery_process_entry($order_id);
+
+	    if (! empty($delivery_process_entry) ) {
+
+		    $workflow = new Gravity_Flow_API($delivery_process_entry['form_id']);
+
+		    $step = $workflow->get_current_step($delivery_process_entry);
+
+		    $action_entries = Wiaas_Delivery_Process_Action::get_process_step_action_entries($step);
+
+		    $action_entry = $action_entries[0];
+
+		    $success = Wiaas_Delivery_Process_Action::upload_customer_acceptance_document($action_entry['id']);
+
+		    return $success;
+	    }
+
+	    return false;
+    }
+
+
+    public static function get_order_delivery_process_entry($order_id) {
+
+		$order = wc_get_order($order_id);
+
+	    $process_entry_id = $order->get_meta('wiaas_delivery_process_entry_id', true);
+
+	    if (empty($process_entry_id)) {
+
+	    	return array();
+	    }
+
+	    return GFAPI::get_entry($process_entry_id);
+    }
+
 	/**
 	 * Retrieves delivery process instance for order
 	 *
@@ -91,8 +396,9 @@ class Wiaas_Delivery_Process {
 	 */
 	public static function get_order_delivery_process($order_id) {
 
-		$process_entry_id = get_post_meta($order_id, 'wiaas_delivery_process_entry_id');
-		if (!isset($process_entry_id)) {
+		$process_entry_id = get_post_meta($order_id, 'wiaas_delivery_process_entry_id', true);
+
+		if (empty($process_entry_id)) {
 			return null;
 		}
 
@@ -107,114 +413,57 @@ class Wiaas_Delivery_Process {
 		$delivery_process = array(
 			'id' => $process_form['id'],
 			'name' => $process_form['title'],
-			'steps' => array()
+			'steps' => array(
+				array(
+					'short_desc' => 'Order placed',
+					'status' => 'complete',
+					'order_id' => $order_id,
+					'process_id' => $process_entry_id,
+					'step_id' => -1,
+				),
+				array(
+					'short_desc' => 'Assign process',
+					'status' => 'complete',
+					'order_id' => $order_id,
+					'process_id' => $process_entry_id,
+					'step_id' => 0,
+				)
+			)
 		);
 
-		foreach ( $steps_info as $step_info ) {
-			$step            = $api->get_step( $step_info->get_id(), $process_instance );
+		$current_step = $api->get_current_step($process_instance);
 
+		foreach ( $steps_info as $step_info ) {
+			$step = $api->get_step( $step_info->get_id(), $process_instance );
+
+			if (! $step->is_visible_to_customer) {
+
+				continue;
+			}
+
+			$action_code = Wiaas_Delivery_Process_Action::get_process_step_action_form_action_code($step);
 			$info = $step->get_feed_meta();
+
+			$status = $step->get_status();
+
+			if ($current_step && $current_step->get_id() === $step->get_id()) {
+				$status = 'pending';
+			}
+
+
 			$delivery_process['steps'][]      = array(
 				'step_id' => $step->get_id(),
-				'step_form_entry_id' => $step->get_target_form_entry_id() ?: null,
+				'process_id' => $process_entry_id,
 				'short_desc' => $info['step_name'],
 				'full_desc' => $info['description'],
-				'action_code' => $step->get_delivery_action_type(),
-				'step_type' => $step->get_delivery_action_type() === 'manual' ? 'manual' : 'extraAction',
-				'status' => $step->get_status() ?: 'inactive',
+				'action_code' => $action_code,
+				'status' => $status,
 				'order_id' => $order_id,
-				'actual_date' => $step->get_target_actual_date(),
-				'comments' => $step->get_target_step_comments(),
 			);
 		}
 
 		return $delivery_process;
 	}
-
-	/**
-	 * Automatically create delivery process instance when order is created
-	 * @param $order_id
-	 */
-	public static function create_delivery_process_for_order($order_id) {
-		$process_form = null;
-		$forms = GFFormsModel::search_forms( self::$process_form_title_prefix, true );
-		$process_form = $forms[0];
-		if(isset($process_form)) {
-			$order = wc_get_order( $order_id );
-			$new_process_entry = array(
-				'form_id' => $process_form->id,
-				'2' => $order->get_customer_id(),
-				'wiaas_delivery_order_id' => $order_id,
-			);
-			$process_entry_id = GFAPI::add_entry( $new_process_entry );
-
-			add_post_meta($order_id, 'wiaas_delivery_process_id', $process_form->id);
-			add_post_meta($order_id, 'wiaas_delivery_process_entry_id', $process_entry_id);
-		}
-	}
-
-	/**
-	 * Extends Gravity Form entry metadata with 'wiaas_delivery_process_id'
-	 *
-	 * This way we can track for each delivery step its parent process
-	 * @param $entry_meta
-	 *
-	 * @return mixed
-	 */
-	public static function extend_gravity_form_entry_meta($entry_meta) {
-		$entry_meta[ 'wiaas_delivery_process_id' ] = array(
-			'label'                      => 'Wiaas Delivery Process Id',
-			'is_numeric'                 => true,
-			'update_entry_meta_callback' => null,
-			'is_default_column'          => false, // this column will be displayed by default on the entry list
-			'filter'                     => array(
-				'operators' => array( 'is' ),
-			),
-		);
-
-		$entry_meta[ 'wiaas_delivery_order_id' ] = array(
-			'label'                      => 'Wiaas Delivery Process Order Id',
-			'is_numeric'                 => true,
-			'update_entry_meta_callback' => null,
-			'is_default_column'          => false, // this column will be displayed by default on the entry list
-			'filter'                     => array(
-				'operators' => array( 'is' ),
-			),
-		);
-
-        $entry_meta[ 'wiaas_delivery_step_name' ] = array(
-            'label'                      => 'Wiaas Delivery Step name',
-            'is_numeric'                 => false,
-            'update_entry_meta_callback' => null,
-            'is_default_column'          => false, // this column will be displayed by default on the entry list
-            'filter'                     => array(
-                'operators' => array( 'is' ),
-            ),
-        );
-
-		return $entry_meta;
-	}
-
-	/**
-	 * Process parent process when single step workflow has completed
-	 * @param $entry_id
-	 * @param $form
-	 * @param $final_status
-	 */
-	public static function maybe_complete_parent_process_step($entry_id, $form) {
-		$entry = GFAPI::get_entry($entry_id);
-		$parent_entry_id = $entry['wiaas_delivery_process_id'];
-
-		if (empty($parent_entry_id)) {
-			return false;
-		}
-
-		$parent_entry_id = absint( $parent_entry_id );
-		$parent_entry = GFAPI::get_entry( $parent_entry_id );
-
-		$parent_api = new Gravity_Flow_API( $parent_entry['form_id'] );
-		$parent_api->process_workflow( $parent_entry_id );
-	}
 }
 
 add_action( 'gravityflow_loaded', array('Wiaas_Delivery_Process', 'init') );

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

@@ -18,9 +18,17 @@ class Wiaas_Order {
 	public static function init() {
 
 		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'));
 
+		add_filter( 'woocommerce_register_shop_order_post_statuses', array(__CLASS__, 'register_custom_order_statuses'), 10, 1);
+
+		add_filter( 'wc_order_statuses', array(__CLASS__, 'add_custom_statuses_to_list' ), 10, 1);
+
+		add_filter( 'bulk_actions-edit-shop_order', array(__CLASS__, 'add_custom_statuses_to_bulk_edit' ), 10, 1);
+
 		add_filter('woocommerce_rest_check_permissions', array( __CLASS__, 'check_order_access'), 10, 4);
 
 		add_filter('woocommerce_rest_prepare_shop_order_object', array(__CLASS__, 'transform_rest_order'), 999, 3);
@@ -28,6 +36,223 @@ class Wiaas_Order {
 		add_filter('woocommerce_rest_orders_prepare_object_query', array( __CLASS__, 'wiaas_prepare_rest_orders_query'), 10, 2);
 
         add_filter('woocommerce_new_order_note_data',  array( __CLASS__, 'update_new_order_comment_date'), 10, 3);
+
+		add_filter('woocommerce_order_number', array( __CLASS__, 'format_order_number'));
+	}
+
+
+	/**
+	 * Prefix order number
+	 *
+	 * @param int $number
+	 *
+	 * @return string
+	 */
+	public static function format_order_number($number) {
+		return "1000000$number";
+	}
+
+	public static function get_additional_days_prior_installation($order_id){
+		$order = wc_get_order($order_id);
+		return $order->get_meta('_wiaas_order_additional_days_prior_installation');
+	}
+
+	public static function add_additional_tracking_info($order_id, $supplier_id){
+		$suppliers = self::get_suppliers($order_id);
+		foreach($suppliers as $key => $supplier){
+			if ($supplier['id'] === $supplier_id){
+				$suppliers[$key]['tracking_info'][] = array(
+					'number' => '',
+					'url' => ''
+				);
+
+				$order = wc_get_order($order_id);
+				$order->update_meta_data('_wiaas_delivery_suppliers', $suppliers);
+				$order->save_meta_data();
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function save_tracking_info($order_id, $supplier_id, $tracking_index, $tracking_num, $tracking_url){
+		$suppliers = self::get_suppliers($order_id);
+		foreach($suppliers as $key => $supplier){
+			if ($supplier['id'] === $supplier_id){
+				$suppliers[$key]['tracking_info'][$tracking_index]['number'] = $tracking_num;
+				$suppliers[$key]['tracking_info'][$tracking_index]['url'] = $tracking_url;
+				
+				
+				$order = wc_get_order($order_id);
+				$order->update_meta_data('_wiaas_delivery_suppliers', $suppliers);
+				$order->save_meta_data();
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function delete_tracking_info($order_id, $supplier_id, $tracking_index){
+		$suppliers = self::get_suppliers($order_id);
+		foreach($suppliers as $key => $supplier){
+			if ($supplier['id'] === $supplier_id){
+				unset($suppliers[$key]['tracking_info'][$tracking_index]);
+				
+				$order = wc_get_order($order_id);
+				$order->update_meta_data('_wiaas_delivery_suppliers', $suppliers);
+				$order->save_meta_data();
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public static function save_estimated_date($order_id, $supplier_id, $date){
+		$suppliers = self::get_suppliers($order_id);
+		$updated = false;
+		foreach($suppliers as $key => $supplier){
+			if ($supplier['id'] === $supplier_id){
+				$suppliers[$key]['estimated_date'] = $date;
+				$updated = true;
+			}
+		}
+
+		if (!$updated){
+			return false;
+		}
+
+		$order = wc_get_order($order_id);
+		
+		$order->update_meta_data('_wiaas_delivery_suppliers', $suppliers);
+		self::_update_max_and_earliest_dates($order, $suppliers);
+		
+		$order->save_meta_data();
+		return true;
+	}
+
+	public static function save_confirmed_date($order_id, $supplier_id, $date){
+
+		$suppliers = self::get_suppliers($order_id);
+		$updated = false;
+
+		foreach($suppliers as $key => $supplier){
+			if ($supplier['id'] === $supplier_id){
+				$suppliers[$key]['confirmed_date'] = $date;
+				$updated = true;
+				if (!$suppliers[$key]['estimated_date']){
+					$suppliers[$key]['estimated_date'] = $date;
+				}
+			}
+		}
+
+		if (!$updated){
+			return false;
+		}
+
+		$order = wc_get_order($order_id);
+		
+		$order->update_meta_data('_wiaas_delivery_suppliers', $suppliers);
+		self::_update_max_and_earliest_dates($order, $suppliers);
+		
+		$order->save_meta_data();
+		return true;
+	}
+
+	public static function get_order_estimated_date($order_id){
+		$order = wc_get_order($order_id);
+		if (!$order){
+			return NULL;
+		}
+
+		return $order->get_meta('_wiaas_order_estimated_delivery_date') ?: NULL;
+	}
+
+	public static function save_order_estimated_date($order_id, $date){
+		return update_post_meta($order_id, '_wiaas_order_estimated_delivery_date', $date);
+	}
+
+	public static function get_final_estimated_date($order_id){
+		$order = wc_get_order($order_id);
+		if (!$order){
+			return 0;
+		}
+
+		return $order->get_meta('_wiaas_final_estimated_delivery_date') ?: 0;
+	}
+
+	public static function get_final_confirmed_date($order_id){
+		$order = wc_get_order($order_id);
+		if (!$order){
+			return 0;
+		}
+
+		return $order->get_meta('_wiaas_final_confirmed_delivery_date') ?: 0;
+	}
+
+	public static function get_earliest_installation_date($order_id){
+		$order = wc_get_order($order_id);
+		if (!$order){
+			return 0;
+		}
+
+		return $order->get_meta('_wiaas_earliest_installation_date') ?: 0;
+	}
+
+
+	/**
+	 * Get suppliers related to order
+	 */
+	public static function get_suppliers($order_id){
+		$order = wc_get_order($order_id);
+		return $order->get_meta('_wiaas_delivery_suppliers');
+	}
+
+	/**
+	 * Register additional order statuses 
+	 * 
+	 * @param array $order_statuses
+	 * 
+	 * @return array
+	 */
+	public static function register_custom_order_statuses($order_statuses){
+		// Status must start with "wc-"
+		$order_statuses['wc-open'] = array(                                            
+			'label'                     => _x( 'Open', 'Order status', 'woocommerce' ),
+			'public'                    => false,                                            
+			'exclude_from_search'       => false,                                            
+			'show_in_admin_all_list'    => true,                                         
+			'show_in_admin_status_list' => true,                                         
+			'label_count'               => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'woocommerce' ),                                       
+			);      
+			return $order_statuses;
+	}
+
+	/**
+	 * display custom wiaas statuses in order status dropdown
+	 * 
+	 * @param array $order_statuses
+	 * 
+	 * @return array
+	 */
+	public static function add_custom_statuses_to_list($order_statuses){
+		$order_statuses['wc-open'] = _x( 'Open', 'Order status', 'woocommerce' );       
+		return $order_statuses;
+	}
+
+	/**
+	 * display custom wiaas statuses in bulk actions
+	 * 
+	 * @param array $bulk_actions
+	 * 
+	 * @return array
+	 */
+	public static function add_custom_statuses_to_bulk_edit($bulk_actions){
+		// Note: "mark_" must be there instead of "wc"
+		$bulk_actions['mark_open'] = 'Change status to open';
+		return $bulk_actions;
 	}
 
 	/**
@@ -146,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);
 	}
@@ -178,10 +422,110 @@ class Wiaas_Order {
 		return get_post_meta($order_id, '_wiaas_tender', true);
 	}
 
+	public static function get_order_country_code($order_id) {
+
+		$order = wc_get_order($order_id);
+
+		$code  = $order->get_meta('_wiaas_country_code');
+
+		if (empty($code)) {
+			$code = Wiaas_Countries::get_available_country_code_by_currency($order->get_currency());
+			$order->add_meta_data('_wiaas_country_code', $code);
+			$order->save_meta_data();
+		}
+
+		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
 	 */
 
+	private static function _update_max_and_earliest_dates($order, $suppliers){
+		$max_estimated_date = 0;
+		$max_confirmed_date = 0;
+		$earliest_installation_date = 0;
+		$missing_estimated = false;
+
+		foreach($suppliers as $supplier) {
+
+			if (! empty($supplier['confirmed_date']) ) {
+
+				$max_confirmed_date = max($max_confirmed_date, $supplier['confirmed_date']);
+			} else {
+
+				$missing_confirmed = true;
+			}
+
+			if (! empty($supplier['estimated_date']) ) {
+
+				$max_estimated_date = max($max_estimated_date, $supplier['estimated_date']);
+
+			} else {
+
+				$missing_estimated = true;
+				$earliest_installation_date = 0;
+			}
+		}
+
+		if (! $missing_estimated) {
+
+			$earliest_installation_date = max($max_estimated_date, $max_confirmed_date);
+			$earliest_installation_date = strtotime('+' . self::get_additional_days_prior_installation($order->id) . ' weekdays', $earliest_installation_date);
+		}
+
+		$order->update_meta_data('_wiaas_final_confirmed_delivery_date', $max_confirmed_date);
+		$order->update_meta_data('_wiaas_final_estimated_delivery_date', $max_estimated_date);
+		$order->update_meta_data('_wiaas_earliest_installation_date', $earliest_installation_date);
+	}
+
 	/**
 	 * Append specific wiaas order details, like reference
 	 * @param $data
@@ -201,19 +545,33 @@ class Wiaas_Order {
 	/**
 	 * Appends additional wiaas customer lead info to order json response
 	 * @param $data
-	 * @param $order
+	 * @param WC_Order $order
 	 * @param $request
 	 *
 	 * @return mixed
 	 */
 	private static function _append_commercial_lead_info($data, $order, $request) {
 
-		$data['commercial_lead'] = array(
-			'id' => 1,
-			'name' => 'Coor Service Management',
-			'phone' => '123456789',
-			'email' => 'rikard@co-ideation.com'
-		);
+		$commercial_lead_org_id = $order->get_meta('_wiaas_commercial_lead_id', true);
+
+		$commercial_lead_organization_info = $order->get_meta('_wiaas_commercial_lead_info', true);
+
+		if (! empty($commercial_lead_org_id) && empty($commercial_lead_organization_info)) {
+			$commercial_lead_organization_info = wiaas_get_organization_info($commercial_lead_org_id);
+
+			$data['commercial_lead'] = array(
+				'id' => $commercial_lead_org_id,
+				'name' => $commercial_lead_organization_info['name'],
+				'phone' => $commercial_lead_organization_info['phone'],
+				'email' => $commercial_lead_organization_info['email']
+			);
+		}
+
+		if (!empty($commercial_lead_organization_info)) {
+			$commercial_lead_organization_info['id'] = $commercial_lead_org_id;
+
+			$data['commercial_lead'] = $commercial_lead_organization_info;
+		}
 
 		return $data;
 	}
@@ -221,25 +579,34 @@ class Wiaas_Order {
 	/**
 	 * Appends additional wiaas customer info to order json response
 	 * @param $data
-	 * @param $order
+	 * @param WC_Order $order
 	 * @param $request
 	 *
 	 * @return mixed
 	 */
 	private static function _append_customer_info($data, $order, $request) {
 
-		$current_user = wp_get_current_user();
+		$customer_organization_id = $order->get_meta('_wiaas_customer_id', true);
 
-		$customer_id = $data['customer_id'];
+		$customer_user_id = $order->get_customer_id();
 
-		$customer_user = get_user_by('id', $customer_id);
-		$data['customer'] = array(
-			'email' => $customer_user->user_email,
-			'name' => $customer_user->display_name,
-			'phone' => '+46 (10) 5595148'
-		);
+		if (empty($customer_organization_id)) {
 
-		$data['is_my_order'] = $customer_id === $current_user->ID;
+			$customer_organization_id = wiaas_get_user_organization_id($customer_user_id);
+		}
+
+		$customer_organization_info = $order->get_meta('_wiaas_customer_info', true);
+
+		if ( !empty($customer_organization_id) && empty($customer_organization_info) ) {
+
+			$customer_organization_info = wiaas_get_organization_info($customer_organization_id);
+
+			$customer_organization_info['id'] = $customer_organization_id;
+		}
+
+		$data['customer'] = $customer_organization_info;
+
+		$data['is_my_order'] = $customer_user_id === get_current_user_id();
 
 		return $data;
 	}
@@ -309,6 +676,12 @@ class Wiaas_Order {
 					}
 				}
 
+				// installation date
+				if (! empty($item['wiaas_installation_date'])) {
+
+					$product_line['installation_date'] = $item['wiaas_installation_date'];
+				}
+
 				$line_items[] = $product_line;
 			}
 		}
@@ -387,11 +760,14 @@ class Wiaas_Order {
 
 			if (wiaas_is_order_item__standard_package($order_item)) {
 				$documents = wiaas_get_standard_package_order_item_documents($order, $product_line['id']);
+
 				$data['line_items'][$index] ['documents'] = $documents;
 			}
 
 		}
 
+		$data['documents'] = wiaas_get_order_other_documents($order->get_id());
+
 	    return $data;
     }
 }

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

@@ -48,6 +48,10 @@ class Wiaas_Package {
 		return $response;
 	}
 
+	public static function get_earliest_installation_additional_days($package_id){
+		return  get_post_meta($package_id, 'additional_days_prior_earliest_installation', true);
+	}
+
 	/**
 	 * Append package documents
 	 * @param $data

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

@@ -48,7 +48,7 @@ class Wiaas_Pricing {
         $bundled_items = $package->get_bundled_items();
         foreach ($bundled_items as $bundled_item) {
 
-            $product = $bundled_item->product;
+            $product = wc_get_product($bundled_item->get_product_id());
             $product_cat = Wiaas_Product_Category::get_category($product);
 
             if (!isset($total_cost_per_category[$product_cat])) {

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'));
 
@@ -70,6 +72,10 @@ class Wiaas_Product {
 
 		return $args;
 	}
+
+	public static function get_supplier_id($product_id){
+		return wp_get_post_terms($product_id, 'supplier', array('fields' => 'ids'))[0];
+	}
 }
 
 Wiaas_Product::init();

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

@@ -19,9 +19,9 @@ class Wiaas_Shop {
 		// update prices search terms for package after prices extras have been updated
 		add_action('wiaas_package_prices_extras_set', array(__CLASS__, 'update_package_prices_search_terms'), 10, 4);
 
-		// create new shop if organization was assigned commercial lead role
-		// or remove shop if commercial lead role was removed for organization
-		add_action('wiaas_organization_roles_updated', array(__CLASS__, 'maybe_manage_shop_for_commercial_lead'), 10, 2);
+		// remove customer shop relationships for all deactivated and removed shops
+		add_action('wiaas_organization_roles_updated', array(__CLASS__, 'remove_deactivated_shop'));
+		add_action('wiaas_organization_deleted', array(__CLASS__, 'remove_shop'));
 	}
 
 	public static function get_shop_customers($owner_id) {
@@ -86,18 +86,24 @@ class Wiaas_Shop {
 	}
 
 	/**
-	 * Creates shop for new shop owner (organization with commercial lead role) or
-	 * deletes existing shop if that role has been removed
+	 * Remove shop for organization that is no longer commercial lead
 	 *
 	 * @param int $owner_id
-	 * @param array $roles
 	 */
-	public static function maybe_manage_shop_for_commercial_lead($owner_id, $roles) {
-		$is_commercial_lead = in_array('commercial_lead', $roles);
+	public static function remove_deactivated_shop($owner_id) {
+		$roles = wiaas_get_organization_roles($owner_id);
 
-		$is_commercial_lead ?
-			self::_maybe_create_shop($owner_id) :
-			self::_maybe_remove_shop($owner_id);
+		if (! in_array('commercial_lead', $roles)) {
+			self::remove_shop($owner_id);
+		}
+	}
+
+	/**
+	 * remove shop
+	 * @param int $owner_id
+	 */
+	public static function remove_shop($owner_id) {
+		Wiaas_Shop_DB::remove_shop($owner_id);
 	}
 
 	/**
@@ -132,7 +138,7 @@ class Wiaas_Shop {
 	 *			        $extra_price_payment_type =>  {
 	 *                      @type bool visible      Indicates if payment type is visible to customer
 	 *                  }
-     *               }
+	 *               }
 	 * @param array $old_cl_extras {
 	 *			        $extra_price_payment_type =>  {
 	 *                      @type bool visible      Indicates if payment type is visible to customer
@@ -156,49 +162,6 @@ class Wiaas_Shop {
 
 	// PRIVATE
 
-	/**
-	 * Each shop will be registered as product attribute.
-	 * This will persist shops information into database.
-	 * Also every attribute has taxonomy associated with it which will enable us to have multiple
-	 * catalogues in one shop
-	 *
-	 * @param int $owner_id
-	 */
-	private static function _maybe_create_shop($owner_id) {
-		$shop_name = 'wiaas_shop_' . $owner_id;
-
-		$attribute_id = wc_attribute_taxonomy_id_by_name($shop_name);
-
-		if ($attribute_id === 0) {
-			// create shop attribute
-			wc_create_attribute(array( 'slug' => $shop_name, 'name' => 'Shop' ));
-
-			$taxonomy_name = wc_attribute_taxonomy_name($shop_name);
-
-			// since  attribute taxonomies are registered once on load
-			// we will register new attribute taxonomy here so default catalogue can be added
-			register_taxonomy($taxonomy_name, array('product'));
-
-			// add default catalogue option to shop
-			wp_insert_term( 'Default Catalogue', $taxonomy_name);
-		}
-	}
-
-	/**
-	 * Deleted associated attribute for shop. This will effectively remove shop and all of its potential catalogues
-	 *
-	 * @param int $owner_id
-	 */
-	private static function _maybe_remove_shop($owner_id) {
-		// get corresponding attribute for shop
-		$attribute_id = wc_attribute_taxonomy_id_by_name('wiaas_shop_' . $owner_id);
-
-		// if shop attribute exists then remove it
-		if ($attribute_id > 0) {
-			wc_delete_attribute($attribute_id);
-		}
-	}
-
 	/**
 	 * Generate search terms from cl extras
 	 *
@@ -242,7 +205,7 @@ class Wiaas_Shop {
 		foreach ($cl_extras_per_customer as $customer_id => $visible) {
 
 			$terms[] = '_' . $owner_id . '_customer_' . $customer_id . '_' .
-			               ($visible ? 'visible' : 'hidden');
+			           ($visible ? 'visible' : 'hidden');
 		}
 
 		return $terms;

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

@@ -15,7 +15,7 @@ class Wiaas_User {
 		add_action('plugins_loaded', array(__CLASS__, 'remove_default_user_groups'), 30);
 
 		add_filter('woocommerce_rest_prepare_customer', array(__CLASS__, 'transform_rest_customer'), 10, 3);
-		add_filter('jwt_auth_token_before_dispatch', array(__CLASS__, 'transform_jwt_token_response'), 10, 2);
+		add_filter('jwt_auth_token_before_dispatch', array(__CLASS__, 'transform_jwt_token_response'), 999, 2);
 	}
 
 	public static function load_user_organization() {
@@ -58,6 +58,10 @@ class Wiaas_User {
 	 * @return mixed
 	 */
 	public static function transform_jwt_token_response($data, $user) {
+		if (is_wp_error($data)) {
+			return $data;
+		}
+
 		return new WP_REST_Response(array(
 			'token' => $data['token'],
 			'userInfo' => array(

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

@@ -0,0 +1,13 @@
+<?php
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Class Wiaas_Validation
+ */
+class Wiaas_Validation {
+
+    public static function is_phone($phone){
+        return WC_Validation::is_phone($phone);
+    }
+}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery-process-sample-form.json

@@ -0,0 +1 @@
+{"0":{"title":"DELIVERY PROCESS EXAMPLE: Copy and set to active to create new delivery process","description":"","labelPlacement":"top_label","descriptionPlacement":"below","button":{"type":"text","text":"Submit","imageUrl":""},"fields":[{"type":"wiaas_order","id":1,"label":"Order number","adminLabel":"","isRequired":false,"size":"medium","errorMessage":"","visibility":"visible","inputs":null,"formId":36,"description":"","allowsPrepopulate":false,"inputMask":false,"inputMaskValue":"","inputType":"","labelPlacement":"","descriptionPlacement":"","subLabelPlacement":"","placeholder":"","cssClass":"","inputName":"","noDuplicates":false,"defaultValue":"","choices":"","conditionalLogic":"","enableCalculation":false,"numberFormat":"decimal_dot","rangeMin":"","rangeMax":"","productField":"","multipleFiles":false,"maxFiles":"","calculationFormula":"","calculationRounding":"","disableQuantity":false,"displayAllCategories":false,"useRichTextEditor":false,"displayOnly":"","enablePrice":""}],"version":"2.3.2","id":36,"useCurrentUserAsAuthor":true,"postContentTemplateEnabled":false,"postTitleTemplateEnabled":false,"postTitleTemplate":"","postContentTemplate":"","lastPageButton":null,"pagination":null,"firstPageCssClass":null,"wiaas_delivery_process":{"delivery_form_type":"process","delivery_country":"se"},"is_active":"1","date_created":"2018-11-02 10:15:28","is_trash":"0","confirmations":[{"id":"5bdb1c7c26da9","name":"Default Confirmation","isDefault":true,"type":"message","message":"Thanks for contacting us! We will get in touch with you shortly.","url":"","pageId":"","queryString":""}],"notifications":[{"id":"5bdb1c7c26952","to":"{admin_email}","name":"Admin Notification","event":"form_submission","toType":"email","subject":"New submission from {form_title}","message":"{all_fields}"}],"feeds":{"gravityflow":[{"id":"120","form_id":"36","is_active":"1","feed_order":"0","meta":{"step_name":"Delivery Step Placeholder (Use Delivery Step type to create process workflow steps)","description":"","step_type":"wiaas_delivery_step","step_highlight":"0","step_highlight_type":"color","step_highlight_color":"#dd3333","feed_condition_conditional_logic":"0","feed_condition_conditional_logic_object":[],"scheduled":"0","schedule_type":"delay","schedule_date":"","schedule_delay_offset":"","schedule_delay_unit":"hours","schedule_date_field_offset":"0","schedule_date_field_offset_unit":"hours","schedule_date_field_before_after":"after","instructionsEnable":"0","instructionsValue":"","is_visible_to_customer":"1","target_form_id":"","destination_complete":"next"},"addon_slug":"gravityflow","event_type":null}]}},"version":"2.3.2"}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery_action_customer_acceptance_form.json

@@ -1,524 +0,0 @@
-{
-    "0": {
-        "title": "DELIVERY ACTION TYPE: Customer acceptance",
-        "description": "The customer must accept the implementation before further actions can be taken. If the customer isn't satisfied, the problems or discrepancies must be fixed in order to gen an acceptance.",
-        "labelPlacement": "top_label",
-        "descriptionPlacement": "below",
-        "button": {
-            "type": "text",
-            "text": "Submit",
-            "imageUrl": ""
-        },
-        "fields": [
-            {
-                "type": "workflow_user",
-                "id": 2,
-                "label": "customer-id",
-                "adminLabel": "customer-id",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "administrative",
-                "inputs": null,
-                "choices": [
-                ],
-                "formId": 1,
-                "description": "",
-                "allowsPrepopulate": true,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "customer-id",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "conditionalLogic": "",
-                "failed_validation": "",
-                "productField": "",
-                "multipleFiles": false,
-                "maxFiles": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false,
-                "displayOnly": "",
-                "enablePrice": "",
-                "gravityflowUsersRoleFilter": ""
-            },
-            {
-                "type": "date",
-                "id": 6,
-                "label": "Actual date",
-                "adminLabel": "",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "visible",
-                "inputs": null,
-                "dateType": "datepicker",
-                "calendarIconType": "none",
-                "formId": 1,
-                "description": "",
-                "allowsPrepopulate": false,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "choices": "",
-                "conditionalLogic": "",
-                "calendarIconUrl": "",
-                "dateFormat": "ymd_dash",
-                "productField": "",
-                "multipleFiles": false,
-                "maxFiles": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false,
-                "displayOnly": ""
-            },
-            {
-                "type": "radio",
-                "id": 8,
-                "label": "acceptance",
-                "adminLabel": "",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "visible",
-                "inputs": null,
-                "choices": [
-                    {
-                        "text": "not-accepted",
-                        "value": "not-accepted",
-                        "isSelected": true,
-                        "price": ""
-                    },
-                    {
-                        "text": "accept",
-                        "value": "accept",
-                        "isSelected": false,
-                        "price": ""
-                    },
-                    {
-                        "text": "decline",
-                        "value": "decline",
-                        "isSelected": false,
-                        "price": ""
-                    }
-                ],
-                "formId": 1,
-                "description": "",
-                "allowsPrepopulate": false,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "conditionalLogic": "",
-                "productField": "",
-                "enableOtherChoice": "",
-                "enablePrice": "",
-                "multipleFiles": false,
-                "maxFiles": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false,
-                "displayOnly": ""
-            },
-            {
-                "type": "date",
-                "id": 9,
-                "label": "Expiration date",
-                "adminLabel": "",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "visible",
-                "inputs": null,
-                "dateType": "datepicker",
-                "calendarIconType": "none",
-                "formId": 1,
-                "description": "",
-                "allowsPrepopulate": false,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "choices": "",
-                "conditionalLogic": "",
-                "calendarIconUrl": "",
-                "dateFormat": "ymd_dash",
-                "productField": "",
-                "multipleFiles": false,
-                "maxFiles": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false,
-                "displayOnly": ""
-            },
-            {
-                "type": "text",
-                "id": 10,
-                "label": "Reason",
-                "adminLabel": "",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "visible",
-                "inputs": null,
-                "formId": 1,
-                "description": "",
-                "allowsPrepopulate": false,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "choices": "",
-                "conditionalLogic": "",
-                "productField": "",
-                "enablePasswordInput": "",
-                "maxLength": "",
-                "multipleFiles": false,
-                "maxFiles": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false,
-                "displayOnly": "",
-                "enablePrice": ""
-            },
-            {
-                "type": "fileupload",
-                "id": 12,
-                "label": "File",
-                "adminLabel": "",
-                "isRequired": false,
-                "size": "medium",
-                "errorMessage": "",
-                "visibility": "visible",
-                "inputs": null,
-                "formId": 1,
-                "description": "Upload customer acceptance file",
-                "allowsPrepopulate": false,
-                "inputMask": false,
-                "inputMaskValue": "",
-                "inputType": "",
-                "labelPlacement": "",
-                "descriptionPlacement": "",
-                "subLabelPlacement": "",
-                "placeholder": "",
-                "cssClass": "",
-                "inputName": "",
-                "noDuplicates": false,
-                "defaultValue": "",
-                "choices": "",
-                "conditionalLogic": "",
-                "maxFileSize": "",
-                "maxFiles": "",
-                "multipleFiles": true,
-                "allowedExtensions": "pdf,docx,doc,xlsx,xls,odt,ods,jpg,png,jpeg",
-                "productField": "",
-                "calculationFormula": "",
-                "calculationRounding": "",
-                "enableCalculation": "",
-                "disableQuantity": false,
-                "displayAllCategories": false,
-                "useRichTextEditor": false
-            }
-        ],
-        "version": "2.3.2",
-        "id": 1,
-        "useCurrentUserAsAuthor": true,
-        "postContentTemplateEnabled": false,
-        "postTitleTemplateEnabled": false,
-        "postTitleTemplate": "",
-        "postContentTemplate": "",
-        "lastPageButton": null,
-        "pagination": null,
-        "firstPageCssClass": null,
-        "is_active": "1",
-        "date_created": "2018-08-15 20:30:18",
-        "is_trash": "0",
-        "confirmations": [
-            {
-                "id": "5b5f75f7494b7",
-                "name": "Default Confirmation",
-                "isDefault": true,
-                "type": "message",
-                "message": "Thanks for contacting us! We will get in touch with you shortly.",
-                "url": "",
-                "pageId": "",
-                "queryString": ""
-            }
-        ],
-        "notifications": [
-            {
-                "id": "5b5f75f748cee",
-                "to": "{admin_email}",
-                "name": "Admin Notification",
-                "event": "form_submission",
-                "toType": "email",
-                "subject": "New submission from {form_title}",
-                "message": "{all_fields}"
-            }
-        ],
-        "feeds": {
-            "gravityflow": [
-                {
-                    "id": "1",
-                    "form_id": "1",
-                    "is_active": "1",
-                    "feed_order": "0",
-                    "meta": {
-                        "step_name": "Upload acceptance file",
-                        "description": "",
-                        "step_type": "user_input",
-                        "step_highlight": "0",
-                        "step_highlight_type": "color",
-                        "step_highlight_color": "#dd3333",
-                        "feed_condition_conditional_logic": "0",
-                        "feed_condition_conditional_logic_object": [],
-                        "scheduled": "0",
-                        "schedule_type": "delay",
-                        "schedule_date": "",
-                        "schedule_delay_offset": "",
-                        "schedule_delay_unit": "hours",
-                        "schedule_date_field_offset": "0",
-                        "schedule_date_field_offset_unit": "hours",
-                        "schedule_date_field_before_after": "after",
-                        "schedule_date_field": "6",
-                        "type": "select",
-                        "assignees": [
-                            "role|administrator",
-                            "assignee_user_field|2"
-                        ],
-                        "routing": "",
-                        "assignee_policy": "any",
-                        "highlight_editable_fields_enabled": "0",
-                        "highlight_editable_fields_class": "green-triangle",
-                        "instructionsEnable": "0",
-                        "instructionsValue": "",
-                        "display_fields_mode": "selected_fields",
-                        "default_status": "hidden",
-                        "note_mode": "not_required",
-                        "assignee_notification_enabled": "0",
-                        "assignee_notification_from_name": "",
-                        "assignee_notification_from_email": "{admin_email}",
-                        "assignee_notification_reply_to": "",
-                        "assignee_notification_bcc": "",
-                        "assignee_notification_subject": "Upload order acceptance file",
-                        "assignee_notification_message": "A new entry requires your input.",
-                        "assignee_notification_disable_autoformat": "0",
-                        "resend_assignee_emailEnable": "0",
-                        "resend_assignee_emailValue": "7",
-                        "resend_assignee_email_repeatEnable": "0",
-                        "resend_assignee_email_repeatValue": "3",
-                        "in_progress_notification_enabled": "0",
-                        "in_progress_notification_type": "select",
-                        "in_progress_notification_routing": [
-                            {
-                                "assignee": "user_id|2",
-                                "fieldId": "0",
-                                "operator": "is",
-                                "value": "",
-                                "type": ""
-                            }
-                        ],
-                        "in_progress_notification_from_name": "",
-                        "in_progress_notification_from_email": "{admin_email}",
-                        "in_progress_notification_reply_to": "",
-                        "in_progress_notification_bcc": "",
-                        "in_progress_notification_subject": "",
-                        "in_progress_notification_message": "Entry {entry_id} has been updated and remains in progress.",
-                        "in_progress_notification_disable_autoformat": "0",
-                        "complete_notification_enabled": "0",
-                        "complete_notification_type": "select",
-                        "complete_notification_routing": [
-                            {
-                                "assignee": "user_id|2",
-                                "fieldId": "0",
-                                "operator": "is",
-                                "value": "",
-                                "type": ""
-                            }
-                        ],
-                        "complete_notification_from_name": "",
-                        "complete_notification_from_email": "{admin_email}",
-                        "complete_notification_reply_to": "",
-                        "complete_notification_bcc": "",
-                        "complete_notification_subject": "",
-                        "complete_notification_message": "Entry {entry_id} has been updated completing the step.",
-                        "complete_notification_disable_autoformat": "0",
-                        "confirmation_messageEnable": "0",
-                        "confirmation_messageValue": "Thank you.",
-                        "expiration": "0",
-                        "expiration_type": "date_field",
-                        "expiration_date": "",
-                        "expiration_delay_offset": "7",
-                        "expiration_delay_unit": "days",
-                        "expiration_date_field_offset": "0",
-                        "expiration_date_field_offset_unit": "hours",
-                        "expiration_date_field_before_after": "after",
-                        "expiration_date_field": "9",
-                        "status_expiration": "expired",
-                        "destination_expired": "2",
-                        "destination_complete": "next"
-                    },
-                    "addon_slug": "gravityflow",
-                    "event_type": null
-                },
-                {
-                    "id": "2",
-                    "form_id": "1",
-                    "is_active": "1",
-                    "feed_order": "0",
-                    "meta": {
-                        "step_name": "Approve customer acceptance",
-                        "description": "",
-                        "step_type": "approval",
-                        "step_highlight": "0",
-                        "step_highlight_type": "color",
-                        "step_highlight_color": "#dd3333",
-                        "feed_condition_conditional_logic": "0",
-                        "feed_condition_conditional_logic_object": [],
-                        "scheduled": "0",
-                        "schedule_type": "delay",
-                        "schedule_date": "",
-                        "schedule_delay_offset": "",
-                        "schedule_delay_unit": "hours",
-                        "schedule_date_field_offset": "0",
-                        "schedule_date_field_offset_unit": "hours",
-                        "schedule_date_field_before_after": "after",
-                        "type": "select",
-                        "assignees": [
-                            "role|administrator"
-                        ],
-                        "routing": [
-                            {
-                                "assignee": "user_id|2",
-                                "fieldId": "0",
-                                "operator": "is",
-                                "value": "",
-                                "type": ""
-                            }
-                        ],
-                        "assignee_policy": "any",
-                        "instructionsEnable": "0",
-                        "instructionsValue": "Instructions: please review the values in the fields below and click on the Approve or Reject button",
-                        "display_fields_mode": "all_fields",
-                        "assignee_notification_enabled": "0",
-                        "assignee_notification_from_name": "",
-                        "assignee_notification_from_email": "{admin_email}",
-                        "assignee_notification_reply_to": "",
-                        "assignee_notification_bcc": "",
-                        "assignee_notification_subject": "",
-                        "assignee_notification_message": "A new entry is pending your approval. Please check your Workflow Inbox.",
-                        "assignee_notification_disable_autoformat": "0",
-                        "resend_assignee_emailEnable": "0",
-                        "resend_assignee_emailValue": "7",
-                        "resend_assignee_email_repeatEnable": "0",
-                        "resend_assignee_email_repeatValue": "3",
-                        "rejection_notification_enabled": "0",
-                        "rejection_notification_type": "select",
-                        "rejection_notification_routing": [
-                            {
-                                "assignee": "user_id|2",
-                                "fieldId": "0",
-                                "operator": "is",
-                                "value": "",
-                                "type": ""
-                            }
-                        ],
-                        "rejection_notification_from_name": "",
-                        "rejection_notification_from_email": "{admin_email}",
-                        "rejection_notification_reply_to": "",
-                        "rejection_notification_bcc": "",
-                        "rejection_notification_subject": "",
-                        "rejection_notification_message": "Entry {entry_id} has been rejected",
-                        "rejection_notification_disable_autoformat": "0",
-                        "approval_notification_enabled": "0",
-                        "approval_notification_type": "select",
-                        "approval_notification_routing": [
-                            {
-                                "assignee": "user_id|2",
-                                "fieldId": "0",
-                                "operator": "is",
-                                "value": "",
-                                "type": ""
-                            }
-                        ],
-                        "approval_notification_from_name": "",
-                        "approval_notification_from_email": "{admin_email}",
-                        "approval_notification_reply_to": "",
-                        "approval_notification_bcc": "",
-                        "approval_notification_subject": "",
-                        "approval_notification_message": "Entry {entry_id} has been approved",
-                        "approval_notification_disable_autoformat": "0",
-                        "revertEnable": "0",
-                        "revertValue": 1,
-                        "note_mode": "not_required",
-                        "expiration": "0",
-                        "expiration_type": "delay",
-                        "expiration_date": "",
-                        "expiration_delay_offset": "",
-                        "expiration_delay_unit": "hours",
-                        "expiration_date_field_offset": "0",
-                        "expiration_date_field_offset_unit": "hours",
-                        "expiration_date_field_before_after": "after",
-                        "status_expiration": "rejected",
-                        "destination_expired": "next",
-                        "destination_rejected": 1,
-                        "destination_approved": "next"
-                    },
-                    "addon_slug": "gravityflow",
-                    "event_type": null
-                }
-            ]
-        }
-    },
-    "version": "2.3.2"
-}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery_action_manual_form.json

@@ -1,252 +0,0 @@
-{
-  "0": {
-    "title": "DELIVERY ACTION TYPE: Manual",
-    "description": "Manual process step action type",
-    "labelPlacement": "top_label",
-    "descriptionPlacement": "below",
-    "button": {
-      "type": "text",
-      "text": "Submit",
-      "imageUrl": ""
-    },
-    "fields": [
-      {
-        "type": "workflow_user",
-        "id": 2,
-        "label": "customer-id",
-        "adminLabel": "customer-id",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "administrative",
-        "inputs": null,
-        "choices": [
-          {
-            "value": 2,
-            "text": "Customer Wiaas"
-          },
-          {
-            "value": 1,
-            "text": "wpUser"
-          }
-        ],
-        "formId": 4,
-        "description": "",
-        "allowsPrepopulate": true,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "customer-id",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "conditionalLogic": "",
-        "failed_validation": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": "",
-        "enablePrice": "",
-        "gravityflowUsersRoleFilter": ""
-      },
-      {
-        "type": "date",
-        "id": 3,
-        "label": "Actual Date",
-        "adminLabel": "",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "dateType": "datepicker",
-        "calendarIconType": "calendar",
-        "formId": 4,
-        "description": "",
-        "allowsPrepopulate": false,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "choices": "",
-        "conditionalLogic": "",
-        "calendarIconUrl": "",
-        "dateFormat": "ymd_dash",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": ""
-      }
-    ],
-    "version": "2.3.2",
-    "id": 4,
-    "useCurrentUserAsAuthor": true,
-    "postContentTemplateEnabled": false,
-    "postTitleTemplateEnabled": false,
-    "postTitleTemplate": "",
-    "postContentTemplate": "",
-    "lastPageButton": null,
-    "pagination": null,
-    "firstPageCssClass": null,
-    "is_active": "1",
-    "date_created": "2018-08-09 15:36:00",
-    "is_trash": "0",
-    "confirmations": [
-      {
-        "id": "5b5f9ebc52a80",
-        "name": "Default Confirmation",
-        "isDefault": true,
-        "type": "message",
-        "message": "Thanks for contacting us! We will get in touch with you shortly.",
-        "url": "",
-        "pageId": "",
-        "queryString": ""
-      }
-    ],
-    "notifications": [
-      {
-        "id": "5b5f9ebc520f3",
-        "to": "{admin_email}",
-        "name": "Admin Notification",
-        "event": "form_submission",
-        "toType": "email",
-        "subject": "New submission from {form_title}",
-        "message": "{all_fields}"
-      }
-    ],
-    "feeds": {
-      "gravityflow": [
-        {
-          "id": "6",
-          "form_id": "4",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Complete step",
-            "description": "",
-            "step_type": "approval",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "schedule_date_field": "3",
-            "type": "select",
-            "assignees": [
-              "role|administrator"
-            ],
-            "routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "assignee_policy": "any",
-            "instructionsEnable": "0",
-            "instructionsValue": "Instructions: please review the values in the fields below and click on the Approve or Reject button",
-            "display_fields_mode": "all_fields",
-            "assignee_notification_enabled": "0",
-            "assignee_notification_from_name": "",
-            "assignee_notification_from_email": "{admin_email}",
-            "assignee_notification_reply_to": "",
-            "assignee_notification_bcc": "",
-            "assignee_notification_subject": "",
-            "assignee_notification_message": "A new entry is pending your approval. Please check your Workflow Inbox.",
-            "assignee_notification_disable_autoformat": "0",
-            "resend_assignee_emailEnable": "0",
-            "resend_assignee_emailValue": "7",
-            "resend_assignee_email_repeatEnable": "0",
-            "resend_assignee_email_repeatValue": "3",
-            "rejection_notification_enabled": "0",
-            "rejection_notification_type": "select",
-            "rejection_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "rejection_notification_from_name": "",
-            "rejection_notification_from_email": "{admin_email}",
-            "rejection_notification_reply_to": "",
-            "rejection_notification_bcc": "",
-            "rejection_notification_subject": "",
-            "rejection_notification_message": "Entry {entry_id} has been rejected",
-            "rejection_notification_disable_autoformat": "0",
-            "approval_notification_enabled": "0",
-            "approval_notification_type": "select",
-            "approval_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "approval_notification_from_name": "",
-            "approval_notification_from_email": "{admin_email}",
-            "approval_notification_reply_to": "",
-            "approval_notification_bcc": "",
-            "approval_notification_subject": "",
-            "approval_notification_message": "Entry {entry_id} has been approved",
-            "approval_notification_disable_autoformat": "0",
-            "note_mode": "not_required",
-            "expiration": "0",
-            "expiration_type": "delay",
-            "expiration_date": "",
-            "expiration_delay_offset": "",
-            "expiration_delay_unit": "hours",
-            "expiration_date_field_offset": "0",
-            "expiration_date_field_offset_unit": "hours",
-            "expiration_date_field_before_after": "after",
-            "expiration_date_field": "3",
-            "status_expiration": "rejected",
-            "destination_expired": "next",
-            "destination_rejected": "complete",
-            "destination_approved": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        }
-      ]
-    }
-  },
-  "version": "2.3.2"
-}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery_action_schedule_meeting.json

@@ -1,406 +0,0 @@
-{
-  "0": {
-    "title": "DELIVERY ACTION TYPE: Schedule meeting",
-    "description": "Schedule meeting with customer",
-    "labelPlacement": "top_label",
-    "descriptionPlacement": "below",
-    "button": {
-      "type": "text",
-      "text": "Submit",
-      "imageUrl": ""
-    },
-    "fields": [
-      {
-        "type": "workflow_user",
-        "id": 3,
-        "label": "customer-id",
-        "adminLabel": "customer-id",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "administrative",
-        "inputs": null,
-        "choices": [
-          {
-            "value": 2,
-            "text": "Customer Wiaas"
-          },
-          {
-            "value": 1,
-            "text": "wpUser"
-          }
-        ],
-        "formId": 2,
-        "description": "",
-        "allowsPrepopulate": true,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "customer-id",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "conditionalLogic": "",
-        "failed_validation": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": "",
-        "gravityflowUsersRoleFilter": ""
-      },
-      {
-        "type": "date",
-        "id": 4,
-        "label": "Actual Date",
-        "adminLabel": "",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "dateType": "datepicker",
-        "calendarIconType": "calendar",
-        "formId": 2,
-        "description": "",
-        "allowsPrepopulate": false,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "choices": "",
-        "conditionalLogic": "",
-        "calendarIconUrl": "",
-        "dateFormat": "ymd_dash",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": ""
-      },
-      {
-        "type": "date",
-        "id": 5,
-        "label": "Schedule date",
-        "adminLabel": "",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "dateType": "datepicker",
-        "calendarIconType": "calendar",
-        "formId": 2,
-        "description": "",
-        "allowsPrepopulate": false,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "choices": "",
-        "conditionalLogic": "",
-        "calendarIconUrl": "",
-        "dateFormat": "ymd_dash",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false
-      }
-    ],
-    "version": "2.3.2",
-    "id": 2,
-    "useCurrentUserAsAuthor": true,
-    "postContentTemplateEnabled": false,
-    "postTitleTemplateEnabled": false,
-    "postTitleTemplate": "",
-    "postContentTemplate": "",
-    "lastPageButton": null,
-    "pagination": null,
-    "firstPageCssClass": null,
-    "is_active": "1",
-    "date_created": "2018-08-09 15:35:59",
-    "is_trash": "0",
-    "confirmations": [
-      {
-        "id": "5b60b12baa00e",
-        "name": "Default Confirmation",
-        "isDefault": true,
-        "type": "message",
-        "message": "Thanks for contacting us! We will get in touch with you shortly.",
-        "url": "",
-        "pageId": "",
-        "queryString": ""
-      }
-    ],
-    "notifications": [
-      {
-        "id": "5b60b12ba9850",
-        "to": "{admin_email}",
-        "name": "Admin Notification",
-        "event": "form_submission",
-        "toType": "email",
-        "subject": "New submission from {form_title}",
-        "message": "{all_fields}"
-      }
-    ],
-    "feeds": {
-      "gravityflow": [
-        {
-          "id": "3",
-          "form_id": "2",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Broker proposes meeting date",
-            "description": "",
-            "step_type": "user_input",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "schedule_date_field": "4",
-            "type": "select",
-            "assignees": [
-              "role|administrator"
-            ],
-            "editable_fields": [
-              "4",
-              "5"
-            ],
-            "routing": "",
-            "assignee_policy": "all",
-            "highlight_editable_fields_enabled": "0",
-            "highlight_editable_fields_class": "green-triangle",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "display_fields_mode": "selected_fields",
-            "display_fields_selected": [
-              "4",
-              "5"
-            ],
-            "default_status": "submit_buttons",
-            "note_mode": "not_required",
-            "assignee_notification_enabled": "0",
-            "assignee_notification_from_name": "",
-            "assignee_notification_from_email": "{admin_email}",
-            "assignee_notification_reply_to": "",
-            "assignee_notification_bcc": "",
-            "assignee_notification_subject": "",
-            "assignee_notification_message": "A new entry requires your input.",
-            "assignee_notification_disable_autoformat": "0",
-            "resend_assignee_emailEnable": "0",
-            "resend_assignee_emailValue": "7",
-            "resend_assignee_email_repeatEnable": "0",
-            "resend_assignee_email_repeatValue": "3",
-            "in_progress_notification_enabled": "0",
-            "in_progress_notification_type": "select",
-            "in_progress_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "in_progress_notification_from_name": "",
-            "in_progress_notification_from_email": "{admin_email}",
-            "in_progress_notification_reply_to": "",
-            "in_progress_notification_bcc": "",
-            "in_progress_notification_subject": "",
-            "in_progress_notification_message": "Entry {entry_id} has been updated and remains in progress.",
-            "in_progress_notification_disable_autoformat": "0",
-            "complete_notification_enabled": "0",
-            "complete_notification_type": "select",
-            "complete_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "complete_notification_from_name": "",
-            "complete_notification_from_email": "{admin_email}",
-            "complete_notification_reply_to": "",
-            "complete_notification_bcc": "",
-            "complete_notification_subject": "",
-            "complete_notification_message": "Entry {entry_id} has been updated completing the step.",
-            "complete_notification_disable_autoformat": "0",
-            "confirmation_messageEnable": "0",
-            "confirmation_messageValue": "Thank you.",
-            "expiration": "0",
-            "expiration_type": "delay",
-            "expiration_date": "",
-            "expiration_delay_offset": "",
-            "expiration_delay_unit": "hours",
-            "expiration_date_field_offset": "0",
-            "expiration_date_field_offset_unit": "hours",
-            "expiration_date_field_before_after": "after",
-            "expiration_date_field": "4",
-            "status_expiration": "complete",
-            "destination_expired": "next",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "4",
-          "form_id": "2",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Customer approval for scheduled date",
-            "description": "",
-            "step_type": "approval",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "schedule_date_field": "4",
-            "type": "select",
-            "assignees": [
-              "assignee_user_field|3"
-            ],
-            "routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "assignee_policy": "all",
-            "instructionsEnable": "0",
-            "instructionsValue": "Instructions: please review the values in the fields below and click on the Approve or Reject button",
-            "display_fields_mode": "selected_fields",
-            "display_fields_selected": [
-              "5"
-            ],
-            "assignee_notification_enabled": "0",
-            "assignee_notification_from_name": "",
-            "assignee_notification_from_email": "{admin_email}",
-            "assignee_notification_reply_to": "",
-            "assignee_notification_bcc": "",
-            "assignee_notification_subject": "",
-            "assignee_notification_message": "A new entry is pending your approval. Please check your Workflow Inbox.",
-            "assignee_notification_disable_autoformat": "0",
-            "resend_assignee_emailEnable": "0",
-            "resend_assignee_emailValue": "7",
-            "resend_assignee_email_repeatEnable": "0",
-            "resend_assignee_email_repeatValue": "3",
-            "rejection_notification_enabled": "0",
-            "rejection_notification_type": "select",
-            "rejection_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "rejection_notification_from_name": "",
-            "rejection_notification_from_email": "{admin_email}",
-            "rejection_notification_reply_to": "",
-            "rejection_notification_bcc": "",
-            "rejection_notification_subject": "",
-            "rejection_notification_message": "Entry {entry_id} has been rejected",
-            "rejection_notification_disable_autoformat": "0",
-            "approval_notification_enabled": "0",
-            "approval_notification_type": "select",
-            "approval_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "approval_notification_from_name": "",
-            "approval_notification_from_email": "{admin_email}",
-            "approval_notification_reply_to": "",
-            "approval_notification_bcc": "",
-            "approval_notification_subject": "",
-            "approval_notification_message": "Entry {entry_id} has been approved",
-            "approval_notification_disable_autoformat": "0",
-            "revertEnable": "0",
-            "revertValue": 3,
-            "note_mode": "not_required",
-            "expiration": "0",
-            "expiration_type": "delay",
-            "expiration_date": "",
-            "expiration_delay_offset": "",
-            "expiration_delay_unit": "hours",
-            "expiration_date_field_offset": "0",
-            "expiration_date_field_offset_unit": "hours",
-            "expiration_date_field_before_after": "after",
-            "expiration_date_field": "4",
-            "status_expiration": "rejected",
-            "destination_expired": "next",
-            "destination_rejected": 3,
-            "destination_approved": "complete"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        }
-      ]
-    }
-  },
-  "version": "2.3.2"
-}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery_action_validate_questionnaire_form.json

@@ -1,264 +0,0 @@
-{
-  "0": {
-    "title": "DELIVERY ACTION TYPE: Validate Questionnaire",
-    "description": "The configuration details submitted at ordering must be validated and any missing or incomplete information must be added.",
-    "labelPlacement": "top_label",
-    "descriptionPlacement": "below",
-    "button": {
-      "type": "text",
-      "text": "Submit",
-      "imageUrl": ""
-    },
-    "fields": [
-      {
-        "type": "workflow_user",
-        "id": 4,
-        "label": "customer-id",
-        "adminLabel": "customer-id",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "administrative",
-        "inputs": null,
-        "choices": [
-          {
-            "value": 2,
-            "text": "Customer Wiaas"
-          },
-          {
-            "value": 1,
-            "text": "wpUser"
-          }
-        ],
-        "formId": 3,
-        "description": "",
-        "allowsPrepopulate": true,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "customer-id",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "conditionalLogic": "",
-        "failed_validation": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": "",
-        "enablePrice": "",
-        "gravityflowUsersRoleFilter": ""
-      },
-      {
-        "type": "date",
-        "id": 5,
-        "label": "Actual date",
-        "adminLabel": "",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "dateType": "datepicker",
-        "calendarIconType": "none",
-        "formId": 3,
-        "description": "",
-        "allowsPrepopulate": false,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "choices": "",
-        "conditionalLogic": "",
-        "calendarIconUrl": "",
-        "dateFormat": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false
-      }
-    ],
-    "version": "2.3.2",
-    "id": 3,
-    "useCurrentUserAsAuthor": true,
-    "postContentTemplateEnabled": false,
-    "postTitleTemplateEnabled": false,
-    "postTitleTemplate": "",
-    "postContentTemplate": "",
-    "lastPageButton": null,
-    "pagination": null,
-    "firstPageCssClass": null,
-    "is_active": "1",
-    "date_created": "2018-08-09 15:36:00",
-    "is_trash": "0",
-    "confirmations": [
-      {
-        "id": "5b5f688188e90",
-        "name": "Default Confirmation",
-        "isDefault": true,
-        "type": "message",
-        "message": "Thanks for contacting us! We will get in touch with you shortly.",
-        "url": "",
-        "pageId": "",
-        "queryString": ""
-      }
-    ],
-    "notifications": [
-      {
-        "id": "5b5f68818822e",
-        "to": "{admin_email}",
-        "name": "Admin Notification",
-        "event": "form_submission",
-        "toType": "email",
-        "subject": "New submission from {form_title}",
-        "message": "{all_fields}"
-      }
-    ],
-    "feeds": {
-      "gravityflow": [
-        {
-          "id": "5",
-          "form_id": "3",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Approve customer configuration",
-            "description": "",
-            "step_type": "approval",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": {
-              "conditionalLogic": {
-                "actionType": "show",
-                "logicType": "all",
-                "rules": [
-                  {
-                    "fieldId": "2",
-                    "operator": "is",
-                    "value": "administrator"
-                  }
-                ]
-              }
-            },
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "schedule_date_field": "5",
-            "type": "select",
-            "assignees": [
-              "role|administrator"
-            ],
-            "routing": [
-              {
-                "target": false,
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": false,
-                "assignee": "user_id|2"
-              }
-            ],
-            "assignee_policy": "any",
-            "instructionsEnable": "1",
-            "instructionsValue": "Instructions: please review the values in the fields below and click on the Approve or Reject button",
-            "display_fields_mode": "selected_fields",
-            "assignee_notification_enabled": "0",
-            "assignee_notification_from_name": "",
-            "assignee_notification_from_email": "{admin_email}",
-            "assignee_notification_reply_to": "",
-            "assignee_notification_bcc": "",
-            "assignee_notification_subject": "",
-            "assignee_notification_message": "A new entry is pending your approval. Please check your Workflow Inbox.",
-            "assignee_notification_disable_autoformat": "0",
-            "resend_assignee_emailEnable": "0",
-            "resend_assignee_emailValue": "7",
-            "resend_assignee_email_repeatEnable": "0",
-            "resend_assignee_email_repeatValue": "3",
-            "rejection_notification_enabled": "0",
-            "rejection_notification_type": "select",
-            "rejection_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "rejection_notification_from_name": "",
-            "rejection_notification_from_email": "{admin_email}",
-            "rejection_notification_reply_to": "",
-            "rejection_notification_bcc": "",
-            "rejection_notification_subject": "",
-            "rejection_notification_message": "Entry {entry_id} has been rejected",
-            "rejection_notification_disable_autoformat": "0",
-            "approval_notification_enabled": "0",
-            "approval_notification_type": "select",
-            "approval_notification_routing": [
-              {
-                "assignee": "user_id|2",
-                "fieldId": "0",
-                "operator": "is",
-                "value": "",
-                "type": ""
-              }
-            ],
-            "approval_notification_from_name": "",
-            "approval_notification_from_email": "{admin_email}",
-            "approval_notification_reply_to": "",
-            "approval_notification_bcc": "",
-            "approval_notification_subject": "",
-            "approval_notification_message": "Entry {entry_id} has been approved",
-            "approval_notification_disable_autoformat": "0",
-            "note_mode": "not_required",
-            "expiration": "0",
-            "expiration_type": "delay",
-            "expiration_date": "",
-            "expiration_delay_offset": "",
-            "expiration_delay_unit": "hours",
-            "expiration_date_field_offset": "0",
-            "expiration_date_field_offset_unit": "hours",
-            "expiration_date_field_before_after": "after",
-            "expiration_date_field": "5",
-            "status_expiration": "rejected",
-            "destination_expired": "next",
-            "destination_rejected": "complete",
-            "destination_approved": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        }
-      ]
-    }
-  },
-  "version": "2.3.2"
-}

backend/app/plugins/wiaas/includes/db-updates/data/delivery-forms/delivery_process_normal_delivery_form.json

@@ -1,338 +0,0 @@
-{
-  "0": {
-    "title": "DELIVERY PROCESS: Normal Delivery",
-    "description": "Normal delivery process",
-    "labelPlacement": "top_label",
-    "descriptionPlacement": "below",
-    "button": {
-      "type": "text",
-      "text": "Submit",
-      "imageUrl": ""
-    },
-    "fields": [
-      {
-        "type": "number",
-        "id": 1,
-        "label": "order-id",
-        "adminLabel": "order-id",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "numberFormat": "decimal_dot",
-        "formId": 5,
-        "description": "",
-        "allowsPrepopulate": true,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "order-id",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "choices": "",
-        "conditionalLogic": "",
-        "enableCalculation": false,
-        "rangeMin": "",
-        "rangeMax": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": "",
-        "enablePrice": ""
-      },
-      {
-        "type": "workflow_user",
-        "id": 2,
-        "label": "customer-id",
-        "adminLabel": "customer-id",
-        "isRequired": false,
-        "size": "medium",
-        "errorMessage": "",
-        "visibility": "visible",
-        "inputs": null,
-        "choices": [
-          {
-            "value": 2,
-            "text": "Customer Wiaas"
-          },
-          {
-            "value": 1,
-            "text": "wpUser"
-          }
-        ],
-        "formId": 5,
-        "description": "",
-        "allowsPrepopulate": true,
-        "inputMask": false,
-        "inputMaskValue": "",
-        "inputType": "",
-        "labelPlacement": "",
-        "descriptionPlacement": "",
-        "subLabelPlacement": "",
-        "placeholder": "",
-        "cssClass": "",
-        "inputName": "customer-id",
-        "noDuplicates": false,
-        "defaultValue": "",
-        "conditionalLogic": "",
-        "failed_validation": "",
-        "productField": "",
-        "multipleFiles": false,
-        "maxFiles": "",
-        "calculationFormula": "",
-        "calculationRounding": "",
-        "enableCalculation": "",
-        "disableQuantity": false,
-        "displayAllCategories": false,
-        "useRichTextEditor": false,
-        "displayOnly": "",
-        "enablePrice": "",
-        "gravityflowUsersRoleFilter": ""
-      }
-    ],
-    "version": "2.3.2.6",
-    "id": 5,
-    "useCurrentUserAsAuthor": true,
-    "postContentTemplateEnabled": false,
-    "postTitleTemplateEnabled": false,
-    "postTitleTemplate": "",
-    "postContentTemplate": "",
-    "lastPageButton": null,
-    "pagination": null,
-    "firstPageCssClass": null,
-    "is_active": "1",
-    "date_created": "2018-08-09 15:36:00",
-    "is_trash": "0",
-    "confirmations": [
-      {
-        "id": "5b5f7ae4bb79e",
-        "name": "Default Confirmation",
-        "isDefault": true,
-        "type": "message",
-        "message": "Thanks for contacting us! We will get in touch with you shortly.",
-        "url": "",
-        "pageId": "",
-        "queryString": ""
-      }
-    ],
-    "notifications": [
-      {
-        "id": "5b5f7ae4baced",
-        "to": "{admin_email}",
-        "name": "Admin Notification",
-        "event": "form_submission",
-        "toType": "email",
-        "subject": "New submission from {form_title}",
-        "message": "{all_fields}",
-        "isActive": false
-      }
-    ],
-    "feeds": {
-      "gravityflow": [
-        {
-          "id": "7",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Validate customer configuration information",
-            "description": "Validate customer configuration information",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "target_form_id": 3,
-            "store_new_entry_idEnable": "1",
-            "new_entry_id_field": "6",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "8",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Wait for installation to be scheduled and confirmed",
-            "description": "Wait for installation to be scheduled and confirmed",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "target_form_id": 4,
-            "store_new_entry_idEnable": "0",
-            "new_entry_id_field": "",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "9",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Installation",
-            "description": " Installation",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "target_form_id": 4,
-            "store_new_entry_idEnable": "0",
-            "new_entry_id_field": "",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "10",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Customer acceptance",
-            "description": "Customer acceptance",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "target_form_id": 1,
-            "store_new_entry_idEnable": "1",
-            "new_entry_id_field": "7",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "11",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Customer training",
-            "description": "Customer training",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "target_form_id": 4,
-            "store_new_entry_idEnable": "0",
-            "new_entry_id_field": "",
-            "destination_complete": "next",
-            "feedName": " - Copy 1"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        },
-        {
-          "id": "12",
-          "form_id": "5",
-          "is_active": "1",
-          "feed_order": "0",
-          "meta": {
-            "step_name": "Set start\/stop dates for contracts",
-            "description": "Set start\/stop dates for contracts",
-            "step_type": "wiaas_delivery_step",
-            "step_highlight": "0",
-            "step_highlight_type": "color",
-            "step_highlight_color": "#dd3333",
-            "feed_condition_conditional_logic": "0",
-            "feed_condition_conditional_logic_object": [],
-            "scheduled": "0",
-            "schedule_type": "delay",
-            "schedule_date": "",
-            "schedule_delay_offset": "",
-            "schedule_delay_unit": "hours",
-            "schedule_date_field_offset": "0",
-            "schedule_date_field_offset_unit": "hours",
-            "schedule_date_field_before_after": "after",
-            "instructionsEnable": "0",
-            "instructionsValue": "",
-            "target_form_id": 4,
-            "store_new_entry_idEnable": "0",
-            "new_entry_id_field": "",
-            "destination_complete": "next"
-          },
-          "addon_slug": "gravityflow",
-          "event_type": null
-        }
-      ]
-    }
-  },
-  "version": "2.3.2"
-}

backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-bundle-properties.json

@@ -0,0 +1,117 @@
+[
+    {
+        "key": "group_5bc845c001de4",
+        "title": "Bundle Properties",
+        "fields": [
+            {
+                "key": "field_5bc845dc7eed5",
+                "label": "Reference",
+                "name": "_wiaas_package_reference",
+                "type": "taxonomy",
+                "instructions": "",
+                "required": 0,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "taxonomy": "product_tag",
+                "field_type": "select",
+                "allow_null": 0,
+                "add_term": 1,
+                "save_terms": 1,
+                "load_terms": 1,
+                "return_format": "id",
+                "multiple": 0
+            },
+            {
+                "key": "field_5bcfcc2cf88f4",
+                "label": "Country",
+                "name": "country",
+                "type": "taxonomy",
+                "instructions": "",
+                "required": 1,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "taxonomy": "product_country",
+                "field_type": "select",
+                "allow_null": 0,
+                "add_term": 0,
+                "save_terms": 1,
+                "load_terms": 1,
+                "return_format": "id",
+                "multiple": 0
+            },
+            {
+                "key": "field_5bdb1512ab14f",
+                "label": "Additional days prior earliest installation",
+                "name": "additional_days_prior_earliest_installation",
+                "type": "number",
+                "instructions": "",
+                "required": 0,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "default_value": 5,
+                "placeholder": "",
+                "prepend": "",
+                "append": "",
+                "min": 0,
+                "max": "",
+                "step": ""
+            },
+            {
+                "key": "field_5bc86761aeafc",
+                "label": "Unit",
+                "name": "unit",
+                "type": "taxonomy",
+                "instructions": "",
+                "required": 0,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "taxonomy": "wiaas_units",
+                "field_type": "select",
+                "allow_null": 0,
+                "add_term": 1,
+                "save_terms": 1,
+                "load_terms": 1,
+                "return_format": "id",
+                "multiple": 0
+            }
+        ],
+        "location": [
+            [
+                {
+                    "param": "post_type",
+                    "operator": "==",
+                    "value": "product"
+                },
+                {
+                    "param": "post_taxonomy",
+                    "operator": "==",
+                    "value": "product_type:bundle"
+                }
+            ]
+        ],
+        "menu_order": 0,
+        "position": "acf_after_title",
+        "style": "seamless",
+        "label_placement": "top",
+        "instruction_placement": "label",
+        "hide_on_screen": "",
+        "active": 1,
+        "description": ""
+    }
+]

backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-country-settings.json

@@ -0,0 +1,501 @@
+[
+    {
+        "key": "group_5bdad38fcebee",
+        "title": "Country settings",
+        "fields": [
+            {
+                "key": "field_5bdad398384e1",
+                "label": "Code",
+                "name": "_wiaas_country_code",
+                "type": "select",
+                "instructions": "",
+                "required": 1,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "choices": {
+                    "ax": "ax - Åland Islands",
+                    "af": "af - Afghanistan",
+                    "al": "al - Albania",
+                    "dz": "dz - Algeria",
+                    "as": "as - American Samoa",
+                    "ad": "ad - Andorra",
+                    "ao": "ao - Angola",
+                    "ai": "ai - Anguilla",
+                    "aq": "aq - Antarctica",
+                    "ag": "ag - Antigua and Barbuda",
+                    "ar": "ar - Argentina",
+                    "am": "am - Armenia",
+                    "aw": "aw - Aruba",
+                    "au": "au - Australia",
+                    "at": "at - Austria",
+                    "az": "az - Azerbaijan",
+                    "bs": "bs - Bahamas",
+                    "bh": "bh - Bahrain",
+                    "bd": "bd - Bangladesh",
+                    "bb": "bb - Barbados",
+                    "by": "by - Belarus",
+                    "pw": "pw - Belau",
+                    "be": "be - Belgium",
+                    "bz": "bz - Belize",
+                    "bj": "bj - Benin",
+                    "bm": "bm - Bermuda",
+                    "bt": "bt - Bhutan",
+                    "bo": "bo - Bolivia",
+                    "bq": "bq - Bonaire, Saint Eustatius and Saba",
+                    "ba": "ba - Bosnia and Herzegovina",
+                    "bw": "bw - Botswana",
+                    "bv": "bv - Bouvet Island",
+                    "br": "br - Brazil",
+                    "io": "io - British Indian Ocean Territory",
+                    "vg": "vg - British Virgin Islands",
+                    "bn": "bn - Brunei",
+                    "bg": "bg - Bulgaria",
+                    "bf": "bf - Burkina Faso",
+                    "bi": "bi - Burundi",
+                    "kh": "kh - Cambodia",
+                    "cm": "cm - Cameroon",
+                    "ca": "ca - Canada",
+                    "cv": "cv - Cape Verde",
+                    "ky": "ky - Cayman Islands",
+                    "cf": "cf - Central African Republic",
+                    "td": "td - Chad",
+                    "cl": "cl - Chile",
+                    "cn": "cn - China",
+                    "cx": "cx - Christmas Island",
+                    "cc": "cc - Cocos (Keeling) Islands",
+                    "co": "co - Colombia",
+                    "km": "km - Comoros",
+                    "cg": "cg - Congo (Brazzaville)",
+                    "cd": "cd - Congo (Kinshasa)",
+                    "ck": "ck - Cook Islands",
+                    "cr": "cr - Costa Rica",
+                    "hr": "hr - Croatia",
+                    "cu": "cu - Cuba",
+                    "cw": "cw - Curaçao",
+                    "cy": "cy - Cyprus",
+                    "cz": "cz - Czech Republic",
+                    "dk": "dk - Denmark",
+                    "dj": "dj - Djibouti",
+                    "dm": "dm - Dominica",
+                    "do": "do - Dominican Republic",
+                    "ec": "ec - Ecuador",
+                    "eg": "eg - Egypt",
+                    "sv": "sv - El Salvador",
+                    "gq": "gq - Equatorial Guinea",
+                    "er": "er - Eritrea",
+                    "ee": "ee - Estonia",
+                    "et": "et - Ethiopia",
+                    "fk": "fk - Falkland Islands",
+                    "fo": "fo - Faroe Islands",
+                    "fj": "fj - Fiji",
+                    "fi": "fi - Finland",
+                    "fr": "fr - France",
+                    "gf": "gf - French Guiana",
+                    "pf": "pf - French Polynesia",
+                    "tf": "tf - French Southern Territories",
+                    "ga": "ga - Gabon",
+                    "gm": "gm - Gambia",
+                    "ge": "ge - Georgia",
+                    "de": "de - Germany",
+                    "gh": "gh - Ghana",
+                    "gi": "gi - Gibraltar",
+                    "gr": "gr - Greece",
+                    "gl": "gl - Greenland",
+                    "gd": "gd - Grenada",
+                    "gp": "gp - Guadeloupe",
+                    "gu": "gu - Guam",
+                    "gt": "gt - Guatemala",
+                    "gg": "gg - Guernsey",
+                    "gn": "gn - Guinea",
+                    "gw": "gw - Guinea-Bissau",
+                    "gy": "gy - Guyana",
+                    "ht": "ht - Haiti",
+                    "hm": "hm - Heard Island and McDonald Islands",
+                    "hn": "hn - Honduras",
+                    "hk": "hk - Hong Kong",
+                    "hu": "hu - Hungary",
+                    "is": "is - Iceland",
+                    "in": "in - India",
+                    "id": "id - Indonesia",
+                    "ir": "ir - Iran",
+                    "iq": "iq - Iraq",
+                    "ie": "ie - Ireland",
+                    "im": "im - Isle of Man",
+                    "il": "il - Israel",
+                    "it": "it - Italy",
+                    "ci": "ci - Ivory Coast",
+                    "jm": "jm - Jamaica",
+                    "jp": "jp - Japan",
+                    "je": "je - Jersey",
+                    "jo": "jo - Jordan",
+                    "kz": "kz - Kazakhstan",
+                    "ke": "ke - Kenya",
+                    "ki": "ki - Kiribati",
+                    "kw": "kw - Kuwait",
+                    "kg": "kg - Kyrgyzstan",
+                    "la": "la - Laos",
+                    "lv": "lv - Latvia",
+                    "lb": "lb - Lebanon",
+                    "ls": "ls - Lesotho",
+                    "lr": "lr - Liberia",
+                    "ly": "ly - Libya",
+                    "li": "li - Liechtenstein",
+                    "lt": "lt - Lithuania",
+                    "lu": "lu - Luxembourg",
+                    "mo": "mo - Macao S.A.R., China",
+                    "mk": "mk - Macedonia",
+                    "mg": "mg - Madagascar",
+                    "mw": "mw - Malawi",
+                    "my": "my - Malaysia",
+                    "mv": "mv - Maldives",
+                    "ml": "ml - Mali",
+                    "mt": "mt - Malta",
+                    "mh": "mh - Marshall Islands",
+                    "mq": "mq - Martinique",
+                    "mr": "mr - Mauritania",
+                    "mu": "mu - Mauritius",
+                    "yt": "yt - Mayotte",
+                    "mx": "mx - Mexico",
+                    "fm": "fm - Micronesia",
+                    "md": "md - Moldova",
+                    "mc": "mc - Monaco",
+                    "mn": "mn - Mongolia",
+                    "me": "me - Montenegro",
+                    "ms": "ms - Montserrat",
+                    "ma": "ma - Morocco",
+                    "mz": "mz - Mozambique",
+                    "mm": "mm - Myanmar",
+                    "na": "na - Namibia",
+                    "nr": "nr - Nauru",
+                    "np": "np - Nepal",
+                    "nl": "nl - Netherlands",
+                    "nc": "nc - New Caledonia",
+                    "nz": "nz - New Zealand",
+                    "ni": "ni - Nicaragua",
+                    "ne": "ne - Niger",
+                    "ng": "ng - Nigeria",
+                    "nu": "nu - Niue",
+                    "nf": "nf - Norfolk Island",
+                    "kp": "kp - North Korea",
+                    "mp": "mp - Northern Mariana Islands",
+                    "no": "no - Norway",
+                    "om": "om - Oman",
+                    "pk": "pk - Pakistan",
+                    "ps": "ps - Palestinian Territory",
+                    "pa": "pa - Panama",
+                    "pg": "pg - Papua New Guinea",
+                    "py": "py - Paraguay",
+                    "pe": "pe - Peru",
+                    "ph": "ph - Philippines",
+                    "pn": "pn - Pitcairn",
+                    "pl": "pl - Poland",
+                    "pt": "pt - Portugal",
+                    "pr": "pr - Puerto Rico",
+                    "qa": "qa - Qatar",
+                    "re": "re - Reunion",
+                    "ro": "ro - Romania",
+                    "ru": "ru - Russia",
+                    "rw": "rw - Rwanda",
+                    "st": "st - São Tomé and Príncipe",
+                    "bl": "bl - Saint Barthélemy",
+                    "sh": "sh - Saint Helena",
+                    "kn": "kn - Saint Kitts and Nevis",
+                    "lc": "lc - Saint Lucia",
+                    "sx": "sx - Saint Martin (Dutch part)",
+                    "mf": "mf - Saint Martin (French part)",
+                    "pm": "pm - Saint Pierre and Miquelon",
+                    "vc": "vc - Saint Vincent and the Grenadines",
+                    "ws": "ws - Samoa",
+                    "sm": "sm - San Marino",
+                    "sa": "sa - Saudi Arabia",
+                    "sn": "sn - Senegal",
+                    "rs": "rs - Serbia",
+                    "sc": "sc - Seychelles",
+                    "sl": "sl - Sierra Leone",
+                    "sg": "sg - Singapore",
+                    "sk": "sk - Slovakia",
+                    "si": "si - Slovenia",
+                    "sb": "sb - Solomon Islands",
+                    "so": "so - Somalia",
+                    "za": "za - South Africa",
+                    "gs": "gs - South Georgia\/Sandwich Islands",
+                    "kr": "kr - South Korea",
+                    "ss": "ss - South Sudan",
+                    "es": "es - Spain",
+                    "lk": "lk - Sri Lanka",
+                    "sd": "sd - Sudan",
+                    "sr": "sr - Suriname",
+                    "sj": "sj - Svalbard and Jan Mayen",
+                    "sz": "sz - Swaziland",
+                    "se": "se - Sweden",
+                    "ch": "ch - Switzerland",
+                    "sy": "sy - Syria",
+                    "tw": "tw - Taiwan",
+                    "tj": "tj - Tajikistan",
+                    "tz": "tz - Tanzania",
+                    "th": "th - Thailand",
+                    "tl": "tl - Timor-Leste",
+                    "tg": "tg - Togo",
+                    "tk": "tk - Tokelau",
+                    "to": "to - Tonga",
+                    "tt": "tt - Trinidad and Tobago",
+                    "tn": "tn - Tunisia",
+                    "tr": "tr - Turkey",
+                    "tm": "tm - Turkmenistan",
+                    "tc": "tc - Turks and Caicos Islands",
+                    "tv": "tv - Tuvalu",
+                    "ug": "ug - Uganda",
+                    "ua": "ua - Ukraine",
+                    "ae": "ae - United Arab Emirates",
+                    "gb": "gb - United Kingdom (UK)",
+                    "us": "us - United States (US)",
+                    "um": "um - United States (US) Minor Outlying Islands",
+                    "vi": "vi - United States (US) Virgin Islands",
+                    "uy": "uy - Uruguay",
+                    "uz": "uz - Uzbekistan",
+                    "vu": "vu - Vanuatu",
+                    "va": "va - Vatican",
+                    "ve": "ve - Venezuela",
+                    "vn": "vn - Vietnam",
+                    "wf": "wf - Wallis and Futuna",
+                    "eh": "eh - Western Sahara",
+                    "ye": "ye - Yemen",
+                    "zm": "zm - Zambia",
+                    "zw": "zw - Zimbabwe"
+                },
+                "default_value": [],
+                "allow_null": 0,
+                "multiple": 0,
+                "ui": 1,
+                "ajax": 0,
+                "return_format": "value",
+                "placeholder": ""
+            },
+            {
+                "key": "field_5bfc4b4fa5992",
+                "label": "Currency",
+                "name": "_wiaas_country_currency",
+                "type": "select",
+                "instructions": "",
+                "required": 1,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "choices": {
+                    "AED": "United Arab Emirates dirham",
+                    "AFN": "Afghan afghani",
+                    "ALL": "Albanian lek",
+                    "AMD": "Armenian dram",
+                    "ANG": "Netherlands Antillean guilder",
+                    "AOA": "Angolan kwanza",
+                    "ARS": "Argentine peso",
+                    "AUD": "Australian dollar",
+                    "AWG": "Aruban florin",
+                    "AZN": "Azerbaijani manat",
+                    "BAM": "Bosnia and Herzegovina convertible mark",
+                    "BBD": "Barbadian dollar",
+                    "BDT": "Bangladeshi taka",
+                    "BGN": "Bulgarian lev",
+                    "BHD": "Bahraini dinar",
+                    "BIF": "Burundian franc",
+                    "BMD": "Bermudian dollar",
+                    "BND": "Brunei dollar",
+                    "BOB": "Bolivian boliviano",
+                    "BRL": "Brazilian real",
+                    "BSD": "Bahamian dollar",
+                    "BTC": "Bitcoin",
+                    "BTN": "Bhutanese ngultrum",
+                    "BWP": "Botswana pula",
+                    "BYR": "Belarusian ruble (old)",
+                    "BYN": "Belarusian ruble",
+                    "BZD": "Belize dollar",
+                    "CAD": "Canadian dollar",
+                    "CDF": "Congolese franc",
+                    "CHF": "Swiss franc",
+                    "CLP": "Chilean peso",
+                    "CNY": "Chinese yuan",
+                    "COP": "Colombian peso",
+                    "CRC": "Costa Rican colón",
+                    "CUC": "Cuban convertible peso",
+                    "CUP": "Cuban peso",
+                    "CVE": "Cape Verdean escudo",
+                    "CZK": "Czech koruna",
+                    "DJF": "Djiboutian franc",
+                    "DKK": "Danish krone",
+                    "DOP": "Dominican peso",
+                    "DZD": "Algerian dinar",
+                    "EGP": "Egyptian pound",
+                    "ERN": "Eritrean nakfa",
+                    "ETB": "Ethiopian birr",
+                    "EUR": "Euro",
+                    "FJD": "Fijian dollar",
+                    "FKP": "Falkland Islands pound",
+                    "GBP": "Pound sterling",
+                    "GEL": "Georgian lari",
+                    "GGP": "Guernsey pound",
+                    "GHS": "Ghana cedi",
+                    "GIP": "Gibraltar pound",
+                    "GMD": "Gambian dalasi",
+                    "GNF": "Guinean franc",
+                    "GTQ": "Guatemalan quetzal",
+                    "GYD": "Guyanese dollar",
+                    "HKD": "Hong Kong dollar",
+                    "HNL": "Honduran lempira",
+                    "HRK": "Croatian kuna",
+                    "HTG": "Haitian gourde",
+                    "HUF": "Hungarian forint",
+                    "IDR": "Indonesian rupiah",
+                    "ILS": "Israeli new shekel",
+                    "IMP": "Manx pound",
+                    "INR": "Indian rupee",
+                    "IQD": "Iraqi dinar",
+                    "IRR": "Iranian rial",
+                    "IRT": "Iranian toman",
+                    "ISK": "Icelandic króna",
+                    "JEP": "Jersey pound",
+                    "JMD": "Jamaican dollar",
+                    "JOD": "Jordanian dinar",
+                    "JPY": "Japanese yen",
+                    "KES": "Kenyan shilling",
+                    "KGS": "Kyrgyzstani som",
+                    "KHR": "Cambodian riel",
+                    "KMF": "Comorian franc",
+                    "KPW": "North Korean won",
+                    "KRW": "South Korean won",
+                    "KWD": "Kuwaiti dinar",
+                    "KYD": "Cayman Islands dollar",
+                    "KZT": "Kazakhstani tenge",
+                    "LAK": "Lao kip",
+                    "LBP": "Lebanese pound",
+                    "LKR": "Sri Lankan rupee",
+                    "LRD": "Liberian dollar",
+                    "LSL": "Lesotho loti",
+                    "LYD": "Libyan dinar",
+                    "MAD": "Moroccan dirham",
+                    "MDL": "Moldovan leu",
+                    "MGA": "Malagasy ariary",
+                    "MKD": "Macedonian denar",
+                    "MMK": "Burmese kyat",
+                    "MNT": "Mongolian tögrög",
+                    "MOP": "Macanese pataca",
+                    "MRO": "Mauritanian ouguiya",
+                    "MUR": "Mauritian rupee",
+                    "MVR": "Maldivian rufiyaa",
+                    "MWK": "Malawian kwacha",
+                    "MXN": "Mexican peso",
+                    "MYR": "Malaysian ringgit",
+                    "MZN": "Mozambican metical",
+                    "NAD": "Namibian dollar",
+                    "NGN": "Nigerian naira",
+                    "NIO": "Nicaraguan córdoba",
+                    "NOK": "Norwegian krone",
+                    "NPR": "Nepalese rupee",
+                    "NZD": "New Zealand dollar",
+                    "OMR": "Omani rial",
+                    "PAB": "Panamanian balboa",
+                    "PEN": "Peruvian nuevo sol",
+                    "PGK": "Papua New Guinean kina",
+                    "PHP": "Philippine peso",
+                    "PKR": "Pakistani rupee",
+                    "PLN": "Polish złoty",
+                    "PRB": "Transnistrian ruble",
+                    "PYG": "Paraguayan guaraní",
+                    "QAR": "Qatari riyal",
+                    "RON": "Romanian leu",
+                    "RSD": "Serbian dinar",
+                    "RUB": "Russian ruble",
+                    "RWF": "Rwandan franc",
+                    "SAR": "Saudi riyal",
+                    "SBD": "Solomon Islands dollar",
+                    "SCR": "Seychellois rupee",
+                    "SDG": "Sudanese pound",
+                    "SEK": "Swedish krona",
+                    "SGD": "Singapore dollar",
+                    "SHP": "Saint Helena pound",
+                    "SLL": "Sierra Leonean leone",
+                    "SOS": "Somali shilling",
+                    "SRD": "Surinamese dollar",
+                    "SSP": "South Sudanese pound",
+                    "STD": "São Tomé and Príncipe dobra",
+                    "SYP": "Syrian pound",
+                    "SZL": "Swazi lilangeni",
+                    "THB": "Thai baht",
+                    "TJS": "Tajikistani somoni",
+                    "TMT": "Turkmenistan manat",
+                    "TND": "Tunisian dinar",
+                    "TOP": "Tongan paʻanga",
+                    "TRY": "Turkish lira",
+                    "TTD": "Trinidad and Tobago dollar",
+                    "TWD": "New Taiwan dollar",
+                    "TZS": "Tanzanian shilling",
+                    "UAH": "Ukrainian hryvnia",
+                    "UGX": "Ugandan shilling",
+                    "USD": "United States (US) dollar",
+                    "UYU": "Uruguayan peso",
+                    "UZS": "Uzbekistani som",
+                    "VEF": "Venezuelan bolívar",
+                    "VND": "Vietnamese đồng",
+                    "VUV": "Vanuatu vatu",
+                    "WST": "Samoan tālā",
+                    "XAF": "Central African CFA franc",
+                    "XCD": "East Caribbean dollar",
+                    "XOF": "West African CFA franc",
+                    "XPF": "CFP franc",
+                    "YER": "Yemeni rial",
+                    "ZAR": "South African rand",
+                    "ZMW": "Zambian kwacha"
+                },
+                "default_value": [],
+                "allow_null": 0,
+                "multiple": 0,
+                "ui": 1,
+                "ajax": 0,
+                "return_format": "value",
+                "placeholder": ""
+            },
+            {
+                "key": "field_5bfc4b00ff8ad",
+                "label": "VAT",
+                "name": "_wiaas_country_vat",
+                "type": "text",
+                "instructions": "",
+                "required": 0,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "default_value": "",
+                "placeholder": "",
+                "prepend": "",
+                "append": "",
+                "maxlength": ""
+            }
+        ],
+        "location": [
+            [
+                {
+                    "param": "taxonomy",
+                    "operator": "==",
+                    "value": "product_country"
+                }
+            ]
+        ],
+        "menu_order": 0,
+        "position": "side",
+        "style": "default",
+        "label_placement": "top",
+        "instruction_placement": "label",
+        "hide_on_screen": "",
+        "active": 1,
+        "description": ""
+    }
+]

backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-general.json

@@ -4,10 +4,10 @@
         "title": "General",
         "fields": [
             {
-                "key": "field_5bc0965a35406",
-                "label": "Type",
-                "name": "_wiaas_product_type",
-                "type": "select",
+                "key": "field_5bceef4c9771c",
+                "label": "General",
+                "name": "_wiaas_product_general",
+                "type": "group",
                 "instructions": "",
                 "required": 0,
                 "conditional_logic": 0,
@@ -16,48 +16,65 @@
                     "class": "",
                     "id": ""
                 },
-                "choices": {
-                    "simple": "Simple",
-                    "bundle": "Bundle",
-                    "wiaastemplate": "Template"
-                },
-                "default_value": [],
-                "allow_null": 0,
-                "multiple": 0,
-                "ui": 1,
-                "ajax": 0,
-                "return_format": "value",
-                "placeholder": ""
-            },
-            {
-                "key": "field_5bbf899bba1af",
-                "label": "Country",
-                "name": "_wiaas_product_country",
-                "type": "taxonomy",
-                "instructions": "",
-                "required": 0,
-                "conditional_logic": [
-                    [
-                        {
-                            "field": "field_5bc0965a35406",
-                            "operator": "!=",
-                            "value": "wiaastemplate"
-                        }
-                    ]
-                ],
-                "wrapper": {
-                    "width": "",
-                    "class": "",
-                    "id": ""
-                },
-                "taxonomy": "product_country",
-                "field_type": "select",
-                "allow_null": 0,
-                "add_term": 0,
-                "save_terms": 1,
-                "load_terms": 1,
-                "return_format": "id",
-                "multiple": 0
+                "layout": "block",
+                "sub_fields": [
+                    {
+                        "key": "field_5bc0965a35406",
+                        "label": "Type",
+                        "name": "_wiaas_product_type",
+                        "type": "select",
+                        "instructions": "",
+                        "required": 0,
+                        "conditional_logic": 0,
+                        "wrapper": {
+                            "width": "",
+                            "class": "",
+                            "id": ""
+                        },
+                        "choices": {
+                            "simple": "Simple",
+                            "bundle": "Bundle",
+                            "wiaastemplate": "Template"
+                        },
+                        "default_value": [],
+                        "allow_null": 0,
+                        "multiple": 0,
+                        "ui": 1,
+                        "ajax": 0,
+                        "return_format": "value",
+                        "placeholder": ""
+                    },
+                    {
+                        "key": "field_5bbf899bba1af",
+                        "label": "Country",
+                        "name": "_wiaas_product_country",
+                        "type": "taxonomy",
+                        "instructions": "",
+                        "required": 1,
+                        "conditional_logic": [
+                            [
+                                {
+                                    "field": "field_5bc0965a35406",
+                                    "operator": "!=",
+                                    "value": "wiaastemplate"
+                                }
+                            ]
+                        ],
+                        "wrapper": {
+                            "width": "",
+                            "class": "",
+                            "id": ""
+                        },
+                        "taxonomy": "product_country",
+                        "field_type": "select",
+                        "allow_null": 0,
+                        "add_term": 0,
+                        "save_terms": 1,
+                        "load_terms": 1,
+                        "return_format": "id",
+                        "multiple": 0
+                    }
+                ]
             }
         ],
         "location": [
@@ -76,7 +93,7 @@
         ],
         "menu_order": 0,
         "position": "acf_after_title",
-        "style": "default",
+        "style": "seamless",
         "label_placement": "top",
         "instruction_placement": "label",
         "hide_on_screen": "",

backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-product-properties.json

@@ -49,7 +49,7 @@
             },
             {
                 "key": "field_5bc867c3aeafd",
-                "label": "Product category",
+                "label": "Category",
                 "name": "category",
                 "type": "taxonomy",
                 "instructions": "",
@@ -90,10 +90,37 @@
                 "load_terms": 1,
                 "return_format": "id",
                 "multiple": 0
+            },
+            {
+                "key": "field_5bcfcceffe617",
+                "label": "Country",
+                "name": "country",
+                "type": "taxonomy",
+                "instructions": "",
+                "required": 1,
+                "conditional_logic": 0,
+                "wrapper": {
+                    "width": "",
+                    "class": "",
+                    "id": ""
+                },
+                "taxonomy": "product_country",
+                "field_type": "select",
+                "allow_null": 0,
+                "add_term": 0,
+                "save_terms": 1,
+                "load_terms": 1,
+                "return_format": "id",
+                "multiple": 0
             }
         ],
         "location": [
             [
+                {
+                    "param": "post_type",
+                    "operator": "==",
+                    "value": "product"
+                },
                 {
                     "param": "post_taxonomy",
                     "operator": "==",

backend/app/plugins/wiaas/includes/db-updates/data/wiaas-ui-field-reference.json

@@ -1,52 +0,0 @@
-[
-    {
-        "key": "group_5bc845c001de4",
-        "title": "Package Reference",
-        "fields": [
-            {
-                "key": "field_5bc845dc7eed5",
-                "label": "Reference",
-                "name": "_wiaas_package_reference",
-                "type": "taxonomy",
-                "instructions": "",
-                "required": 0,
-                "conditional_logic": 0,
-                "wrapper": {
-                    "width": "",
-                    "class": "",
-                    "id": ""
-                },
-                "taxonomy": "product_tag",
-                "field_type": "select",
-                "allow_null": 0,
-                "add_term": 1,
-                "save_terms": 1,
-                "load_terms": 1,
-                "return_format": "id",
-                "multiple": 0
-            }
-        ],
-        "location": [
-            [
-                {
-                    "param": "post_type",
-                    "operator": "==",
-                    "value": "product"
-                },
-                {
-                    "param": "post_taxonomy",
-                    "operator": "==",
-                    "value": "product_type:bundle"
-                }
-            ]
-        ],
-        "menu_order": 0,
-        "position": "acf_after_title",
-        "style": "seamless",
-        "label_placement": "top",
-        "instruction_placement": "label",
-        "hide_on_screen": "",
-        "active": 1,
-        "description": ""
-    }
-]

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

@@ -6,14 +6,6 @@
  * General functions for updating wiaas database to latest version
  */
 
-
-/**
- * Enable restricting visibility by user roles for products
- */
-function wiaas_db_update_enable_product_by_user_role() {
-	update_option('wcj_product_by_user_role_enabled', 'yes');
-}
-
 function wiaas_db_update_setup_gravity() {
 	// Gravity Form settings
 	update_option('gform_pending_installation', false);
@@ -25,59 +17,6 @@ function wiaas_db_update_setup_gravity() {
 	update_option('gravityflow_pending_installation', false);
 }
 
-function wiaas_db_update_add_delivery_process_forms() {
-	$action_type_forms_files = array(
-		'delivery_action_customer_acceptance_form',
-		'delivery_action_schedule_meeting',
-		'delivery_action_validate_questionnaire_form',
-		'delivery_action_manual_form',
-	);
-
-	// Since import action will generate form with new id, we need to remember this mapping
-	// so we can update process delivery steps to point to correct form ids
-	$action_type_forms_ids_mappings = array();
-
-	$process_forms_files = array(
-		'delivery_process_normal_delivery_form'
-	);
-
-	$created_forms = array();
-
-	// import forms for delivery action types
-	foreach ($action_type_forms_files as $action_type_form_file) {
-		$form_json = file_get_contents( dirname( __FILE__ ) . "/data/delivery-forms/" . $action_type_form_file . '.json' );
-
-		$form_meta     = json_decode( $form_json, true );
-		$form_meta = $form_meta[0];
-
-		$form_id = GFAPI::add_form($form_meta);
-
-		$created_forms[] = GFAPI::get_form($form_id);
-
-		$action_type_forms_ids_mappings[$form_meta['id']] = $form_id;
-	}
-
-	// import forms for delivery process
-	foreach ($process_forms_files as $process_form_file) {
-		$form_json = file_get_contents( dirname( __FILE__ ) . "/data/delivery-forms/" . $process_form_file . '.json' );
-
-		$form_meta     = json_decode( $form_json, true );
-		$form_meta = $form_meta[0];
-
-		// update delivery steps forms ids with correct values
-		foreach ($form_meta['feeds']['gravityflow'] as $key => $process_step_meta) {
-			$process_step_target_form_id = $form_meta['feeds']['gravityflow'][$key]['meta']['target_form_id'];
-			$form_meta['feeds']['gravityflow'][$key]['meta']['target_form_id'] = $action_type_forms_ids_mappings[$process_step_target_form_id];
-		}
-
-		$form_id = GFAPI::add_form($form_meta);
-
-		$created_forms[] = GFAPI::get_form($form_id);
-	}
-
-	do_action('gform_forms_post_import', $created_forms);
-}
-
 function wiaas_db_update_enable_orders_access_management() {
 	$post_types_option = Groups_Options::get_option( Groups_Post_Access::POST_TYPES, array() );
 
@@ -88,26 +27,10 @@ function wiaas_db_update_enable_orders_access_management() {
 	Groups_Options::update_option(Groups_Post_Access::POST_TYPES, $post_types_option);
 }
 
-function wiaas_db_update_enable_order_numbers() {
-	update_option('wcj_order_numbers_enabled', 'yes');
-	update_option('wcj_order_number_sequential_enabled', 'no');
-	update_option('wcj_order_number_counter', '0');
-	update_option('wcj_order_number_counter_reset_enabled', 'no');
-	update_option('wcj_order_number_prefix', '1000000');
-}
-
-function wiaas_create_broker_access_group() {
-	Groups_Group::create(array(
-		'name' => 'Broker',
-	));
-}
-
 function wiaas_db_setup_exclusive_taxonomies() {
 	update_option('radio_button_for_taxonomies_options', array(
 		'taxonomies' => array(
-			'product_cat',
-			'product_country',
-			'wiaas_document_types',
+			'shop_order_project',
 		),
 		'delete' => 0,
 	));
@@ -145,4 +68,166 @@ function wiaas_db_setup_create_customer_commercial_lead_table() {
 		";
 
 	dbDelta( $sql );
+}
+
+
+function wiaas_create_organization_roles_capabilities() {
+	$roles = array( 'commercial_lead', 'supplier', 'customer', 'administrator');
+	foreach ($roles as $role) {
+		Groups_Capability::create( array( 'capability' => 'wiaas_' . $role ));
+	}
+}
+
+function wiaas_disable_processing_order_email_delivery() {
+    update_option( 'woocommerce_customer_processing_order_settings', array(
+        'enabled'   =>  'no',
+        'subject'   =>  '',
+        'heading'   =>  '',
+        'mail_type' => 'html'
+    ) );
+}
+
+
+function wiaas_db_update_update_delivery_forms() {
+
+	$forms = GFAPI::get_forms();
+	foreach ($forms as $form) {
+		RGFormsModel::update_form_active($form['id'], false);
+	}
+
+	$created_forms = array();
+
+	$actions_forms_json = file_get_contents( dirname( __FILE__ ) . '/data/delivery-forms/delivery-action-forms.json' );
+
+	$action_forms_meta     = json_decode( $actions_forms_json, true );
+
+	foreach ($action_forms_meta as $action_form_meta) {
+
+		$form_id = GFAPI::add_form($action_form_meta);
+		$created_forms[] = GFAPI::get_form($form_id);
+	}
+
+
+	$sample_form_json = file_get_contents( dirname( __FILE__ ) . '/data/delivery-forms/delivery-process-sample-form.json' );
+
+	$sample_form    = json_decode( $sample_form_json, true );
+
+	$sample_form = $sample_form[0];
+
+	$sample_form_id = GFAPI::add_form($sample_form);
+
+	RGFormsModel::update_form_active($sample_form_id, false);
+
+	$created_forms[] = GFAPI::get_form($sample_form_id);
+
+	do_action('gform_forms_post_import', $created_forms);
+}
+
+function wiaas_db_update_add_installation_date_delivery_action_form() {
+
+	$action_form_json = file_get_contents( dirname( __FILE__ ) . '/data/delivery-forms/delivery-action-enter-installation-date.json' );
+
+	$action_form_meta = json_decode( $action_form_json, true )[0];
+
+	$action_form_id = GFAPI::add_form($action_form_meta);
+
+	do_action('gform_forms_post_import', array( GFAPI::get_form($action_form_id) ));
+}
+
+// TODO: Remove after migration has been completed
+function wiaas_db_migration_fix_user_profile_addresses() {
+
+	$users = get_users();
+
+	foreach ($users as $user) {
+
+		$billing_addresses = Wiaas_Customer::get_customer_billing_addresses($user->ID);
+
+		if (! empty($billing_addresses)) {
+
+			foreach ($billing_addresses as $index => $billing_address) {
+
+				switch ($billing_address['id_country_selected']) {
+
+					case 1:
+						$billing_address['country_code'] = 'se';
+						break;
+					case 2:
+						$billing_address['country_code'] = 'dk';
+						break;
+					case 3:
+						$billing_address['country_code'] = 'fi';
+						break;
+				}
+				unset($billing_address['id_country_selected']);
+				$billing_addresses[$index] = $billing_address;
+			}
+
+			update_user_meta( $user->ID, 'billing_addresses', $billing_addresses);
+		}
+
+		$profile_addresses = Wiaas_Customer::get_customer_profile_addresses($user->ID);
+
+		if (! empty($profile_addresses)) {
+
+			foreach ($profile_addresses as $index => $profile_address) {
+
+				switch ($profile_address['id_country_selected']) {
+
+					case 1:
+						$profile_address['country_code'] = 'se';
+						break;
+					case 2:
+						$profile_address['country_code'] = 'dk';
+						break;
+					case 3:
+						$profile_address['country_code'] = 'fi';
+						break;
+				}
+				unset($profile_address['id_country_selected']);
+				$profile_addresses[$index] = $profile_address;
+			}
+
+			update_user_meta( $user->ID, 'profile_addresses', $profile_addresses);
+		}
+
+	}
+}
+
+// TODO: Remove after migration has been completed
+function wiaas_db_migration_fix_countries() {
+
+	$available_country_terms = get_terms(array(
+		'taxonomy' => 'product_country',
+		'hide_empty' => false,
+	));
+
+	foreach($available_country_terms as $country_term) {
+
+		$code = ''; $currency = ''; $vat  = '';
+
+		switch ($country_term->name) {
+
+			case 'Sweden':
+				$code = 'se';
+				$currency = 'SEK';
+				$vat = 9;
+				break;
+			case 'Denmark':
+				$code = 'dk';
+				$currency = 'DKK';
+				$vat = 9;
+				break;
+			case 'Finland':
+				$code = 'fi';
+				$currency = 'EUR';
+				$vat = 9;
+				break;
+		}
+
+		update_term_meta($country_term->term_id, '_wiaas_country_code', $code);
+		update_term_meta($country_term->term_id, '_wiaas_country_currency', $currency);
+		update_term_meta($country_term->term_id, '_wiaas_country_vat', $vat);
+	}
+
 }

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

@@ -10,126 +10,268 @@
 
 
 function wiaas_db_update_create_default_roles() {
-    $roles = array(
-        'customer', // this role will be created by woocommerce so we do not have to create it here
-        'supplier',
-        'commercial_lead'
-    );
+	$roles = array(
+		'customer', // this role will be created by woocommerce so we do not have to create it here
+		'supplier',
+		'commercial_lead'
+	);
 
-    // remove wordpress default roles
-    remove_role('author');
-    remove_role('contributor');
-    remove_role('editor');
-    remove_role('subscriber');
+	// remove wordpress default roles
+	remove_role('author');
+	remove_role('contributor');
+	remove_role('editor');
+	remove_role('subscriber');
 
-    // remove woocoommerce shop manager role
-    remove_role('shop_manager');
+	// remove woocoommerce shop manager role
+	remove_role('shop_manager');
 
-    // Dummy gettext calls to get strings in the catalog.
-    /* translators: user role */
-    _x( 'Supplier', 'User role', 'wiaas' );
-    /* translators: user role */
-    _x( 'Commercial Lead', 'User role', 'wiaas' );
+	// Dummy gettext calls to get strings in the catalog.
+	/* translators: user role */
+	_x( 'Supplier', 'User role', 'wiaas' );
+	/* translators: user role */
+	_x( 'Commercial Lead', 'User role', 'wiaas' );
 
-    // Add wiaas roles
-    add_role(
-        'commercial_lead',
-        array(
-            'read' => true,
-        )
-    );
+	// Add wiaas roles
+	add_role(
+		'commercial_lead',
+		'Commercial Lead',
+		array(
+			'read' => true,
+		)
+	);
 
-    add_role(
-        'supplier',
-        array(
-            'read' => true,
-        )
-    );
+	add_role(
+		'supplier',
+		'Supplier',
+		array(
+			'read' => true,
+		)
+	);
 
-    add_role(
-        'user',
-        array(
-            'read'  => true
-        )
-    );
+	add_role(
+		'user',
+		'User',
+		array(
+			'read'  => true
+		)
+	);
 
-    // set default wiaas role
-    update_option('default_role', 'user');
+	// set default wiaas role
+	update_option('default_role', 'user');
 
-    // capabilities
+	// capabilities
 
-    $capabilities = array();
+	$capabilities = array();
 
-    $capability_types = array( 'wiaas_doc' );
+	$capability_types = array( 'wiaas_doc' );
 
-    foreach ( $capability_types as $capability_type ) {
+	foreach ( $capability_types as $capability_type ) {
 
-        $capabilities[ $capability_type ] = array(
-            // Post type.
-            "edit_{$capability_type}",
-            "read_{$capability_type}",
-            "delete_{$capability_type}",
-            "edit_{$capability_type}s",
-            "edit_others_{$capability_type}s",
-            "publish_{$capability_type}s",
-            "read_private_{$capability_type}s",
-            "delete_{$capability_type}s",
-            "delete_private_{$capability_type}s",
-            "delete_published_{$capability_type}s",
-            "delete_others_{$capability_type}s",
-            "edit_private_{$capability_type}s",
-            "edit_published_{$capability_type}s",
+		$capabilities[ $capability_type ] = array(
+			// Post type.
+			"edit_{$capability_type}",
+			"read_{$capability_type}",
+			"delete_{$capability_type}",
+			"edit_{$capability_type}s",
+			"edit_others_{$capability_type}s",
+			"publish_{$capability_type}s",
+			"read_private_{$capability_type}s",
+			"delete_{$capability_type}s",
+			"delete_private_{$capability_type}s",
+			"delete_published_{$capability_type}s",
+			"delete_others_{$capability_type}s",
+			"edit_private_{$capability_type}s",
+			"edit_published_{$capability_type}s",
 
-            // Terms.
-            "manage_{$capability_type}_terms",
-            "edit_{$capability_type}_terms",
-            "delete_{$capability_type}_terms",
-            "assign_{$capability_type}_terms",
-        );
-    }
+			// Terms.
+			"manage_{$capability_type}_terms",
+			"edit_{$capability_type}_terms",
+			"delete_{$capability_type}_terms",
+			"assign_{$capability_type}_terms",
+		);
+	}
 
-    foreach ( $capabilities as $cap_group ) {
-	    foreach ( $cap_group as $cap ) {
-		    wp_roles()->add_cap( 'administrator', $cap );
-		    wp_roles()->add_cap( 'commercial_lead', $cap );
-	    }
-    }
+	foreach ( $capabilities as $cap_group ) {
+		foreach ( $cap_group as $cap ) {
+			wp_roles()->add_cap( 'administrator', $cap );
+			wp_roles()->add_cap( 'commercial_lead', $cap );
+		}
+	}
 }
 
 
 function wiaas_db_import_aam_role_settings() {
-    // update role settings that are imported
-    $content = file_get_contents( dirname( __FILE__ ) . '/data/aam-settings.json' );
+	// update role settings that are imported
+	$content = file_get_contents( dirname( __FILE__ ) . '/data/aam-settings.json' );
 
-    $importer = new AAM_Core_Importer($content);
+	$importer = new AAM_Core_Importer($content);
 
-    $importer->run();
+	$importer->run();
 
-    // update toolbar settins manually since it does not get imported
-    update_option('aam_toolbar_default', array (
-            'about' => '1',
-            'toolbar-wp-logo' => '1',
-            'wporg' => '1',
-            'documentation' => '1',
-            'support-forums' => '1',
-            'feedback' => '1',
-            'toolbar-site-name' => '0',
-            'view-site' => '1',
-            'view-store' => '1',
-            'toolbar-updates' => '1',
-            'toolbar-comments' => '1',
-            'toolbar-new-content' => '1',
-            'new-post' => '1',
-            'new-media' => '1',
-            'new-page' => '1',
-            'new-product' => '1',
-            'new-shop_order' => '1',
-            'new-shop_coupon' => '1',
-            'new-wiaas_doc' => '1',
-            'new-user' => '1',
-            'gravityforms-new-form' => '1',
-        )
-    );
+	// update toolbar settins manually since it does not get imported
+	update_option('aam_toolbar_default', array (
+			'about' => '1',
+			'toolbar-wp-logo' => '1',
+			'wporg' => '1',
+			'documentation' => '1',
+			'support-forums' => '1',
+			'feedback' => '1',
+			'toolbar-site-name' => '0',
+			'view-site' => '1',
+			'view-store' => '1',
+			'toolbar-updates' => '1',
+			'toolbar-comments' => '1',
+			'toolbar-new-content' => '1',
+			'new-post' => '1',
+			'new-media' => '1',
+			'new-page' => '1',
+			'new-product' => '1',
+			'new-shop_order' => '1',
+			'new-shop_coupon' => '1',
+			'new-wiaas_doc' => '1',
+			'new-user' => '1',
+			'gravityforms-new-form' => '1',
+		)
+	);
+
+	update_option('aam_menu_default', array (
+			'menu-edit.php' => '1',
+			'edit.php' => '1',
+			'post-new.php' => '1',
+			'edit-tags.php?taxonomy=category' => '1',
+			'edit-tags.php?taxonomy=post_tag' => '1',
+			'menu-edit.php?post_type=page' => '1',
+			'edit.php?post_type=page' => '1',
+			'post-new.php?post_type=page' => '1',
+			'menu-woocommerce' => '1',
+			'woocommerce' => '1',
+			'edit.php?post_type=shop_coupon' => '1',
+			'edit-tags.php?taxonomy=shop_order_project' => '1',
+			'wc-reports' => '1',
+			'wc-settings' => '1',
+			'wc-status' => '1',
+			'wc-addons' => '1',
+			'wcj-tools' => '1',
+			'admin.php?page=wc-settings&tab=jetpack' => '1',
+			'menu-themes.php' => '1',
+			'themes.php' => '1',
+			'customize.php' => '1',
+			'widgets.php' => '1',
+			'nav-menus.php' => '1',
+			'custom-header' => '1',
+			'menu-tools.php' => '1',
+			'tools.php' => '1',
+			'import.php' => '1',
+			'export.php' => '1',
+			'export_personal_data' => '1',
+			'remove_personal_data' => '1',
+			'menu-options-general.php' => '1',
+			'options-general.php' => '1',
+			'options-writing.php' => '1',
+			'options-reading.php' => '1',
+			'options-discussion.php' => '1',
+			'options-media.php' => '1',
+			'options-permalink.php' => '1',
+			'privacy.php' => '1',
+			'radio-buttons-for-taxonomies' => '1',
+			'sendgrid-settings' => '1',
+			'menu-plugins.php' => '1',
+			'plugins.php' => '1',
+			'plugin-install.php' => '1',
+			'menu-groups-admin' => '1',
+			'groups-admin' => '1',
+			'groups-admin-capabilities' => '1',
+			'groups-admin-options' => '1',
+			'groups-admin-add-ons' => '1',
+		)
+	);
+
+	update_option('aam-utilities', array(
+		'core.settings.getStarted' => '0',
+		'ui.settings.renderAccessActionLink' => '0',
+		'core.settings.secureLogin' => '0',
+		'core.settings.xmlrpc' => '0',
+		'core.settings.cron' => '0',
+		'core.settings.extensionSupport' => '0',
+		'ui.settings.renderAccessMetabox' => '0',
+		'core.settings.apiAccessControl' => '0',
+		'core.settings.frontendAccessControl' => '0',
+
+	));
+
+	update_option('aam_menu_role_administrator', array(
+		'menu-edit.php' => '1',
+		'edit.php' => '1',
+		'post-new.php' => '1',
+		'edit-tags.php?taxonomy=category' => '1',
+		'edit-tags.php?taxonomy=post_tag' => '1',
+		'menu-edit.php?post_type=page' => '1',
+		'edit.php?post_type=page' => '1',
+		'post-new.php?post_type=page' => '1',
+		'menu-woocommerce' => '1',
+		'woocommerce' => '1',
+		'edit.php?post_type=shop_coupon' => '1',
+		'wc-reports' => '1',
+		'wc-settings' => '1',
+		'wc-status' => '1',
+		'wc-addons' => '1',
+		'wcj-tools' => '1',
+		'admin.php?page=wc-settings&tab=jetpack' => '1',
+		'menu-themes.php' => '1',
+		'themes.php' => '1',
+		'customize.php' => '1',
+		'widgets.php' => '1',
+		'nav-menus.php' => '1',
+		'custom-header' => '1',
+		'menu-tools.php' => '1',
+		'tools.php' => '1',
+		'import.php' => '1',
+		'export.php' => '1',
+		'export_personal_data' => '1',
+		'remove_personal_data' => '1',
+		'menu-options-general.php' => '1',
+		'options-general.php' => '1',
+		'options-writing.php' => '1',
+		'options-reading.php' => '1',
+		'options-discussion.php' => '1',
+		'options-media.php' => '1',
+		'options-permalink.php' => '1',
+		'privacy.php' => '1',
+		'radio-buttons-for-taxonomies' => '1',
+		'sendgrid-settings' => '1',
+		'menu-plugins.php' => '1',
+		'plugins.php' => '1',
+		'plugin-install.php' => '1',
+		'menu-groups-admin' => '1',
+		'groups-admin' => '1',
+		'groups-admin-capabilities' => '1',
+		'groups-admin-options' => '1',
+		'groups-admin-add-ons' => '1',
+		'menu-edit-comments.php' => '1',
+	));
+
+	update_option('aam_metabox_default', array(
+		'dashboard' =>
+			array (
+				'rg_forms_dashboard' => '1',
+				'dashboard_quick_press' => '1',
+				'dashboard_primary' => '1',
+				'woocommerce_dashboard_status' => '1',
+				'dashboard_activity' => '1',
+			),
+	));
+
+	update_option('aam_metabox_role_administrator', array(
+		'dashboard' =>
+			array (
+				'rg_forms_dashboard' => '1',
+				'dashboard_quick_press' => '1',
+				'dashboard_primary' => '1',
+				'woocommerce_dashboard_status' => '1',
+				'dashboard_activity' => '1',
+				'dashboard_right_now' => '1',
+			),
+	));
 }
 
 function wiaas_db_update_update_commercial_lead_capabilities() {
@@ -160,23 +302,30 @@ function wiaas_db_update_update_supplier_capabilities() {
 
 function wiaas_db_update_update_admin_capabilities() {
 	wp_roles()->add_cap( 'administrator', 'create_products' );
+	wp_roles()->add_cap( 'administrator', 'manage_wiaas_order_projects' );
 }
 
 
-function wiaas_create_role_access_groups() {
+function wiaas_admin_create_role_access_groups() {
 	Groups_Group::create(array(
 		'name' => 'admin',
 	));
+}
 
-	Groups_Group::create(array(
-		'name' => 'commercial_lead',
-	));
+function wiaas_db_update_update_supplier_order_capabilities() {
+    // add supplier role to view orders
+    wp_roles()->add_cap( 'supplier', 'edit_shop_orders' );
+}
 
-	Groups_Group::create(array(
-		'name' => 'supplier',
-	));
+function wiaas_db_update_enable_workflow_inbox_for_roles() {
+	// add workflow inbox for supplier
+	wp_roles()->add_cap( 'supplier', 'gravityflow_inbox' );
+	// add workflow inbox for commercial lead
+	wp_roles()->add_cap( 'commercial_lead', 'gravityflow_inbox' );
 
-	Groups_Group::create(array(
-		'name' => 'customer',
-	));
+}
+
+function wiaas_db_update_add_administrator_delivery_process_capabilities() {
+
+	wp_roles()->add_cap('administrator', 'manage_wiaas_order_delivery_process');
 }

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

@@ -18,9 +18,9 @@ function wiaas_db_update_add_user_organization_ui_fields() {
 	_wiaas_import_field_group($ui_json);
 }
 
-function wiaas_db_update_add_reference_ui_field() {
+function wiaas_db_update_add_bundle_properties_ui_field() {
 
-	$ui_json = file_get_contents( dirname( __FILE__ ) . '/data/wiaas-ui-field-reference.json' );
+	$ui_json = file_get_contents( dirname( __FILE__ ) . '/data/wiaas-ui-field-bundle-properties.json' );
 
 	$ui_json = json_decode( $ui_json, true );
 
@@ -45,6 +45,15 @@ function wiaas_db_update_add_product_properties_ui_fields() {
 	_wiaas_import_field_group($ui_json);
 }
 
+function wiaas_db_update_add_country_settings_ui_fields() {
+
+	$ui_json = file_get_contents( dirname( __FILE__ ) . '/data/wiaas-ui-field-country-settings.json' );
+
+	$ui_json = json_decode( $ui_json, true );
+
+	_wiaas_import_field_group($ui_json);
+}
+
 
 // private helper function
 

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

@@ -147,11 +147,27 @@ class Wiaas_Shop_DB {
 
 		$shops = array_map(function($result_row) {
 			return array(
-				'owner_id' => $result_row->shop_owner_id,
+				'owner_id' => absint($result_row->shop_owner_id),
 				'order_type' => $result_row->order_type
 			);
 		}, $results);
 
 		return $shops;
 	}
+
+	/**
+	 * Remove shop
+	 *
+	 * @param int $owner_id
+	 */
+	public static function remove_shop($owner_id) {
+		global $wpdb;
+
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE FROM {$wpdb->prefix}wiaas_shop_customer_relationships 
+                      WHERE shop_owner_id = %d",
+				$owner_id )
+		);
+	}
 }

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

@@ -0,0 +1,423 @@
+<?php
+
+/**
+ * Class Wiaas_Delivery_Process_Action
+ */
+class Wiaas_Delivery_Process_Action {
+
+	/**
+	 * Check if form is delivery process action form
+	 *
+	 * @param $form
+	 *
+	 * @return bool
+	 */
+	public static function is_action_form($form) {
+
+		$delivery_settings = rgar($form, 'wiaas_delivery_process');
+
+		return  ! empty($delivery_settings) && $delivery_settings['delivery_form_type'] === 'action';
+	}
+
+	/**
+	 * Retrieve action form for step
+	 *
+	 * @param Wiaas_Delivery_Process_Step $step
+	 *
+	 * @return mixed|null
+	 */
+	public static function get_process_step_action_form($step) {
+
+		if (empty($step->target_form_id)) {
+
+			return null;
+		}
+
+		return GFAPI::get_form($step->target_form_id);
+	}
+
+	/**
+	 * Get action code for delivery process step form
+	 *
+	 * Action code is used for implementing specific logic for step form
+	 *
+	 * @param Wiaas_Delivery_Process_Step $step
+	 *
+	 * @return string
+	 */
+	public static function get_process_step_action_form_action_code($step) {
+
+		$action_form = self::get_process_step_action_form($step);
+
+		if (empty($action_form)) {
+
+			return 'manual';
+		}
+
+		$delivery_settings = rgar($action_form, 'wiaas_delivery_process');
+
+		return empty($delivery_settings) ? 'manual' : $delivery_settings['delivery_action_code'];
+	}
+
+	/**
+	 * Check if delivery process step has customer acceptance action form
+	 *
+	 * @param  Wiaas_Delivery_Process_Step $step
+	 *
+	 * @return bool
+	 */
+	public static function process_step_has_customer_acceptance_action($step) {
+
+		return self::get_process_step_action_form_action_code($step) === 'customer-acceptance';
+	}
+
+	/**
+	 * Check if delivery process step has customer validate action form
+	 *
+	 * @param Wiaas_Delivery_Process_Step $step
+	 *
+	 * @return bool
+	 */
+	public static function process_step_has_customer_validate_questionnaires_action($step) {
+
+		return self::get_process_step_action_form_action_code($step) === 'validate-questionnaire';
+	}
+
+	/**
+	 * @param Wiaas_Delivery_Process_Step $step
+	 *
+	 * @return array|WP_Error
+	 */
+	public static function get_process_step_action_entries(Wiaas_Delivery_Process_Step $step) {
+
+		$action_form = self::get_process_step_action_form($step);
+
+		if (!$action_form) {
+
+			return array();
+		}
+
+		$search_criteria = array(
+			'field_filters' => array(
+				array( 'key'   => 'wiaas_delivery_process_id',
+				       'value' => $step->get_entry_id()
+				),
+			),
+		);
+
+		$sorting         = array( 'key' => 'date_created', 'direction' => 'DESC' );
+
+		return GFAPI::get_entries( $action_form, $search_criteria, $sorting );
+	}
+
+	/**
+	 * Retrieve forms that will be used as possible action forms
+	 *
+	 * @return array
+	 */
+	public static function get_action_forms() {
+
+		$forms = GFAPI::get_forms();
+
+		$action_forms = array();
+
+		foreach ( $forms as $form ) {
+
+			$delivery_settings = rgar($form, 'wiaas_delivery_process');
+
+			if ( ! empty($delivery_settings) && $delivery_settings['delivery_form_type'] === 'action'){
+
+				$action_forms[] = $form;
+			}
+		}
+
+		return $action_forms;
+	}
+
+	/**
+	 * Complete current workflow step for action form
+	 *
+	 * @param int $action_entry_id
+	 */
+	public static function complete_action_step($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+		$workflow = new Gravity_Flow_API($action_form['id']);
+
+		$current_step = $workflow->get_current_step($action_entry);
+
+		if ( $current_step ) {
+
+			$new_status = $current_step->get_type() === 'approval' ? 'approved' : 'complete';
+
+			$assignees = $current_step->get_assignees();
+
+			foreach ($assignees as $assignee) {
+
+				$current_step->process_assignee_status($assignee, $new_status, $action_form);
+			}
+		}
+
+		gravity_flow()->process_workflow($action_form, $action_entry['id']);
+	}
+
+	/**
+	 * Upload customer questionnaire document
+	 *
+	 * @param int $action_entry_id
+	 */
+	public static function upload_customer_questionnaire($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+
+		$document_field = GFCommon::get_fields_by_type(GFAPI::get_form($action_entry['form_id']), 'wiaas_order_bundle_document')[0];
+
+
+		$new_file = $document_field->get_single_file_value($action_entry['form_id'], 'file');
+
+		$action_entry[$document_field->id] = $new_file;
+
+		GFAPI::update_entry($action_entry);
+
+		self::complete_action_step($action_entry_id);
+	}
+
+	/**
+	 * Check if customer uploaded acceptance document
+	 *
+	 * @param int $action_entry_id
+	 *
+	 * @return bool
+	 */
+	public static function is_customer_acceptance_uploaded($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+
+		$acceptance_documents_field = GFCommon::get_fields_by_type($action_form, 'wiaas_order_document')[0];
+
+		return ! empty( $action_entry[$acceptance_documents_field->id]);
+	}
+
+	/**
+	 * Update acceptance status for order
+	 *
+	 * @param int $action_entry_id
+	 * @param $new_status
+	 * @param $reason
+	 */
+	public static function update_customer_acceptance_status($action_entry_id, $new_status, $reason) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+		$acceptance_field = GFCommon::get_fields_by_type($action_form, 'radio')[0];
+		$decline_reason_field = GFCommon::get_fields_by_type($action_form, 'textarea')[0];
+
+		$action_entry[$acceptance_field->id] = $new_status;
+		$action_entry[$decline_reason_field->id] = $reason;
+
+		GFAPI::update_entry($action_entry);
+
+		if ($new_status === 'accept') {
+
+			Wiaas_Delivery_Process_Action::complete_action_step($action_entry['id']);
+		}
+	}
+
+	/**
+	 * Upload customer acceptance document for order
+	 *
+	 * @param int $action_entry_id
+	 *
+	 * @return bool
+	 */
+	public static function upload_customer_acceptance_document($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+		$acceptance_documents_field = GFCommon::get_fields_by_type($action_form, 'wiaas_order_document')[0];
+
+		$old_value = $action_entry[$acceptance_documents_field->id];
+
+		$value = $acceptance_documents_field->get_single_file_value($action_form['id'], 'file');
+
+		if ($acceptance_documents_field->multipleFiles ) {
+
+			$value = array( $value );
+
+			$old_value = json_decode( $old_value );
+
+			if (! empty($old_value)) {
+
+				$old_value = is_array( $old_value ) ? $old_value : array( $old_value );
+
+				$value = array_merge( $value, $old_value );
+			}
+
+			$value = json_encode( $value );
+		}
+
+		$action_entry[$acceptance_documents_field->id] = $value;
+
+		$result = GFAPI::update_entry($action_entry);
+
+		// complete step if current step is customer acceptance user input
+		$workflow = new Gravity_Flow_API($action_form['id']);
+		$current_step = $workflow->get_current_step($action_entry);
+
+		if ($current_step->get_type() === 'user_input' && ! is_wp_error($result)) {
+
+			Wiaas_Delivery_Process_Action::complete_action_step($action_entry['id']);
+		}
+
+		return ! is_wp_error($result);
+	}
+
+	/**
+	 * Collect customer acceptance action data
+	 *
+	 * @param int $action_entry_id
+	 *
+	 * @return array
+	 */
+	public static function get_customer_acceptance_action_data($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+
+		$acceptance_documents_field = GFCommon::get_fields_by_type($action_form, 'wiaas_order_document')[0];
+		$acceptance_field = GFCommon::get_fields_by_type($action_form, 'radio')[0];
+		$decline_reason_field = GFCommon::get_fields_by_type($action_form, 'textarea')[0];
+		$expiration_date_field = GFCommon::get_fields_by_type($action_form, 'date')[0];
+
+		$file_paths = json_decode($action_entry[$acceptance_documents_field->id]);
+
+		$documents = array();
+
+		foreach ($file_paths as $file_path) {
+
+			$info = pathinfo( $file_path );
+
+			$documents[] = array(
+				'name' => $info['basename'],
+				'extension' => $info['extension'],
+				'url' => $acceptance_documents_field->get_download_url( $file_path, true )
+			);
+		}
+
+		$status = 0;
+		if ($action_entry[$acceptance_field->id] === 'accept') {
+			$status = 1;
+		}
+
+		if ($action_entry[$acceptance_field->id] === 'decline') {
+			$status = -1;
+		}
+
+		return array(
+			'action_id' => $action_entry['id'],
+			'documents' => $documents,
+			'expiration' => $action_entry[$expiration_date_field->id],
+			'decline_reason' => $action_entry[$decline_reason_field->id],
+			'status' => $status
+		);
+	}
+
+	/**
+	 * Get customer validate questionnaires action data
+	 *
+	 * @param int $action_entry_id
+	 *
+	 * @return array|null
+	 */
+	public static function get_customer_validate_questionnaires_action_data($action_entry_id) {
+
+		$action_entry = GFAPI::get_entry($action_entry_id);
+
+		$action_form = GFAPI::get_form($action_entry['form_id']);
+
+		$order_id = $action_entry['wiaas_delivery_order_id'];
+		$order = wc_get_order($order_id);
+
+
+		// we need to collect document, bundle id and current status
+		$bundle_item_id = null; $status = null;
+
+		$bundle_field = GFCommon::get_fields_by_type($action_form, 'wiaas_order_bundle')[0];
+		$bundle_item_id = absint(explode('|', $action_entry[$bundle_field->id])[1]);
+
+		if (empty($bundle_item_id)) {
+
+			return null;
+		}
+
+		$document_field = GFCommon::get_fields_by_type($action_form, 'wiaas_order_bundle_document')[0];
+		$file_path = $action_entry[$document_field->id];
+
+		$info = pathinfo( $action_entry[$document_field->id] );
+
+		$document = array(
+			'name' => $info['basename'],
+			'extension' => $info['extension'],
+			'url' => $document_field->get_download_url( $file_path, true )
+		);
+
+		$discussion_field = GFCommon::get_fields_by_type(GFAPI::get_form($action_entry['form_id']), 'workflow_discussion')[0];
+		$discussion_items = json_decode($action_entry[$discussion_field->id], ARRAY_A);
+
+		$formatted_comments = array();
+
+		if (is_array($discussion_items)) {
+			foreach ($discussion_items as $item) {
+
+				$formatted = $discussion_field->format_discussion_item( $item, 'text', $action_entry_id );
+				$formatted = explode("\n", $formatted);
+
+				$formatted_comments[] = array(
+					'header' => $formatted[0],
+					'value' => $formatted[1]
+				);
+			}
+		}
+
+
+		$action_workflow_api = new Gravity_Flow_API($action_form['id']);
+		$action_step = $action_workflow_api->get_current_step($action_entry);
+
+
+		// if completed it means that document got validated
+		$status = 'validated';
+
+		if (! empty($action_step)) {
+
+			$is_assignee = $action_step->is_assignee($action_step->get_current_assignee_key());
+
+			if ($is_assignee) {
+				 // if customer is assignee it means it is his turn to upload changed version of document
+				// which means it was rejected
+				$status = 'invalid';
+			} else {
+				// if customer is not assignee it means administrator is still reviewing document
+				$status = 'not-validated';
+			}
+		}
+
+		return array(
+			'item_id' => $bundle_item_id,
+			'order_id' =>$order->get_id(),
+			'action_id' => $action_entry['id'],
+			'document' => $document,
+			'status' => $status,
+			'comments' => $formatted_comments
+		);
+
+	}
+}

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

@@ -0,0 +1,234 @@
+<?php
+
+if (! class_exists( 'GFForms' ) )  {
+
+	die();
+}
+
+class Wiaas_Delivery_Process_Addon extends Gravity_Flow_Extension {
+
+	private static $_instance = null;
+
+	protected $_slug = 'wiaas_delivery_process';
+
+	protected $_title = 'Delivery Settings';
+
+	protected $_short_title = 'Delivery Settings';
+
+
+	public static function get_instance() {
+		if ( self::$_instance == null ) {
+			self::$_instance = new Wiaas_Delivery_Process_Addon();
+		}
+
+		return self::$_instance;
+	}
+
+	public function init() {
+
+	    parent::init();
+
+		add_filter( 'gform_enqueue_scripts', array( $this, 'filter_gform_enqueue_scripts' ) );
+    }
+
+    public function filter_gform_enqueue_scripts( ) {
+
+	    wp_enqueue_script( 'gform_datepicker_init' );
+    }
+
+	/**
+	 * Extends Gravity Form entry metadata with 'wiaas_delivery_process_id'
+	 *
+	 * @param array $entry_meta
+	 * @param int $form_id
+	 *
+	 * @return array
+	 */
+	public function get_entry_meta( $entry_meta, $form_id ) {
+		$entry_meta[ 'wiaas_delivery_process_id' ] = array(
+			'label'                      => 'Wiaas Delivery Process Id',
+			'is_numeric'                 => true,
+			'update_entry_meta_callback' => array( __CLASS__, 'update_entry_delivery_process_id' ),
+			'is_default_column'          => false, // this column will be displayed by default on the entry list
+			'filter'                     => array(
+				'operators' => array( 'is' ),
+			),
+		);
+
+		$entry_meta[ 'wiaas_delivery_order_id' ] = array(
+			'label'                      => 'Wiaas Delivery Process Order Id',
+			'is_numeric'                 => true,
+			'update_entry_meta_callback' => null,
+			'is_default_column'          => false, // this column will be displayed by default on the entry list
+			'filter'                     => array(
+				'operators' => array( 'is' ),
+			),
+		);
+
+		$entry_meta[ 'wiaas_delivery_step_name' ] = array(
+			'label'                      => 'Wiaas Delivery Step name',
+			'is_numeric'                 => false,
+			'update_entry_meta_callback' => null,
+			'is_default_column'          => false, // this column will be displayed by default on the entry list
+			'filter'                     => array(
+				'operators' => array( 'is' ),
+			),
+		);
+
+		return $entry_meta;
+	}
+
+	public static function update_entry_delivery_process_id($key, $entry, $form) {
+
+		if ( isset( $_REQUEST['wiaas_delivery_process_id'] ) ) {
+			return absint( $_REQUEST['wiaas_delivery_process_id'] );
+		}
+
+		if ( isset( $entry[ $key ] ) ) {
+			return $entry[ $key ];
+		}
+
+		return '';
+	}
+
+
+	public function scripts() {
+
+		$plugin_url = untrailingslashit( plugins_url( '/', WIAAS_FILE ) );
+
+		$scripts = array(
+
+			array(
+				'handle' => 'wiaas_form_editor_js',
+				'src' => $plugin_url . '/assets/js/wiaas-form-editor.js',
+				'enqueue'  => array(
+					array(
+						'admin_page' => array('form_editor'),
+					),
+				),
+			)
+		);
+
+		return array_merge( parent::scripts(), $scripts );
+	}
+
+
+	/**
+	 * Add settings menu for form delivery process
+	 *
+	 * @param $tabs
+	 * @param $form_id
+	 *
+	 * @return array
+	 */
+	public function add_form_settings_menu( $tabs, $form_id ) {
+
+		$tabs[] = array(
+			'name'  => $this->_slug,
+			'label' => esc_html__( 'Delivery Settings', 'wiaas' ),
+			'query' => array( 'fid' => null )
+		);
+
+		return $tabs;
+	}
+
+
+	/**
+	 * Add settings field for delivery process settings menu
+	 *
+	 * @param $form
+	 *
+	 * @return array
+	 */
+	public function form_settings_fields($form) {
+
+		return array(
+
+			array(
+				'title' => esc_html__( 'Delivery Process', 'wiaas' ),
+				'fields' => array(
+					array(
+						'name' => 'delivery_process',
+						'label' => esc_html__( 'Delivery Form Type', 'wiaas' ),
+						'type'  => 'delivery_process',
+					)
+				)
+			)
+		);
+	}
+
+	public function settings_delivery_process() {
+
+		$this->settings_select(array(
+			'name' => 'delivery_form_type',
+			'choices' => array(
+				array( 'value' => 'process', 'label' => 'Process Form' ),
+				array( 'value' => 'action', 'label' => 'Action Form' ),
+			),
+			'after_select' => '<p class="description"> Choose if this form will be used as process form or action form.</p>' .
+			                  '<p class="description"> <strong>Process form</strong> defines order delivery process workflow.</p>' .
+			                  '<p class="description"> <strong>Action form</strong> defines custom order data that is collected from delivery process participants.</p>'
+		));
+
+
+		?>
+        <br />  <br />  <br />
+		<?php
+
+
+		$settings = $this->get_current_settings();
+
+		if ($settings['delivery_form_type'] !== 'process') {
+
+			$this->settings_select(array(
+				'name' => 'delivery_action_code',
+				'choices' => array(
+					array( 'value' => '', 'label' => 'Select action code ...' ),
+					array( 'value' => 'customer-acceptance', 'label' => 'Customer acceptance' ),
+					array( 'value' => 'validate-questionnaire', 'label' => 'Validate Questionnaire' ),
+					array( 'value' => 'schedule-meeting', 'label' => 'Schedule meeting' ),
+				),
+				'after_select' => '<p class="description"> Choose action code for action form.</p>'
+			));
+
+
+			$this->settings_checkbox_and_select(array(
+				'checkbox' => array(
+					'label'          => esc_html__( 'Automatic', 'wiaas' ),
+					'name'           => 'automatic_action_entries_enabled',
+					'default_value' => '0',
+				),
+				'select'   => array(
+					'name'    => 'automatic_action_entries_type',
+					'choices' => array(
+						array(
+							'value' => 'single',
+							'label' => esc_html__( 'Single entry', 'wiaas' ),
+						),
+						array(
+							'value' => 'bundle',
+							'label' => esc_html__( 'Entry per bundle', 'wiaas' ),
+						)
+					),
+					'after_select' => '<p class="description">Automatic entries can be created once per order or per every bundle in order.</p>' .
+					                  '<p class="description">Automatic entry will not be created if any required field cannot be populated.</p>',
+				)
+			));
+
+			return;
+		}
+
+		$countries = Wiaas_Countries::get_available_countries();
+
+		$countries_choices = array();
+		foreach ($countries as $country) {
+		    $countries_choices[] = array( 'value' => $country['code'] , 'label' => $country['name'] );
+        }
+
+		$this->settings_select(array(
+			'name' => 'delivery_country',
+			'choices' => $countries_choices,
+			'after_select' => '<p class="description"> Choose country for which this process is defined.</p>'
+		));
+	}
+}

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

@@ -0,0 +1,193 @@
+<?php
+
+/**
+ * Handle organization and order level assignment to delivery process step.
+ *
+ * Currently Gravity Flow enables assignment of roles to step, but these roles are not bounded to organization level
+ * so cannot be used in that form for our delivery processes.
+ *
+ * This will enable delivery process step to be assigned to order admin, order seller, order customer or
+ * single order supplier organization.
+ *
+ *
+ * Class Wiaas_Delivery_Process_Step_Assignee
+ */
+
+class Wiaas_Delivery_Process_Step_Assignee {
+
+	public static function init() {
+
+		add_filter('gravityflow_assignee_choices', array (__CLASS__, 'filter_delivery_process_step_assignee_choices'));
+
+		add_filter('gravityflow_step_assignees', array (__CLASS__, 'maybe_handle_order_organization_assignees'), 10, 2);
+	}
+
+
+	/**
+	 * Allow only order specific organization roles and fields as choices for delivery process step assignee
+	 *
+	 * @param array $old_choices
+	 *
+	 * @return array
+	 */
+	public static function filter_delivery_process_step_assignee_choices($old_choices) {
+
+		$choices = array(
+			$choices[] = array(
+				'label'   => __( 'Order', 'wiaas' ),
+				'choices' => array(
+					array(
+						'value' => 'role|administrator', // allow global administrator role here since it is only one
+						'label' => __('Administrator', 'wiaas')
+					)
+				),
+			)
+		);
+
+		// add administrator users
+		$args            = array(
+			'number' => 1000,
+			'orderby' => 'display_name',
+			'role' => 'administrator'
+		);
+		$accounts        = get_users( $args );
+		$account_choices = array();
+		foreach ( $accounts as $account ) {
+			$account_choices[] = array( 'value' => 'user_id|' . $account->ID, 'label' => $account->display_name );
+		}
+
+		$choices[] = array(
+			'label'   => __( 'Users', 'gravityflow' ),
+			'choices' => $account_choices,
+		);
+
+		// append field choices
+		foreach ($old_choices as $old_choice) {
+
+			if ($old_choice['label'] === 'Fields') {
+
+				$choices[] = $old_choice;
+				break;
+			}
+		}
+
+		return $choices;
+	}
+
+
+	/**
+	 * Handle order level assignees for delivery process step
+	 *
+	 * @param $assignees
+	 *
+	 * @param Gravity_Flow_Step $step
+	 *
+	 * @return array
+	 */
+	public static function maybe_handle_order_organization_assignees($assignees, Gravity_Flow_Step $step) {
+
+		$mapped_assignees = array();
+
+		$order_id = self::_get_order_id_for_step($step);
+
+		$order = wc_get_order($order_id);
+
+		foreach ($assignees as $assignee) {
+
+			/**
+			 * Handle step assignee for installation company field
+			 */
+			if (strpos($assignee->get_type(), 'wiaas_installation_') !== false) {
+
+				$item_id = $assignee->get_id();
+
+				$item = $order->get_item($item_id);
+
+				$organization_id = $item['wiaas_supplier_organization_id'];
+
+				$user_ids = wiaas_get_organization_user_ids($organization_id);
+
+				if (empty($user_ids)) {
+
+					continue;
+				}
+
+				$user_id = $user_ids[0];
+
+				$mapped_assignees[] = $step->get_assignee( array(
+					'id' => $user_id,
+					'type' => 'user_id',
+					'editable_fields' => $assignee->get_editable_fields()
+				) );
+
+				continue;
+			}
+
+			/**
+			 * Handle step assignee for order role
+			 */
+			if ($assignee->get_type() === 'wiaas_order_role') {
+
+
+				$order_role = $assignee->get_id();
+
+				// Assign step to order customer
+				if ($order_role === 'customer') {
+
+					$customer_user_id = $order->get_customer_id();
+
+					// for now assign only customer that create order
+					// check if all customer organization users should be able to see order step
+
+					$mapped_assignees[] = $step->get_assignee( array(
+						'id' => $customer_user_id,
+						'type' => 'user_id',
+						'editable_fields' => $assignee->get_editable_fields()
+					) );
+
+					continue;
+				}
+			}
+
+			$mapped_assignees[] = $assignee;
+		}
+
+		return $mapped_assignees;
+	}
+
+
+	/**
+	 * Retrieve order id for delivery process step
+	 *
+	 * @param Gravity_Flow_Step $step
+	 *
+	 * @return bool|int Order id on success, false if step does not have associated order id
+	 *
+	 */
+	private static function _get_order_id_for_step(Gravity_Flow_Step $step) {
+
+		$entry = $step->get_entry();
+
+		// if order is present in entry metadata use that value
+		if (! empty($entry['wiaas_delivery_order_id'])) {
+
+			return absint($entry['wiaas_delivery_order_id']);
+		}
+
+		// try getting order id from order field
+		$form = GFAPI::get_form($entry['form_id']);
+
+		$order_fields = GFCommon::get_fields_by_type($form, array( 'wiaas_order'));
+
+		if (! empty($order_fields)) {
+
+			$order_field = $order_fields[0]; // there should only be one order field per entry
+
+			return absint($entry[$order_field->id]);
+		}
+
+		return false;
+	}
+}
+
+Wiaas_Delivery_Process_Step_Assignee::init();

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

@@ -7,30 +7,12 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 	 * @var string
 	 */
 	public $_step_type = 'wiaas_delivery_step';
-
-	private static $delivery_action_form_title_prefix = 'DELIVERY ACTION TYPE:';
-
-	private static $delivery_action_types = array(
-		'DELIVERY ACTION TYPE: Customer acceptance' => 'customer-acceptance',
-		'DELIVERY ACTION TYPE: Validate Questionnaire' => 'validate-questionnaire',
-		'DELIVERY ACTION TYPE: Manual' => 'manual',
-		'DELIVERY ACTION TYPE: Schedule meeting' => 'schedule-meeting'
-	);
-
-	public static function get_delivery_action_types() {
-		return array_keys(self::$delivery_action_types);
-	}
-
-	public static function get_delivery_action_type_prefix() {
-		return self::$delivery_action_form_title_prefix;
-	}
-
 	/**
 	 * Returns label for Wiass Delivery Process Step
 	 * @return string
 	 */
 	public function get_label() {
-		return esc_html__( 'Wiaas Delivery Step', 'wiaas' );
+		return esc_html__( 'Delivery Step', 'wiaas' );
 	}
 
 	/**
@@ -41,12 +23,12 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 
 		$settings_api = $this->get_common_settings_api();
 
-		$forms = $this->get_target_forms_choices();
+		$forms = Wiaas_Delivery_Process_Action::get_action_forms();
 		$form_choices[] = array( 'label' => esc_html__( 'Select a Form', 'wiaas' ), 'value' => '' );
 		foreach ( $forms  as $form ) {
-			$form_choices[] = array( 'label' => $form->title, 'value' => $form->id );
-		}
 
+		    $form_choices[] = array( 'label' => $form['title'], 'value' => $form['id'] );
+		}
 
 		$settings = array(
 			'title'  => esc_html__( 'Wiaas Delivery Step', 'wiaas' ),
@@ -71,18 +53,71 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 					'type' => 'select',
 					'onchange'    => "jQuery(this).closest('form').submit();",
 					'choices' => $form_choices,
-				),
+				)
 			),
 		);
 
 		return $settings;
 	}
 
+	public function start() {
+
+	    parent::start();
+
+        $this->update_step_status('pending');
+
+        return false;
+	}
+
+	public function evaluate_status() {
+
+	   return $this->get_status();
+    }
+
+    public function get_status_label($status) {
+
+	    $label = parent::get_status_label($status);
+
+	    if (empty($label)) {
+
+	        $label = __('Not started', 'wiaas');
+        }
+
+        return $label;
+    }
+
 	/**
-	 * Process Wiass Delivery Process Step
+     * Update status
+     *
+	 * @param bool $status
+	 */
+	public function update_step_status($status = false) {
+
+		/**
+		 * If status is being updated after manual step completion ('Next Step' or 'Previous Step') change default
+         * behavior of settings status to cancelled if manual action is sending flow to next step.
+         * Instead of default cancelled status set complete status for this step.
+		 */
+	    if ($status === 'cancelled' && $admin_action = rgpost( 'wiaas_delivery_process_navigation_action' )) {
+
+		    list( $base_admin_action, $step_id ) = rgexplode( '|', $admin_action, 2 );
+
+		    $next_step = gravity_flow()->get_next_step($this, $this->get_entry(), $this->get_form());
+		    // going to next step
+		    if ($base_admin_action === 'send_to_step' && $next_step && $next_step->get_id() == $step_id) {
+
+			    $status = 'complete';
+            }
+        }
+
+        parent::update_step_status($status);
+    }
+
+	/**
+     *
+	 * Process Wiaas Delivery Process Step
 	 *
-	 *
-	 * @return bool
+	 * @return bool We will always return false because step will be completed only by manual user action
 	 */
 	function process() {
 
@@ -90,81 +125,77 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 		$entry = $this->get_entry();
 		$target_form = GFAPI::get_form( $this->target_form_id );
 
-		# if target form is not valid just finish the step
+		# if target form is not set we are done
 		if (!$target_form) {
-			return true;
+			// return false since we wait for admin to process the step
+			return false;
 		}
 
-		# create new entry for target form with populated value for customer-id from parent entry
-		$new_entry = array(
-			'form_id' => $this->target_form_id,
-			'wiaas_delivery_process_id' => $this->get_entry_id(),
-			'wiaas_delivery_order_id' => $entry['wiaas_delivery_order_id'],
-            'wiaas_delivery_step_name' => $this->get_name(),
-		);
+		$delivery_settings = rgar($target_form, 'wiaas_delivery_process');
 
-		$customer_id_value = null;
+		if (! $delivery_settings['automatic_action_entries_enabled']) {
 
-		if ( is_array( $form['fields'] ) ) {
-			foreach ( $form['fields'] as $field ) {
-				if (GFCommon::get_label( $field ) === 'customer-id') {
-					$customer_id_value = $entry[$field->id];
-					break;
-				}
-			}
+		    return false;
+        }
+
+		$action_entries_ids = gform_get_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() . '_action_entry_ids');
+
+		// if action entries present this step is reprocessing and we should not be creating new action entries
+		if (! empty($action_entries_ids)) {
+			// return false since we wait for admin to process the step
+			return false;
 		}
 
-		if ( is_array( $target_form['fields'] ) ) {
-			foreach ( $target_form['fields'] as $field ) {
-				if (GFCommon::get_label( $field ) === 'customer-id') {
-					$new_entry[$field->id] = $customer_id_value;
-					break;
-				}
-			}
+		// create new entries for step action forms
+		$order_field = GFCommon::get_fields_by_type($form, 'wiaas_order')[0];
+		$order_id = empty($order_field) ? null : absint($entry[$order_field->id]);
+
+		// if process has not order we cannot create actions
+		if (empty($order_id)) {
+			// return false since we wait for admin to process the step
+			return false;
 		}
 
-		$entry_id = GFAPI::add_entry( $new_entry );
-		if ( is_wp_error( $entry_id ) ) {
-			$this->log_debug( __METHOD__ .'(): failed to add entry' );
-		} else {
-			// store entry id
-			gform_update_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() .'_entry_id', $entry_id);
+		$delivery_settings = rgar($target_form, 'wiaas_delivery_process');
+
+		switch ($delivery_settings['automatic_action_entries_type']) {
+
+			case 'single':
+				$action_entries_ids = $this->_create_single_action_entry($target_form, $order_id);
+				break;
+			case 'bundle':
+				$action_entries_ids = $this->_create_per_bundle_action_entries($target_form, $order_id);
 		}
 
+		gform_update_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() . '_action_entry_ids', $action_entries_ids);
+
 		$note = $this->get_name() . ': ' . esc_html__( 'started.', 'wiaas' );
 		$this->add_note( $note );
 
-		# return false since we wait for workflow of target entry to be complete first
+		// return false since we wait for admin to process the step
 		return false;
 	}
 
-	/**
-	 * Evaluates current step status based on target form entry status
-	 *
-	 * If target form entry has associated workflow current step will complete its status
-	 * only when target form entry workflow is completed
-	 * @return string
-	 */
-	public function status_evaluation() {
+	public function workflow_detail_box($form, $args) {
+		parent::workflow_detail_box($form, $args);
 
-		# retrieve target form entry to check its workflow status
-		$target_form_entry = $this->get_target_form_entry();
+		$target_form = GFAPI::get_form( $this->target_form_id );
 
-		# if there is no target form entry just complete the step
-		if(!$target_form_entry) {
-			return 'complete';
+		if (empty( $target_form)) {
+
+			return;
 		}
 
-		# retrieve target form entry workflow status
-		$api = new Gravity_Flow_API( $this->target_form_id );
-		$status = $api->get_status($target_form_entry);
+		?>
+			<h4>Step: <?php echo $this->get_name() ?></h4>
+			<h4>Action: <?php echo $target_form['title'] ?></h4>
+		<?php
 
-		# status is complete only if target entry flow is complete
-		return $status === 'complete' || $status === 'approved' ? 'complete' : 'pending';
 	}
 
 	/**
-	 * Expands step entry with additional metadata to track created target entry id
+	 * Expands step entry with additional metadata to track created target actions entries id
+	 *
 	 * @param array $entry_meta
 	 * @param int $form_id
 	 *
@@ -172,79 +203,94 @@ class Wiaas_Delivery_Process_Step extends Gravity_Flow_Step {
 	 */
 	public function get_entry_meta($entry_meta, $form_id) {
 		if ($form_id === $this->get_form_id()) {
-			$entry_meta['wiaas_delivery_step_' . $this->get_id() .'_entry_id'] = null;
+			$entry_meta['wiaas_delivery_step_' . $this->get_id() . '_action_entry_ids'] = array();
 		}
 		return $entry_meta;
 	}
 
+
+
 	/**
-	 * Retrieves forms that are valid options for delivery step action
+     *
+	 * PRIVATE
+     *
+	 */
+
+
+	/**
+     * Create action entry to trigger subworkflow
+	 * @param $target_form
+	 * @param $order_id
+	 *
 	 * @return array
 	 */
-	public function get_target_forms_choices() {
-		return GFFormsModel::search_forms(self::$delivery_action_form_title_prefix, true);
+	private function _create_single_action_entry($target_form, $order_id) {
+
+		$action_entries_ids = array();
+
+		$new_entry = Wiaas_Order_Fields::map_order_to_entry($order_id, $target_form);
+
+		if (empty($new_entry)) {
+		    // entry cannot be created
+		    return $action_entries_ids;
+        }
+
+		$new_entry['form_id'] = $target_form['id'];
+		$new_entry['wiaas_delivery_process_id'] = $this->get_entry_id();
+		$new_entry['wiaas_delivery_order_id'] = $order_id;
+
+		$entry_id = GFAPI::add_entry( $new_entry );
+
+		if ( is_wp_error( $entry_id ) ) {
+			$this->log_debug( __METHOD__ .'(): failed to add entry' );
+		} else {
+			// store entry id
+			$action_entries_ids[] = $entry_id;
+		}
+
+		return $action_entries_ids;
 	}
 
+
 	/**
-	 * Retrieves delivery action type that is executed with this step
-	 * @return string
+     * Create action form entries for every bundle in order to trigger subworkflows
+     *
+	 * @param $target_form
+	 * @param $order_id
+	 *
+	 * @return array
 	 */
-	public function get_delivery_action_type() {
-		$target_form = GFAPI::get_form( $this->target_form_id );
-		return self::$delivery_action_types[$target_form['title']];
-	}
+	private function _create_per_bundle_action_entries($target_form, $order_id) {
 
-	public function get_target_actual_date() {
-		$target_entry = $this->get_target_form_entry();
-		$target_form = GFAPI::get_form( $this->target_form_id );
+		$action_entries_ids = array();
 
-		if (!is_wp_error($target_entry) && is_array($target_form['fields'])) {
-			foreach ( $target_form['fields'] as $field ) {
-				if (GFCommon::get_label( $field ) === 'Actual Date') {
-					return $target_entry[$field->id];
-				}
+		$bundle_items = wiaas_get_order_standard_bundle_items($order_id);
+
+		foreach ($bundle_items as $item) {
+
+			$new_entry = Wiaas_Order_Fields::map_order_to_entry($order_id, $target_form, $item->get_id());
+
+			if (empty($new_entry)) {
+				// entry cannot be created
+				continue;
+			}
+
+			$new_entry['form_id'] = $target_form['id'];
+			$new_entry['wiaas_delivery_process_id'] = $this->get_entry_id();
+			$new_entry['wiaas_delivery_order_id'] = $order_id;
+
+			$entry_id = GFAPI::add_entry( $new_entry );
+
+			if ( is_wp_error( $entry_id ) ) {
+
+				$this->log_debug( __METHOD__ .'(): failed to add entry' );
+			} else {
+				// store entry id
+
+				$action_entries_ids[] = $entry_id;
 			}
 		}
 
-		return null;
-	}
-
-	public function get_target_step_comments() {
-		$notes = RGFormsModel::get_lead_notes( $this->get_target_form_entry_id() );
-
-		$comments = array();
-		foreach ( $notes as $key => $note ) {
-			if ( $note->note_type !== 'gravityflow' ) {
-				$comments[] = array(
-					'date' => $note->date_created,
-					'text' => $note->value,
-					'user' => $note->user_name
-				);
- 			}
-		}
-		return $comments;
-	}
-
-	/**
-	 * Retrieves target form entry created when step was started
-	 * @return array|null
-	 */
-	public function get_target_form_entry() {
-		$entry = GFAPI::get_entry($this->get_target_form_entry_id());
-		if(is_wp_error($entry)) {
-			return null;
-		}
-		return $entry;
-	}
-
-
-	/**
-	 * Retrieves target form entry id created when step was started
-	 * @return int
-	 */
-	public function get_target_form_entry_id() {
-		$value = gform_get_meta($this->get_entry_id(), 'wiaas_delivery_step_' . $this->get_id() .'_entry_id');
-
-		return absint($value);
+		return $action_entries_ids;
 	}
 }

backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-field-order-bundle-document.php

@@ -0,0 +1,73 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Field_Order_Bundle_Document extends GF_Field_FileUpload {
+
+	public $type ='wiaas_order_bundle_document';
+
+	public $wiaasDocTypeFilter = 'config';
+
+	public function get_form_editor_field_settings() {
+		return array(
+			'wiaas_doc_type_filter',
+			'multiple_files_setting',
+			'conditional_logic_field_setting',
+			'error_message_setting',
+			'label_setting',
+			'label_placement_setting',
+			'admin_label_setting',
+			'rules_setting',
+			'file_extensions_setting',
+			'file_size_setting',
+			'visibility_setting',
+			'description_setting',
+			'css_class_setting',
+		);
+	}
+
+	public function get_input_type() {
+		return 'fileupload';
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Bundle Document', 'wiaas' );
+	}
+
+	public function get_download_url( $file, $force_download = false ) {
+
+		$upload_root = GFFormsModel::get_upload_url( $this->formId );
+		$upload_root = trailingslashit( $upload_root );
+
+		// handle download for order documents not uploaded by gravity forms
+		if ( strpos( $file, $upload_root ) === false ) {
+
+			return admin_url() . '?gf-wiaas-order-doc=' . urlencode($file);
+		}
+
+		return parent::get_download_url( $file, $force_download );
+	}
+
+	public function sanitize_settings() {
+		parent::sanitize_settings();
+
+		$this->wiaasDocTypeFilter = sanitize_key($this->wiaasDocTypeFilter);
+	}
+}
+
+GF_Fields::register( new Wiaas_Field_Order_Bundle_Document() );

backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-field-order-bundle-installation-date.php

@@ -0,0 +1,38 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Field_Order_Bundle_Installation_Date extends GF_Field_Date {
+
+	public $type ='wiaas_order_bundle_installation_date';
+
+	public $inputType = 'date';
+
+	public $dateType = 'datepicker';
+
+	public function get_input_type() {
+		return 'date';
+	}
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Bundle Install Date', 'wiaas' );
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+}
+
+
+GF_Fields::register( new Wiaas_Field_Order_Bundle_Installation_Date() );

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

@@ -0,0 +1,63 @@
+<?php
+
+class Wiaas_Field_Order_Bundle extends GF_Field_Text {
+
+	public $type = 'wiaas_order_bundle';
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Bundle', 'wiaas' );
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+
+	public function get_value_entry_list( $value, $entry, $field_id, $columns, $form ) {
+		return $this->get_bundle_display_name($value);
+	}
+
+
+	public function get_value_merge_tag( $value, $input_id, $entry, $form, $modifier, $raw_value, $url_encode, $esc_html, $format, $nl2br ) {
+		return $this->get_bundle_display_name($value);
+	}
+
+
+	public function get_value_entry_detail( $value, $currency = '', $use_text = false, $format = 'html', $media = 'screen' ) {
+		return $this->get_bundle_display_name($value);
+	}
+
+	public function get_bundle_item($value) {
+
+		list($order_id, $item_id) = rgexplode('|', $value, 2);
+
+		if (! empty($order_id) && ! empty($item_id) && $order = wc_get_order($order_id)) {
+
+			return $order->get_item($item_id);
+		}
+
+		return null;
+	}
+
+	public function get_bundle_display_name($value) {
+
+		$item = $this->get_bundle_item($value);
+
+		if (! empty($item)) {
+
+			return $item->get_name();
+		}
+
+		return '';
+	}
+}
+
+GF_Fields::register( new Wiaas_Field_Order_Bundle() );

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

@@ -0,0 +1,74 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Field_Order_Document extends GF_Field_FileUpload {
+
+	public $type ='wiaas_order_document';
+
+	public $wiaasDocTypeFilter = 'install_guide';
+
+	public function get_form_editor_field_settings() {
+		return array(
+			'wiaas_doc_type_filter',
+			'multiple_files_setting',
+			'conditional_logic_field_setting',
+			'error_message_setting',
+			'label_setting',
+			'label_placement_setting',
+			'admin_label_setting',
+			'rules_setting',
+			'file_extensions_setting',
+			'file_size_setting',
+			'visibility_setting',
+			'description_setting',
+			'css_class_setting',
+		);
+	}
+
+	public function get_input_type() {
+		return 'fileupload';
+	}
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Order Document', 'wiaas' );
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+
+	public function get_download_url( $file, $force_download = false ) {
+
+		$upload_root = GFFormsModel::get_upload_url( $this->formId );
+		$upload_root = trailingslashit( $upload_root );
+
+		// handle download for order documents not uploaded by gravity forms
+		if ( strpos( $file, $upload_root ) === false ) {
+
+			return admin_url() . '?gf-wiaas-order-doc=' . urlencode($file);
+		}
+
+		return parent::get_download_url( $file, true );
+	}
+
+	public function sanitize_settings() {
+		parent::sanitize_settings();
+
+		$this->wiaasDocTypeFilter = sanitize_key($this->wiaasDocTypeFilter);
+	}
+}
+
+
+GF_Fields::register( new Wiaas_Field_Order_Document() );

backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-field-order-installation-select.php

@@ -0,0 +1,127 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Order_Installation_Select extends GF_Field_Select {
+
+	public $type = 'wiaas_order_installation_select';
+
+
+	public function get_input_type() {
+		return 'workflow_assignee_select';
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+
+	public function get_field_input( $form, $value = '', $entry = null ) {
+
+		if ( empty($entry) ) {
+
+			return parent::get_field_input($form, $value, $entry);
+		}
+
+		// get bundle item field
+		$bundle_item_field = GFCommon::get_fields_by_type($form, array( 'wiaas_order_bundle') )[0];
+
+		if (! empty($bundle_item_field) &&
+		    $bundle_item = $bundle_item_field->get_bundle_item($entry[$bundle_item_field->id])) {
+
+			$bundled_items = wc_pb_get_bundled_order_items($bundle_item);
+
+			$installation_items = array();
+
+			foreach ($bundled_items as $id => $bundled_item) {
+
+				$product = $bundled_item->get_product();
+
+				if ($product && Wiaas_Product_Category::is_installation($product)) {
+
+					$installation_items[] = $bundled_item;
+				}
+			}
+
+			$choices = array(
+				array( 'value' => '0', 'text' => 'Select installation ...')
+			);
+
+			$order_id = $bundle_item->get_order_id();
+
+			foreach ($installation_items as $installation_item) {
+
+				$choices[] = array(
+					'value' => 'wiaas_installation_' . $order_id . '|' . $installation_item->get_id(),
+					'text' => $installation_item->get_name()
+				);
+			}
+
+			$this->choices = $choices;
+		}
+
+		return parent::get_field_input($form, $value, $entry);
+	}
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Installation Select', 'wiaas' );
+	}
+
+	public function get_value_entry_list( $value, $entry, $field_id, $columns, $form ) {
+		return $this->get_selected_installation_display_name($value);
+	}
+
+
+	public function get_value_merge_tag( $value, $input_id, $entry, $form, $modifier, $raw_value, $url_encode, $esc_html, $format, $nl2br ) {
+		return $this->get_selected_installation_display_name($value);
+	}
+
+
+	public function get_value_entry_detail( $value, $currency = '', $use_text = false, $format = 'html', $media = 'screen' ) {
+		return $this->get_selected_installation_display_name($value);
+	}
+
+	public function get_selected_installation($value) {
+
+		$value = $value ? str_replace('wiaas_installation_', '', $value) : '';
+
+		list ($order_id, $item_id) = explode('|', $value);
+
+		if (! empty($order_id) && ! empty($item_id) && $order = wc_get_order($order_id)) {
+
+			return $order->get_item($item_id);
+		}
+
+		return null;
+	}
+
+	public function get_selected_installation_display_name($value) {
+
+		$item = $this->get_selected_installation($value);
+
+		return ! empty($item) ? $item->get_name() : '';
+	}
+
+	public function post_convert_field() {
+
+		if ($this->is_form_editor()) {
+
+			$this->choices = array(
+				array( 'value' => '0', 'text' => 'Select installation ...')
+			);
+		}
+	}
+}
+
+
+GF_Fields::register( new Wiaas_Order_Installation_Select() );

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

@@ -0,0 +1,66 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Field_Order_Number extends GF_Field_Number {
+
+	public $type = 'wiaas_order';
+
+	function get_form_editor_field_settings() {
+		return array(
+			'conditional_logic_field_setting',
+			'prepopulate_field_setting',
+			'error_message_setting',
+			'label_setting',
+			'label_placement_setting',
+			'admin_label_setting',
+			'size_setting',
+			'rules_setting',
+			'visibility_setting',
+			'duplicate_setting',
+			'default_value_setting',
+			'placeholder_setting',
+			'description_setting',
+			'css_class_setting',
+		);
+	}
+
+	public function sanitize_settings() {
+		parent::sanitize_settings();
+	}
+
+
+	public function get_form_editor_field_title() {
+		return esc_attr__( 'Order Number', 'wiaas' );
+	}
+
+	public function add_button( $field_groups ) {
+		$field_groups = Wiaas_Order_Fields::maybe_add_order_field_group($field_groups);
+
+		return parent::add_button( $field_groups );
+	}
+
+	public function get_form_editor_button() {
+		return array(
+			'group' => 'wiaas_order_fields',
+			'text'  => $this->get_form_editor_field_title(),
+		);
+	}
+
+
+	public function get_value_entry_list( $value, $entry, $field_id, $columns, $form ) {
+		return "#100000$value";
+	}
+
+	public function get_value_entry_detail( $value, $currency = '', $use_text = false, $format = 'html', $media = 'screen' ) {
+		return "#100000$value";
+	}
+
+	public function get_value_merge_tag( $value, $input_id, $entry, $form, $modifier, $raw_value, $url_encode, $esc_html, $format, $nl2br ) {
+		return "#100000$value";
+	}
+}
+
+GF_Fields::register( new Wiaas_Field_Order_Number() );

backend/app/plugins/wiaas/includes/delivery-process/class-wiaas-merge-tag-customer-order-url.php

@@ -0,0 +1,59 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Merge_Tag_Customer_Order_Url extends Gravity_Flow_Merge_Tag {
+
+	/**
+	 * Name of the merge tag
+	 * 
+	 * @var string
+	 */
+	public $name = 'customer_order_url';
+
+
+	/**
+	 * The regular expression to use for the matching.
+	 *
+	 * @var string
+	 */
+	protected $regex = '/{customer_order_url(:(.*?))?}/';
+
+
+	public function replace( $text ) {
+
+		$matches = $this->get_matches( $text );
+
+		if ( ! empty( $matches ) ) {
+
+			$entry = $this->entry;
+
+			$form = GFAPI::get_form($entry['form_id']);
+
+			$order_field = GFCommon::get_fields_by_type($form, 'wiaas_order')[0];
+
+			if (empty($order_field)) {
+
+				return $text;
+			}
+
+			$order_id = $entry[$order_field->id];
+
+			$url = WIAAS_CUSTOMER_INTERFACE . '/orders/' . $order_id;
+
+			$link = sprintf( '<a href="%s">%s</a>', $url, 'Order' );
+
+			foreach ( $matches as $match ) {
+				$full_tag = $match[0];
+
+				$text = str_replace( $full_tag, $link, $text );
+			}
+		}
+
+		return $text;
+	}
+}
+
+Gravity_Flow_Merge_Tags::register( new Wiaas_Merge_Tag_Customer_Order_Url );

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

@@ -0,0 +1,477 @@
+<?php
+
+if ( ! class_exists( 'GFForms' ) ) {
+	die();
+}
+
+class Wiaas_Order_Fields {
+
+	public static function init() {
+
+		add_action( 'gform_field_standard_settings', array( __CLASS__, 'field_settings' ) );
+
+		add_filter('gform_fileupload_entry_value_file_path', array( __CLASS__, 'display_order_document_fields' ), 999, 2);
+
+		add_action('gform_post_update_entry', array(__CLASS__, 'maybe_map_entry_to_order'), 10, 2);
+
+		add_action('gform_after_update_entry', array(__CLASS__, 'maybe_apply_user_input_changes'), 10, 3);
+	}
+
+	/**
+     * Workflow user input are handled separately in gravity flow. We get them here
+     * and then try to apply changes to order
+     *
+	 * @param $form
+	 * @param $entry_id
+	 * @param $original_entry
+	 */
+	public static function maybe_apply_user_input_changes($form, $entry_id, $original_entry) {
+
+	    $entry = GFAPI::get_entry($entry_id);
+
+	    self::maybe_map_entry_to_order($entry, $original_entry);
+    }
+
+
+	/**
+     * Persist workflow entry change to order
+     *
+	 * @param $entry
+	 * @param $old_entry
+	 */
+	public static function maybe_map_entry_to_order($entry, $old_entry) {
+
+	    $form = GFAPI::get_form($old_entry['form_id']);
+
+	    $order_field = GFCommon::get_fields_by_type($form, 'wiaas_order')[0];
+
+	    if (empty($order_field)) {
+
+	        return;
+        }
+
+	    $order_id = $entry[$order_field->id];
+
+	    // get order process entry
+	    $order = wc_get_order($order_id);
+	    $process_entry = Wiaas_Delivery_Process::get_order_delivery_process_entry($order_id);
+
+	    if ( !$order || empty($process_entry) ) {
+
+	        return;
+        }
+
+        // apply entry changes to order properties
+        foreach ($form['fields'] as $field) {
+
+	        $old_value = $old_entry[$field->id];
+	        $new_value = $entry[$field->id];
+
+	        // check if field changed
+            if ($old_value ===  $new_value || empty($new_value)) {
+
+                continue;
+            }
+
+            // save changes to order
+	        switch ($field->type) {
+
+                case 'wiaas_order_bundle_installation_date':
+	                /**
+	                 * Persist bundle installation date
+	                 */
+
+	                // get corresponding bundle field
+	                $bundle_field = GFCommon::get_fields_by_type( $form, 'wiaas_order_bundle' )[0];
+
+	                if (empty($bundle_field)) {
+
+		                continue;
+	                }
+
+	                $bundle_item = $bundle_field->get_bundle_item( $entry[$bundle_field->id] );
+
+	                if (empty($bundle_item)) {
+
+		                continue;
+	                }
+
+	                $bundle_item->update_meta_data('_wiaas_installation_date', $new_value);
+	                $bundle_item->save_meta_data();
+
+                    break;
+
+                case 'wiaas_order_bundle_document':
+	                /**
+	                 * Persist delivery flow documents for bundle
+	                 */
+
+                    // get corresponding bundle field
+                    $bundle_field = GFCommon::get_fields_by_type( $form, 'wiaas_order_bundle' )[0];
+
+                    if (empty($bundle_field)) {
+
+                        continue;
+                    }
+
+                    $bundle_item = $bundle_field->get_bundle_item( $entry[$bundle_field->id] );
+
+                    if (empty($bundle_item)) {
+
+                        continue;
+                    }
+
+                    $bundle_documents = $bundle_item->get_meta('_wiaas_documents', true);
+	                if (empty($bundle_documents)) {
+		                $bundle_documents = array();
+	                }
+
+	                $new_documents = $field->multipleFiles ? json_decode( $new_value ) : array( $new_value );
+	                if (! empty($old_value) ) {
+
+		                $old_documents = $field->multipleFiles ? json_decode( $old_value ) : array( $old_value );
+		                $added_documents = array_diff($new_documents, $old_documents);
+	                } else {
+
+		                $added_documents = $new_documents;
+	                }
+
+
+	                foreach ($added_documents as $added_document) {
+		                $info = pathinfo( $added_document );
+
+		                $dir = wp_upload_dir();
+		                $relative_file_path = str_replace($dir['baseurl'] . '/', '', $added_document);
+
+		                $bundle_documents[] = array(
+			                'key' => wp_generate_uuid4(),
+			                'name' => $info['filename'],
+			                'extension' => $info['extension'],
+			                'version' => $relative_file_path,
+			                'url'  => $field->get_download_url( $added_document, true ),
+			                'type' => $field->wiaasDocTypeFilter
+		                );
+	                }
+
+	                $bundle_item->update_meta_data('_wiaas_documents', $bundle_documents);
+	                $bundle_item->save_meta_data();
+
+                    break;
+
+                case 'wiaas_order_document':
+	                /**
+	                 * Persist delivery flow documents for order
+	                 */
+                    $new_documents = $field->multipleFiles ? json_decode( $new_value ) : array( $new_value );
+
+                    if (! empty($old_value) ) {
+
+	                    $old_documents = $field->multipleFiles ? json_decode( $old_value ) : array( $old_value );
+	                    $added_documents = array_diff($new_documents, $old_documents);
+                    } else {
+
+                        $added_documents = $new_documents;
+                    }
+
+                    $order_documents = $order->get_meta('_wiaas_other_documents', true);
+                    if (empty($order_documents)) {
+                        $order_documents = array();
+                    }
+
+                    foreach ($added_documents as $added_document) {
+	                    $info = pathinfo( $added_document );
+
+	                    $dir = wp_upload_dir();
+	                    $relative_file_path = str_replace($dir['baseurl'] . '/', '', $added_document);
+
+	                    $order_documents[] = array(
+		                    'key' => wp_generate_uuid4(),
+		                    'name' => $info['filename'],
+		                    'extension' => $info['extension'],
+		                    'version' => $relative_file_path,
+		                    'url'  => $field->get_download_url( $added_document, true ),
+                            'type' => $field->wiaasDocTypeFilter
+                        );
+                    }
+
+	                $order->update_meta_data('_wiaas_other_documents', $order_documents);
+                    $order->save_meta_data();
+
+                    break;
+
+                case 'wiaas_order_installation_select':
+	                /**
+	                 * Persist installation for bundle
+	                 */
+
+	                $selected_installation = $field->get_selected_installation($new_value);
+
+	                if ( empty($selected_installation) ) {
+	                    // no installation selected
+		                continue;
+                    }
+
+	                // get corresponding bundle field
+	                $bundle_field = GFCommon::get_fields_by_type( $form, 'wiaas_order_bundle' )[0];
+
+	                if (empty($bundle_field)) {
+
+		                continue;
+	                }
+
+	                $bundle_item = $bundle_field->get_bundle_item( $entry[$bundle_field->id] );
+
+	                if (empty($bundle_item)) {
+
+		                continue;
+	                }
+
+	                $bundle_item->update_meta_data('_wiaas_installation', $selected_installation->get_id());
+	                $bundle_item->save_meta_data();
+
+	                /**
+	                 * Apply actions related to order item installation
+	                 * (ex. make order visible to corresponding installation company)
+	                 */
+	                do_action('wiaas_order_item_installation_assigned', $order, $bundle_item, $selected_installation);
+            }
+        }
+    }
+
+	/**
+	 * Adds the Order Fields group to the form editor.
+	 *
+	 * @param array $field_groups The properties for the field groups.
+	 *
+	 * @return array
+	 */
+	public static function maybe_add_order_field_group( $field_groups ) {
+		foreach ( $field_groups as $field_group ) {
+			if ( $field_group['name'] == 'wiaas_order_fields' ) {
+				return $field_groups;
+			}
+		}
+
+		$field_groups[] = array(
+			'name'   => 'wiaas_order_fields',
+			'label'  => __( 'Order Fields', 'wiaas' ),
+			'fields' => array()
+		);
+
+		return $field_groups;
+	}
+
+
+	public static function display_order_document_fields($file_path, $field) {
+
+	    if (strpos($file_path, 'gf-download') === false &&
+            strpos($file_path, 'gf-wiaas-order-doc') === false) {
+
+		    $field = new Wiaas_Field_Order_Bundle_Document();
+
+		    return $field->get_download_url($file_path);
+        }
+
+        return $file_path;
+	}
+
+	/**
+     * Add custom settings for form order fields
+     *
+	 * @param int $position
+	 */
+	public static function field_settings( $position ) {
+		if ( $position === 20 ) {
+			// After Field description setting.
+			?>
+
+			<li class="wiaas_doc_type_filter field_setting">
+
+				<label for="wiaas-doc-type-filter" class="section_label">
+					<?php esc_html_e( 'Document Type', 'wiaas' ); ?>
+				</label>
+				<select id="wiaas-doc-type-filter" onchange="SetFieldProperty('wiaasDocTypeFilter',this.value);">
+					<option value="configuration"><?php esc_html_e( 'Configuration', 'wiaas' ); ?></option>
+					<option value="order_questionaire"><?php esc_html_e( 'Order Questionaire', 'wiaas' ); ?></option>
+					<option value="installation_protocol"><?php esc_html_e( 'Installation protocol', 'wiaas' ); ?></option>
+                    <option value="install_guide"><?php esc_html_e( 'Installation Guide', 'wiaas' ); ?></option>
+					<option value="customer_acceptance"><?php esc_html_e( 'Customer acceptance', 'wiaas' ); ?></option>
+				</select>
+
+			</li>
+
+            <li class="wiaas_installation_organization_filter field_setting">
+                <input type="checkbox" id="wiaas-installation-organization-filter"
+                       onclick="var value = jQuery(this).is(':checked'); SetFieldProperty('wiaasOnlyInstallationOrg', value);""/>
+                <label for="wiaas-installation-organization-filter" class="inline">
+	                <?php esc_html_e( 'Only installation', 'wiaas' ); ?>
+                </label>
+            </li>
+
+			<?php
+		}
+	}
+
+
+	/**
+     * Create new entry for order delivery process action form
+     *
+	 * @param int $order_id
+	 * @param array $form
+	 * @param int|null $bundle_item_id
+	 *
+	 * @return array|bool
+	 */
+	public static function map_order_to_entry($order_id, $form, $bundle_item_id = null) {
+
+	    if (empty($form['fields']) ||
+            empty(GFCommon::get_fields_by_type( $form, array('wiaas_order')) ) ) {
+	        // form does not have order field so cannot be mapped
+	        return false;
+        }
+
+		$order = wc_get_order($order_id);
+
+        $entry = array();
+
+	    foreach ($form['fields'] as $field) {
+
+            switch ($field->type) {
+
+                case 'wiaas_order':
+
+                    $entry[(string) $field->id] = $order->get_id();
+
+                    break;
+
+                case 'workflow_user':
+	                $entry[(string) $field->id] = $order->get_customer_id(); // save customer if needed
+
+	                break;
+
+                case 'wiaas_order_bundle':
+
+	                $bundle_item = $order->get_item($bundle_item_id);
+
+                    if ( empty($bundle_item) && $field->isRequired) {
+	                    // there is no data for required field so entry cannot be created
+	                    return false;
+                    }
+
+                    if (! empty($bundle_item)) {
+
+	                    $entry[(string) $field->id] = $order->get_id() . '|' . $bundle_item->get_id();
+                    }
+
+	                break;
+
+                case 'wiaas_order_bundle_document':
+
+	                $bundle_item = $order->get_item($bundle_item_id);
+
+	                if ( empty($bundle_item) && $field->isRequired) {
+		                // there is no data for required field so entry cannot be created
+		                return false;
+	                }
+
+	                if (! empty($bundle_item)) {
+
+		                $documents = wiaas_get_standard_package_order_item_documents($order, $bundle_item_id);
+
+		                $filtered_documents = array();
+
+		                foreach ($documents as $document) {
+
+		                    if ($document['type'] === $field->wiaasDocTypeFilter) {
+
+		                        $filtered_documents[] = $document;
+                            }
+                        }
+
+		                if ( empty($filtered_documents) && $field->isRequired ) {
+			                // there is no data for required field so entry cannot be created
+			                return false;
+		                }
+
+		                if (! empty ($filtered_documents) && ! $field->multipleFiles) {
+
+			                $document = $filtered_documents[0];
+
+			                $entry[$field->id] = $document['version'];
+
+                        } else if (! empty ($filtered_documents) ) {
+
+		                    $versions = array();
+		                    foreach ($filtered_documents as $filtered_document) {
+		                        $versions[] = $filtered_document['version'];
+                            }
+
+			                $entry[$field->id] = json_encode($versions);
+                        }
+                    }
+
+	                break;
+
+	            case 'wiaas_order_installation_select':
+
+		            $bundle_item = $order->get_item($bundle_item_id);
+
+		            if ( empty($bundle_item) && $field->isRequired) {
+			            // there is no data for required field so entry cannot be created
+			            return false;
+		            }
+
+		            // installation is already selected
+		            if (!empty($bundle_item->get_meta('_wiaas_installation', true))) {
+
+			            $entry[(string) $field->id] = 'wiaas_installation_' . $order->get_id() . '|' . $bundle_item->get_meta('_wiaas_installation', true);
+
+			            continue;
+                    }
+
+		            $bundled_items = wc_pb_get_bundled_order_items($bundle_item, $order);
+
+		            $installation_items = array();
+
+		            foreach ($bundled_items as $id => $bundled_item) {
+
+		                $product = $bundled_item->get_product();
+
+		                if ($product && Wiaas_Product_Category::is_installation($product)) {
+
+		                    $installation_items[] = $bundled_item;
+                        }
+                    }
+
+                    if (empty($installation_items)) {
+	                    // there is no data for required field so entry cannot be created
+		                return false;
+                    }
+
+                    if (count($installation_items) === 1) {
+
+		                $installation_item = $installation_items[0];
+
+	                    $entry[(string) $field->id] = 'wiaas_installation_' . $order->get_id() . '|' . $installation_item->get_id();
+
+	                    /**
+	                     * Apply actions related to order item installation
+                         * (ex. make order visible to corresponding installation company)
+	                     */
+	                    do_action('wiaas_order_item_installation_assigned', $order, $bundle_item, $installation_item);
+
+                    } else if (count($installation_items) > 1) {
+
+		                // force admin to select installation
+	                    $entry[(string) $field->id] = '0';
+                    }
+
+            }
+        }
+
+        return $entry;
+    }
+
+}
+
+Wiaas_Order_Fields::init();